Commit dcd24138 authored by Philip Makedonski's avatar Philip Makedonski
Browse files

+ updated dependencies and pom for standalone (needs to be slimmed down)

parent e91c7dca
Loading
Loading
Loading
Loading
+3 −1
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ Bundle-SymbolicName: org.etsi.mts.tdl.standalone
Bundle-Version: 1.0.0.qualifier
Automatic-Module-Name: org.etsi.mts.tdl.standalone
Bundle-Vendor: ETSI
Main-Class: org.etsi.mts.tdl.standalone.Standalone
Require-Bundle: org.eclipse.core.runtime,
 org.eclipse.core.resources,
 org.eclipse.emf.ecore,
@@ -19,5 +20,6 @@ Require-Bundle: org.eclipse.core.runtime,
 org.etsi.mts.tdl.constraints,
 org.eclipse.epsilon.evl.engine,
 org.etsi.mts.tdl.tools.to.docx.poi,
 org.etsi.mts.tdl.json2tdl
 org.etsi.mts.tdl.json2tdl,
 org.eclipse.emf.common
Bundle-ClassPath: .
+232 −0
Original line number Diff line number Diff line
@@ -8,4 +8,236 @@
  </parent>
  <artifactId>org.etsi.mts.tdl.standalone</artifactId>
  <packaging>eclipse-plugin</packaging>
	<properties>
		<extras.package.copy>packagex</extras.package.copy>
		<extras.package.addjars>packagex</extras.package.addjars>
		<extras.package.shade>packagex</extras.package.shade>
	</properties>

	<build>
		<plugins>
 <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-jar-plugin</artifactId>
        <!-- Here come other details
        ...
        -->
        <configuration>
          <archive>
            <manifest>
              <addClasspath>true</addClasspath>
              <!-- Extract to variable for reuse
              -->
	          <mainClass>org.etsi.mts.tdl.standalone.Standalone</mainClass>
            </manifest>
          </archive>
        </configuration>
        <!-- Here come other details
        ...
        -->
      </plugin>
    <plugin>
        <groupId>org.codehaus.mojo</groupId>
        <artifactId>exec-maven-plugin</artifactId>
        <version>1.2.1</version>
        <executions>
          <execution>
            <goals>
              <goal>java</goal>
            </goals>
          </execution>
        </executions>
        <configuration>
          <mainClass>org.etsi.mts.tdl.standalone.Standalone</mainClass>
          <arguments>
          </arguments>
        </configuration>
      </plugin>

			<plugin>
				<groupId>org.apache.maven.plugins</groupId>
				<artifactId>maven-dependency-plugin</artifactId>
				<version>3.3.0</version>
				<executions>
					<execution>
						<id>copy-dependencies</id>
						<phase>${extras.package.copy}</phase>
						<goals>
							<goal>copy-dependencies</goal>
						</goals>
						<configuration>
							<excludeGroupIds>p2.eclipse-feature</excludeGroupIds>
							<outputDirectory>${project.build.directory}/libs</outputDirectory>
							<overWriteReleases>false</overWriteReleases>
							<overWriteSnapshots>false</overWriteSnapshots>
							<overWriteIfNewer>true</overWriteIfNewer>
							<excludeTransitive>false</excludeTransitive>
							<excludeArtifactIds>
								com.ibm.icu,
								org.apache.ant,
								org.apache.commons.lang,
								org.eclipse.core.expressions,
								org.eclipse.core.filesystem,
								org.eclipse.core.variables,
								org.eclipse.jdt.core,
								org.eclipse.jdt.debug,
								org.eclipse.jdt.launching,
								org.eclipse.text,
								org.eclipse.e4.core.commands,
								org.eclipse.e4.core.contexts,
								org.eclipse.e4.core.di,
								org.eclipse.e4.core.di.annotation,
								org.eclipse.e4.core.di.extensions,
								org.eclipse.e4.core.di.extensions.supplier,
								org.eclipse.e4.core.services,
								org.eclipse.e4.emf.xpath,
								org.eclipse.e4.ui.bindings,
								org.eclipse.e4.ui.css.core,
								org.eclipse.e4.ui.css.swt,
								org.eclipse.e4.ui.css.swt.theme,
								org.eclipse.e4.ui.di,
								org.eclipse.e4.ui.dialogs,
								org.eclipse.e4.ui.ide,
								org.eclipse.e4.ui.model.workbench,
								org.eclipse.e4.ui.services,
								org.eclipse.e4.ui.widgets,
								org.eclipse.e4.ui.workbench,
								org.eclipse.e4.ui.workbench.addons.swt,
								org.eclipse.e4.ui.workbench.renderers.swt,
								org.eclipse.e4.ui.workbench.swt,
								org.eclipse.core.databinding,
								org.eclipse.core.databinding.observable,
								org.eclipse.core.databinding.property,
								org.eclipse.emf.common.ui,
								org.eclipse.emf.mapping.ecore2xml,
								org.eclipse.epsilon.eol.dt,
								org.eclipse.equinox.bidi,
								org.eclipse.equinox.event,
								org.eclipse.equinox.p2.artifact.repository,
								org.eclipse.equinox.p2.core,
								org.eclipse.equinox.p2.engine,
								org.eclipse.equinox.p2.jarprocessor,
								org.eclipse.equinox.p2.metadata,
								org.eclipse.equinox.p2.metadata.repository,
								org.eclipse.equinox.p2.repository,
								org.eclipse.equinox.security,
								org.eclipse.help,
								org.eclipse.jdt.core.compiler.batch,
								org.eclipse.jface.databinding,
								org.eclipse.jface.text,
								org.eclipse.ocl.pivot.uml,
								org.eclipse.ui.console,
								org.eclipse.ui.forms,
								org.eclipse.ui.ide,
								org.eclipse.ui.navigator,
								org.eclipse.ui.views,
								org.eclipse.uml2.codegen.ecore,
								org.eclipse.uml2.common,
								org.eclipse.uml2.types,
								org.eclipse.uml2.uml,
								org.eclipse.uml2.uml.profile.standard,
								org.eclipse.uml2.uml.resources,
								org.eclipse.urischeme,
								org.eclipse.xsd,
								org.osgi.namespace.extender,
								org.osgi.namespace.implementation,
								org.osgi.service.component,
								org.osgi.service.event,

							</excludeArtifactIds>
						</configuration>
					</execution>
				</executions>
			</plugin>
			<plugin>
				<groupId>com.googlecode.addjars-maven-plugin</groupId>
				<artifactId>addjars-maven-plugin</artifactId>
				<version>1.0.5</version>
				<executions>
					<execution>
						<phase>${extras.package.addjars}</phase>
						<goals>
							<goal>add-jars</goal>
						</goals>
						<configuration>
							<resources>
								<resource>
									<directory>${project.build.directory}/libs</directory>
								</resource>
							</resources>
						</configuration>
					</execution>
				</executions>
			</plugin>
			<plugin>
				<groupId>org.apache.maven.plugins</groupId>
				<artifactId>maven-shade-plugin</artifactId>
				<version>3.3.0</version>
				<configuration>
					<transformers>
						<transformer
							implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
							<mainClass>org.etsi.mts.tdl.standalone.Standalone</mainClass>
						</transformer>
						<transformer
							implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
							<resource>plugin.properties</resource>
						</transformer>
						<transformer 
							implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer">
						</transformer>
					</transformers>
					<artifactSet>
						<excludes><!-- avoid duplicate inclusion due to addjars plugin -->
							<exclude>*:org.etsi.mts.tdl.tx.ide-org.eclipse.lsp4j*</exclude>
							<exclude>*:org.etsi.mts.tdl.tx.ide-org.eclipse.xtext.xbase.lib*</exclude>
							<exclude>*:org.etsi.mts.tdl.tx.ide-org.eclipse.xtend.lib*</exclude>
							<exclude>*:org.etsi.mts.tdl.tx.ide-com.google.guava*</exclude>
							<exclude>*:org.etsi.mts.tdl.tx.ide-asm*</exclude>
							<exclude>*:org.etsi.mts.tdl.tx.ide-log4j*</exclude>
							<exclude>*:org.etsi.mts.tdl.tx.ide-reload4j*</exclude>
							<exclude>*:org.etsi.mts.tdl.tx.ide-org.objectweb.asm*</exclude>
							<exclude>*:org.etsi.mts.tdl.tx.ide-org.apache.log4j*</exclude>
						</excludes>
					</artifactSet>
					<filters>
						<filter>
							<artifact>*:*</artifact>
							<excludes>
								<exclude>META-INF/INDEX.LIST</exclude>
								<exclude>META-INF/*.SF</exclude>
								<exclude>META-INF/*.DSA</exclude>
								<exclude>META-INF/*.RSA</exclude>
								<exclude>.options</exclude>
								<exclude>.api_description</exclude>
								<exclude>*.profile</exclude>
								<exclude>*.html</exclude>
								<exclude>about.*</exclude>
								<exclude>about_files/*</exclude>
								<exclude>plugin.xml</exclude>
								<exclude>systembundle.properties</exclude>
								<exclude>profile.list</exclude>
								<exclude>**/*._trace</exclude>
								<exclude>**/*.g</exclude>
								<exclude>**/*.mwe2</exclude>
								<exclude>**/*.xtext</exclude>
							</excludes>
						</filter>
					</filters>
					<shadedArtifactAttached>true</shadedArtifactAttached>
					<shadedClassifierName>shadow</shadedClassifierName>
					<minimizeJar>false</minimizeJar>
				</configuration>
				<executions>
					<execution>
						<phase>${extras.package.shade}</phase>
						<goals>
							<goal>shade</goal>
						</goals>
					</execution>
				</executions>
			</plugin>
		</plugins>
	</build>

</project>
 No newline at end of file
+6 −1
Original line number Diff line number Diff line
@@ -71,12 +71,13 @@ public class Standalone {
//		app.path = "examples/json/model.json";
		app.path = "examples/validation/Naming.tdltx";
		app.recursive = false;
		app.modes.add(MODE.list);
		app.modes.add(MODE.validate);
//		targetExtension = "tdl";
//		app.modes.add(MODE.translate);
		
//		app.path = "examples/validation/Naming.tdltx.tdl";
		app.modes.add(MODE.validateOCL);
//		app.modes.add(MODE.validateOCL);
		
		if (app.selected(MODE.list)) {
			String path = pathOrDefault(app.path, "examples/basics");
@@ -227,6 +228,10 @@ public class Standalone {
		Resource resource = TDLHelper.load(path);
		Package p = (Package) resource.getContents().get(0);
		System.out.println("Package: "+p.getName());
		p.getNestedPackage().forEach(e -> {
			System.out.println("  " + e.getName());
			System.out.println("    " + e.eClass().getName() + " : " + e.getQualifiedName());
		});
		p.getPackagedElement().forEach(e -> {
			System.out.println("  " + e.getName());
			System.out.println("    " + e.eClass().getName() + " : " + e.getQualifiedName());