Просмотр исходного кода

Merge remote-tracking branch 'origin/master' into issue_184

Johannes Dicks 10 лет назад
Родитель
Сommit
7193cd4606
100 измененных файлов с 387 добавлено и 7367 удалено
  1. 2 1
      README.md
  2. 1 1
      examples/coffee_machine/pom.xml
  3. 1 1
      examples/digital_watch/pom.xml
  4. 1 1
      examples/light_switch/pom.xml
  5. 1 1
      examples/org.yakindu.sct.examples/META-INF/MANIFEST.MF
  6. 1 1
      examples/org.yakindu.sct.examples/pom.xml
  7. 1 1
      examples/traffic_light/pom.xml
  8. 1 1
      features/org.yakindu.base-feature/feature.xml
  9. 1 1
      features/org.yakindu.base-feature/pom.xml
  10. 1 1
      features/org.yakindu.base.gmf.runtime-feature/feature.xml
  11. 1 1
      features/org.yakindu.base.gmf.runtime-feature/pom.xml
  12. 1 1
      features/org.yakindu.base.xtext.utils.gmf-feature/feature.xml
  13. 1 1
      features/org.yakindu.base.xtext.utils.gmf-feature/pom.xml
  14. 1 1
      features/org.yakindu.base.xtext.utils.jface-feature/feature.xml
  15. 1 1
      features/org.yakindu.base.xtext.utils.jface-feature/pom.xml
  16. 2 2
      features/org.yakindu.sct-feature/feature.xml
  17. 1 1
      features/org.yakindu.sct-feature/pom.xml
  18. 2 2
      features/org.yakindu.sct.generator-feature/feature.xml
  19. 1 1
      features/org.yakindu.sct.generator-feature/pom.xml
  20. 2 2
      features/org.yakindu.sct.generator.c-feature/feature.xml
  21. 1 1
      features/org.yakindu.sct.generator.c-feature/pom.xml
  22. 2 2
      features/org.yakindu.sct.generator.cpp-feature/feature.xml
  23. 1 1
      features/org.yakindu.sct.generator.cpp-feature/pom.xml
  24. 2 2
      features/org.yakindu.sct.generator.java-feature/feature.xml
  25. 1 1
      features/org.yakindu.sct.generator.java-feature/pom.xml
  26. 1 1
      features/org.yakindu.sct.test-feature/feature.xml
  27. 1 1
      features/org.yakindu.sct.test-feature/pom.xml
  28. 1 1
      plugins/org.yakindu.base.expressions.edit/META-INF/MANIFEST.MF
  29. 1 1
      plugins/org.yakindu.base.expressions.edit/pom.xml
  30. 1 1
      plugins/org.yakindu.base.expressions.ui/META-INF/MANIFEST.MF
  31. 1 1
      plugins/org.yakindu.base.expressions.ui/pom.xml
  32. 0 36
      plugins/org.yakindu.base.expressions/.launch/Launch Runtime Eclipse.launch
  33. 1 1
      plugins/org.yakindu.base.expressions/META-INF/MANIFEST.MF
  34. 1 1
      plugins/org.yakindu.base.expressions/pom.xml
  35. 1 1
      plugins/org.yakindu.base.gmf.runtime/META-INF/MANIFEST.MF
  36. 1 1
      plugins/org.yakindu.base.gmf.runtime/pom.xml
  37. 1 1
      plugins/org.yakindu.base.types.edit/META-INF/MANIFEST.MF
  38. 1 1
      plugins/org.yakindu.base.types.edit/pom.xml
  39. 1 1
      plugins/org.yakindu.base.types.test/META-INF/MANIFEST.MF
  40. 1 1
      plugins/org.yakindu.base.types.test/pom.xml
  41. 1 1
      plugins/org.yakindu.base.types/META-INF/MANIFEST.MF
  42. 1 1
      plugins/org.yakindu.base.types/pom.xml
  43. 1 1
      plugins/org.yakindu.base.xtext.utils.gmf/META-INF/MANIFEST.MF
  44. 1 1
      plugins/org.yakindu.base.xtext.utils.gmf/pom.xml
  45. 1 1
      plugins/org.yakindu.base.xtext.utils.jface/META-INF/MANIFEST.MF
  46. 1 1
      plugins/org.yakindu.base.xtext.utils.jface/pom.xml
  47. 1 1
      plugins/org.yakindu.sct.commons/META-INF/MANIFEST.MF
  48. 1 1
      plugins/org.yakindu.sct.commons/pom.xml
  49. 1 1
      plugins/org.yakindu.sct.compare/META-INF/MANIFEST.MF
  50. 1 1
      plugins/org.yakindu.sct.compare/pom.xml
  51. 16 0
      plugins/org.yakindu.sct.doc.user/.externalToolBuilders/Documentation Builder.launch
  52. 0 3
      plugins/org.yakindu.sct.doc.user/.gitignore
  53. 10 1
      plugins/org.yakindu.sct.doc.user/.project
  54. 1 1
      plugins/org.yakindu.sct.doc.user/META-INF/MANIFEST.MF
  55. 1 2
      plugins/org.yakindu.sct.doc.user/build.properties
  56. 3 295
      plugins/org.yakindu.sct.doc.user/build.xml
  57. 0 17
      plugins/org.yakindu.sct.doc.user/docbook-xsl.tmpl/common-html-rules.xsl
  58. 0 35
      plugins/org.yakindu.sct.doc.user/docbook-xsl.tmpl/common-params.xsl
  59. 0 25
      plugins/org.yakindu.sct.doc.user/docbook-xsl.tmpl/eclipsehelp.xsl
  60. 0 26
      plugins/org.yakindu.sct.doc.user/docbook-xsl.tmpl/html.xsl
  61. 0 14
      plugins/org.yakindu.sct.doc.user/docbook-xsl.tmpl/pdf.xsl
  62. 1 1
      plugins/org.yakindu.sct.doc.user/pom.xml
  63. 166 118
      plugins/org.yakindu.sct.doc.user/src/documentation.textile
  64. 0 6529
      plugins/org.yakindu.sct.doc.user/src/documentation.xml
  65. BIN
      plugins/org.yakindu.sct.doc.user/src/images/callhandling_example_final.png
  66. BIN
      plugins/org.yakindu.sct.doc.user/src/images/callhandling_example_finished.png
  67. BIN
      plugins/org.yakindu.sct.doc.user/src/images/genmodelwizardchooselanguage.jpg
  68. BIN
      plugins/org.yakindu.sct.doc.user/src/images/java_simulating_operation_010_statechart_with_operation.png
  69. 0 0
      plugins/org.yakindu.sct.doc.user/src/images/java_simulating_operation_020_run_configuration.png
  70. BIN
      plugins/org.yakindu.sct.doc.user/src/images/light_switch_250_statechart_editor_create_transition_02.png
  71. BIN
      plugins/org.yakindu.sct.doc.user/src/images/light_switch_250_statechart_editor_create_transition_03.png
  72. BIN
      plugins/org.yakindu.sct.doc.user/src/images/light_switch_310_statechart_simulator_state_off.png
  73. 111 0
      plugins/org.yakindu.sct.doc.user/src/tasks.textile
  74. 0 13
      plugins/org.yakindu.sct.doc.user/src/warning_sctypesh.xml
  75. BIN
      plugins/org.yakindu.sct.doc.user/structure.odg
  76. 1 1
      plugins/org.yakindu.sct.domain.generic/META-INF/MANIFEST.MF
  77. 1 1
      plugins/org.yakindu.sct.domain.generic/pom.xml
  78. 1 1
      plugins/org.yakindu.sct.domain/META-INF/MANIFEST.MF
  79. 1 1
      plugins/org.yakindu.sct.domain/pom.xml
  80. 1 1
      plugins/org.yakindu.sct.generator.c/META-INF/MANIFEST.MF
  81. 1 1
      plugins/org.yakindu.sct.generator.c/pom.xml
  82. 1 1
      plugins/org.yakindu.sct.generator.core/META-INF/MANIFEST.MF
  83. 1 1
      plugins/org.yakindu.sct.generator.core/pom.xml
  84. 0 174
      plugins/org.yakindu.sct.generator.core/src/org/yakindu/sct/generator/core/filesystem/HeadlessFileSystemAccess.java
  85. 1 1
      plugins/org.yakindu.sct.generator.cpp/META-INF/MANIFEST.MF
  86. 1 1
      plugins/org.yakindu.sct.generator.cpp/pom.xml
  87. 1 1
      plugins/org.yakindu.sct.generator.genmodel.ui/META-INF/MANIFEST.MF
  88. 1 1
      plugins/org.yakindu.sct.generator.genmodel.ui/pom.xml
  89. 1 1
      plugins/org.yakindu.sct.generator.genmodel/META-INF/MANIFEST.MF
  90. 1 1
      plugins/org.yakindu.sct.generator.genmodel/pom.xml
  91. 1 1
      plugins/org.yakindu.sct.generator.java/META-INF/MANIFEST.MF
  92. 1 1
      plugins/org.yakindu.sct.generator.java/pom.xml
  93. 1 1
      plugins/org.yakindu.sct.model.resource/META-INF/MANIFEST.MF
  94. 1 1
      plugins/org.yakindu.sct.model.resource/pom.xml
  95. 1 1
      plugins/org.yakindu.sct.model.sexec.edit/META-INF/MANIFEST.MF
  96. 1 1
      plugins/org.yakindu.sct.model.sexec.edit/pom.xml
  97. 1 1
      plugins/org.yakindu.sct.model.sexec/META-INF/MANIFEST.MF
  98. 1 1
      plugins/org.yakindu.sct.model.sexec/pom.xml
  99. 1 1
      plugins/org.yakindu.sct.model.sgen.edit/META-INF/MANIFEST.MF
  100. 0 0
      plugins/org.yakindu.sct.model.sgen.edit/pom.xml

+ 2 - 1
README.md

@@ -6,7 +6,8 @@
 
 
 The free to use, open source toolkit YAKINDU Statechart Tools (SCT) provides an integrated modeling environment for the specification and development of reactive, event-driven systems based on the concept of Harel statecharts. 
 The free to use, open source toolkit YAKINDU Statechart Tools (SCT) provides an integrated modeling environment for the specification and development of reactive, event-driven systems based on the concept of Harel statecharts. 
 
 
-
+## Professional Support
+Need professional support for Yakindu Statechart Tools? Contact us: statecharts@itemis.com
 ## License
 ## License
 
 
 The source code is provided under the <a href="http://www.eclipse.org/legal/epl-v10.html">Eclipse Public License</a>. 
 The source code is provided under the <a href="http://www.eclipse.org/legal/epl-v10.html">Eclipse Public License</a>. 

+ 1 - 1
examples/coffee_machine/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 	<parent>
 		<groupId>org.yakindu.sct</groupId>
 		<groupId>org.yakindu.sct</groupId>
 		<artifactId>org.yakindu.sct.releng</artifactId>
 		<artifactId>org.yakindu.sct.releng</artifactId>
-		<version>2.5.0-SNAPSHOT</version>
+		<version>2.6.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.yakindu.sct.releng/pom.xml</relativePath>
 		<relativePath>../../releng/org.yakindu.sct.releng/pom.xml</relativePath>
 	</parent>
 	</parent>
 	<groupId>org.yakindu.sct.examples</groupId>
 	<groupId>org.yakindu.sct.examples</groupId>

+ 1 - 1
examples/digital_watch/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 	<parent>
 		<groupId>org.yakindu.sct</groupId>
 		<groupId>org.yakindu.sct</groupId>
 		<artifactId>org.yakindu.sct.releng</artifactId>
 		<artifactId>org.yakindu.sct.releng</artifactId>
-		<version>2.5.0-SNAPSHOT</version>
+		<version>2.6.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.yakindu.sct.releng/pom.xml</relativePath>
 		<relativePath>../../releng/org.yakindu.sct.releng/pom.xml</relativePath>
 	</parent>
 	</parent>
 	<groupId>org.yakindu.sct.examples</groupId>
 	<groupId>org.yakindu.sct.examples</groupId>

+ 1 - 1
examples/light_switch/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 	<parent>
 		<groupId>org.yakindu.sct</groupId>
 		<groupId>org.yakindu.sct</groupId>
 		<artifactId>org.yakindu.sct.releng</artifactId>
 		<artifactId>org.yakindu.sct.releng</artifactId>
-		<version>2.5.0-SNAPSHOT</version>
+		<version>2.6.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.yakindu.sct.releng/pom.xml</relativePath>
 		<relativePath>../../releng/org.yakindu.sct.releng/pom.xml</relativePath>
 	</parent>
 	</parent>
 	<groupId>org.yakindu.sct.examples</groupId>
 	<groupId>org.yakindu.sct.examples</groupId>

+ 1 - 1
examples/org.yakindu.sct.examples/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-ManifestVersion: 2
 Bundle-Name: YAKINDU Examples
 Bundle-Name: YAKINDU Examples
 Bundle-SymbolicName: org.yakindu.sct.examples;singleton:=true
 Bundle-SymbolicName: org.yakindu.sct.examples;singleton:=true
-Bundle-Version: 2.5.0.qualifier
+Bundle-Version: 2.6.0.qualifier
 Bundle-Activator: org.yakindu.sct.ui.examples.Activator
 Bundle-Activator: org.yakindu.sct.ui.examples.Activator
 Bundle-Vendor: statecharts.org
 Bundle-Vendor: statecharts.org
 Require-Bundle: org.eclipse.core.runtime,
 Require-Bundle: org.eclipse.core.runtime,

+ 1 - 1
examples/org.yakindu.sct.examples/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 	<parent>
 		<groupId>org.yakindu.sct</groupId>
 		<groupId>org.yakindu.sct</groupId>
 		<artifactId>org.yakindu.sct.releng</artifactId>
 		<artifactId>org.yakindu.sct.releng</artifactId>
-		<version>2.5.0-SNAPSHOT</version>
+		<version>2.6.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.yakindu.sct.releng/pom.xml</relativePath>
 		<relativePath>../../releng/org.yakindu.sct.releng/pom.xml</relativePath>
 	</parent>
 	</parent>
 	<artifactId>org.yakindu.sct.examples</artifactId>
 	<artifactId>org.yakindu.sct.examples</artifactId>

+ 1 - 1
examples/traffic_light/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 	<parent>
 		<groupId>org.yakindu.sct</groupId>
 		<groupId>org.yakindu.sct</groupId>
 		<artifactId>org.yakindu.sct.releng</artifactId>
 		<artifactId>org.yakindu.sct.releng</artifactId>
-		<version>2.5.0-SNAPSHOT</version>
+		<version>2.6.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.yakindu.sct.releng/pom.xml</relativePath>
 		<relativePath>../../releng/org.yakindu.sct.releng/pom.xml</relativePath>
 	</parent>
 	</parent>
 	<groupId>org.yakindu.sct.examples</groupId>
 	<groupId>org.yakindu.sct.examples</groupId>

+ 1 - 1
features/org.yakindu.base-feature/feature.xml

@@ -2,7 +2,7 @@
 <feature
 <feature
       id="org.yakindu.base"
       id="org.yakindu.base"
       label="YAKINDU Statechart Tool Base"
       label="YAKINDU Statechart Tool Base"
-      version="2.5.0.qualifier"
+      version="2.6.0.qualifier"
       provider-name="statecharts.org">
       provider-name="statecharts.org">
 
 
    <description url="http://www.statecharts.org">
    <description url="http://www.statecharts.org">

+ 1 - 1
features/org.yakindu.base-feature/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 	<parent>
 		<groupId>org.yakindu.sct</groupId>
 		<groupId>org.yakindu.sct</groupId>
 		<artifactId>org.yakindu.sct.releng</artifactId>
 		<artifactId>org.yakindu.sct.releng</artifactId>
-		<version>2.5.0-SNAPSHOT</version>
+		<version>2.6.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.yakindu.sct.releng/pom.xml</relativePath>
 		<relativePath>../../releng/org.yakindu.sct.releng/pom.xml</relativePath>
 	</parent>
 	</parent>
 	<artifactId>org.yakindu.base</artifactId>
 	<artifactId>org.yakindu.base</artifactId>

+ 1 - 1
features/org.yakindu.base.gmf.runtime-feature/feature.xml

@@ -2,7 +2,7 @@
 <feature
 <feature
       id="org.yakindu.base.gmf.runtime"
       id="org.yakindu.base.gmf.runtime"
       label="GMF Runtime"
       label="GMF Runtime"
-      version="2.5.0.qualifier"
+      version="2.6.0.qualifier"
       provider-name="itemis AG">
       provider-name="itemis AG">
 
 
    <description>
    <description>

+ 1 - 1
features/org.yakindu.base.gmf.runtime-feature/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 	<parent>
 		<groupId>org.yakindu.sct</groupId>
 		<groupId>org.yakindu.sct</groupId>
 		<artifactId>org.yakindu.sct.releng</artifactId>
 		<artifactId>org.yakindu.sct.releng</artifactId>
-		<version>2.5.0-SNAPSHOT</version>
+		<version>2.6.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.yakindu.sct.releng/pom.xml</relativePath>
 		<relativePath>../../releng/org.yakindu.sct.releng/pom.xml</relativePath>
 	</parent>
 	</parent>
 	<artifactId>org.yakindu.base.gmf.runtime</artifactId>
 	<artifactId>org.yakindu.base.gmf.runtime</artifactId>

+ 1 - 1
features/org.yakindu.base.xtext.utils.gmf-feature/feature.xml

@@ -2,7 +2,7 @@
 <feature
 <feature
       id="org.yakindu.base.xtext.utils.gmf"
       id="org.yakindu.base.xtext.utils.gmf"
       label="Xtext GMF Integration (XGI) Feature"
       label="Xtext GMF Integration (XGI) Feature"
-      version="2.5.0.qualifier"
+      version="2.6.0.qualifier"
       provider-name="itemis AG">
       provider-name="itemis AG">
 
 
    <description>
    <description>

+ 1 - 1
features/org.yakindu.base.xtext.utils.gmf-feature/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 	<parent>
 		<groupId>org.yakindu.sct</groupId>
 		<groupId>org.yakindu.sct</groupId>
 		<artifactId>org.yakindu.sct.releng</artifactId>
 		<artifactId>org.yakindu.sct.releng</artifactId>
-		<version>2.5.0-SNAPSHOT</version>
+		<version>2.6.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.yakindu.sct.releng/pom.xml</relativePath>
 		<relativePath>../../releng/org.yakindu.sct.releng/pom.xml</relativePath>
 	</parent>
 	</parent>
 	<artifactId>org.yakindu.base.xtext.utils.gmf</artifactId>
 	<artifactId>org.yakindu.base.xtext.utils.gmf</artifactId>

+ 1 - 1
features/org.yakindu.base.xtext.utils.jface-feature/feature.xml

@@ -2,7 +2,7 @@
 <feature
 <feature
       id="org.yakindu.base.xtext.utils.jface"
       id="org.yakindu.base.xtext.utils.jface"
       label="Xtext JFace Integration Feature"
       label="Xtext JFace Integration Feature"
-      version="2.5.0.qualifier"
+      version="2.6.0.qualifier"
       provider-name="itemis AG">
       provider-name="itemis AG">
 
 
    <description url="http://www.example.com/description">
    <description url="http://www.example.com/description">

+ 1 - 1
features/org.yakindu.base.xtext.utils.jface-feature/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 	<parent>
 		<groupId>org.yakindu.sct</groupId>
 		<groupId>org.yakindu.sct</groupId>
 		<artifactId>org.yakindu.sct.releng</artifactId>
 		<artifactId>org.yakindu.sct.releng</artifactId>
-		<version>2.5.0-SNAPSHOT</version>
+		<version>2.6.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.yakindu.sct.releng/pom.xml</relativePath>
 		<relativePath>../../releng/org.yakindu.sct.releng/pom.xml</relativePath>
 	</parent>
 	</parent>
 	<artifactId>org.yakindu.base.xtext.utils.jface</artifactId>
 	<artifactId>org.yakindu.base.xtext.utils.jface</artifactId>

+ 2 - 2
features/org.yakindu.sct-feature/feature.xml

@@ -2,7 +2,7 @@
 <feature
 <feature
       id="org.yakindu.sct"
       id="org.yakindu.sct"
       label="YAKINDU Statechart Tools"
       label="YAKINDU Statechart Tools"
-      version="2.5.0.qualifier"
+      version="2.6.0.qualifier"
       provider-name="statecharts.org"
       provider-name="statecharts.org"
       plugin="org.yakindu.sct.doc.user">
       plugin="org.yakindu.sct.doc.user">
 
 
@@ -23,7 +23,7 @@
    </url>
    </url>
 
 
    <requires>
    <requires>
-      <import feature="org.yakindu.base" version="2.5.0.qualifier"/>
+      <import feature="org.yakindu.base" version="2.6.0.qualifier"/>
       <import plugin="com.google.guava" version="12.0.0" match="greaterOrEqual"/>
       <import plugin="com.google.guava" version="12.0.0" match="greaterOrEqual"/>
       <import plugin="com.google.inject" version="3.0.0" match="compatible"/>
       <import plugin="com.google.inject" version="3.0.0" match="compatible"/>
       <import plugin="com.google.inject.multibindings" version="3.0.0" match="compatible"/>
       <import plugin="com.google.inject.multibindings" version="3.0.0" match="compatible"/>

+ 1 - 1
features/org.yakindu.sct-feature/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 	<parent>
 		<groupId>org.yakindu.sct</groupId>
 		<groupId>org.yakindu.sct</groupId>
 		<artifactId>org.yakindu.sct.releng</artifactId>
 		<artifactId>org.yakindu.sct.releng</artifactId>
-		<version>2.5.0-SNAPSHOT</version>
+		<version>2.6.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.yakindu.sct.releng/pom.xml</relativePath>
 		<relativePath>../../releng/org.yakindu.sct.releng/pom.xml</relativePath>
 	</parent>
 	</parent>
 	<artifactId>org.yakindu.sct</artifactId>
 	<artifactId>org.yakindu.sct</artifactId>

+ 2 - 2
features/org.yakindu.sct.generator-feature/feature.xml

@@ -2,7 +2,7 @@
 <feature
 <feature
       id="org.yakindu.sct.generator"
       id="org.yakindu.sct.generator"
       label="YAKINDU Generator All-In-One Feature"
       label="YAKINDU Generator All-In-One Feature"
-      version="2.5.0.qualifier"
+      version="2.6.0.qualifier"
       provider-name="yakindu.org"
       provider-name="yakindu.org"
       plugin="org.yakindu.sct.doc.user">
       plugin="org.yakindu.sct.doc.user">
 
 
@@ -31,7 +31,7 @@
          version="0.0.0"/>
          version="0.0.0"/>
 
 
    <requires>
    <requires>
-      <import feature="org.yakindu.sct" version="2.5.0.qualifier"/>
+      <import feature="org.yakindu.sct" version="2.6.0.qualifier"/>
    </requires>
    </requires>
 
 
 </feature>
 </feature>

+ 1 - 1
features/org.yakindu.sct.generator-feature/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 	<parent>
 		<groupId>org.yakindu.sct</groupId>
 		<groupId>org.yakindu.sct</groupId>
 		<artifactId>org.yakindu.sct.releng</artifactId>
 		<artifactId>org.yakindu.sct.releng</artifactId>
-		<version>2.5.0-SNAPSHOT</version>
+		<version>2.6.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.yakindu.sct.releng/pom.xml</relativePath>
 		<relativePath>../../releng/org.yakindu.sct.releng/pom.xml</relativePath>
 	</parent>
 	</parent>
 	<artifactId>org.yakindu.sct.generator</artifactId>
 	<artifactId>org.yakindu.sct.generator</artifactId>

+ 2 - 2
features/org.yakindu.sct.generator.c-feature/feature.xml

@@ -2,7 +2,7 @@
 <feature
 <feature
       id="org.yakindu.sct.generator.c"
       id="org.yakindu.sct.generator.c"
       label="YAKINDU Statechart Tools C code generator"
       label="YAKINDU Statechart Tools C code generator"
-      version="2.5.0.qualifier"
+      version="2.6.0.qualifier"
       provider-name="statecharts.org"
       provider-name="statecharts.org"
       plugin="org.yakindu.sct.doc.user">
       plugin="org.yakindu.sct.doc.user">
 
 
@@ -19,7 +19,7 @@
    </license>
    </license>
 
 
    <requires>
    <requires>
-      <import feature="org.yakindu.sct" version="2.5.0.qualifier"/>
+      <import feature="org.yakindu.sct" version="2.6.0.qualifier"/>
    </requires>
    </requires>
 
 
    <plugin
    <plugin

+ 1 - 1
features/org.yakindu.sct.generator.c-feature/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 	<parent>
 		<groupId>org.yakindu.sct</groupId>
 		<groupId>org.yakindu.sct</groupId>
 		<artifactId>org.yakindu.sct.releng</artifactId>
 		<artifactId>org.yakindu.sct.releng</artifactId>
-		<version>2.5.0-SNAPSHOT</version>
+		<version>2.6.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.yakindu.sct.releng/pom.xml</relativePath>
 		<relativePath>../../releng/org.yakindu.sct.releng/pom.xml</relativePath>
 	</parent>
 	</parent>
 	<artifactId>org.yakindu.sct.generator.c</artifactId>
 	<artifactId>org.yakindu.sct.generator.c</artifactId>

+ 2 - 2
features/org.yakindu.sct.generator.cpp-feature/feature.xml

@@ -2,7 +2,7 @@
 <feature
 <feature
       id="org.yakindu.sct.generator.cpp"
       id="org.yakindu.sct.generator.cpp"
       label="YAKINDU Statechart Tools C++ code generator"
       label="YAKINDU Statechart Tools C++ code generator"
-      version="2.5.0.qualifier"
+      version="2.6.0.qualifier"
       provider-name="statecharts.org"
       provider-name="statecharts.org"
       plugin="org.yakindu.sct.doc.user">
       plugin="org.yakindu.sct.doc.user">
 
 
@@ -19,7 +19,7 @@
    </license>
    </license>
 
 
    <requires>
    <requires>
-      <import feature="org.yakindu.sct" version="2.5.0.qualifier"/>
+      <import feature="org.yakindu.sct" version="2.6.0.qualifier"/>
    </requires>
    </requires>
 
 
    <plugin
    <plugin

+ 1 - 1
features/org.yakindu.sct.generator.cpp-feature/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 	<parent>
 		<groupId>org.yakindu.sct</groupId>
 		<groupId>org.yakindu.sct</groupId>
 		<artifactId>org.yakindu.sct.releng</artifactId>
 		<artifactId>org.yakindu.sct.releng</artifactId>
-		<version>2.5.0-SNAPSHOT</version>
+		<version>2.6.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.yakindu.sct.releng/pom.xml</relativePath>
 		<relativePath>../../releng/org.yakindu.sct.releng/pom.xml</relativePath>
 	</parent>
 	</parent>
 	<artifactId>org.yakindu.sct.generator.cpp</artifactId>
 	<artifactId>org.yakindu.sct.generator.cpp</artifactId>

+ 2 - 2
features/org.yakindu.sct.generator.java-feature/feature.xml

@@ -2,7 +2,7 @@
 <feature
 <feature
       id="org.yakindu.sct.generator.java"
       id="org.yakindu.sct.generator.java"
       label="YAKINDU Statechart Tools Java code generator"
       label="YAKINDU Statechart Tools Java code generator"
-      version="2.5.0.qualifier"
+      version="2.6.0.qualifier"
       provider-name="statecharts.org"
       provider-name="statecharts.org"
       plugin="org.yakindu.sct.doc.user">
       plugin="org.yakindu.sct.doc.user">
 
 
@@ -19,7 +19,7 @@
    </license>
    </license>
 
 
    <requires>
    <requires>
-      <import feature="org.yakindu.sct" version="2.5.0.qualifier"/>
+      <import feature="org.yakindu.sct" version="2.6.0.qualifier"/>
    </requires>
    </requires>
 
 
    <plugin
    <plugin

+ 1 - 1
features/org.yakindu.sct.generator.java-feature/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 	<parent>
 		<groupId>org.yakindu.sct</groupId>
 		<groupId>org.yakindu.sct</groupId>
 		<artifactId>org.yakindu.sct.releng</artifactId>
 		<artifactId>org.yakindu.sct.releng</artifactId>
-		<version>2.5.0-SNAPSHOT</version>
+		<version>2.6.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.yakindu.sct.releng/pom.xml</relativePath>
 		<relativePath>../../releng/org.yakindu.sct.releng/pom.xml</relativePath>
 	</parent>
 	</parent>
 	<artifactId>org.yakindu.sct.generator.java</artifactId>
 	<artifactId>org.yakindu.sct.generator.java</artifactId>

+ 1 - 1
features/org.yakindu.sct.test-feature/feature.xml

@@ -2,7 +2,7 @@
 <feature
 <feature
       id="org.yakindu.sct.test"
       id="org.yakindu.sct.test"
       label="YAKINDU 2 Test"
       label="YAKINDU 2 Test"
-      version="2.5.0.qualifier"
+      version="2.6.0.qualifier"
       provider-name="yakindu.org">
       provider-name="yakindu.org">
 
 
    <description>
    <description>

+ 1 - 1
features/org.yakindu.sct.test-feature/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 	<parent>
 		<groupId>org.yakindu.sct</groupId>
 		<groupId>org.yakindu.sct</groupId>
 		<artifactId>org.yakindu.sct.releng</artifactId>
 		<artifactId>org.yakindu.sct.releng</artifactId>
-		<version>2.5.0-SNAPSHOT</version>
+		<version>2.6.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.yakindu.sct.releng/pom.xml</relativePath>
 		<relativePath>../../releng/org.yakindu.sct.releng/pom.xml</relativePath>
 	</parent>
 	</parent>
 	<artifactId>org.yakindu.sct.test</artifactId>
 	<artifactId>org.yakindu.sct.test</artifactId>

+ 1 - 1
plugins/org.yakindu.base.expressions.edit/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-ManifestVersion: 2
 Bundle-Name: YAKINDU Base Edit
 Bundle-Name: YAKINDU Base Edit
 Bundle-SymbolicName: org.yakindu.base.expressions.edit;singleton:=true
 Bundle-SymbolicName: org.yakindu.base.expressions.edit;singleton:=true
-Bundle-Version: 2.5.0.qualifier
+Bundle-Version: 2.6.0.qualifier
 Bundle-ClassPath: .
 Bundle-ClassPath: .
 Bundle-Activator: org.yakindu.base.expressions.expressions.provider.ExpressionsEditPlugin$Implementation
 Bundle-Activator: org.yakindu.base.expressions.expressions.provider.ExpressionsEditPlugin$Implementation
 Bundle-Vendor: statecharts.org
 Bundle-Vendor: statecharts.org

+ 1 - 1
plugins/org.yakindu.base.expressions.edit/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 	<parent>
 		<groupId>org.yakindu.sct</groupId>
 		<groupId>org.yakindu.sct</groupId>
 		<artifactId>org.yakindu.sct.releng</artifactId>
 		<artifactId>org.yakindu.sct.releng</artifactId>
-		<version>2.5.0-SNAPSHOT</version>
+		<version>2.6.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.yakindu.sct.releng/pom.xml</relativePath>
 		<relativePath>../../releng/org.yakindu.sct.releng/pom.xml</relativePath>
 	</parent>
 	</parent>
 	<artifactId>org.yakindu.base.expressions.edit</artifactId>
 	<artifactId>org.yakindu.base.expressions.edit</artifactId>

+ 1 - 1
plugins/org.yakindu.base.expressions.ui/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-ManifestVersion: 2
 Bundle-Name: YAKINDU Base Expressions UI
 Bundle-Name: YAKINDU Base Expressions UI
 Bundle-Vendor: statecharts.org
 Bundle-Vendor: statecharts.org
-Bundle-Version: 2.5.0.qualifier
+Bundle-Version: 2.6.0.qualifier
 Bundle-SymbolicName: org.yakindu.base.expressions.ui; singleton:=true
 Bundle-SymbolicName: org.yakindu.base.expressions.ui; singleton:=true
 Bundle-ActivationPolicy: lazy
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.yakindu.base.expressions;visibility:=reexport,
 Require-Bundle: org.yakindu.base.expressions;visibility:=reexport,

+ 1 - 1
plugins/org.yakindu.base.expressions.ui/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 	<parent>
 		<groupId>org.yakindu.sct</groupId>
 		<groupId>org.yakindu.sct</groupId>
 		<artifactId>org.yakindu.sct.releng</artifactId>
 		<artifactId>org.yakindu.sct.releng</artifactId>
-		<version>2.5.0-SNAPSHOT</version>
+		<version>2.6.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.yakindu.sct.releng/pom.xml</relativePath>
 		<relativePath>../../releng/org.yakindu.sct.releng/pom.xml</relativePath>
 	</parent>
 	</parent>
 	<artifactId>org.yakindu.base.expressions.ui</artifactId>
 	<artifactId>org.yakindu.base.expressions.ui</artifactId>

+ 0 - 36
plugins/org.yakindu.base.expressions/.launch/Launch Runtime Eclipse.launch

@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.pde.ui.RuntimeWorkbench">
-<booleanAttribute key="append.args" value="true"/>
-<booleanAttribute key="askclear" value="true"/>
-<booleanAttribute key="automaticAdd" value="true"/>
-<booleanAttribute key="automaticValidate" value="false"/>
-<stringAttribute key="bad_container_name" value="/org.yakindu.base.expressions/.launch/"/>
-<stringAttribute key="bootstrap" value=""/>
-<stringAttribute key="checked" value="[NONE]"/>
-<booleanAttribute key="clearConfig" value="false"/>
-<booleanAttribute key="clearws" value="false"/>
-<booleanAttribute key="clearwslog" value="false"/>
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/Launch Runtime Eclipse"/>
-<booleanAttribute key="default" value="true"/>
-<booleanAttribute key="includeOptional" value="true"/>
-<stringAttribute key="location" value="${workspace_loc}/../runtime-EclipseXtext"/>
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
-<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
-</listAttribute>
-<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl}"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms40m -Xmx512m -XX:MaxPermSize=256m &#13;&#10;-Dorg.eclipse.epp.internal.mpc.core.service.DefaultCatalogService.url=http://localhost:8080"/>
-<stringAttribute key="pde.version" value="3.3"/>
-<stringAttribute key="product" value="org.eclipse.platform.ide"/>
-<booleanAttribute key="show_selected_only" value="false"/>
-<stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/>
-<booleanAttribute key="tracing" value="false"/>
-<booleanAttribute key="useCustomFeatures" value="false"/>
-<booleanAttribute key="useDefaultConfig" value="true"/>
-<booleanAttribute key="useDefaultConfigArea" value="true"/>
-<booleanAttribute key="useProduct" value="true"/>
-<booleanAttribute key="usefeatures" value="false"/>
-</launchConfiguration>

+ 1 - 1
plugins/org.yakindu.base.expressions/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-ManifestVersion: 2
 Bundle-Name: YAKINDU Base Expressions
 Bundle-Name: YAKINDU Base Expressions
 Bundle-Vendor: statecharts.org
 Bundle-Vendor: statecharts.org
-Bundle-Version: 2.5.0.qualifier
+Bundle-Version: 2.6.0.qualifier
 Bundle-SymbolicName: org.yakindu.base.expressions; singleton:=true
 Bundle-SymbolicName: org.yakindu.base.expressions; singleton:=true
 Bundle-ActivationPolicy: lazy
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.xtext;visibility:=reexport,
 Require-Bundle: org.eclipse.xtext;visibility:=reexport,

+ 1 - 1
plugins/org.yakindu.base.expressions/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 	<parent>
 		<groupId>org.yakindu.sct</groupId>
 		<groupId>org.yakindu.sct</groupId>
 		<artifactId>org.yakindu.sct.releng</artifactId>
 		<artifactId>org.yakindu.sct.releng</artifactId>
-		<version>2.5.0-SNAPSHOT</version>
+		<version>2.6.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.yakindu.sct.releng/pom.xml</relativePath>
 		<relativePath>../../releng/org.yakindu.sct.releng/pom.xml</relativePath>
 	</parent>
 	</parent>
 	<artifactId>org.yakindu.base.expressions</artifactId>
 	<artifactId>org.yakindu.base.expressions</artifactId>

+ 1 - 1
plugins/org.yakindu.base.gmf.runtime/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-ManifestVersion: 2
 Bundle-Name: YAKINDU GMF Runtime Commons
 Bundle-Name: YAKINDU GMF Runtime Commons
 Bundle-SymbolicName: org.yakindu.base.gmf.runtime
 Bundle-SymbolicName: org.yakindu.base.gmf.runtime
-Bundle-Version: 2.5.0.qualifier
+Bundle-Version: 2.6.0.qualifier
 Bundle-Vendor: statecharts.org
 Bundle-Vendor: statecharts.org
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Require-Bundle: org.eclipse.gmf.runtime.diagram.ui.properties,
 Require-Bundle: org.eclipse.gmf.runtime.diagram.ui.properties,

+ 1 - 1
plugins/org.yakindu.base.gmf.runtime/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 	<parent>
 		<groupId>org.yakindu.sct</groupId>
 		<groupId>org.yakindu.sct</groupId>
 		<artifactId>org.yakindu.sct.releng</artifactId>
 		<artifactId>org.yakindu.sct.releng</artifactId>
-		<version>2.5.0-SNAPSHOT</version>
+		<version>2.6.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.yakindu.sct.releng/pom.xml</relativePath>
 		<relativePath>../../releng/org.yakindu.sct.releng/pom.xml</relativePath>
 	</parent>
 	</parent>
 	<artifactId>org.yakindu.base.gmf.runtime</artifactId>
 	<artifactId>org.yakindu.base.gmf.runtime</artifactId>

+ 1 - 1
plugins/org.yakindu.base.types.edit/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-ManifestVersion: 2
 Bundle-Name: YAKINDU Base Types Edit
 Bundle-Name: YAKINDU Base Types Edit
 Bundle-SymbolicName: org.yakindu.base.types.edit;singleton:=true
 Bundle-SymbolicName: org.yakindu.base.types.edit;singleton:=true
-Bundle-Version: 2.5.0.qualifier
+Bundle-Version: 2.6.0.qualifier
 Bundle-ClassPath: .
 Bundle-ClassPath: .
 Bundle-Activator: org.yakindu.base.base.provider.BaseEditPlugin$Implementation
 Bundle-Activator: org.yakindu.base.base.provider.BaseEditPlugin$Implementation
 Bundle-Vendor: statecharts.org
 Bundle-Vendor: statecharts.org

+ 1 - 1
plugins/org.yakindu.base.types.edit/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 	<parent>
 		<groupId>org.yakindu.sct</groupId>
 		<groupId>org.yakindu.sct</groupId>
 		<artifactId>org.yakindu.sct.releng</artifactId>
 		<artifactId>org.yakindu.sct.releng</artifactId>
-		<version>2.5.0-SNAPSHOT</version>
+		<version>2.6.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.yakindu.sct.releng/pom.xml</relativePath>
 		<relativePath>../../releng/org.yakindu.sct.releng/pom.xml</relativePath>
 	</parent>
 	</parent>
 	<artifactId>org.yakindu.base.types.edit</artifactId>
 	<artifactId>org.yakindu.base.types.edit</artifactId>

+ 1 - 1
plugins/org.yakindu.base.types.test/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-ManifestVersion: 2
 Bundle-Name: YAKINDU Base Types Tests
 Bundle-Name: YAKINDU Base Types Tests
 Bundle-SymbolicName: org.yakindu.base.types.test
 Bundle-SymbolicName: org.yakindu.base.types.test
-Bundle-Version: 2.5.0.qualifier
+Bundle-Version: 2.6.0.qualifier
 Bundle-Vendor: statecharts.org
 Bundle-Vendor: statecharts.org
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Require-Bundle: org.yakindu.base.types,
 Require-Bundle: org.yakindu.base.types,

+ 1 - 1
plugins/org.yakindu.base.types.test/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 	<parent>
 		<groupId>org.yakindu.sct</groupId>
 		<groupId>org.yakindu.sct</groupId>
 		<artifactId>org.yakindu.sct.releng</artifactId>
 		<artifactId>org.yakindu.sct.releng</artifactId>
-		<version>2.5.0-SNAPSHOT</version>
+		<version>2.6.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.yakindu.sct.releng/pom.xml</relativePath>
 		<relativePath>../../releng/org.yakindu.sct.releng/pom.xml</relativePath>
 	</parent>
 	</parent>
 	<artifactId>org.yakindu.base.types.test</artifactId>
 	<artifactId>org.yakindu.base.types.test</artifactId>

+ 1 - 1
plugins/org.yakindu.base.types/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-ManifestVersion: 2
 Bundle-Name: YAKINDU Base Types
 Bundle-Name: YAKINDU Base Types
 Bundle-SymbolicName: org.yakindu.base.types;singleton:=true
 Bundle-SymbolicName: org.yakindu.base.types;singleton:=true
-Bundle-Version: 2.5.0.qualifier
+Bundle-Version: 2.6.0.qualifier
 Bundle-ClassPath: .
 Bundle-ClassPath: .
 Bundle-Vendor: statecharts.org
 Bundle-Vendor: statecharts.org
 Bundle-Localization: plugin
 Bundle-Localization: plugin

+ 1 - 1
plugins/org.yakindu.base.types/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 	<parent>
 		<groupId>org.yakindu.sct</groupId>
 		<groupId>org.yakindu.sct</groupId>
 		<artifactId>org.yakindu.sct.releng</artifactId>
 		<artifactId>org.yakindu.sct.releng</artifactId>
-		<version>2.5.0-SNAPSHOT</version>
+		<version>2.6.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.yakindu.sct.releng/pom.xml</relativePath>
 		<relativePath>../../releng/org.yakindu.sct.releng/pom.xml</relativePath>
 	</parent>
 	</parent>
 	<artifactId>org.yakindu.base.types</artifactId>
 	<artifactId>org.yakindu.base.types</artifactId>

+ 1 - 1
plugins/org.yakindu.base.xtext.utils.gmf/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-ManifestVersion: 2
 Bundle-Name: YAKINDU Xtext GMF Integration (XGI)
 Bundle-Name: YAKINDU Xtext GMF Integration (XGI)
 Bundle-SymbolicName: org.yakindu.base.xtext.utils.gmf
 Bundle-SymbolicName: org.yakindu.base.xtext.utils.gmf
-Bundle-Version: 2.5.0.qualifier
+Bundle-Version: 2.6.0.qualifier
 Bundle-Vendor: statecharts.org
 Bundle-Vendor: statecharts.org
 Require-Bundle: org.eclipse.core.runtime,
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.xtext.ui,
  org.eclipse.xtext.ui,

+ 1 - 1
plugins/org.yakindu.base.xtext.utils.gmf/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 	<parent>
 		<groupId>org.yakindu.sct</groupId>
 		<groupId>org.yakindu.sct</groupId>
 		<artifactId>org.yakindu.sct.releng</artifactId>
 		<artifactId>org.yakindu.sct.releng</artifactId>
-		<version>2.5.0-SNAPSHOT</version>
+		<version>2.6.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.yakindu.sct.releng/pom.xml</relativePath>
 		<relativePath>../../releng/org.yakindu.sct.releng/pom.xml</relativePath>
 	</parent>
 	</parent>
 	<artifactId>org.yakindu.base.xtext.utils.gmf</artifactId>
 	<artifactId>org.yakindu.base.xtext.utils.gmf</artifactId>

+ 1 - 1
plugins/org.yakindu.base.xtext.utils.jface/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-ManifestVersion: 2
 Bundle-Name: YAKINDU Xtext JFace Integration (XJI)
 Bundle-Name: YAKINDU Xtext JFace Integration (XJI)
 Bundle-SymbolicName: org.yakindu.base.xtext.utils.jface;singleton:=true
 Bundle-SymbolicName: org.yakindu.base.xtext.utils.jface;singleton:=true
-Bundle-Version: 2.5.0.qualifier
+Bundle-Version: 2.6.0.qualifier
 Bundle-Vendor: statecharts.org
 Bundle-Vendor: statecharts.org
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Require-Bundle: org.eclipse.core.runtime,
 Require-Bundle: org.eclipse.core.runtime,

+ 1 - 1
plugins/org.yakindu.base.xtext.utils.jface/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 	<parent>
 		<groupId>org.yakindu.sct</groupId>
 		<groupId>org.yakindu.sct</groupId>
 		<artifactId>org.yakindu.sct.releng</artifactId>
 		<artifactId>org.yakindu.sct.releng</artifactId>
-		<version>2.5.0-SNAPSHOT</version>
+		<version>2.6.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.yakindu.sct.releng/pom.xml</relativePath>
 		<relativePath>../../releng/org.yakindu.sct.releng/pom.xml</relativePath>
 	</parent>
 	</parent>
 	<artifactId>org.yakindu.base.xtext.utils.jface</artifactId>
 	<artifactId>org.yakindu.base.xtext.utils.jface</artifactId>

+ 1 - 1
plugins/org.yakindu.sct.commons/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-ManifestVersion: 2
 Bundle-Name: YAKINDU Commons
 Bundle-Name: YAKINDU Commons
 Bundle-SymbolicName: org.yakindu.sct.commons
 Bundle-SymbolicName: org.yakindu.sct.commons
-Bundle-Version: 2.5.0.qualifier
+Bundle-Version: 2.6.0.qualifier
 Bundle-Vendor: statecharts.org
 Bundle-Vendor: statecharts.org
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Require-Bundle: org.eclipse.core.resources,
 Require-Bundle: org.eclipse.core.resources,

+ 1 - 1
plugins/org.yakindu.sct.commons/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 	<parent>
 		<groupId>org.yakindu.sct</groupId>
 		<groupId>org.yakindu.sct</groupId>
 		<artifactId>org.yakindu.sct.releng</artifactId>
 		<artifactId>org.yakindu.sct.releng</artifactId>
-		<version>2.5.0-SNAPSHOT</version>
+		<version>2.6.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.yakindu.sct.releng/pom.xml</relativePath>
 		<relativePath>../../releng/org.yakindu.sct.releng/pom.xml</relativePath>
 	</parent>
 	</parent>
 	<artifactId>org.yakindu.sct.commons</artifactId>
 	<artifactId>org.yakindu.sct.commons</artifactId>

+ 1 - 1
plugins/org.yakindu.sct.compare/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-ManifestVersion: 2
 Bundle-Name: YAKINDU Compare
 Bundle-Name: YAKINDU Compare
 Bundle-SymbolicName: org.yakindu.sct.compare;singleton:=true
 Bundle-SymbolicName: org.yakindu.sct.compare;singleton:=true
-Bundle-Version: 2.5.0.qualifier
+Bundle-Version: 2.6.0.qualifier
 Bundle-Activator: org.yakindu.sct.compare.CompareActivator
 Bundle-Activator: org.yakindu.sct.compare.CompareActivator
 Require-Bundle: org.eclipse.ui,
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.core.runtime,

+ 1 - 1
plugins/org.yakindu.sct.compare/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 	<parent>
 		<groupId>org.yakindu.sct</groupId>
 		<groupId>org.yakindu.sct</groupId>
 		<artifactId>org.yakindu.sct.releng</artifactId>
 		<artifactId>org.yakindu.sct.releng</artifactId>
-		<version>2.5.0-SNAPSHOT</version>
+		<version>2.6.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.yakindu.sct.releng/pom.xml</relativePath>
 		<relativePath>../../releng/org.yakindu.sct.releng/pom.xml</relativePath>
 	</parent>
 	</parent>
 	<artifactId>org.yakindu.sct.compare</artifactId>
 	<artifactId>org.yakindu.sct.compare</artifactId>

+ 16 - 0
plugins/org.yakindu.sct.doc.user/.externalToolBuilders/Documentation Builder.launch

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
+<booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
+<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="true"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"/>
+<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.launching.remote.InternalAntRunner"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.yakindu.sct.doc.user"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.yakindu.sct.doc.user/build.xml}"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,"/>
+<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
+<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/>
+</launchConfiguration>

+ 0 - 3
plugins/org.yakindu.sct.doc.user/.gitignore

@@ -1,7 +1,4 @@
 .ant-targets-build.xml
 .ant-targets-build.xml
-docbook-xsl/
-docbook-xsl.distribution/
-docbook-xml.distribution/
 examples/
 examples/
 help/
 help/
 html/
 html/

+ 10 - 1
plugins/org.yakindu.sct.doc.user/.project

@@ -3,7 +3,6 @@
 	<name>org.yakindu.sct.doc.user</name>
 	<name>org.yakindu.sct.doc.user</name>
 	<comment></comment>
 	<comment></comment>
 	<projects>
 	<projects>
-		<project>org.yakindu.sct.doc.docbook-xsl</project>
 	</projects>
 	</projects>
 	<buildSpec>
 	<buildSpec>
 		<buildCommand>
 		<buildCommand>
@@ -26,6 +25,16 @@
 			<arguments>
 			<arguments>
 			</arguments>
 			</arguments>
 		</buildCommand>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
+			<triggers>full,incremental,</triggers>
+			<arguments>
+				<dictionary>
+					<key>LaunchConfigHandle</key>
+					<value>&lt;project&gt;/.externalToolBuilders/Documentation Builder.launch</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	</buildSpec>
 	<natures>
 	<natures>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>

+ 1 - 1
plugins/org.yakindu.sct.doc.user/META-INF/MANIFEST.MF

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-ManifestVersion: 2
 Bundle-Name: YAKINDU User Help
 Bundle-Name: YAKINDU User Help
 Bundle-SymbolicName: org.yakindu.sct.doc.user;singleton:=true
 Bundle-SymbolicName: org.yakindu.sct.doc.user;singleton:=true
-Bundle-Version: 2.5.0.qualifier
+Bundle-Version: 2.6.0.qualifier
 Bundle-Vendor: statecharts.org
 Bundle-Vendor: statecharts.org

+ 1 - 2
plugins/org.yakindu.sct.doc.user/build.properties

@@ -9,5 +9,4 @@ bin.includes = plugin.xml,\
                about.mappings,\
                about.mappings,\
                about.properties,\
                about.properties,\
                Yakindu-about.png,\
                Yakindu-about.png,\
-               css/,\
-               docbook-xsl.tmpl/
+               css/

+ 3 - 295
plugins/org.yakindu.sct.doc.user/build.xml

@@ -52,37 +52,17 @@
     <property name="wikitext.zip.src"
     <property name="wikitext.zip.src"
               value="http://www.eclipse.org/downloads/download.php?file=/mylyn/snapshots/nightly/docs/wikitext-standalone-latest.zip" />
               value="http://www.eclipse.org/downloads/download.php?file=/mylyn/snapshots/nightly/docs/wikitext-standalone-latest.zip" />
     -->
     -->
-    <property name="wikitext.zip.src" value="file://${basedir}/externals/wikitext.zip" />
+    <property name="wikitext.zip.src" value="file:///${basedir}/externals/wikitext.zip" />
     <property name="wikitext.zip.file" value="${lib.dir}/wikitext.zip" />
     <property name="wikitext.zip.file" value="${lib.dir}/wikitext.zip" />
     <property name="wikitext.basename" value="wikitext-standalone" />
     <property name="wikitext.basename" value="wikitext-standalone" />
     <property name="wikitext.version" value="2.8.0-SNAPSHOT" />
     <property name="wikitext.version" value="2.8.0-SNAPSHOT" />
 
 
 
 
 
 
-    <!-- The DocBook XML distribution ZIP file will be unpacked to this directory: -->
-    <property name="docbook-xml.distribution.dir" location="${basedir}/docbook-xml.distribution" />
-
-    <!-- The DocBook XSL distribution ZIP file will be unpacked to this directory: -->
-    <property name="docbook-xsl.distribution.dir" location="${basedir}/docbook-xsl.distribution" />
-
-    <!-- This directory contains our project-specific DocBook XSL customization layer as templates with to-be-resolved
-         references to the unpacked DocBook XSL distribution: -->
-    <property name="docbook-xsl.dir.tmpl.name" value="docbook-xsl.tmpl" />
-    <property name="docbook-xsl.dir.tmpl" location="${basedir}/${docbook-xsl.dir.tmpl.name}" />
-
-    <!-- This directory contains our project-specific DocBook XSL customization layer with references being resolved to
-         point to the unpacked DocBook XSL distribution: -->
-    <property name="docbook-xsl.dir" location="${basedir}/docbook-xsl" />
-
-
-
     <!-- Remove generated stuff: -->
     <!-- Remove generated stuff: -->
     <target name="clean">
     <target name="clean">
         <delete includeemptydirs="true" failonerror="false">
         <delete includeemptydirs="true" failonerror="false">
             <fileset dir="${res.dir.name}" />
             <fileset dir="${res.dir.name}" />
-            <fileset dir="${docbook-xsl.dir}" />
-            <fileset dir="${docbook-xsl.distribution.dir}" />
-            <fileset dir="${docbook-xml.distribution.dir}" />
             <fileset dir="${basedir}" defaultexcludes="false">
             <fileset dir="${basedir}" defaultexcludes="false">
                 <include name="${help.dir.name}/**" />
                 <include name="${help.dir.name}/**" />
                 <include name="${html.dir.name}/**" />
                 <include name="${html.dir.name}/**" />
@@ -93,43 +73,6 @@
     </target>
     </target>
 
 
 
 
-    <!-- Initializes the build environment. -->
-    <target name="init" depends="init.aether, init.dependencies" description="Initializes the build environment." />
-
-
-    <!-- Aether Ant Tasks are used to access Maven dependencies from an Ant build. It is initialized by downloading
-         the Aether Ant Tasks JAR to the library folder, if needed. The downloaded JAR will not be removed by the
-         "clean" target. If the JAR is present, a typedef will make Aether Ant Tasks' elements available in the Ant
-         build file. -->
-    <target name="init.aether"
-            description="Initializes Aether Ant Tasks JAR by downloading the JAR and defining a type.">
-        <condition property="target.exists">
-            <available file="${aether.jar.file}" />
-        </condition>
-        <sequential unless:set="target.exists">
-            <mkdir dir="${lib.dir}" />
-            <get src="${aether.jar.src}"
-                 dest="${aether.jar.file}"
-                 skipexisting="true"
-                 usetimestamp="true"
-                 verbose="true" />
-            <fail message="Checksum mismatch for ${aether.jar.file}. Please delete it and rerun ant to redownload.">
-                <condition>
-                    <not>
-                        <checksum file="${aether.jar.file}"
-                                  algorithm="SHA-512"
-                                  property="${aether.jar.checksum}"
-                                  verifyproperty="checksum.matches" />
-                    </not>
-                </condition>
-            </fail>
-        </sequential>
-        <path id="aether-ant-tasks.classpath" path="${aether.jar.file}" />
-        <typedef resource="org/eclipse/aether/ant/antlib.xml"
-                 uri="antlib:org.eclipse.aether.ant"
-                 classpathref="aether-ant-tasks.classpath" />
-    </target>
-
     <!-- Download and unpack the wikitext standalone distribution. Unfortunately it is currently available as a nightly build only. -->
     <!-- Download and unpack the wikitext standalone distribution. Unfortunately it is currently available as a nightly build only. -->
     <target name="wikitext.download" description="Download and unpack the wikitext standalone distribution.">
     <target name="wikitext.download" description="Download and unpack the wikitext standalone distribution.">
         <condition property="wikitext.zip.file.exists">
         <condition property="wikitext.zip.file.exists">
@@ -168,165 +111,13 @@
         </path>
         </path>
     </target>
     </target>
 
 
-    <!-- Resolves the necessary dependencies: -->
-    <target name="init.dependencies" description="Resolves the necessary dependencies." depends="init.aether">
-
-        <!-- Classpath for Xalan, needed to render DocBook documents via XSLT. -->
-        <artifact:resolve>
-            <artifact:dependencies>
-                <dependency groupId="xalan" artifactId="xalan" version="2.7.2" scope="compile" />
-            </artifact:dependencies>
-            <path refid="xalan.classpath" />
-        </artifact:resolve>
-
-        <!-- Classpath for Xerces and Xerces samples, needed for XInclude preprocessing. -->
-        <artifact:resolve>
-            <artifact:dependencies>
-                <dependency groupId="xerces" artifactId="xercesImpl" version="2.11.0" scope="compile" />
-                <dependency groupId="xerces" artifactId="xercesSamples" version="2.8.0" scope="compile" />
-            </artifact:dependencies>
-            <path refid="xerces.classpath" />
-        </artifact:resolve>
-
-        <!-- Classpath for FOP, needed to render FOP files (generated by DocBook XSL) into PDF documents. -->
-        <artifact:resolve>
-            <artifact:dependencies>
-                <dependency groupId="org.apache.xmlgraphics" artifactId="fop" version="2.1" scope="compile" />
-            </artifact:dependencies>
-            <path refid="fop.classpath" />
-        </artifact:resolve>
-
-        <!-- ZIP file containing the DocBook XSL distribution, needed to convert DocBook documents to anything else: -->
-        <artifact:resolve>
-            <artifact:dependencies>
-                <dependency groupId="net.sf.docbook"
-                            artifactId="docbook-xsl"
-                            version="1.78.1"
-                            type="zip"
-                            classifier="ns-resources"
-                            scope="compile" />
-            </artifact:dependencies>
-            <properties prefix="docbook-xsl" />
-        </artifact:resolve>
-
-        <!-- DocBook XML -->
-        <artifact:resolve>
-            <artifact:dependencies>
-                <dependency groupId="net.sf.docbook"
-                            artifactId="docbook-xml"
-                            version="5.0"
-                            type="zip"
-                            classifier="rng-resources"
-                            scope="compile" />
-            </artifact:dependencies>
-            <properties prefix="docbook-xml" />
-        </artifact:resolve>
-
-        <!-- Jing (used for Relax-NG validation) -->
-        <artifact:resolve>
-            <artifact:dependencies>
-                <dependency groupId="com.thaiopensource" artifactId="jing" version="20091111" scope="compile" />
-            </artifact:dependencies>
-            <path refid="jing.classpath" />
-        </artifact:resolve>
-
-    </target>
-
-
-    <!-- Initializes DocBook XML by unpacking the distribution ZIP file. -->
-    <target name="init.docbook-xml"
-            description="Initializes DocBook XML by unpacking the distribution ZIP file."
-            depends="init.dependencies">
-        <condition property="docbook-xml.dirstribution.dir.exists">
-            <available file="${docbook-xml.distribution.dir}" />
-        </condition>
-        <unzip dest="${docbook-xml.distribution.dir}"
-               src="${docbook-xml.net.sf.docbook:docbook-xml:zip:rng-resources}"
-               overwrite="false"
-               unless:set="docbook-xml.dirstribution.dir.exists" />
-    </target>
-
-
-    <!-- Initializes DocBook XSL by unpacking the distribution ZIP file and resolving the references in our
-         customization layer template files. -->
-    <target name="init.docbook-xsl"
-            description="Initializes DocBook XSL by unpacking the distribution ZIP file and resolving the references in our customization layer template files."
-            depends="init.dependencies">
-        <condition property="docbook-xsl.distribution.dir.exists">
-            <available file="${docbook-xsl.distribution.dir}" />
-        </condition>
-        <sequential unless:set="docbook-xsl.distribution.dir.exists">
-            <unzip dest="${docbook-xsl.distribution.dir}"
-                   src="${docbook-xsl.net.sf.docbook:docbook-xsl:zip:ns-resources}"
-                   overwrite="false" />
-        </sequential>
-        <mkdir dir="${docbook-xsl.dir}" />
-        <filter token="docbook-xsl" value="${docbook-xsl.distribution.dir}/docbook" />
-        <copy todir="${docbook-xsl.dir}" filtering="true">
-            <fileset dir="${docbook-xsl.dir.tmpl}" />
-        </copy>
-    </target>
-
-
-    <!-- Resolves XIncludes. -->
-    <target name="resolve-xinclude" depends="init">
-        <mkdir dir="${res.dir.name}" />
-        <java classname="sax.Writer"
-              classpathref="xerces.classpath"
-              output="${res.dir.name}/${res.basename}.xml"
-              logerror="true"
-              failonerror="true"
-              fork="true">
-            <arg value="-np" />
-            <arg value="-xi" />
-            <arg value="${src.dir}/${src.basename}.xml" />
-        </java>
-    </target>
-
-
-    <!-- Validates the DocBook source file against the DocBook 5.0 Relax-NG grammar. -->
-    <target name="validate" depends="init.docbook-xml, resolve-xinclude">
-        <java classname="com.thaiopensource.relaxng.util.Driver"
-              classpathref="jing.classpath"
-              fork="true"
-              failonerror="true">
-            <arg value="${docbook-xml.distribution.dir}/xsd/docbook.rng" />
-            <arg value="${res.dir.name}/${res.basename}.xml" />
-        </java>
-    </target>
-
-
     <!-- Generates the documentation in all supported formats. -->
     <!-- Generates the documentation in all supported formats. -->
     <target name="generate.all"
     <target name="generate.all"
             description="Generates the documentation in all supported formats."
             description="Generates the documentation in all supported formats."
             depends="generate.eclipsehelp" />
             depends="generate.eclipsehelp" />
 
 
 
 
-    <!-- Generates the documentation as HTML. -->
-    <target name="generate.html.from.docbook"
-            description="Generates the documentation as HTML."
-            depends="validate, init.docbook-xsl">
-        <docbook.conversion src.dir="${res.dir.name}"
-                            src.file.name="${res.basename}.xml"
-                            dst.dir="${html.dir.name}"
-                            dst.file.name="${src.basename}.html"
-                            style="${docbook-xsl.dir}/html.xsl" />
-    </target>
-
-
-    <!-- Generates the documentation as Eclipse help. This is essentially chunked HTML with a TOC file. -->
-    <target name="generate.eclipsehelp.from.docbook"
-            description="Generates the documentation as Eclipse help."
-            depends="validate, init.docbook-xsl">
-        <docbook.conversion src.dir="${res.dir.name}"
-                            src.file.name="${res.basename}.xml"
-                            dst.dir="${help.dir.name}"
-                            dst.file.name="${src.basename}.html"
-                            style="${docbook-xsl.dir}/eclipsehelp.xsl" />
-    </target>
-
-
-    <!-- Generates the documentation as Eclipse help. This is essentially chunked HTML with a TOC file. -->
+    <!-- Generates the documentation as Eclipse help. -->
     <target name="generate.eclipsehelp"
     <target name="generate.eclipsehelp"
             description="Generates the documentation as Eclipse help from the textile (wikitext) sources."
             description="Generates the documentation as Eclipse help from the textile (wikitext) sources."
             depends="init.wikitext">
             depends="init.wikitext">
@@ -338,23 +129,6 @@
     </target>
     </target>
 
 
 
 
-    <!-- Generates the documentation as PDF. -->
-    <target name="generate.pdf.from.docbook"
-            description="Generates the documentation as PDF."
-            depends="validate, init.docbook-xsl">
-        <docbook.conversion src.dir="${res.dir.name}"
-                            src.file.name="${res.basename}.xml"
-                            dst.dir="${pdf.dir.name}"
-                            dst.file.name="${src.basename}.fo"
-                            style="${docbook-xsl.dir}/pdf.xsl" />
-        <taskdef name="fop" classname="org.apache.fop.tools.anttasks.Fop" classpathref="fop.classpath" />
-        <fop fofile="${pdf.dir}/${src.basename}.fo"
-             outfile="${pdf.dir}/${src.basename}.pdf"
-             format="application/pdf"
-             basedir="${pdf.dir}" />
-    </target>
-
-
 
 
     <!-- Converts a Textile document into Eclipsehelp format. Produces an HTML document and a corresponding toc.xml -->
     <!-- Converts a Textile document into Eclipsehelp format. Produces an HTML document and a corresponding toc.xml -->
     <macrodef name="wikitext.conversion"
     <macrodef name="wikitext.conversion"
@@ -376,7 +150,7 @@
                                       validate="true"
                                       validate="true"
                                       failOnValidationError="true"
                                       failOnValidationError="true"
                                       failOnValidationWarning="false"
                                       failOnValidationWarning="false"
-                                      title="YAKINDU Statechart Tools – User Documentation"
+                                      title="YAKINDU Statechart Tools"
                                       helpPrefix="@{dst.dir}">
                                       helpPrefix="@{dst.dir}">
                 <fileset dir="@{src.dir}">
                 <fileset dir="@{src.dir}">
                     <include name="@{src.file.name}" />
                     <include name="@{src.file.name}" />
@@ -410,70 +184,4 @@
         </sequential>
         </sequential>
     </macrodef>
     </macrodef>
 
 
-    <!-- Converts a DocBook document into a target format. -->
-    <macrodef name="docbook.conversion" description="Converts a DocBook document into a target format.">
-        <attribute name="src.dir" />
-        <attribute name="src.file.name" />
-        <attribute name="dst.dir" />
-        <attribute name="dst.file.name" />
-        <attribute name="style" />
-
-        <sequential>
-            <local name="src.file" />
-            <local name="dst.file" />
-            <local name="dst.dirname" />
-            <local name="dst.subdir" />
-            <local name="subdir.exists" />
-            <property name="src.file" value="@{src.dir}/@{src.file.name}" />
-            <property name="dst.file" value="@{dst.dir}/@{dst.file.name}" />
-            <basename property="dst.dirname" file="@{dst.dir}" />
-
-            <!-- Convert DocBook sources to target format: -->
-            <mkdir dir="@{dst.dir}" />
-            <java classname="org.apache.xalan.xslt.Process" classpathref="xalan.classpath" fork="true">
-                <sysproperty key="java.endorsed.dirs" value="${lib.dir}" />
-                <sysproperty key="org.apache.xerces.xni.parser.XMLParserConfiguration"
-                             value="org.apache.xerces.parsers.XIncludeParserConfiguration" />
-                <arg value="-out" />
-                <arg value="${dst.file}" />
-                <arg value="-in" />
-                <arg value="${src.file}" />
-                <arg value="-xsl" />
-                <arg value="@{style}" />
-            </java>
-
-            <!-- In the special case "eclipsehelp", HTML files have been generated one level too deep, so let's move them up: -->
-            <sequential>
-                <property name="dst.subdir" value="@{dst.dir}/${dst.dirname}" />
-                <condition property="subdir.exists">
-                    <available file="${dst.subdir}" />
-                </condition>
-                <sequential if:set="subdir.exists">
-                    <mkdir dir="${dst.subdir}" />
-                    <move todir="@{dst.dir}">
-                        <fileset dir="${dst.subdir}">
-                            <include name="*" />
-                        </fileset>
-                    </move>
-                    <delete dir="${dst.subdir}" />
-                </sequential>
-            </sequential>
-
-            <!-- Copy the CSS files to the destination directory: -->
-            <copy todir="@{dst.dir}/${css.dir.name}">
-                <fileset dir="${css.dir}">
-                    <include name="*" />
-                </fileset>
-            </copy>
-
-            <!-- Copy the image files to the destination directory: -->
-            <copy todir="@{dst.dir}/${img.dir.name}">
-                <fileset dir="${img.dir}">
-                    <include name="*" />
-                </fileset>
-            </copy>
-
-        </sequential>
-    </macrodef>
-
 </project>
 </project>

+ 0 - 17
plugins/org.yakindu.sct.doc.user/docbook-xsl.tmpl/common-html-rules.xsl

@@ -1,17 +0,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-
- <xsl:template match="informaltable[@role]">
-  <xsl:value-of select="@role" />
- </xsl:template>
-
-
- <xsl:template match="sect3">
- </xsl:template>
-
-
- <xsl:template match="application[child::text() = 'YAKINDU Statechart Tools']" mode="class.value">
-  <xsl:value-of select="'application-ysct'" />
- </xsl:template>
-
-</xsl:stylesheet>

+ 0 - 35
plugins/org.yakindu.sct.doc.user/docbook-xsl.tmpl/common-params.xsl

@@ -1,35 +0,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-
- <!-- Don't have DocBook XSL render navigation links. -->
- <xsl:param name="suppress.navigation">1</xsl:param>
-
- <!-- This CSS stylesheet is to be referenced from generated HTML files. -->
- <xsl:param name="html.stylesheet">css/style.css</xsl:param>
-
- <!-- Enables section numbering. -->
- <xsl:param name="section.autolabel">1</xsl:param>
-
- <!-- Specifies the maximum depth of section numbers. -->
- <xsl:param name="section.autolabel.max.depth">4</xsl:param>
-
- <!-- Don't render <remark> elements. -->
- <xsl:param name="show.comments" select="0"></xsl:param>
-
- <!-- Specifies the maximum depth of the section hierarchy to be included in the TOC. -->
- <xsl:param name="toc.section.depth">10</xsl:param>
- 
- <!-- Image URLs should be interpreted as being relative to the xml:base. -->
- <xsl:param name="keep.relative.image.uris">0</xsl:param>
-
- <!--  Specifies where a title is to be placed relative to the object it describes. -->
- <xsl:param name="formal.title.placement">
-  figure after
-  example before
-  equation before
-  table before
-  procedure before
-  task before
- </xsl:param>
-
-</xsl:stylesheet>

+ 0 - 25
plugins/org.yakindu.sct.doc.user/docbook-xsl.tmpl/eclipsehelp.xsl

@@ -1,25 +0,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-
- <xsl:import href="@docbook-xsl@/eclipse/eclipse.xsl"/>
-
-
- <xsl:import href="common-params.xsl"/>
- <xsl:import href="common-html-rules.xsl"/>
-
- <xsl:param name="base.dir">help</xsl:param>
- <xsl:param name="chunked.filename.prefix">documentation-</xsl:param>
- <xsl:param name="manifest">0</xsl:param>
- <xsl:param name="create.plugin.xml">0</xsl:param>
-
-
-
- <xsl:template match="*[contains(@role, 'stext_') or contains(@role, 'sgen_') ]">
-  <xsl:variable name="start_marker"><xsl:text> Start </xsl:text><xsl:value-of select="@role"/><xsl:text> </xsl:text></xsl:variable>
-  <xsl:variable name="end_marker"><xsl:text> End </xsl:text><xsl:value-of select="@role"/><xsl:text> </xsl:text></xsl:variable>
-  <xsl:comment><xsl:value-of select="$start_marker"/></xsl:comment>
-  <xsl:apply-imports/>
-  <xsl:comment><xsl:value-of select="$end_marker"/></xsl:comment>
- </xsl:template>
-
-</xsl:stylesheet>

+ 0 - 26
plugins/org.yakindu.sct.doc.user/docbook-xsl.tmpl/html.xsl

@@ -1,26 +0,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:d="http://docbook.org/ns/docbook" version="1.0">
-
- <xsl:import href="@docbook-xsl@/html/docbook.xsl"/>
-
-
- <xsl:import href="common-params.xsl"/>
- <xsl:import href="common-html-rules.xsl"/>
-
-
- <xsl:param name="base.dir">html</xsl:param>
- 
- <xsl:template name="user.header.content">
-  <p style="background-color: #95c0f3; text-align: right; font-weight: bold">YAKINDU Statechart Tools</p>
-</xsl:template>
-
- <xsl:template name="user.footer.content">
-  <p style="background-color: #95c0f3; text-align: right; font-weight: bold">YAKINDU Statechart Tools</p>
-</xsl:template>
-
-<xsl:template
- match="d:section[@role = 'to-be-written'] | d:sect1[@role = 'to-be-written'] | d:sect2[@role = 'to-be-written'] | d:sect3[@role = 'to-be-written'] | d:sect4[@role = 'to-be-written'] | d:sect5[@role = 'to-be-written']">
- <xsl:text><!-- The section missing here will be provided later. --></xsl:text>
-</xsl:template>
-
-</xsl:stylesheet>

+ 0 - 14
plugins/org.yakindu.sct.doc.user/docbook-xsl.tmpl/pdf.xsl

@@ -1,14 +0,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-
- <xsl:import href="@docbook-xsl@/fo/docbook.xsl"/>
-
-
- <xsl:import href="common-params.xsl"/>
-
- <xsl:param name="base.dir">pdf</xsl:param>
- <xsl:param name="paper.type">A4</xsl:param>
- <xsl:param name="body.font.family">Sans-Serif, Helvetica</xsl:param>
- <xsl:param name="fop.extensions">0</xsl:param>
-
-</xsl:stylesheet>

+ 1 - 1
plugins/org.yakindu.sct.doc.user/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 	<parent>
 		<groupId>org.yakindu.sct</groupId>
 		<groupId>org.yakindu.sct</groupId>
 		<artifactId>org.yakindu.sct.releng</artifactId>
 		<artifactId>org.yakindu.sct.releng</artifactId>
-		<version>2.5.0-SNAPSHOT</version>
+		<version>2.6.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.yakindu.sct.releng/pom.xml</relativePath>
 		<relativePath>../../releng/org.yakindu.sct.releng/pom.xml</relativePath>
 	</parent>
 	</parent>
 	<artifactId>org.yakindu.sct.doc.user</artifactId>
 	<artifactId>org.yakindu.sct.doc.user</artifactId>

Разница между файлами не показана из-за своего большого размера
+ 166 - 118
plugins/org.yakindu.sct.doc.user/src/documentation.textile


Разница между файлами не показана из-за своего большого размера
+ 0 - 6529
plugins/org.yakindu.sct.doc.user/src/documentation.xml


BIN
plugins/org.yakindu.sct.doc.user/src/images/callhandling_example_final.png


BIN
plugins/org.yakindu.sct.doc.user/src/images/callhandling_example_finished.png


BIN
plugins/org.yakindu.sct.doc.user/src/images/genmodelwizardchooselanguage.jpg


BIN
plugins/org.yakindu.sct.doc.user/src/images/java_simulating_operation_010_statechart_with_operation.png


plugins/org.yakindu.sct.doc.user/src/images/runConfiguration.png → plugins/org.yakindu.sct.doc.user/src/images/java_simulating_operation_020_run_configuration.png


BIN
plugins/org.yakindu.sct.doc.user/src/images/light_switch_250_statechart_editor_create_transition_02.png


BIN
plugins/org.yakindu.sct.doc.user/src/images/light_switch_250_statechart_editor_create_transition_03.png


BIN
plugins/org.yakindu.sct.doc.user/src/images/light_switch_310_statechart_simulator_state_off.png


Разница между файлами не показана из-за своего большого размера
+ 111 - 0
plugins/org.yakindu.sct.doc.user/src/tasks.textile


Разница между файлами не показана из-за своего большого размера
+ 0 - 13
plugins/org.yakindu.sct.doc.user/src/warning_sctypesh.xml


BIN
plugins/org.yakindu.sct.doc.user/structure.odg


+ 1 - 1
plugins/org.yakindu.sct.domain.generic/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-ManifestVersion: 2
 Bundle-Name: YAKINDU Generic Domain
 Bundle-Name: YAKINDU Generic Domain
 Bundle-SymbolicName: org.yakindu.sct.domain.generic;singleton:=true
 Bundle-SymbolicName: org.yakindu.sct.domain.generic;singleton:=true
-Bundle-Version: 2.5.0.qualifier
+Bundle-Version: 2.6.0.qualifier
 Bundle-Activator: org.yakindu.sct.domain.generic.DefaultDomainActivator
 Bundle-Activator: org.yakindu.sct.domain.generic.DefaultDomainActivator
 Bundle-Vendor: statecharts.org
 Bundle-Vendor: statecharts.org
 Require-Bundle: org.eclipse.core.runtime,
 Require-Bundle: org.eclipse.core.runtime,

+ 1 - 1
plugins/org.yakindu.sct.domain.generic/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 	<parent>
 		<groupId>org.yakindu.sct</groupId>
 		<groupId>org.yakindu.sct</groupId>
 		<artifactId>org.yakindu.sct.releng</artifactId>
 		<artifactId>org.yakindu.sct.releng</artifactId>
-		<version>2.5.0-SNAPSHOT</version>
+		<version>2.6.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.yakindu.sct.releng/pom.xml</relativePath>
 		<relativePath>../../releng/org.yakindu.sct.releng/pom.xml</relativePath>
 	</parent>
 	</parent>
 	<artifactId>org.yakindu.sct.domain.generic</artifactId>
 	<artifactId>org.yakindu.sct.domain.generic</artifactId>

+ 1 - 1
plugins/org.yakindu.sct.domain/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-ManifestVersion: 2
 Bundle-Name: YAKINDU Domain
 Bundle-Name: YAKINDU Domain
 Bundle-SymbolicName: org.yakindu.sct.domain;singleton:=true
 Bundle-SymbolicName: org.yakindu.sct.domain;singleton:=true
-Bundle-Version: 2.5.0.qualifier
+Bundle-Version: 2.6.0.qualifier
 Bundle-Activator: org.yakindu.sct.domain.DomainActivator
 Bundle-Activator: org.yakindu.sct.domain.DomainActivator
 Bundle-Vendor: statecharts.org
 Bundle-Vendor: statecharts.org
 Require-Bundle: org.eclipse.core.runtime,
 Require-Bundle: org.eclipse.core.runtime,

+ 1 - 1
plugins/org.yakindu.sct.domain/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 	<parent>
 		<groupId>org.yakindu.sct</groupId>
 		<groupId>org.yakindu.sct</groupId>
 		<artifactId>org.yakindu.sct.releng</artifactId>
 		<artifactId>org.yakindu.sct.releng</artifactId>
-		<version>2.5.0-SNAPSHOT</version>
+		<version>2.6.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.yakindu.sct.releng/pom.xml</relativePath>
 		<relativePath>../../releng/org.yakindu.sct.releng/pom.xml</relativePath>
 	</parent>
 	</parent>
 	<artifactId>org.yakindu.sct.domain</artifactId>
 	<artifactId>org.yakindu.sct.domain</artifactId>

+ 1 - 1
plugins/org.yakindu.sct.generator.c/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-ManifestVersion: 2
 Bundle-Name: YAKINDU C Generator
 Bundle-Name: YAKINDU C Generator
 Bundle-SymbolicName: org.yakindu.sct.generator.c;singleton:=true
 Bundle-SymbolicName: org.yakindu.sct.generator.c;singleton:=true
-Bundle-Version: 2.5.0.qualifier
+Bundle-Version: 2.6.0.qualifier
 Require-Bundle: org.yakindu.sct.model.sexec,
 Require-Bundle: org.yakindu.sct.model.sexec,
  org.eclipse.jdt.core,
  org.eclipse.jdt.core,
  org.apache.commons.logging,
  org.apache.commons.logging,

+ 1 - 1
plugins/org.yakindu.sct.generator.c/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 	<parent>
 		<groupId>org.yakindu.sct</groupId>
 		<groupId>org.yakindu.sct</groupId>
 		<artifactId>org.yakindu.sct.releng</artifactId>
 		<artifactId>org.yakindu.sct.releng</artifactId>
-		<version>2.5.0-SNAPSHOT</version>
+		<version>2.6.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.yakindu.sct.releng/pom.xml</relativePath>
 		<relativePath>../../releng/org.yakindu.sct.releng/pom.xml</relativePath>
 	</parent>
 	</parent>
 	<artifactId>org.yakindu.sct.generator.c</artifactId>
 	<artifactId>org.yakindu.sct.generator.c</artifactId>

+ 1 - 1
plugins/org.yakindu.sct.generator.core/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-ManifestVersion: 2
 Bundle-Name: YAKINDU Generator Core
 Bundle-Name: YAKINDU Generator Core
 Bundle-SymbolicName: org.yakindu.sct.generator.core;singleton:=true
 Bundle-SymbolicName: org.yakindu.sct.generator.core;singleton:=true
-Bundle-Version: 2.5.0.qualifier
+Bundle-Version: 2.6.0.qualifier
 Bundle-Activator: org.yakindu.sct.generator.core.GeneratorActivator
 Bundle-Activator: org.yakindu.sct.generator.core.GeneratorActivator
 Bundle-Vendor: statecharts.org
 Bundle-Vendor: statecharts.org
 Require-Bundle: org.eclipse.ui,
 Require-Bundle: org.eclipse.ui,

+ 1 - 1
plugins/org.yakindu.sct.generator.core/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 	<parent>
 		<groupId>org.yakindu.sct</groupId>
 		<groupId>org.yakindu.sct</groupId>
 		<artifactId>org.yakindu.sct.releng</artifactId>
 		<artifactId>org.yakindu.sct.releng</artifactId>
-		<version>2.5.0-SNAPSHOT</version>
+		<version>2.6.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.yakindu.sct.releng/pom.xml</relativePath>
 		<relativePath>../../releng/org.yakindu.sct.releng/pom.xml</relativePath>
 	</parent>
 	</parent>
 	<artifactId>org.yakindu.sct.generator.core</artifactId>
 	<artifactId>org.yakindu.sct.generator.core</artifactId>

+ 0 - 174
plugins/org.yakindu.sct.generator.core/src/org/yakindu/sct/generator/core/filesystem/HeadlessFileSystemAccess.java

@@ -1,174 +0,0 @@
-package org.yakindu.sct.generator.core.filesystem;
-
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.io.Writer;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.xtext.generator.AbstractFileSystemAccess;
-import org.eclipse.xtext.generator.IFileSystemAccess;
-import org.eclipse.xtext.generator.OutputConfiguration;
-import org.yakindu.sct.generator.core.features.ICoreFeatureConstants;
-
-import com.google.inject.Inject;
-import com.google.inject.name.Named;
-
-public class HeadlessFileSystemAccess extends AbstractFileSystemAccess implements ISCTFileSystemAccess {
-	public static final String BASE_DIR = "filesystemAccess.absolute.baseDir";
-	public static final String ENCODING = "filesystemAccess.encoding";
-
-	@Inject
-	@Named(ENCODING)
-	protected String ENCODING_UTF_8;
-	@Inject
-	@Named(BASE_DIR)
-	protected String absoluteBaseDir;
-
-	@Override
-	public void generateFile(String fileName, String outputConfigurationName, CharSequence contents) {
-		// validate setup
-		validateFileSystemAccess();
-
-		OutputConfiguration outputConfig = getOutputConfig(outputConfigurationName);
-
-		File outputDir = getOutputDir(outputConfig);
-
-		String contentsAsString = doPostProcesses(fileName, outputConfigurationName, contents);
-
-		File outputFile = new File(outputDir, fileName);
-		if (outputFile.exists()) {
-			if (outputConfig.isOverrideExistingResources()) {
-				tryOverride(contentsAsString, outputFile);
-			}
-		} else {
-			outputFile.getParentFile().mkdirs();
-			try {
-				outputFile.createNewFile();
-			} catch (IOException e) {
-				throw new RuntimeException(e);
-			}
-			writeContent(contentsAsString, outputFile, ENCODING_UTF_8);
-		}
-	}
-
-	protected void validateFileSystemAccess() {
-		if (this.absoluteBaseDir == null || this.absoluteBaseDir.isEmpty())
-			throw new IllegalStateException("the base dir must have been set");
-	}
-
-	protected void tryOverride(String contentsAsString, File outputFile) {
-		String currentContent = getCurrentContent(outputFile);
-		if (isSame(contentsAsString, currentContent)) {
-			writeContent(contentsAsString, outputFile, ENCODING_UTF_8);
-		} else {
-			// ignore same content...
-		}
-	}
-
-	/**
-	 * Respects 'Pigeonhole_principle'.
-	 * 
-	 * @param newContent
-	 * @param currentContent
-	 * @return
-	 */
-	protected boolean isSame(String newContent, String currentContent) {
-		return currentContent.hashCode() != newContent.hashCode() &&
-				/* Pigeonhole_principle */currentContent.equals(newContent);
-	}
-
-	protected String getCurrentContent(File outputFile) {
-		String currentContent = null;
-		BufferedReader reader = null;
-		try {
-			reader = new BufferedReader(new FileReader(outputFile));
-			String line = null;
-			StringBuilder stringBuilder = new StringBuilder();
-			String ls = System.getProperty("line.separator");
-			while ((line = reader.readLine()) != null) {
-				stringBuilder.append(line);
-				stringBuilder.append(ls);
-			}
-			currentContent = stringBuilder.toString();
-		} catch (FileNotFoundException e1) {
-			throw new RuntimeException("Error during load of current file", e1);
-		} catch (IOException e) {
-			throw new RuntimeException("Error during load of current file", e);
-		} finally {
-			try {
-				reader.close();
-			} catch (IOException e) {
-				// ignore
-			}
-		}
-		return currentContent;
-	}
-
-	protected String doPostProcesses(String fileName, String outputConfigurationName, CharSequence contents) {
-		CharSequence postProcessedContent = postProcess(fileName, outputConfigurationName, contents);
-		String contentsAsString = postProcessedContent.toString();
-		return contentsAsString;
-	}
-
-	protected File getOutputDir(OutputConfiguration outputConfig) {
-		String fullPath = getFullPath(outputConfig);
-		File outputDir = new File(fullPath);
-		if (!outputDir.exists()) {
-			if (outputConfig.isCreateOutputDirectory()) {
-				outputDir.mkdirs();
-			} else {
-				outputDir = null;
-			}
-		}
-		return outputDir;
-	}
-
-	protected String getFullPath(OutputConfiguration outputConfig) {
-		String outputDirectory = outputConfig.getOutputDirectory();
-		String fullPath = absoluteBaseDir + File.separator
-				+ getOutputConfig(ICoreFeatureConstants.OUTLET_FEATURE_TARGET_PROJECT).getOutputDirectory()
-				+ File.separator + outputDirectory;
-		return fullPath;
-	}
-
-	protected void writeContent(String contentsAsString, File outputFile, String encoding) {
-		Writer out = null;
-		try {
-			out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(outputFile), encoding));
-			out.write(contentsAsString);
-		} catch (IOException e) {
-			throw new RuntimeException(e);
-		} finally {
-			try {
-				if (out != null)
-					out.close();
-			} catch (IOException e) {
-				// ignore
-			}
-
-		}
-	}
-
-	@Override
-	public URI getURI(String path, String outputConfiguration) {
-		OutputConfiguration outputConfig = getOutputConfig(outputConfiguration);
-		return URI.createFileURI(getFullPath(outputConfig) + File.separator + path);
-	}
-
-	@Override
-	public IFileSystemAccess getIFileSystemAccess() {
-		return this;
-	}
-
-	@Override
-	public void afterGeneration() {
-		// currently nothing
-	}
-
-}

+ 1 - 1
plugins/org.yakindu.sct.generator.cpp/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-ManifestVersion: 2
 Bundle-Name: YAKINDU C++ Generator
 Bundle-Name: YAKINDU C++ Generator
 Bundle-SymbolicName: org.yakindu.sct.generator.cpp;singleton:=true
 Bundle-SymbolicName: org.yakindu.sct.generator.cpp;singleton:=true
-Bundle-Version: 2.5.0.qualifier
+Bundle-Version: 2.6.0.qualifier
 Require-Bundle: org.yakindu.sct.model.sexec,
 Require-Bundle: org.yakindu.sct.model.sexec,
  org.eclipse.jdt.core,
  org.eclipse.jdt.core,
  org.apache.commons.logging,
  org.apache.commons.logging,

+ 1 - 1
plugins/org.yakindu.sct.generator.cpp/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 	<parent>
 		<groupId>org.yakindu.sct</groupId>
 		<groupId>org.yakindu.sct</groupId>
 		<artifactId>org.yakindu.sct.releng</artifactId>
 		<artifactId>org.yakindu.sct.releng</artifactId>
-		<version>2.5.0-SNAPSHOT</version>
+		<version>2.6.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.yakindu.sct.releng/pom.xml</relativePath>
 		<relativePath>../../releng/org.yakindu.sct.releng/pom.xml</relativePath>
 	</parent>
 	</parent>
 	<artifactId>org.yakindu.sct.generator.cpp</artifactId>
 	<artifactId>org.yakindu.sct.generator.cpp</artifactId>

+ 1 - 1
plugins/org.yakindu.sct.generator.genmodel.ui/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-ManifestVersion: 2
 Bundle-Name: YAKINDU Generator Model UI
 Bundle-Name: YAKINDU Generator Model UI
 Bundle-Vendor: statecharts.org
 Bundle-Vendor: statecharts.org
-Bundle-Version: 2.5.0.qualifier
+Bundle-Version: 2.6.0.qualifier
 Bundle-SymbolicName: org.yakindu.sct.generator.genmodel.ui; singleton:=true
 Bundle-SymbolicName: org.yakindu.sct.generator.genmodel.ui; singleton:=true
 Require-Bundle: org.yakindu.sct.generator.genmodel;visibility:=reexport,
 Require-Bundle: org.yakindu.sct.generator.genmodel;visibility:=reexport,
  org.eclipse.xtext.ui,
  org.eclipse.xtext.ui,

+ 1 - 1
plugins/org.yakindu.sct.generator.genmodel.ui/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 	<parent>
 		<groupId>org.yakindu.sct</groupId>
 		<groupId>org.yakindu.sct</groupId>
 		<artifactId>org.yakindu.sct.releng</artifactId>
 		<artifactId>org.yakindu.sct.releng</artifactId>
-		<version>2.5.0-SNAPSHOT</version>
+		<version>2.6.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.yakindu.sct.releng/pom.xml</relativePath>
 		<relativePath>../../releng/org.yakindu.sct.releng/pom.xml</relativePath>
 	</parent>
 	</parent>
 	<artifactId>org.yakindu.sct.generator.genmodel.ui</artifactId>
 	<artifactId>org.yakindu.sct.generator.genmodel.ui</artifactId>

+ 1 - 1
plugins/org.yakindu.sct.generator.genmodel/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-ManifestVersion: 2
 Bundle-Name: YAKINDU Generator Model
 Bundle-Name: YAKINDU Generator Model
 Bundle-Vendor: statecharts.org
 Bundle-Vendor: statecharts.org
-Bundle-Version: 2.5.0.qualifier
+Bundle-Version: 2.6.0.qualifier
 Bundle-SymbolicName: org.yakindu.sct.generator.genmodel;singleton:=true
 Bundle-SymbolicName: org.yakindu.sct.generator.genmodel;singleton:=true
 Bundle-ActivationPolicy: lazy
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.xtext;visibility:=reexport,
 Require-Bundle: org.eclipse.xtext;visibility:=reexport,

+ 1 - 1
plugins/org.yakindu.sct.generator.genmodel/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 	<parent>
 		<groupId>org.yakindu.sct</groupId>
 		<groupId>org.yakindu.sct</groupId>
 		<artifactId>org.yakindu.sct.releng</artifactId>
 		<artifactId>org.yakindu.sct.releng</artifactId>
-		<version>2.5.0-SNAPSHOT</version>
+		<version>2.6.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.yakindu.sct.releng/pom.xml</relativePath>
 		<relativePath>../../releng/org.yakindu.sct.releng/pom.xml</relativePath>
 	</parent>
 	</parent>
 	<artifactId>org.yakindu.sct.generator.genmodel</artifactId>
 	<artifactId>org.yakindu.sct.generator.genmodel</artifactId>

+ 1 - 1
plugins/org.yakindu.sct.generator.java/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-ManifestVersion: 2
 Bundle-Name: YAKINDU Java Generator
 Bundle-Name: YAKINDU Java Generator
 Bundle-SymbolicName: org.yakindu.sct.generator.java;singleton:=true
 Bundle-SymbolicName: org.yakindu.sct.generator.java;singleton:=true
-Bundle-Version: 2.5.0.qualifier
+Bundle-Version: 2.6.0.qualifier
 Require-Bundle: org.eclipse.jdt.core,
 Require-Bundle: org.eclipse.jdt.core,
  org.apache.commons.logging,
  org.apache.commons.logging,
  org.apache.log4j;resolution:=optional,
  org.apache.log4j;resolution:=optional,

+ 1 - 1
plugins/org.yakindu.sct.generator.java/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 	<parent>
 		<groupId>org.yakindu.sct</groupId>
 		<groupId>org.yakindu.sct</groupId>
 		<artifactId>org.yakindu.sct.releng</artifactId>
 		<artifactId>org.yakindu.sct.releng</artifactId>
-		<version>2.5.0-SNAPSHOT</version>
+		<version>2.6.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.yakindu.sct.releng/pom.xml</relativePath>
 		<relativePath>../../releng/org.yakindu.sct.releng/pom.xml</relativePath>
 	</parent>
 	</parent>
 	<artifactId>org.yakindu.sct.generator.java</artifactId>
 	<artifactId>org.yakindu.sct.generator.java</artifactId>

+ 1 - 1
plugins/org.yakindu.sct.model.resource/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-ManifestVersion: 2
 Bundle-Name: YAKINDU SText Resource
 Bundle-Name: YAKINDU SText Resource
 Bundle-SymbolicName: org.yakindu.sct.model.resource;singleton:=true
 Bundle-SymbolicName: org.yakindu.sct.model.resource;singleton:=true
-Bundle-Version: 2.5.0.qualifier
+Bundle-Version: 2.6.0.qualifier
 Bundle-Vendor: statecharts.org
 Bundle-Vendor: statecharts.org
 Bundle-Activator: org.yakindu.sct.model.resource.Activator
 Bundle-Activator: org.yakindu.sct.model.resource.Activator
 Require-Bundle: org.eclipse.ui,
 Require-Bundle: org.eclipse.ui,

+ 1 - 1
plugins/org.yakindu.sct.model.resource/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 	<parent>
 		<groupId>org.yakindu.sct</groupId>
 		<groupId>org.yakindu.sct</groupId>
 		<artifactId>org.yakindu.sct.releng</artifactId>
 		<artifactId>org.yakindu.sct.releng</artifactId>
-		<version>2.5.0-SNAPSHOT</version>
+		<version>2.6.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.yakindu.sct.releng/pom.xml</relativePath>
 		<relativePath>../../releng/org.yakindu.sct.releng/pom.xml</relativePath>
 	</parent>
 	</parent>
 	<artifactId>org.yakindu.sct.model.resource</artifactId>
 	<artifactId>org.yakindu.sct.model.resource</artifactId>

+ 1 - 1
plugins/org.yakindu.sct.model.sexec.edit/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-ManifestVersion: 2
 Bundle-Name: YAKINDU Execution Model Edit
 Bundle-Name: YAKINDU Execution Model Edit
 Bundle-SymbolicName: org.yakindu.sct.model.sexec.edit;singleton:=true
 Bundle-SymbolicName: org.yakindu.sct.model.sexec.edit;singleton:=true
-Bundle-Version: 2.5.0.qualifier
+Bundle-Version: 2.6.0.qualifier
 Bundle-ClassPath: .
 Bundle-ClassPath: .
 Bundle-Activator: org.yakindu.sct.model.sexec.provider.SexecEditPlugin$Implementation
 Bundle-Activator: org.yakindu.sct.model.sexec.provider.SexecEditPlugin$Implementation
 Bundle-Vendor: statecharts.org
 Bundle-Vendor: statecharts.org

+ 1 - 1
plugins/org.yakindu.sct.model.sexec.edit/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 	<parent>
 		<groupId>org.yakindu.sct</groupId>
 		<groupId>org.yakindu.sct</groupId>
 		<artifactId>org.yakindu.sct.releng</artifactId>
 		<artifactId>org.yakindu.sct.releng</artifactId>
-		<version>2.5.0-SNAPSHOT</version>
+		<version>2.6.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.yakindu.sct.releng/pom.xml</relativePath>
 		<relativePath>../../releng/org.yakindu.sct.releng/pom.xml</relativePath>
 	</parent>
 	</parent>
 	<artifactId>org.yakindu.sct.model.sexec.edit</artifactId>
 	<artifactId>org.yakindu.sct.model.sexec.edit</artifactId>

+ 1 - 1
plugins/org.yakindu.sct.model.sexec/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-ManifestVersion: 2
 Bundle-Name: YAKINDU Execution Model
 Bundle-Name: YAKINDU Execution Model
 Bundle-SymbolicName: org.yakindu.sct.model.sexec;singleton:=true
 Bundle-SymbolicName: org.yakindu.sct.model.sexec;singleton:=true
-Bundle-Version: 2.5.0.qualifier
+Bundle-Version: 2.6.0.qualifier
 Bundle-ClassPath: .
 Bundle-ClassPath: .
 Bundle-Vendor: statecharts.org
 Bundle-Vendor: statecharts.org
 Bundle-Localization: plugin
 Bundle-Localization: plugin

+ 1 - 1
plugins/org.yakindu.sct.model.sexec/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 	<parent>
 		<groupId>org.yakindu.sct</groupId>
 		<groupId>org.yakindu.sct</groupId>
 		<artifactId>org.yakindu.sct.releng</artifactId>
 		<artifactId>org.yakindu.sct.releng</artifactId>
-		<version>2.5.0-SNAPSHOT</version>
+		<version>2.6.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.yakindu.sct.releng/pom.xml</relativePath>
 		<relativePath>../../releng/org.yakindu.sct.releng/pom.xml</relativePath>
 	</parent>
 	</parent>
 	<artifactId>org.yakindu.sct.model.sexec</artifactId>
 	<artifactId>org.yakindu.sct.model.sexec</artifactId>

+ 1 - 1
plugins/org.yakindu.sct.model.sgen.edit/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-ManifestVersion: 2
 Bundle-Name: YAKINDU SGen Edit
 Bundle-Name: YAKINDU SGen Edit
 Bundle-SymbolicName: org.yakindu.sct.model.sgen.edit;singleton:=true
 Bundle-SymbolicName: org.yakindu.sct.model.sgen.edit;singleton:=true
-Bundle-Version: 2.5.0.qualifier
+Bundle-Version: 2.6.0.qualifier
 Bundle-ClassPath: .
 Bundle-ClassPath: .
 Bundle-Activator: org.yakindu.sct.model.sgen.provider.SgenEditPlugin$Implementation
 Bundle-Activator: org.yakindu.sct.model.sgen.provider.SgenEditPlugin$Implementation
 Bundle-Vendor: statecharts.org
 Bundle-Vendor: statecharts.org

+ 0 - 0
plugins/org.yakindu.sct.model.sgen.edit/pom.xml


Некоторые файлы не были показаны из-за большого количества измененных файлов