vitruv-tools · tschilpp · Jun 5, 2023 · Jul 3, 2023 · Jul 3, 2023 · Jul 10, 2023
@@ -18,9 +18,10 @@ xtend-gen/
 # Maven
 target/
 .mvn/wrapper/maven-wrapper.jar
+*.polyglot.*
 
 # Custom
 EvaluationData
 *.DS_Store
 *.polyglot
-*.pom.tycho
+*.pom.tycho
@@ -16,7 +16,7 @@ Require-Bundle: tools.vitruv.framework.applications,
  org.eclipse.uml2.uml;visibility:=reexport,
  org.emftext.language.java;visibility:=reexport,
  edu.kit.ipd.sdq.activextendannotations,
- tools.vitruv.applications.util.temporary,
- edu.kit.ipd.sdq.commons.util.emf
+ edu.kit.ipd.sdq.commons.util.emf,
+ tools.vitruv.applications.cbs.testutils
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Automatic-Module-Name: tools.vitruv.applications.cbs.commonalities
@@ -14,7 +14,7 @@ import tools.vitruv.applications.cbs.commonalities.oo.Visibility
 import static com.google.common.base.Preconditions.*
 import static tools.vitruv.dsls.commonalities.runtime.helper.XtendAssertHelper.*
 
-import static extension tools.vitruv.applications.util.temporary.java.JavaModifierUtil.*
+import static extension tools.vitruv.applications.cbs.testutils.oldmetamodelutils.JavaModifierUtil.*
 
 /**
  * Helper class for the mapping between Java's visibility modifiers and

@@ -1,14 +1,14 @@
 package tools.vitruv.applications.cbs.commonalities.java.operators
 
 import org.apache.log4j.Logger
-import org.emftext.language.java.JavaUniquePathConstructor
 import org.emftext.language.java.containers.CompilationUnit
 import tools.vitruv.dsls.commonalities.runtime.operators.mapping.attribute.AbstractAttributeMappingOperator
 import tools.vitruv.dsls.commonalities.runtime.operators.mapping.attribute.AttributeMappingOperator
 import tools.vitruv.dsls.commonalities.runtime.operators.mapping.attribute.AttributeType
 import tools.vitruv.dsls.reactions.runtime.state.ReactionExecutionState
 
 import static com.google.common.base.Preconditions.*
+import org.emftext.language.java.JavaUniquePathConstructor
 
 // CompilationUnit name schema: '<dot-separated-namespaces>.<fileName/classifierName>.java'
 @AttributeMappingOperator(

@@ -2,21 +2,21 @@ package tools.vitruv.applications.cbs.commonalities.java.operators
 
 import org.apache.log4j.Logger
 import org.eclipse.emf.ecore.EObject
-import org.emftext.language.java.JavaUniquePathConstructor
 import org.emftext.language.java.commons.NamespaceAwareElement
 import org.emftext.language.java.containers.CompilationUnit
+import org.emftext.language.java.containers.ContainersPackage
 import org.emftext.language.java.containers.Package
-import tools.vitruv.applications.util.temporary.java.JavaPersistenceHelper
+import tools.vitruv.applications.cbs.testutils.oldmetamodelutils.JavaPersistenceHelper
 import tools.vitruv.dsls.commonalities.runtime.operators.mapping.reference.AbstractReferenceMappingOperator
 import tools.vitruv.dsls.commonalities.runtime.operators.mapping.reference.ReferenceMappingOperator
 import tools.vitruv.dsls.reactions.runtime.state.ReactionExecutionState
 
 import static com.google.common.base.Preconditions.*
 import static tools.vitruv.dsls.commonalities.runtime.helper.XtendAssertHelper.*
+import static extension tools.vitruv.applications.cbs.testutils.oldmetamodelutils.JavaContainerAndClassifierUtil.*
 
 import static extension tools.vitruv.dsls.commonalities.runtime.helper.IntermediateModelHelper.*
-import static extension tools.vitruv.applications.util.temporary.java.JavaContainerAndClassifierUtil.*
-import org.emftext.language.java.containers.ContainersPackage
+import org.emftext.language.java.JavaUniquePathConstructor
 
 // TODO Some duplication with JavaSubPackagesOperator
 @ReferenceMappingOperator(
@@ -50,6 +50,10 @@ class JavaPackageCompilationUnitsOperator extends AbstractReferenceMappingOperat
 		logger.trace('''  Found compilation units in package '«package.packageString»': «package.compilationUnits»''')
 		return package.compilationUnits
 	}
+
+	def Iterable<CompilationUnit> compilationUnits(Package package1) {
+		package1.containedObjects.filter(CompilationUnit).toList
+	}
 
 	override getContainer(EObject object) {
 		val CompilationUnit compilationUnit = validateObject(object)

@@ -9,7 +9,7 @@ import tools.vitruv.dsls.reactions.runtime.state.ReactionExecutionState
 
 import static com.google.common.base.Preconditions.*
 
-import static extension tools.vitruv.applications.util.temporary.java.JavaPersistenceHelper.*
+import static extension tools.vitruv.applications.cbs.testutils.oldmetamodelutils.JavaPersistenceHelper.*
 import org.emftext.language.java.containers.ContainersPackage
 
 @AttributeMappingOperator(

@@ -7,7 +7,7 @@ import org.eclipse.emf.ecore.EObject
 import org.eclipse.emf.ecore.resource.ResourceSet
 import org.emftext.language.java.JavaUniquePathConstructor
 import org.emftext.language.java.containers.Package
-import tools.vitruv.applications.util.temporary.java.JavaPersistenceHelper
+import tools.vitruv.applications.cbs.testutils.oldmetamodelutils.JavaPersistenceHelper
 import tools.vitruv.dsls.commonalities.runtime.operators.mapping.reference.AbstractReferenceMappingOperator
 import tools.vitruv.dsls.commonalities.runtime.operators.mapping.reference.ReferenceMappingOperator
 import tools.vitruv.dsls.reactions.runtime.state.ReactionExecutionState
@@ -20,7 +20,7 @@ import static tools.vitruv.dsls.commonalities.runtime.helper.XtendAssertHelper.*
 import static extension java.nio.file.Files.*
 import static extension tools.vitruv.dsls.commonalities.runtime.helper.IntermediateModelHelper.*
 
-import static extension tools.vitruv.applications.util.temporary.java.JavaContainerAndClassifierUtil.*
+import static extension tools.vitruv.applications.cbs.testutils.oldmetamodelutils.JavaContainerAndClassifierUtil.*
 import org.emftext.language.java.containers.ContainersPackage
 
 @ReferenceMappingOperator(

@@ -13,7 +13,7 @@ import org.emftext.language.java.types.TypesFactory
 import org.emftext.language.java.types.Void
 import tools.vitruv.applications.cbs.commonalities.domaincommon.CommonPrimitiveType
 import tools.vitruv.applications.cbs.commonalities.domaincommon.operators.AbstractTypeReferenceOperator
-import tools.vitruv.applications.util.temporary.java.JavaModificationUtil
+import tools.vitruv.applications.cbs.testutils.oldmetamodelutils.JavaModificationUtil
 import tools.vitruv.dsls.commonalities.runtime.operators.mapping.attribute.AttributeMappingOperator
 import tools.vitruv.dsls.commonalities.runtime.operators.mapping.attribute.AttributeType
 import tools.vitruv.dsls.reactions.runtime.state.ReactionExecutionState

@@ -14,7 +14,7 @@ import static com.google.common.base.Preconditions.*
 import static tools.vitruv.dsls.commonalities.runtime.helper.XtendAssertHelper.*
 
 import static extension tools.vitruv.applications.cbs.commonalities.java.JavaVisibilityHelper.*
-import static extension tools.vitruv.applications.util.temporary.java.JavaModifierUtil.*
+import static extension tools.vitruv.applications.cbs.testutils.oldmetamodelutils.JavaModifierUtil.*
 
 @AttributeMappingOperator(
 	name='javaVisibility',

@@ -26,7 +26,14 @@ Require-Bundle: tools.vitruv.testutils.vsum,
  org.hamcrest.core,
  org.opentest4j,
  tools.vitruv.framework.applications;visibility:=reexport,
- tools.vitruv.applications.util.temporary
+ tools.vitruv.applications.util.temporary,
+ edu.kit.ipd.sdq.activextendannotations,
+ org.emftext.language.java.resource,
+ org.emftext.language.java,
+ org.apache.log4j,
+ edu.kit.ipd.sdq.commons.util.java,
+ edu.kit.ipd.sdq.commons.util.emf
 Export-Package: tools.vitruv.applications.cbs.testutils,
  tools.vitruv.applications.cbs.testutils.equivalencetest,
- tools.vitruv.applications.cbs.testutils.junit
+ tools.vitruv.applications.cbs.testutils.junit,
+ tools.vitruv.applications.cbs.testutils.oldmetamodelutils
@@ -0,0 +1,73 @@
+package tools.vitruv.applications.cbs.testutils.oldmetamodelutils
+
+import org.emftext.language.java.JavaClasspath
+import org.emftext.language.java.JavaClasspath.Initializer
+import org.eclipse.emf.ecore.resource.Resource
+import org.eclipse.emf.common.util.URI
+import static com.google.common.base.Preconditions.checkState
+import java.nio.file.Path
+
+/**
+ * This helper class allows to load the Java standard library in JaMoPP also with
+ * Java versions 9 and above.
+ * In Java 9 the boot classpath was removed and the standard library is packaged
+ * differently, which is corrected by this patch.
+ */
+class JamoppLibraryHelper {
+	static String STANDARD_LIBRARY_FOLDER_IN_HOME = "/jmods/"
+	static String BASE_LIBRARY_NAME = "java.base"
+
+	/**
+	 * Registers the Java standard library. In case of Java 8 and below, this is the deployed standard library.
+	 * In case of Java 9 and above, this is the "java.base" module. Further modules can be registered with
+	 * the {@link #registerStdLibraryModule} method.
+	 */
+	static def void registerStdLib() {
+		val String javaVersion = System.getProperty("java.version")
+
+		// Until Java 1.8 we can use the mechanism of JaMoPP
+		if (javaVersion.startsWith("1.")) {
+			JavaClasspath.get().registerStdLib();
+		// From Java 9 on, we have to search for the Java base module instead of the rt.jar file.
+		// To do so, we disable automatic initialization of the standard library using the classpath 
+		// (where library cannot be found in Java 9 and above) and manually load the base Java module
+		} else {
+			JavaClasspath.initializers.add(new Initializer() {
+				override initialize(Resource resource) {}
+
+				override requiresLocalClasspath() { false }
+
+				override requiresStdLib() { false }
+			})
+			registerStdLibraryModule(BASE_LIBRARY_NAME)
+		}
+	}
+
+	/**
+	 * Registers the Java standard library module with the given name.
+	 * This may only be called when using Java in version 9 or above.
+	 * Otherwise, it will throw an {@link IllegalStateException}.
+	 * @param name - the name of the module to register
+	 */
+	static def void registerStdLibraryModule(String name) {
+		val String javaVersion = System.getProperty("java.version");
+		checkState(!javaVersion.startsWith("1."), "Modules can only be registered in Java version 9 and above")
+
+		val modulePath = System.getProperty("java.home") + STANDARD_LIBRARY_FOLDER_IN_HOME + name + ".jmod"
+		val moduleUri = URI.createFileURI(modulePath)
+		// From java 9, the module files do not directly contain the classes in the package structure
+		// but are placed in the "classes" folder, so that prefix has to be removed.
+		JavaClasspath.get().registerClassifierJar(moduleUri, "classes/");
+	}
+
+	/**
+	 * Registers the library placed at the given path to. The library must
+	 * be an archive (like a ".jar" file) directly containing the package structure
+	 * to be imported.
+	 * @param pathToLibrary - the path to the library to register
+	 */
+	static def void registerLocalLibrary(Path pathToLibrary) {
+		JavaClasspath.get().registerClassifierJar(URI.createFileURI(pathToLibrary.toString), "");
+	}
+
+}