Merge pull request #57 from eclipse-emf-parsley/issue-54-parsley-rap-…

…update-site Issue 54 parsley rap update site
eclipse-emf-parsley · Dec 6, 2022 · f4e7561 · f4e7561
2 parents 13235b5 + a0abf23
commit f4e7561
Show file tree

Hide file tree

Showing 8 changed files with 145 additions and 4 deletions.
diff --git a/.github/workflows/maven-rap.yml b/.github/workflows/maven-rap.yml
@@ -39,3 +39,9 @@ jobs:
         ./mvnw -f releng/org.eclipse.emf.parsley.parent/pom.xml
         -Prap-examples
         clean verify
+    - name: Archive Target Platform example
+      uses: actions/upload-artifact@v2
+      if: ${{ always() }}
+      with:
+        name: rap-examples-test-${{ runner.os }}
+        path: '**/org.eclipse.emf.parsley.targetplatform/rap-examples-test.target'
diff --git a/devtools/org.eclipse.emf.parsley.targetplatform/create_test_target.ant b/devtools/org.eclipse.emf.parsley.targetplatform/create_test_target.ant
@@ -46,7 +46,7 @@
 		</replaceregexp>
 
 		<replaceregexp byline="true">
-			<regexp pattern="&lt;repository location=&quot;(https://download.eclipse.org/emf-parsley/rt)&quot;(\.*)/&gt;" />
+			<regexp pattern="&lt;repository location=&quot;(https://download.eclipse.org/emf-parsley/rt.*)&quot;(\.*)/&gt;" />
 			<substitution expression="&lt;repository location=&quot;${local.mirror.url}&quot;\2/&gt;" />
 			<fileset id="path.target" dir="${ant.file}/../">
 				<include name="${local.target.name}" />

diff --git a/examples/org.eclipse.emf.parsley.examples.rap.targetplatform/emf-parsely-rap.target b/examples/org.eclipse.emf.parsley.examples.rap.targetplatform/emf-parsely-rap.target
@@ -39,7 +39,7 @@
 <unit id="org.eclipse.emf.parsley.rap.cdo.sdk.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.emf.parsley.rap.cdo.sdk.source.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.emf.parsley.rap.sdk.source.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/emf-parsley/rt"/>
+<repository location="https://download.eclipse.org/emf-parsley/rt/1.14"/>
 </location>
 </locations>
 </target>
diff --git a/examples/org.eclipse.emf.parsley.examples.rap.targetplatform/pom.xml b/examples/org.eclipse.emf.parsley.examples.rap.targetplatform/pom.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<relativePath>../../releng/org.eclipse.emf.parsley.parent/pom.xml</relativePath>
+		<groupId>org.eclipse.emf.parsley</groupId>
+		<artifactId>org.eclipse.emf.parsley.parent</artifactId>
+		<version>1.14.0-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>org.eclipse.emf.parsley.examples.rap.targetplatform</artifactId>
+	<packaging>pom</packaging>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>build-helper-maven-plugin</artifactId>
+				<executions>
+					<!-- sets the following properties that we use in our for substitutions:
+							parsedVersion.majorVersion
+							parsedVersion.minorVersion
+						bound by default to the validate phase -->
+					<execution>
+						<id>parse-version</id>
+						<goals>
+							<goal>parse-version</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<artifactId>maven-resources-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>replace-references-in-tp</id>
+						<phase>generate-resources</phase>
+						<goals>
+							<goal>copy-resources</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>${basedir}</outputDirectory>
+							<resources>
+								<resource>
+									<directory>${basedir}/template-tp/</directory>
+									<includes>
+										<include>emf-parsely-rap.target</include>
+									</includes>
+									<filtering>true</filtering>
+								</resource>
+							</resources>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+
+</project>
diff --git a/...es/org.eclipse.emf.parsley.examples.rap.targetplatform/template-tp/emf-parsely-rap.target b/...es/org.eclipse.emf.parsley.examples.rap.targetplatform/template-tp/emf-parsely-rap.target
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?>
+
+<target name="EMF Parsley RAP" sequenceNumber="1">
+<locations>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.rap.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.rap.sdk.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.rap.examples.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.rap.equinox.target.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.xtext.xbase.lib.feature.group" version="0.0.0"/>
+<unit id="javax.inject" version="0.0.0"/>
+<unit id="org.eclipse.emf.cdo.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.emf.rap.edit.ui.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.emf.rap.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.emf.rap.sdk.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.emf.databinding.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.net4j.db.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.net4j.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.net4j.util.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.emf.cdo.server.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.emf.cdo.server.db.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.emf.databinding.edit.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.emf.query.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.emf.ecore.feature.group" version="0.0.0"/>
+<repository location="https://download.eclipse.org/staging/${eclipse-version}/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<unit id="com.google.guava" version="0.0.0"/>
+<unit id="com.google.inject" version="0.0.0"/>
+<unit id="org.apache.log4j" version="0.0.0"/>
+<unit id="org.aopalliance" version="0.0.0"/>
+<unit id="org.slf4j.api" version="0.0.0"/>
+<unit id="org.slf4j.binding.log4j12" version="0.0.0"/>
+<repository location="https://download.eclipse.org/tools/orbit/downloads/${eclipse-version}"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.emf.parsley.rap.sdk.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.emf.parsley.rap.cdo.sdk.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.emf.parsley.rap.cdo.sdk.source.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.emf.parsley.rap.sdk.source.feature.group" version="0.0.0"/>
+<repository location="https://download.eclipse.org/emf-parsley/rt/${parsedVersion.majorVersion}.${parsedVersion.minorVersion}"/>
+</location>
+</locations>
+</target>
diff --git a/...lipse.emf.parsley.examples.rap.targetplatform/template-tp/replace-references-in-tp.launch b/...lipse.emf.parsley.examples.rap.targetplatform/template-tp/replace-references-in-tp.launch
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType">
+    <booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>
+    <stringAttribute key="M2_GOALS" value="build-helper:parse-version@parse-version resources:copy-resources@replace-references-in-tp -Dtycho.mode=maven"/>
+    <booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
+    <booleanAttribute key="M2_OFFLINE" value="false"/>
+    <listAttribute key="M2_PROPERTIES"/>
+    <stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
+    <booleanAttribute key="M2_SKIP_TESTS" value="false"/>
+    <intAttribute key="M2_THREADS" value="1"/>
+    <booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
+    <stringAttribute key="M2_USER_SETTINGS" value=""/>
+    <booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>
+    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/>
+    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_CLASSPATH_ONLY_JAR" value="false"/>
+    <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${project_loc:org.eclipse.emf.parsley.examples.rap.targetplatform}"/>
+</launchConfiguration>
diff --git a/plugins/org.eclipse.emf.parsley.ui.examples/build.xml b/plugins/org.eclipse.emf.parsley.ui.examples/build.xml
@@ -23,7 +23,7 @@
 		<sequential>
 			<delete file="@{target}/@{name}.zip" />
 			<zip destfile="@{target}/@{name}.zip" basedir="@{source}/@{name}" 
-				excludes="pom.xml,bin,bin/**,emfparsley-gen/**/*.java,emfparsley-gen/**/*.xml_emfparsley_gen,xtend-gen,xtend-gen/**,**/*._trace,**/*.smap,.antlr-generator*.jar,target,target/**,nodist,nodist/**,old,old/**,**/hs_*.log,**/*_Internal.launch" />
+				excludes="template-tp,template-tp/**,pom.xml,bin,bin/**,emfparsley-gen/**/*.java,emfparsley-gen/**/*.xml_emfparsley_gen,xtend-gen,xtend-gen/**,**/*._trace,**/*.smap,.antlr-generator*.jar,target,target/**,nodist,nodist/**,old,old/**,**/hs_*.log,**/*_Internal.launch" />
 		</sequential>
 	</macrodef>
 

diff --git a/releng/org.eclipse.emf.parsley.parent/pom.xml b/releng/org.eclipse.emf.parsley.parent/pom.xml
@@ -71,6 +71,7 @@
 		<xtext-version>2.29.0</xtext-version>
 		<xtextVersion>${xtext-version}</xtextVersion>
 		<mwe2Version>2.14.0</mwe2Version>
+		<eclipse-version>2022-12</eclipse-version>
 
 		<!-- tests and runtime args -->
 		<os-jvm-flags />
@@ -222,6 +223,10 @@
 				<module>../../plugins/org.eclipse.emf.parsley.generator.common</module>
 				<module>../../plugins/org.eclipse.emf.parsley.wizards</module>
 
+				<!-- The target platform rap example is required here to allow to generate
+					a .target file with proper substitution of versions in the update sites.
+					The example is then packaged by org.eclipse.emf.parsley.ui.examples -->
+				<module>../../examples/org.eclipse.emf.parsley.examples.rap.targetplatform</module>
 				<module>../../plugins/org.eclipse.emf.parsley.ui.examples</module>
 
 				<module>../../features/org.eclipse.emf.parsley.examples.feature</module>
@@ -350,7 +355,11 @@
 				<module>../../features/org.eclipse.emf.parsley.rap.sdk</module>
 
 				<module>../../features/org.eclipse.emf.parsley.rap.cdo.sdk</module>
-
+
+				<!-- The target platform rap example is required here to allow to generate
+					a .target file with proper substitution of versions in the update sites.
+					The example .target file is then processed by the rap.repository -->
+				<module>../../examples/org.eclipse.emf.parsley.examples.rap.targetplatform</module>
 				<module>../../releng/org.eclipse.emf.parsley.rap.repository</module>
 			</modules>
 			<properties>
@@ -623,6 +632,10 @@
 					<artifactId>maven-antrun-plugin</artifactId>
 					<version>${maven-antrun-plugin.version}</version>
 				</plugin>
+				<plugin>
+					<artifactId>maven-resources-plugin</artifactId>
+					<version>3.3.0</version>
+				</plugin>
 
 				<!-- The main configuration is here, parameterized over the
 					.target file name.