profile for building p2 composite update site

Change-Id: I538918918224e37cb2bc86bce50f1df1730f34da

8 files changed, 272 insertions, 3 deletions

diff --git a/releng/org.eclipse.emf.parsley.parent/launches/org.eclipse.emf.parsley.parent RAP.launch b/releng/org.eclipse.emf.parsley.parent/launches/org.eclipse.emf.parsley.parent RAP.launch
index 431dbb7fe..fc49fcd0d 100644
--- a/releng/org.eclipse.emf.parsley.parent/launches/org.eclipse.emf.parsley.parent RAP.launch
+++ b/releng/org.eclipse.emf.parsley.parent/launches/org.eclipse.emf.parsley.parent RAP.launch
@@ -10,6 +10,7 @@
 <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"/>
 <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/org.eclipse.emf.parsley.parent}"/>
 </launchConfiguration>
diff --git a/releng/org.eclipse.emf.parsley.parent/launches/org.eclipse.emf.parsley.parent Test RAP Release Composite (without signing).launch b/releng/org.eclipse.emf.parsley.parent/launches/org.eclipse.emf.parsley.parent Test RAP Release Composite (without signing).launch
new file mode 100644
index 000000000..c700d51c5
--- /dev/null
+++ b/releng/org.eclipse.emf.parsley.parent/launches/org.eclipse.emf.parsley.parent Test RAP Release Composite (without signing).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="clean verify -Dcbi.jarsigner.skip=true -Dfindbugs.skip=true -Dmwe2.skip=true -Dparsley.download.area=${user.home}/p2.repositories/emf-parsley"/>
+<booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
+<booleanAttribute key="M2_OFFLINE" value="false"/>
+<stringAttribute key="M2_PROFILES" value="rap-build eclipse-sign release-composite"/>
+<listAttribute key="M2_PROPERTIES"/>
+<stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
+<booleanAttribute key="M2_SKIP_TESTS" value="true"/>
+<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"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms40m -Xmx384m -XX:MaxPermSize=256m"/>
+<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/org.eclipse.emf.parsley.parent}"/>
+</launchConfiguration>
diff --git a/releng/org.eclipse.emf.parsley.parent/launches/org.eclipse.emf.parsley.parent Test Release Composite (without signing).launch b/releng/org.eclipse.emf.parsley.parent/launches/org.eclipse.emf.parsley.parent Test Release Composite (without signing).launch
new file mode 100644
index 000000000..02560cd75
--- /dev/null
+++ b/releng/org.eclipse.emf.parsley.parent/launches/org.eclipse.emf.parsley.parent Test Release Composite (without signing).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="clean verify -Dcbi.jarsigner.skip=true -Dfindbugs.skip=true -Dmwe2.skip=true -Dparsley.download.area=${user.home}/p2.repositories/emf-parsley"/>
+<booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
+<booleanAttribute key="M2_OFFLINE" value="false"/>
+<stringAttribute key="M2_PROFILES" value="rcp-build rcp-build-luna eclipse-sign release-composite"/>
+<listAttribute key="M2_PROPERTIES"/>
+<stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
+<booleanAttribute key="M2_SKIP_TESTS" value="true"/>
+<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"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms40m -Xmx384m -XX:MaxPermSize=256m"/>
+<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/org.eclipse.emf.parsley.parent}"/>
+</launchConfiguration>
diff --git a/releng/org.eclipse.emf.parsley.parent/launches/org.eclipse.emf.parsley.parent Test eclipse-sign (without signing).launch b/releng/org.eclipse.emf.parsley.parent/launches/org.eclipse.emf.parsley.parent Test eclipse-sign (without signing).launch
index fec79a3c8..ebd690898 100644
--- a/releng/org.eclipse.emf.parsley.parent/launches/org.eclipse.emf.parsley.parent Test eclipse-sign (without signing).launch
+++ b/releng/org.eclipse.emf.parsley.parent/launches/org.eclipse.emf.parsley.parent Test eclipse-sign (without signing).launch
@@ -7,9 +7,10 @@
 <stringAttribute key="M2_PROFILES" value="rcp-build rcp-build-luna eclipse-sign"/>
 <listAttribute key="M2_PROPERTIES"/>
 <stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
-<booleanAttribute key="M2_SKIP_TESTS" value="false"/>
+<booleanAttribute key="M2_SKIP_TESTS" value="true"/>
 <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"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms40m -Xmx384m -XX:MaxPermSize=256m"/>
 <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/org.eclipse.emf.parsley.parent}"/>
diff --git a/releng/org.eclipse.emf.parsley.parent/pom.xml b/releng/org.eclipse.emf.parsley.parent/pom.xml
index 219620762..f4da9cb08 100644
--- a/releng/org.eclipse.emf.parsley.parent/pom.xml
+++ b/releng/org.eclipse.emf.parsley.parent/pom.xml
@@ -36,6 +36,9 @@
 		<!-- <jacoco.reportPath>../target/jacoco.exec</jacoco.reportPath> -->
 		<!-- <findbugs.reportPath>../target/findbugs</findbugs.reportPath> -->
 		
+		<parsley.download.area>/home/data/httpd/download.eclipse.org/emf-parsley</parsley.download.area>
+		<parsley.updates.dir>updates</parsley.updates.dir>
+		<parsley.rap.updates.dir>rt</parsley.rap.updates.dir>
 		<p2.repository.dest>${project.basedir}/../../target/repository</p2.repository.dest>
 		
 		<!-- Enable this on Hudson CI @Eclipse.org -->
diff --git a/releng/org.eclipse.emf.parsley.rap.repository/pom.xml b/releng/org.eclipse.emf.parsley.rap.repository/pom.xml
index 02b303c3f..1c30676c9 100644
--- a/releng/org.eclipse.emf.parsley.rap.repository/pom.xml
+++ b/releng/org.eclipse.emf.parsley.rap.repository/pom.xml
@@ -48,8 +48,71 @@
 					</execution>
 				</executions>
 			</plugin>
-
 		</plugins>
 	</build>
 
+	<profiles>
+		<profile>
+			<id>release-composite</id>
+			<activation>
+				<activeByDefault>false</activeByDefault>
+			</activation>
+
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.eclipse.tycho.extras</groupId>
+						<artifactId>tycho-eclipserun-plugin</artifactId>
+						<version>${tycho-version}</version>
+						<configuration>
+							<appArgLine>-application org.eclipse.ant.core.antRunner -buildfile ${project.basedir}/../org.eclipse.emf.parsley.releng/packaging-p2composite.ant p2.composite.add -Dsoftware.download.area=${parsley.download.area} -Dupdates.dir=${parsley.rap.updates.dir} -Dsite.label="Emf Parsley Target Components" -Dproject.build.directory=${project.build.directory} -DunqualifiedVersion=${unqualifiedVersion} -DbuildQualifier=${buildQualifier}</appArgLine>
+							<repositories>
+								<repository>
+									<id>luna</id>
+									<layout>p2</layout>
+									<url>http://download.eclipse.org/releases/luna</url>
+								</repository>
+							</repositories>
+							<dependencies>
+								<dependency>
+									<artifactId>org.eclipse.ant.core</artifactId>
+									<type>eclipse-plugin</type>
+								</dependency>
+								<dependency>
+									<artifactId>org.apache.ant</artifactId>
+									<type>eclipse-plugin</type>
+								</dependency>
+								<dependency>
+									<artifactId>org.eclipse.equinox.p2.repository.tools</artifactId>
+									<type>eclipse-plugin</type>
+								</dependency>
+								<dependency>
+									<artifactId>org.eclipse.equinox.p2.core.feature</artifactId>
+									<type>eclipse-feature</type>
+								</dependency>
+								<dependency>
+									<artifactId>org.eclipse.equinox.p2.extras.feature</artifactId>
+									<type>eclipse-feature</type>
+								</dependency>
+								<dependency>
+									<artifactId>org.eclipse.equinox.ds</artifactId>
+									<type>eclipse-plugin</type>
+								</dependency>
+							</dependencies>
+						</configuration>
+						<executions>
+							<execution>
+								<id>add-p2-composite-repository</id>
+								<phase>package</phase>
+								<goals>
+									<goal>eclipse-run</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+
+		</profile>
+	</profiles>
 </project>
\ No newline at end of file
diff --git a/releng/org.eclipse.emf.parsley.releng/packaging-p2composite.ant b/releng/org.eclipse.emf.parsley.releng/packaging-p2composite.ant
new file mode 100644
index 000000000..d8f012ecd
--- /dev/null
+++ b/releng/org.eclipse.emf.parsley.releng/packaging-p2composite.ant
@@ -0,0 +1,104 @@
+<?xml version="1.0"?>
+<project name="project">
+	
+	<target name="getMajorMinorVersion">
+	    <script language="javascript">
+	        <![CDATA[
+
+	                // getting the value
+	                buildnumber = project.getProperty("unqualifiedVersion");
+	                index = buildnumber.lastIndexOf(".");
+	                counter = buildnumber.substring(0, index);
+	    			project.setProperty("majorMinorVersion",counter);
+
+	            ]]>
+	    </script>
+	</target>
+
+	<target name="test_getMajorMinor" depends="getMajorMinorVersion">
+		<echo message="majorMinorVersion: ${majorMinorVersion}"/>
+	</target>
+
+	<!--
+		site.label			The name/title/label of the created composite site
+		unqualifiedVersion 	The version without any qualifier replacement
+		buildQualifier		The build qualifier
+	-->
+	<target name="compute.child.repository.data" depends="getMajorMinorVersion">
+		<property name="full.version" value="${unqualifiedVersion}.${buildQualifier}" />
+
+		<property name="software.download.area" location="${user.home}/p2.repositories" />
+		<property name="updates.dir" value="updates" />
+
+		<property name="site.composite.name" value="${site.label} ${majorMinorVersion}" />
+		<property name="main.site.composite.name" value="${site.label} All Versions" />
+
+		<property name="main.composite.repository.directory" location="${software.download.area}/${updates.dir}" />
+
+		<property name="composite.repository.directory" value="${main.composite.repository.directory}/${majorMinorVersion}" />
+		<property name="child.repository" value="${full.version}" />
+		<property name="child.repository.directory" value="${composite.repository.directory}/${child.repository}/" />
+	</target>
+
+	<target name="p2.composite.add" depends="compute.child.repository.data">
+		<property name="source.repository" location="${project.build.directory}/repository"/>
+
+		<echo message=" " />
+
+		<echo message="Source repository path: ${source.repository}" />
+
+		<echo message="Copying to ${child.repository.directory}..." />
+
+		<mkdir dir="${child.repository.directory}"/>
+		<copy todir="${child.repository.directory}" overwrite="true">
+			<fileset dir="${source.repository}" />
+		</copy>
+
+		<add.composite.repository.internal
+			composite.repository.location="${composite.repository.directory}"
+			composite.repository.name="${site.composite.name}"
+			composite.repository.child="${child.repository}"
+		/>
+		
+		<add.composite.repository.internal
+			composite.repository.location="${main.composite.repository.directory}"
+			composite.repository.name="${main.site.composite.name}"
+			composite.repository.child="${majorMinorVersion}"
+		/>
+
+	</target>
+	
+	<!-- = = = = = = = = = = = = = = = = =
+          macrodef: add.composite.repository.internal          
+         = = = = = = = = = = = = = = = = = -->
+    <macrodef name="add.composite.repository.internal">
+        <attribute name="composite.repository.location" />
+    	<attribute name="composite.repository.name" />
+    	<attribute name="composite.repository.child" />
+        <sequential>
+
+    		<echo message=" " />
+    		<echo message="Composite repository       : @{composite.repository.location}" />
+    		<echo message="Composite name             : @{composite.repository.name}" />
+    		<echo message="Adding child repository    : @{composite.repository.child}" />
+
+    		<p2.composite.repository>
+    			<repository
+    				compressed="false"
+    				location="@{composite.repository.location}" 
+    				name="@{composite.repository.name}" />
+    			<add>
+    				<repository location="@{composite.repository.child}" />
+    			</add>
+    		</p2.composite.repository>
+
+		<echo file="@{composite.repository.location}/p2.index">version=1
+metadata.repository.factory.order=compositeContent.xml,\!
+artifact.repository.factory.order=compositeArtifacts.xml,\!
+</echo>
+            
+        </sequential>
+    </macrodef>
+
+
+</project>
diff --git a/releng/org.eclipse.emf.parsley.repository/pom.xml b/releng/org.eclipse.emf.parsley.repository/pom.xml
index b03419b41..0a4510db5 100644
--- a/releng/org.eclipse.emf.parsley.repository/pom.xml
+++ b/releng/org.eclipse.emf.parsley.repository/pom.xml
@@ -48,8 +48,71 @@
 					</execution>
 				</executions>
 			</plugin>
-
 		</plugins>
 	</build>
+	
+	<profiles>
+		<profile>
+			<id>release-composite</id>
+			<activation>
+				<activeByDefault>false</activeByDefault>
+			</activation>
+
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.eclipse.tycho.extras</groupId>
+						<artifactId>tycho-eclipserun-plugin</artifactId>
+						<version>${tycho-version}</version>
+						<configuration>
+							<appArgLine>-application org.eclipse.ant.core.antRunner -buildfile ${project.basedir}/../org.eclipse.emf.parsley.releng/packaging-p2composite.ant p2.composite.add -Dsoftware.download.area=${parsley.download.area} -Dupdates.dir=${parsley.updates.dir} -Dsite.label="Emf Parsley Site" -Dproject.build.directory=${project.build.directory} -DunqualifiedVersion=${unqualifiedVersion} -DbuildQualifier=${buildQualifier}</appArgLine>
+							<repositories>
+								<repository>
+									<id>luna</id>
+									<layout>p2</layout>
+									<url>http://download.eclipse.org/releases/luna</url>
+								</repository>
+							</repositories>
+							<dependencies>
+								<dependency>
+									<artifactId>org.eclipse.ant.core</artifactId>
+									<type>eclipse-plugin</type>
+								</dependency>
+								<dependency>
+									<artifactId>org.apache.ant</artifactId>
+									<type>eclipse-plugin</type>
+								</dependency>
+								<dependency>
+									<artifactId>org.eclipse.equinox.p2.repository.tools</artifactId>
+									<type>eclipse-plugin</type>
+								</dependency>
+								<dependency>
+									<artifactId>org.eclipse.equinox.p2.core.feature</artifactId>
+									<type>eclipse-feature</type>
+								</dependency>
+								<dependency>
+									<artifactId>org.eclipse.equinox.p2.extras.feature</artifactId>
+									<type>eclipse-feature</type>
+								</dependency>
+								<dependency>
+									<artifactId>org.eclipse.equinox.ds</artifactId>
+									<type>eclipse-plugin</type>
+								</dependency>
+							</dependencies>
+						</configuration>
+						<executions>
+							<execution>
+								<id>add-p2-composite-repository</id>
+								<phase>package</phase>
+								<goals>
+									<goal>eclipse-run</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
 
 </project>
\ No newline at end of file