simantics/platform.git
3 years agoMerge commit '0b471805f017da83d715a0d8409f53bdd009d31e'
Tuukka Lehtonen [Tue, 18 Oct 2016 22:19:39 +0000 (01:19 +0300)]
Merge commit '0b471805f017da83d715a0d8409f53bdd009d31e'

refs #6654
refs #6766
refs #6769
refs #6770
refs #6771
refs #6772
refs #6773

3 years agoSync git svn branch with SVN repository r33345.
Tuukka Lehtonen [Tue, 18 Oct 2016 22:16:53 +0000 (01:16 +0300)]
Sync git svn branch with SVN repository r33345.

refs #6654
refs #6766
refs #6769
refs #6770
refs #6771
refs #6772
refs #6773

3 years agoMerge "InputStream returns -1 on EOF instead of throwing IOException"
Jani Simomaa [Mon, 17 Oct 2016 07:41:11 +0000 (10:41 +0300)]
Merge "InputStream returns -1 on EOF instead of throwing IOException"

3 years agoInputStream returns -1 on EOF instead of throwing IOException 24/124/2
Tuukka Lehtonen [Fri, 14 Oct 2016 13:18:06 +0000 (16:18 +0300)]
InputStream returns -1 on EOF instead of throwing IOException

ClusterSupport2.getValueStreamBig now returns -1 when EOF is reached.
Previously it was invalidly throwing IOException (and before that very
invalidly throwing IllegalStateException).

refs #6741

Change-Id: I220e6bd26b94d92ae1db5a330ca3304035e7614e

3 years agoMerge commit '145a2884933f2ffdd48d6835729e58f1152d274e'
Tuukka Lehtonen [Fri, 14 Oct 2016 12:02:52 +0000 (15:02 +0300)]
Merge commit '145a2884933f2ffdd48d6835729e58f1152d274e'

refs #6654
refs #6756

3 years agoSync git svn branch with SVN repository r33334.
Tuukka Lehtonen [Fri, 14 Oct 2016 12:00:33 +0000 (15:00 +0300)]
Sync git svn branch with SVN repository r33334.

refs #6654
refs #6756

3 years agoMerge commit 'bd5bc6e45f700e755b61bd112631796631330ecb'
Tuukka Lehtonen [Wed, 12 Oct 2016 08:17:39 +0000 (11:17 +0300)]
Merge commit 'bd5bc6e45f700e755b61bd112631796631330ecb'

refs #6751 [PRIVATE-12404]
refs #6752 [PRIVATE-12401]

3 years agoSync git svn branch with SVN repository r33324.
Tuukka Lehtonen [Wed, 12 Oct 2016 08:15:59 +0000 (11:15 +0300)]
Sync git svn branch with SVN repository r33324.

refs #6751 [PRIVATE-12404]
refs #6752 [PRIVATE-12401]

3 years agoMerge "Databoard and SCL enchancements."
Tuukka Lehtonen [Tue, 11 Oct 2016 09:42:05 +0000 (12:42 +0300)]
Merge "Databoard and SCL enchancements."

3 years agoDataboard and SCL enchancements. 21/121/2
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

3 years agoMerge commit '7684bae'
Tuukka Lehtonen [Mon, 10 Oct 2016 12:05:41 +0000 (15:05 +0300)]
Merge commit '7684bae'

refs #6744 [PRIVATE-5991]
refs #6745
refs #6748

3 years agoSync git svn branch with SVN repository r33319.
Tuukka Lehtonen [Mon, 10 Oct 2016 12:04:10 +0000 (15:04 +0300)]
Sync git svn branch with SVN repository r33319.

refs #6744 [PRIVATE-5991]
refs #6745
refs #6748

3 years agoPlatform startup now reads the used database driver from <ws>/db.ini 20/120/1
Tuukka Lehtonen [Fri, 7 Oct 2016 14:19:48 +0000 (17:19 +0300)]
Platform startup now reads the used database driver from <ws>/db.ini

Previously it was possible to use the wrong database driver for a
workspace if the default driver was changed in the code. Now,
SimanticsPlatform.setupDatabase will read the database driver used for
the opened workspace from an ini file <workspace>/db.ini. If the file
does not exist, it will write it with the following data:
[driver]
id = <database-id-value>

refs #6747

Change-Id: Ie304b480095657e25e694a81cdd5085a4d2c17e9

3 years agoFixed acorn db main.state loading rollback reporting. 19/119/1
Tuukka Lehtonen [Fri, 7 Oct 2016 14:15:11 +0000 (17:15 +0300)]
Fixed acorn db main.state loading rollback reporting.

The previous implementation caused main.state loading to always report
the database as requiring rollback which caused the system to always
delete all indexes on program startup.

refs #6709

Change-Id: Id3d90436c1960faa3ac5ebbc82e817b673934f53

3 years agoMerge commit '0915910'
Tuukka Lehtonen [Wed, 5 Oct 2016 21:30:01 +0000 (00:30 +0300)]
Merge commit '0915910'

refs #6742
refs #6741

3 years agoSync git svn branch with SVN repository r33308.
Tuukka Lehtonen [Wed, 5 Oct 2016 21:29:28 +0000 (00:29 +0300)]
Sync git svn branch with SVN repository r33308.

refs #6742
refs #6741

3 years agoMerge commit '55ca14c'
Tuukka Lehtonen [Tue, 4 Oct 2016 20:11:38 +0000 (23:11 +0300)]
Merge commit '55ca14c'

3 years agoSync git svn branch with SVN repository r33303.
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

3 years agoImprove Databoard's dynamically typed data capabilities. 17/117/1
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

3 years agoMerge commit '0580ea8b675c868685993b0780c9ecc31010f681' into master
Tuukka Lehtonen [Fri, 30 Sep 2016 13:32:51 +0000 (16:32 +0300)]
Merge commit '0580ea8b675c868685993b0780c9ecc31010f681' into master

refs #6726

3 years agoMerge commit '3b5069d' into develop
Tuukka Lehtonen [Fri, 30 Sep 2016 13:31:32 +0000 (16:31 +0300)]
Merge commit '3b5069d' into develop

refs #6726

3 years agoSync git svn branch with SVN repository r33290.
Tuukka Lehtonen [Fri, 30 Sep 2016 13:28:29 +0000 (16:28 +0300)]
Sync git svn branch with SVN repository r33290.

refs #6726

3 years agoLogger fixes after merge commit:fdbe8762 14/114/1
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)

3 years agoLogger fixes after merge commit:fdbe8762 13/113/1
Tuukka Lehtonen [Fri, 30 Sep 2016 09:23:53 +0000 (12:23 +0300)]
Logger fixes after merge commit:fdbe8762

refs #6724

Change-Id: I4559a65783b104aadbf8a5797aa6b3edbe128fea

3 years agoMerge commit 'bf75fd9'
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

3 years agoSync git svn branch with SVN repository r33269.
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

3 years agoAdd Koloboke API and Koloboke Compile to target platform 11/111/1
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

3 years agomerged svn r33251, contains graph.tg changes
Hannu Niemistö [Wed, 28 Sep 2016 06:27:39 +0000 (09:27 +0300)]
merged svn r33251, contains graph.tg changes

3 years agoMerge commit '9d2bb8d'
Tuukka Lehtonen [Tue, 27 Sep 2016 23:23:58 +0000 (02:23 +0300)]
Merge commit '9d2bb8d'

refs #6684

3 years agoSync git svn branch with SVN repository r33251.
Tuukka Lehtonen [Tue, 27 Sep 2016 23:22:03 +0000 (02:22 +0300)]
Sync git svn branch with SVN repository r33251.

refs #6684

3 years agoFixes for non-compiling code after merge 5930811a7
Tuukka Lehtonen [Tue, 27 Sep 2016 23:09:05 +0000 (02:09 +0300)]
Fixes for non-compiling code after merge 5930811a7

3 years agoMerge commit 'ffdf837'
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

3 years agoSync git svn branch with SVN repository r33249.
Tuukka Lehtonen [Tue, 27 Sep 2016 22:38:03 +0000 (01:38 +0300)]
Sync git svn branch with SVN repository r33249.

3 years agoUpgrade pdfbox to 2.0.3 and fastutil to 7.0.13 in target platform defs 09/109/1
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

3 years agoMerge "Upgrade pdfbox to 2.0.3 and fastutil to 7.0.13."
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."

3 years agoUpgrade pdfbox to 2.0.3 and fastutil to 7.0.13. 08/108/1
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

3 years agoDB-client fixes 06/106/5
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

3 years agoWork around one active experiment per model limitation for FMI studio. 04/104/4
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

3 years agoFixing SpreadsheetBookRemover to not fail with URIless resources 05/105/5
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

3 years agoAcorn: Fix WriteRunnable.runReally() and other fixes 07/107/2
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

3 years agoMerge commit 'd1a82fe'
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]

3 years agoAllow selection of modules to rename through checkboxes and Select All/Clear Selectio...
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]

3 years agoMerge commit 'bb1507f'
Tuukka Lehtonen [Mon, 26 Sep 2016 10:31:57 +0000 (13:31 +0300)]
Merge commit 'bb1507f'

3 years agoSync git svn branch with SVN repository r33219.
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

3 years agoUtilize slf4j 93/93/1
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

3 years agoChanging existing log4j logging to use slf4j 92/92/1
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>
3 years agoAdding configuration logging for Simantics platform with SLF4J and 90/90/2
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

3 years agoChanged database driver of TestSCLOsgi to acorn 89/89/3
Hannu Niemistö [Fri, 23 Sep 2016 12:48:32 +0000 (15:48 +0300)]
Changed database driver of TestSCLOsgi to acorn

Change-Id: Ie8d92025bb3976a210a8f4d36a0e2d74eea5eb09

3 years agoAutomatic execution of SCL tests in Maven 88/88/1
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

3 years agoMerge "More Enhance logging for Simantics platform with SLF4J and Logback "
Jani Simomaa [Fri, 23 Sep 2016 10:43:47 +0000 (13:43 +0300)]
Merge "More Enhance logging for Simantics platform with SLF4J and Logback "

3 years agoMore Enhance logging for Simantics platform with SLF4J and Logback 87/87/1
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

3 years agoEnhance logging for Simantics platform with SLF4J and Logback 86/86/1
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

3 years agoEnhance logging for Simantics platform with SLF4J and Logback 85/85/3
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

3 years agoMerge "Open module when pressing F3 on import or include declaration"
Tuukka Lehtonen [Wed, 21 Sep 2016 12:25:02 +0000 (15:25 +0300)]
Merge "Open module when pressing F3 on import or include declaration"

3 years agoMerge "Rebuilt graph.tg with latest graph compiler version"
Tuukka Lehtonen [Wed, 21 Sep 2016 12:09:57 +0000 (15:09 +0300)]
Merge "Rebuilt graph.tg with latest graph compiler version"

3 years agoRebuilt graph.tg with latest graph compiler version 84/84/1
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

3 years agoOpen module when pressing F3 on import or include declaration 82/82/3
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

3 years agoCheck that do block is not empty. 81/81/3
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

3 years agoFixed target platform e4 tool location content. 83/83/1
Tuukka Lehtonen [Wed, 21 Sep 2016 11:46:00 +0000 (14:46 +0300)]
Fixed target platform e4 tool location content.

Change-Id: Ic4a58eebb4cf864db0d4c4cc6cfee361c635a13a

3 years agoMerge commit '12468c2'
Tuukka Lehtonen [Tue, 20 Sep 2016 08:01:16 +0000 (11:01 +0300)]
Merge commit '12468c2'

3 years agoSync git svn branch with SVN repository r33219.
Tuukka Lehtonen [Tue, 20 Sep 2016 08:00:44 +0000 (11:00 +0300)]
Sync git svn branch with SVN repository r33219.

refs #5039

3 years agoMerge commit 'a371783'
Tuukka Lehtonen [Tue, 20 Sep 2016 07:34:24 +0000 (10:34 +0300)]
Merge commit 'a371783'

3 years agoSync git svn branch with SVN repository r33218.
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

3 years agoMerge commit '8e4e41fa135641b23f68e205832e0696951c5f63'
Tuukka Lehtonen [Mon, 19 Sep 2016 14:10:17 +0000 (17:10 +0300)]
Merge commit '8e4e41fa135641b23f68e205832e0696951c5f63'

3 years agoSync git svn branch with SVN repository r33216.
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

3 years agoMerge remote-tracking branch 'origin/svn' 80/80/1
Hannu Niemistö [Mon, 19 Sep 2016 09:15:51 +0000 (12:15 +0300)]
Merge remote-tracking branch 'origin/svn'

Change-Id: I6de2fe5c0e54e45498ef01e5ee398325dee1a2a7

3 years agoMerged changes from SVN
Hannu Niemistö [Mon, 19 Sep 2016 09:08:31 +0000 (12:08 +0300)]
Merged changes from SVN

3 years agoMerge "Small improvements to statement collision reporting."
Hannu Niemistö [Mon, 19 Sep 2016 05:36:52 +0000 (08:36 +0300)]
Merge "Small improvements to statement collision reporting."

3 years agoMerge commit '621bec7'
Tuukka Lehtonen [Sat, 17 Sep 2016 11:37:47 +0000 (14:37 +0300)]
Merge commit '621bec7'

3 years agoSync git svn branch with SVN repository r33205.
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

3 years agoSmall improvements to statement collision reporting. 79/79/1
Hannu Niemistö [Fri, 16 Sep 2016 14:28:01 +0000 (17:28 +0300)]
Small improvements to statement collision reporting.

Change-Id: I18469fcc69d11f1fcd652ad7f8ffd52496064d30

3 years agoMerge commit 'fd452722e97db9cf876f4f03a9e44fe750625a92'
Tuukka Lehtonen [Fri, 16 Sep 2016 10:47:30 +0000 (13:47 +0300)]
Merge commit 'fd452722e97db9cf876f4f03a9e44fe750625a92'

3 years agoSync git svn branch with SVN repository r33203.
Tuukka Lehtonen [Fri, 16 Sep 2016 10:45:33 +0000 (13:45 +0300)]
Sync git svn branch with SVN repository r33203.

refs #6695

3 years agoMerge commit 'a4c65e9'
Tuukka Lehtonen [Fri, 16 Sep 2016 09:59:21 +0000 (12:59 +0300)]
Merge commit 'a4c65e9'

3 years agoSync git svn branch with SVN repository r33200.
Tuukka Lehtonen [Fri, 16 Sep 2016 09:58:41 +0000 (12:58 +0300)]
Sync git svn branch with SVN repository r33200.

refs #6493

3 years agoMerge branch 'master' of ssh://www.simantics.org:29418/simantics/platform
Tuukka Lehtonen [Fri, 16 Sep 2016 08:28:03 +0000 (11:28 +0300)]
Merge branch 'master' of ssh://simantics.org:29418/simantics/platform

3 years agoMerge commit '728147df5d63a3333daff3d8c0e9bfd4f5597e3a'
Tuukka Lehtonen [Fri, 16 Sep 2016 08:17:32 +0000 (11:17 +0300)]
Merge commit '728147df5d63a3333daff3d8c0e9bfd4f5597e3a'

refs #6694

3 years agoSync git svn branch with SVN repository r33199.
Tuukka Lehtonen [Fri, 16 Sep 2016 08:14:02 +0000 (11:14 +0300)]
Sync git svn branch with SVN repository r33199.

refs #6694

3 years agoFixed the version range of ANTLR dependency of graph compiler 77/77/1
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

3 years agoMerge "Rebuilt graph.tg's with latest graph compiler version"
Tuukka Lehtonen [Thu, 15 Sep 2016 18:44:38 +0000 (21:44 +0300)]
Merge "Rebuilt graph.tg's with latest graph compiler version"

3 years agoRebuilt graph.tg's with latest graph compiler version 75/75/1
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

3 years agoMerge "Check statement collisions"
Tuukka Lehtonen [Thu, 15 Sep 2016 18:33:03 +0000 (21:33 +0300)]
Merge "Check statement collisions"

3 years agoMerge commit 'd11239c402eec37ba28edcfa7ea6ca7c1f01147f'
Tuukka Lehtonen [Thu, 15 Sep 2016 18:19:22 +0000 (21:19 +0300)]
Merge commit 'd11239c402eec37ba28edcfa7ea6ca7c1f01147f'

3 years agoSync git svn branch with SVN repository r33198.
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

3 years agoCheck statement collisions 73/73/1
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

3 years agoMerge commit '2bcb7e8598e769cf21fa6525fc244e1da3eceb31'
Tuukka Lehtonen [Thu, 15 Sep 2016 10:18:36 +0000 (13:18 +0300)]
Merge commit '2bcb7e8598e769cf21fa6525fc244e1da3eceb31'

3 years agoSync git svn branch with SVN repository r33196.
Tuukka Lehtonen [Thu, 15 Sep 2016 10:06:08 +0000 (13:06 +0300)]
Sync git svn branch with SVN repository r33196.

refs #6692

3 years agoResolve a clash between two implementations of org.w3c.dom 72/72/2
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

3 years agoMerge commit '606a8f7'
Tuukka Lehtonen [Wed, 14 Sep 2016 11:31:57 +0000 (14:31 +0300)]
Merge commit '606a8f7'

3 years agoSync git svn branch with SVN repository r33191.
Tuukka Lehtonen [Wed, 14 Sep 2016 11:31:12 +0000 (14:31 +0300)]
Sync git svn branch with SVN repository r33191.

refs #6685

3 years agoMerge "Added target-folders that Maven creates to .gitignore"
Tuukka Lehtonen [Wed, 14 Sep 2016 06:15:42 +0000 (09:15 +0300)]
Merge "Added target-folders that Maven creates to .gitignore"

3 years agoAdded target-folders that Maven creates to .gitignore 59/59/1
Hannu Niemistö [Tue, 13 Sep 2016 15:09:52 +0000 (18:09 +0300)]
Added target-folders that Maven creates to .gitignore

Change-Id: I1cb9ff5b0bee6cfd21f12e0a08d73dd3b989ac98

3 years agoMerge commit 'b809a171b6dfb81ed9ef9e84870dcbcbc5912f0e'
Tuukka Lehtonen [Tue, 13 Sep 2016 15:09:15 +0000 (18:09 +0300)]
Merge commit 'b809a171b6dfb81ed9ef9e84870dcbcbc5912f0e'

3 years agoSync git svn branch with SVN repository r33189.
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

3 years agoMerge "Small SCL changes"
Hannu Niemistö [Tue, 13 Sep 2016 14:26:45 +0000 (17:26 +0300)]
Merge "Small SCL changes"

3 years agoMerge "Removed standard xml packages from apache and import them from elsewhere"
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"

3 years agoMerge "An initial implementation of Json module."
Hannu Niemistö [Tue, 13 Sep 2016 14:26:34 +0000 (17:26 +0300)]
Merge "An initial implementation of Json module."

3 years agoSmall SCL changes 58/58/1
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

3 years agoRemoved standard xml packages from apache and import them from elsewhere 57/57/1
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

3 years agoAn initial implementation of Json module. 56/56/1
Hannu Niemistö [Tue, 13 Sep 2016 13:29:17 +0000 (16:29 +0300)]
An initial implementation of Json module.

Change-Id: I33668d8cfdcafd91f7f205a49d5660337f2f0c46