]>
gerrit.simantics Code Review - simantics/platform.git/log
Reino Ruusu [Fri, 7 Oct 2016 18:54:29 +0000 (21:54 +0300)]
Databoard and SCL enchancements.
Mapping for generic java.util.Map and java.util.Set references.
Moved databoard-related SCL definitions to a new Databoard module.
Added documentation string to Databoard.scl.
Added a few SCL bindings to potentially useful methods in the Binding
class.
refs #6738
Change-Id: I07369ca5a5ae23966b11ce5ff9787ab07e38af29
Tuukka Lehtonen [Tue, 4 Oct 2016 20:11:38 +0000 (23:11 +0300)]
Tuukka Lehtonen [Tue, 4 Oct 2016 20:07:47 +0000 (23:07 +0300)]
Sync git svn branch with SVN repository r33303.
refs #6740
refs #6726
refs #6739
refs #6735
refs #6731
refs #6730
refs #6729
refs #6728
refs #6724
refs #6701
refs #6669
Reino Ruusu [Mon, 3 Oct 2016 14:39:33 +0000 (17:39 +0300)]
Improve Databoard's dynamically typed data capabilities.
refs #6738
Change-Id: Iddbcf7e875aefa1bc70430b918cef3656ad97501
Tuukka Lehtonen [Fri, 30 Sep 2016 13:32:51 +0000 (16:32 +0300)]
Tuukka Lehtonen [Fri, 30 Sep 2016 13:31:32 +0000 (16:31 +0300)]
Merge commit '
3b5069d ' into develop
refs #6726
Tuukka Lehtonen [Fri, 30 Sep 2016 13:28:29 +0000 (16:28 +0300)]
Sync git svn branch with SVN repository r33290.
refs #6726
Tuukka Lehtonen [Fri, 30 Sep 2016 09:23:53 +0000 (12:23 +0300)]
Logger fixes after merge commit:
fdbe8762
refs #6724
Change-Id: I4559a65783b104aadbf8a5797aa6b3edbe128fea
(cherry picked from commit
a0b1831418eba8870ca849ef2cd85823aa7bfa0a )
Tuukka Lehtonen [Fri, 30 Sep 2016 09:23:53 +0000 (12:23 +0300)]
Logger fixes after merge commit:
fdbe8762
refs #6724
Change-Id: I4559a65783b104aadbf8a5797aa6b3edbe128fea
Tuukka Lehtonen [Fri, 30 Sep 2016 08:06:06 +0000 (11:06 +0300)]
Merge commit '
bf75fd9 '
Resolved conflicts:
bundles/org.simantics.charts/src/org/simantics/charts/Charts.java
refs #6724
refs #6723
refs #6704
refs #6495
Tuukka Lehtonen [Fri, 30 Sep 2016 07:59:43 +0000 (10:59 +0300)]
Sync git svn branch with SVN repository r33269.
refs #6724
refs #6723
refs #6704
refs #6495
jsimomaa [Wed, 28 Sep 2016 15:49:17 +0000 (18:49 +0300)]
Add Koloboke API and Koloboke Compile to target platform
refs #6725
Change-Id: I279092cc2136525bf6098502eeb75f4affd8bad9
Hannu Niemistö [Wed, 28 Sep 2016 06:27:39 +0000 (09:27 +0300)]
merged svn r33251, contains graph.tg changes
Tuukka Lehtonen [Tue, 27 Sep 2016 23:23:58 +0000 (02:23 +0300)]
Merge commit '
9d2bb8d '
refs #6684
Tuukka Lehtonen [Tue, 27 Sep 2016 23:22:03 +0000 (02:22 +0300)]
Sync git svn branch with SVN repository r33251.
refs #6684
Tuukka Lehtonen [Tue, 27 Sep 2016 23:09:05 +0000 (02:09 +0300)]
Fixes for non-compiling code after merge
5930811a7
Tuukka Lehtonen [Tue, 27 Sep 2016 22:54:05 +0000 (01:54 +0300)]
Merge commit '
ffdf837 '
Resolved conflicts from:
bundles/org.simantics.db.procore/src/fi/vtt/simantics/procore/internal/GraphSessionVirtual.java
bundles/org.simantics.db.server/src/org/simantics/db/server/internal/SessionI.java
bundles/org.simantics.db/src/org/simantics/db/Database.java
bundles/org.simantics.db/src/org/simantics/db/service/ClusterSetsSupport.java
bundles/org.simantics.modeling/src/org/simantics/modeling/SCL.java
bundles/org.simantics.workbench/src/org/simantics/workbench/internal/SimanticsWorkbenchAdvisor.java
bundles/org.simantics/src/org/simantics/SimanticsPlatform.java
Tuukka Lehtonen [Tue, 27 Sep 2016 22:38:03 +0000 (01:38 +0300)]
Sync git svn branch with SVN repository r33249.
Tuukka Lehtonen [Tue, 27 Sep 2016 20:59:56 +0000 (23:59 +0300)]
Upgrade pdfbox to 2.0.3 and fastutil to 7.0.13 in target platform defs
Change-Id: Id16d9d58850a655efc5fbe779ea11233ab2d4fb8
Tuukka Lehtonen [Tue, 27 Sep 2016 20:51:13 +0000 (23:51 +0300)]
Merge "Upgrade pdfbox to 2.0.3 and fastutil to 7.0.13."
Tuukka Lehtonen [Tue, 27 Sep 2016 20:50:17 +0000 (23:50 +0300)]
Upgrade pdfbox to 2.0.3 and fastutil to 7.0.13.
Change-Id: I46b772c2a6c15347d33564f87ae2d52b095444e4
jsimomaa [Tue, 27 Sep 2016 11:00:54 +0000 (14:00 +0300)]
DB-client fixes
* XSupport.rollback for checking if database rolled back
* Separate read and write directory setting and updating in
ClusterSetsSupport
refs #6710
Change-Id: I3395c7042ab3faf2291ed215d4e5830d80b6d2fa
jsimomaa [Tue, 27 Sep 2016 10:59:37 +0000 (13:59 +0300)]
Work around one active experiment per model limitation for FMI studio.
refs #6711
Change-Id: I78a98ca08b81828a728f8bd0ab4c338a064a04fd
jsimomaa [Tue, 27 Sep 2016 11:00:38 +0000 (14:00 +0300)]
Fixing SpreadsheetBookRemover to not fail with URIless resources
refs #6568
Change-Id: Idcf961b7d21ad29fd94010013590e555eaba4c5b
jsimomaa [Tue, 27 Sep 2016 11:59:56 +0000 (14:59 +0300)]
Acorn: Fix WriteRunnable.runReally() and other fixes
Lets hope this crlf thing is over after this
refs #6709
Change-Id: I4e69d8eebf790c2bf4352c1bc8130ba62f126d2f
Tuukka Lehtonen [Mon, 26 Sep 2016 13:08:12 +0000 (16:08 +0300)]
Merge commit '
d1a82fe '
Allow selection of modules to rename through checkboxes and Select All/Clear Selection buttons.
refs #6708
[PRIVATE-11320]
Tuukka Lehtonen [Mon, 26 Sep 2016 13:07:37 +0000 (16:07 +0300)]
Allow selection of modules to rename through checkboxes and Select All/Clear Selection buttons.
refs #6708
[PRIVATE-11320]
Tuukka Lehtonen [Mon, 26 Sep 2016 10:31:57 +0000 (13:31 +0300)]
Tuukka Lehtonen [Mon, 26 Sep 2016 10:30:21 +0000 (13:30 +0300)]
Sync git svn branch with SVN repository r33219.
refs #6706
refs #6704
refs #6702
refs #6701
Hannu Niemistö [Mon, 26 Sep 2016 06:08:29 +0000 (09:08 +0300)]
Utilize slf4j
Changed System.out/err prints to use logging in several places. Removed
org.simantics.Logging and replaced all uses by slf4j.
Change-Id: Ib0a9f4f87b945fd59130a9dfd02fe02d39ee0eac
Tuukka Lehtonen [Fri, 23 Sep 2016 21:30:33 +0000 (00:30 +0300)]
Changing existing log4j logging to use slf4j
Removed org.simantics.utils.logging.{Logger,LogManager}. Anybody using
those should just switch to using slf4j. Removed their use from
org.simantics.spreadsheet.graph.
Also changed org.simantics.utils.FileUtils to use slf4j instead of
log4j.
Also added .keep to org.simantics.logback.configuration/src folder to
help it compile properly.
refs #6705
Change-Id: Ib6d78ee964e0a05aedb332167456aee4eea2a4d7
Signed-off-by: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
jsimomaa [Fri, 23 Sep 2016 13:14:33 +0000 (16:14 +0300)]
Adding configuration logging for Simantics platform with SLF4J and
Logback
Adding logback.xml file to org.simantics.logback.configuration bundle
for configuring logback logging
refs #6705
Change-Id: I67abe04ed0d6a54b6a45fb3591bbb6b5a3991b2a
Hannu Niemistö [Fri, 23 Sep 2016 12:48:32 +0000 (15:48 +0300)]
Changed database driver of TestSCLOsgi to acorn
Change-Id: Ie8d92025bb3976a210a8f4d36a0e2d74eea5eb09
Hannu Niemistö [Fri, 23 Sep 2016 12:14:20 +0000 (15:14 +0300)]
Automatic execution of SCL tests in Maven
This includes both compiler tests (in
tests/org.simantics.scl.compiler.tests) and a test that checks that all
SCL modules in org.simantics.sdk feature compile (in
tests/org.simantics.scl.osgi.tests).
This commit contains also some modifications to make all SCL
modules compile:
* Disabled Data/Json, because it does not compile (missing jackson)
* Committed away Simantics/Image/linkImage
Change-Id: I22a460d756f65139971f1e7d2cc8624a7a6b8ffb
Jani Simomaa [Fri, 23 Sep 2016 10:43:47 +0000 (13:43 +0300)]
Merge "More Enhance logging for Simantics platform with SLF4J and Logback "
jsimomaa [Fri, 23 Sep 2016 08:47:02 +0000 (11:47 +0300)]
More Enhance logging for Simantics platform with SLF4J and Logback
Changing pom.xml to override generation of ch.qos.logback.classic
refs #6705
Change-Id: I512378d6a583b062c74bffc8c46b743eb2d68305
jsimomaa [Fri, 23 Sep 2016 08:47:02 +0000 (11:47 +0300)]
Enhance logging for Simantics platform with SLF4J and Logback
Fixing typo in feature.xml
refs #6705
Change-Id: I2984a5017265389ebede223111c8d78627117ada
jsimomaa [Fri, 23 Sep 2016 08:47:02 +0000 (11:47 +0300)]
Enhance logging for Simantics platform with SLF4J and Logback
Include the new logging bundles in org.simantics.rcp.feature.
refs #6705
Change-Id: I0711950cbb858a1bbcf0b3a14f648b98707dc1ca
Tuukka Lehtonen [Wed, 21 Sep 2016 12:25:02 +0000 (15:25 +0300)]
Merge "Open module when pressing F3 on import or include declaration"
Tuukka Lehtonen [Wed, 21 Sep 2016 12:09:57 +0000 (15:09 +0300)]
Merge "Rebuilt graph.tg with latest graph compiler version"
Tuukka Lehtonen [Wed, 21 Sep 2016 12:05:43 +0000 (15:05 +0300)]
Rebuilt graph.tg with latest graph compiler version
refs #6692
Change-Id: I13172185137f8b6164efdf235d18d6e0d288f784
Hannu Niemistö [Wed, 21 Sep 2016 11:28:31 +0000 (14:28 +0300)]
Open module when pressing F3 on import or include declaration
Change-Id: If53a968b8a29a7c6a18ae9f1e44bac06df13bbd4
Hannu Niemistö [Wed, 21 Sep 2016 11:27:57 +0000 (14:27 +0300)]
Check that do block is not empty.
A new check is needed, because parser was modified before
to allow empty blocks.
Change-Id: I7fa51c7ef25cae6a51e69f9a39378780094c0d8e
Tuukka Lehtonen [Wed, 21 Sep 2016 11:46:00 +0000 (14:46 +0300)]
Fixed target platform e4 tool location content.
Change-Id: Ic4a58eebb4cf864db0d4c4cc6cfee361c635a13a
Tuukka Lehtonen [Tue, 20 Sep 2016 08:01:16 +0000 (11:01 +0300)]
Tuukka Lehtonen [Tue, 20 Sep 2016 08:00:44 +0000 (11:00 +0300)]
Sync git svn branch with SVN repository r33219.
refs #5039
Tuukka Lehtonen [Tue, 20 Sep 2016 07:34:24 +0000 (10:34 +0300)]
Tuukka Lehtonen [Tue, 20 Sep 2016 07:33:37 +0000 (10:33 +0300)]
Sync git svn branch with SVN repository r33218.
refs #6692
refs #6568
Tuukka Lehtonen [Mon, 19 Sep 2016 14:10:17 +0000 (17:10 +0300)]
Tuukka Lehtonen [Mon, 19 Sep 2016 14:09:15 +0000 (17:09 +0300)]
Sync git svn branch with SVN repository r33216.
refs #6653
refs #6699
refs #6700
Hannu Niemistö [Mon, 19 Sep 2016 09:15:51 +0000 (12:15 +0300)]
Merge remote-tracking branch 'origin/svn'
Change-Id: I6de2fe5c0e54e45498ef01e5ee398325dee1a2a7
Hannu Niemistö [Mon, 19 Sep 2016 09:08:31 +0000 (12:08 +0300)]
Merged changes from SVN
Hannu Niemistö [Mon, 19 Sep 2016 05:36:52 +0000 (08:36 +0300)]
Merge "Small improvements to statement collision reporting."
Tuukka Lehtonen [Sat, 17 Sep 2016 11:37:47 +0000 (14:37 +0300)]
Tuukka Lehtonen [Sat, 17 Sep 2016 11:32:15 +0000 (14:32 +0300)]
Sync git svn branch with SVN repository r33205.
refs #6692
refs #6695
Hannu Niemistö [Fri, 16 Sep 2016 14:28:01 +0000 (17:28 +0300)]
Small improvements to statement collision reporting.
Change-Id: I18469fcc69d11f1fcd652ad7f8ffd52496064d30
Tuukka Lehtonen [Fri, 16 Sep 2016 10:47:30 +0000 (13:47 +0300)]
Tuukka Lehtonen [Fri, 16 Sep 2016 10:45:33 +0000 (13:45 +0300)]
Sync git svn branch with SVN repository r33203.
refs #6695
Tuukka Lehtonen [Fri, 16 Sep 2016 09:59:21 +0000 (12:59 +0300)]
Tuukka Lehtonen [Fri, 16 Sep 2016 09:58:41 +0000 (12:58 +0300)]
Sync git svn branch with SVN repository r33200.
refs #6493
Tuukka Lehtonen [Fri, 16 Sep 2016 08:28:03 +0000 (11:28 +0300)]
Merge branch 'master' of ssh://www.simantics.org:29418/simantics/platform
Tuukka Lehtonen [Fri, 16 Sep 2016 08:17:32 +0000 (11:17 +0300)]
Tuukka Lehtonen [Fri, 16 Sep 2016 08:14:02 +0000 (11:14 +0300)]
Sync git svn branch with SVN repository r33199.
refs #6694
Hannu Niemistö [Fri, 16 Sep 2016 08:04:35 +0000 (11:04 +0300)]
Fixed the version range of ANTLR dependency of graph compiler
Change-Id: I80f240a913ef4f5d7d2aa839c53c595d75b2e4dd
Tuukka Lehtonen [Thu, 15 Sep 2016 18:44:38 +0000 (21:44 +0300)]
Merge "Rebuilt graph.tg's with latest graph compiler version"
Tuukka Lehtonen [Thu, 15 Sep 2016 18:49:53 +0000 (21:49 +0300)]
Rebuilt graph.tg's with latest graph compiler version
refs #6692
Change-Id: I9cda9b562958aff6b3edc647c5f882718204f1e7
Tuukka Lehtonen [Thu, 15 Sep 2016 18:33:03 +0000 (21:33 +0300)]
Merge "Check statement collisions"
Tuukka Lehtonen [Thu, 15 Sep 2016 18:19:22 +0000 (21:19 +0300)]
Tuukka Lehtonen [Thu, 15 Sep 2016 18:18:22 +0000 (21:18 +0300)]
Sync git svn branch with SVN repository r33198.
refs #6688
refs #6692
Hannu Niemistö [Thu, 15 Sep 2016 10:58:42 +0000 (13:58 +0300)]
Check statement collisions
Added a new validation step that checks whether the result
of graph compilation contains the same statement more than once.
Change-Id: I3d1f5941048d62538e4f732f30cd55099a015513
Tuukka Lehtonen [Thu, 15 Sep 2016 10:18:36 +0000 (13:18 +0300)]
Tuukka Lehtonen [Thu, 15 Sep 2016 10:06:08 +0000 (13:06 +0300)]
Sync git svn branch with SVN repository r33196.
refs #6692
Hannu Niemistö [Thu, 15 Sep 2016 05:55:13 +0000 (08:55 +0300)]
Resolve a clash between two implementations of org.w3c.dom
The bundle org.apache.batik contained its own version of
org.w3c.dom and other basic xml packages. This change
adds javax.xml as a required bundle for org.apache.batik
and removes corresponding import package declarations.
Import package declarations didn't work because of
split packages.
Change-Id: Id49851c63e37ebe12cb9dbab557dc0b3a32b7f58
Tuukka Lehtonen [Wed, 14 Sep 2016 11:31:57 +0000 (14:31 +0300)]
Tuukka Lehtonen [Wed, 14 Sep 2016 11:31:12 +0000 (14:31 +0300)]
Sync git svn branch with SVN repository r33191.
refs #6685
Tuukka Lehtonen [Wed, 14 Sep 2016 06:15:42 +0000 (09:15 +0300)]
Merge "Added target-folders that Maven creates to .gitignore"
Hannu Niemistö [Tue, 13 Sep 2016 15:09:52 +0000 (18:09 +0300)]
Added target-folders that Maven creates to .gitignore
Change-Id: I1cb9ff5b0bee6cfd21f12e0a08d73dd3b989ac98
Tuukka Lehtonen [Tue, 13 Sep 2016 15:09:15 +0000 (18:09 +0300)]
Tuukka Lehtonen [Tue, 13 Sep 2016 15:08:40 +0000 (18:08 +0300)]
Sync git svn branch with SVN repository r33189.
refs #6653
refs #6684
Hannu Niemistö [Tue, 13 Sep 2016 14:26:45 +0000 (17:26 +0300)]
Merge "Small SCL changes"
Hannu Niemistö [Tue, 13 Sep 2016 14:26:40 +0000 (17:26 +0300)]
Merge "Removed standard xml packages from apache and import them from elsewhere"
Hannu Niemistö [Tue, 13 Sep 2016 14:26:34 +0000 (17:26 +0300)]
Merge "An initial implementation of Json module."
Hannu Niemistö [Tue, 13 Sep 2016 13:49:01 +0000 (16:49 +0300)]
Small SCL changes
Removed error message from subsumption constraints that
cannot be simplified away, because the simplification is not
working correctly in certain standard cases.
Removed Json2 from StandardLibrary
Small efficiency fix in Prelude
Check if the input block expression is empty in ExpressionEvalutor.
Change-Id: I1b1843cb7847886618aea5063aff53fef35814cb
Hannu Niemistö [Tue, 13 Sep 2016 13:46:56 +0000 (16:46 +0300)]
Removed standard xml packages from apache and import them from elsewhere
Change-Id: I9499e63a4905bea38461d9ead48dcea68ea6f77b
Hannu Niemistö [Tue, 13 Sep 2016 13:29:17 +0000 (16:29 +0300)]
An initial implementation of Json module.
Change-Id: I33668d8cfdcafd91f7f205a49d5660337f2f0c46
Tuukka Lehtonen [Tue, 13 Sep 2016 10:40:43 +0000 (13:40 +0300)]
Add missing external dependency plug-ins to SDK build platform.
refs #6475
Tuukka Lehtonen [Tue, 13 Sep 2016 10:14:40 +0000 (13:14 +0300)]
Add missing external dependency plug-ins to SDK build platform.
refs #6475
Tuukka Lehtonen [Tue, 13 Sep 2016 09:42:51 +0000 (12:42 +0300)]
Added org.simantics.fileimport{,ui} to bundles POM.
This fixes the SDK build.
refs #6475
Tuukka Lehtonen [Tue, 13 Sep 2016 08:21:04 +0000 (11:21 +0300)]
Added com.fasterxml.jackson.core.jackson-core version 2.8.2 to ext-deps
refs #6683
Change-Id: I187c6edff7e58e26093a879b4f184c38f02ac663
Tuukka Lehtonen [Mon, 12 Sep 2016 20:17:54 +0000 (23:17 +0300)]
Refresh native part of org.simantics.fastlz compilation instructions.
Added Visual Studio 2012 solution/project for compiling with Microsoft
Platform SDK for Windows Server 2003 R2.
Renamed libfastlz-darwin-x86_64.jnilib to libfastlz-darwin-x86_64.dylib
since .dylib is what System.mapLibraryName adds to library names. Also
updated compile.sh to produce .dylib on Darwin.
Removed LZ4 codes from the native codebase, they are already elsewhere
and don't belong here anymore.
refs #6675
Change-Id: I8dc95c5f91bc906c627b47e32ee1b9d1b6a4cb6d
Signed-off-by: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Tuukka Lehtonen [Fri, 9 Sep 2016 13:05:42 +0000 (16:05 +0300)]
Merge branch 'master' of ssh://www.simantics.org:29418/simantics/platform
Tuukka Lehtonen [Fri, 9 Sep 2016 13:05:22 +0000 (16:05 +0300)]
Tuukka Lehtonen [Fri, 9 Sep 2016 12:46:09 +0000 (15:46 +0300)]
Sync git svn branch with SVN repository r33184.
refs #6621
refs #6679
refs #6682
Tuukka Lehtonen [Wed, 7 Sep 2016 13:01:04 +0000 (16:01 +0300)]
Merge "Re-implement URIStringUtils escape and unescape using Unicode"
Tuukka Lehtonen [Wed, 7 Sep 2016 12:50:57 +0000 (15:50 +0300)]
Sync git svn branch with SVN repository r33176.
refs #6677
Tuukka Lehtonen [Wed, 7 Sep 2016 12:50:57 +0000 (15:50 +0300)]
Sync git svn branch with SVN repository r33176.
refs #6677
Tuukka Lehtonen [Wed, 7 Sep 2016 07:09:22 +0000 (10:09 +0300)]
Re-implement URIStringUtils escape and unescape using Unicode
Now escape only performs the absolute minimum amount of escaping
necessary. All String inputs are treated directly as UTF-16 characters
and only the smallest amount of 7-bit US-ASCII characters are escaped.
These characters are " ", "%", "#", "/" and "&". All other unicode chars
(> 127) are written directly as is into the escaped output.
The main effect of this change is that Simantics database URIs will
contain much less escaped characters than before. Since we always deal
with Java String (Unicode) character sequences in Simantics and these
URIs are only valid within Simantics, this approach doesn't really cause
any problems for us.
This implementation is not in accordance with RFC 2396 - Uniform
Resource Identifiers (URI): Generic Syntax but it works for us.
refs #6673
Change-Id: I5279f68993a087b856d58c36d63427562ea1d1e4
Tuukka Lehtonen [Tue, 6 Sep 2016 12:24:10 +0000 (15:24 +0300)]
Fixed og.simantics.backup.ontology/build.properties
It contained an extra plugin.xml row which doesn't exist.
refs #6475
Tuukka Lehtonen [Tue, 6 Sep 2016 12:06:33 +0000 (15:06 +0300)]
Added missing bundles to pom.xml.
Missing: org.simantics.acorn, org.simantics.backup{,.db,.ontology}.
refs #6475
Tuukka Lehtonen [Tue, 6 Sep 2016 11:45:06 +0000 (14:45 +0300)]
Merge "Some Acorn improvements"