PalladioSimulator · sdkrach · Aug 27, 2020 · Sep 17, 2020 · Oct 17, 2020
diff --git a/.gitignore b/.gitignore
@@ -11,6 +11,10 @@ generated/
 *.polyglot.category.xml
 *.polyglot.feature.xml
 
+*.iml
+.idea/
+.vscode/
+
 pom.tycho
 
 *.xml_gen

diff --git a/.project b/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>parent</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+	</natures>
+</projectDescription>
diff --git a/README.md b/README.md
@@ -18,7 +18,7 @@ The TPCM language currently supports the PCM view points _Repository_, _System_,
 * Reliability modeling is not yet part of the language
 * Component parameters are not yet part of the language
 
-All view points can be specified in a single .tpcm file otr split into multiple ones. A comprehensive specification-by-example can be found in the folder _tests/org.palladiosimulator.textual.tpcm.tests/test-resources/parser_. 
+All view points can be specified in a single .tpcm file otr split into multiple ones. A comprehensive specification-by-example can be found in the folder _examples/org.palladiosimulator.textual.tpcm.examples/_. 
 
 ### Example
 ``` Smalltalk

diff --git a/bundles/org.palladiosimulator.textual.tpcm.ide/pom.xml b/bundles/org.palladiosimulator.textual.tpcm.ide/pom.xml
diff --git a/bundles/org.palladiosimulator.textual.tpcm/META-INF/MANIFEST.MF b/bundles/org.palladiosimulator.textual.tpcm/META-INF/MANIFEST.MF
@@ -15,7 +15,7 @@ Require-Bundle: org.eclipse.xtext,
  org.eclipse.emf.common,
  org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
  org.palladiosimulator.commons.stoex;bundle-version="1.0.0";visibility:=reexport,
- de.uka.ipd.sdq.stoex.analyser,
+ de.uka.ipd.sdq.stoex.analyser;visibility:=reexport,
  io.vavr;bundle-version="0.10.3",
  tools.mdsd.ecoreworkflow.mwe2lib.xtext;bundle-version="0.1.1",
  org.palladiosimulator.pcm;bundle-version="4.2.0",

diff --git a/bundles/org.palladiosimulator.textual.tpcm/pom.xml b/bundles/org.palladiosimulator.textual.tpcm/pom.xml
@@ -5,7 +5,7 @@
 		<groupId>org.palladiosimulator.textual</groupId>
 		<artifactId>bundles</artifactId>
 		<version>4.3.0-SNAPSHOT</version>
-		<relativePath>..\.polyglot.pom.tycho</relativePath>
+		<relativePath>../.polyglot.pom.tycho</relativePath>
 	  </parent>
 	<artifactId>org.palladiosimulator.textual.tpcm</artifactId>
 	<packaging>eclipse-plugin</packaging>

diff --git a/examples/org.palladio.textual.tpcm.examples/.project b/examples/org.palladio.textual.tpcm.examples/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.palladio.textual.tpcm.examples</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+	</natures>
+</projectDescription>
diff --git a/examples/org.palladio.textual.tpcm.examples/.settings/org.eclipse.core.resources.prefs b/examples/org.palladio.textual.tpcm.examples/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/examples/org.palladio.textual.tpcm.examples/META-INF/MANIFEST.MF b/examples/org.palladio.textual.tpcm.examples/META-INF/MANIFEST.MF
@@ -0,0 +1,7 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: TPCM Examples
+Bundle-SymbolicName: org.palladio.textual.tpcm.examples
+Bundle-Version: 4.3.0.qualifier
+Automatic-Module-Name: org.palladio.textual.tpcm.examples
+Bundle-Vendor: Palladiosimulator.org
diff --git a/examples/org.palladio.textual.tpcm.examples/build.properties b/examples/org.palladio.textual.tpcm.examples/build.properties
@@ -0,0 +1,6 @@
+bin.includes = resources_explained.tpcm,\
+               resourceenvironment_explained.tpcm,\
+               repository_explained.tpcm,\
+               imports_explained.tpcm,\
+               fragments_explained.tpcm,\
+               META-INF/
diff --git a/...resources/parser/fragments_explained.tpcm → ...al.tpcm.examples/fragments_explained.tpcm b/...resources/parser/fragments_explained.tpcm → ...al.tpcm.examples/fragments_explained.tpcm
diff --git a/...t-resources/parser/imports_explained.tpcm → ...tual.tpcm.examples/imports_explained.tpcm b/...t-resources/parser/imports_explained.tpcm → ...tual.tpcm.examples/imports_explained.tpcm
@@ -1,4 +1,7 @@
-import "std_definitions.tpcm" //import definitions from separate files by providing a URI or its the relative path
+import std::definitions //Import default models from provided plugins. The namespace is mapped to a pathmap uri. The import is equivalent to the next line. 
+import "pathmap://TPCM_RESOURCES_STD/definitions.tpcm"//import definitions from separate files by providing a URI or its the relative path
+// If imported using a absolute or relative uri the file extension needs to be specified.
+
 // imports are not transitively imported
 // imported objects can be referred to by their fully qualified name (Namespace::ObjectName), e. g. PrimitiveTypes::Integer
 

diff --git a/...esources/parser/repository_explained.tpcm → ...l.tpcm.examples/repository_explained.tpcm b/...esources/parser/repository_explained.tpcm → ...l.tpcm.examples/repository_explained.tpcm
diff --git a/...parser/resourceenvironment_explained.tpcm → ...amples/resourceenvironment_explained.tpcm b/...parser/resourceenvironment_explained.tpcm → ...amples/resourceenvironment_explained.tpcm
@@ -1,4 +1,4 @@
-import "std_definitions.tpcm"
+import std::definitions
 
 resourceenvironment ResourceEnvironment1 //Declaration of resource environment
 

diff --git a/...resources/parser/resources_explained.tpcm → ...al.tpcm.examples/resources_explained.tpcm b/...resources/parser/resources_explained.tpcm → ...al.tpcm.examples/resources_explained.tpcm
@@ -1,4 +1,4 @@
-import "std_definitions.tpcm"
+import std::definitions
 
 resourcetypes { // Definition of resource types, which is equivalent to a ResourceTypeRepository	
 	// Resource interfaces are defined similar to operation interfaces

diff --git a/pom.xml b/pom.xml
@@ -16,8 +16,9 @@
 	<properties>
 		<xtextVersion>2.22.0</xtextVersion>
 		<mwe2Version>2.11.3</mwe2Version>
+		<tycho.version>2.0.0</tycho.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<org.palladiosimulator.maven.tychotprefresh.tplocation.2>${project.basedir}/releng/org.palladiosimulator.textual.targetplatform/org.palladiosimulator.textual.targetplatform.target</org.palladiosimulator.maven.tychotprefresh.tplocation.2>
+		<org.palladiosimulator.maven.tychotprefresh.tplocation.2>${maven.multiModuleProjectDirectory}/releng/org.palladiosimulator.textual.targetplatform/org.palladiosimulator.textual.targetplatform.target</org.palladiosimulator.maven.tychotprefresh.tplocation.2>
 	</properties>
 
 	<dependencyManagement>

diff --git a/releng/org.palladiosimulator.textual.languageserver/META-INF/MANIFEST.MF b/releng/org.palladiosimulator.textual.languageserver/META-INF/MANIFEST.MF
@@ -0,0 +1,7 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Textual Palladio Language Server
+Bundle-SymbolicName: org.palladiosimulator.textual.languageserver
+Bundle-Version: 4.3.0.qualifier
+Automatic-Module-Name: org.palladiosimulator.textual.languageserver
+Require-Bundle: org.palladiosimulator.textual.tpcm.ide;bundle-version="4.3.0"
diff --git a/releng/org.palladiosimulator.textual.languageserver/build.properties b/releng/org.palladiosimulator.textual.languageserver/build.properties
@@ -0,0 +1 @@
+bin.includes = META-INF/
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		eclipse.preferences.version=1
		encoding/<project>=UTF-8