From a7484f418f472c892b59ce84800d2126a0008102 Mon Sep 17 00:00:00 2001
From: Uwe Stieber <uwe.stieber@windriver.com>
Date: Mon, 1 Jun 2015 11:26:42 +0200
Subject: [PATCH] Releng: Make the nightly build repository a composite
 repository to make it easier to access the remote connector pieces

---
 .../pom.xml                                   | 15 +++++++++++++++
 .../composite/compositeArtifacts.xml          | 16 ++++++++++++++++
 .../composite/compositeContent.xml            | 16 ++++++++++++++++
 repos/org.eclipse.tm.terminal.repo/pom.xml    | 19 +++++++++++++++++--
 4 files changed, 64 insertions(+), 2 deletions(-)
 create mode 100644 repos/org.eclipse.tm.terminal.repo/composite/compositeArtifacts.xml
 create mode 100644 repos/org.eclipse.tm.terminal.repo/composite/compositeContent.xml

diff --git a/repos/org.eclipse.tm.terminal.remote.repo/pom.xml b/repos/org.eclipse.tm.terminal.remote.repo/pom.xml
index 690cf855a83..ae77d6bd587 100644
--- a/repos/org.eclipse.tm.terminal.remote.repo/pom.xml
+++ b/repos/org.eclipse.tm.terminal.remote.repo/pom.xml
@@ -41,7 +41,22 @@
                                                 <include name="${terminal-zipfile}"/>
                                             </fileset>
                                         </copy>
+                                        
+                                        <delete includeemptydirs="false">
+                                            <fileset dir="${terminal-install}/remote">
+                                                <include name="**"/>
+                                            </fileset>
+                                        </delete>
+                                        <copy includeemptydirs="false" todir="${terminal-install}/remote">
+                                            <fileset dir="target/repository">
+                                                <include name="**"/>
+                                            </fileset>
+                                        </copy>
+                                        
                                         <chmod perm="g+w">
+                                            <fileset dir="${terminal-install}/remote">
+                                                <include name="**"/>
+                                            </fileset>
                                             <fileset dir="${terminal-install}">
                                                 <include name="${terminal-zipfile}"/>
                                             </fileset>
diff --git a/repos/org.eclipse.tm.terminal.repo/composite/compositeArtifacts.xml b/repos/org.eclipse.tm.terminal.repo/composite/compositeArtifacts.xml
new file mode 100644
index 00000000000..3ac7eaa10dc
--- /dev/null
+++ b/repos/org.eclipse.tm.terminal.repo/composite/compositeArtifacts.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<?compositeArtifactRepository version='1.0.0'?>
+<repository
+        name='TM Terminal - Nightly Development Builds'
+    type='org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository'
+    version='1.0.0'>
+
+        <properties size='1'>
+			<property name='p2.timestamp' value='1433150343971'/>
+        </properties>
+
+        <children size='2'>
+			<child location='common'/>
+			<child location='remote'/>
+        </children>
+</repository>
diff --git a/repos/org.eclipse.tm.terminal.repo/composite/compositeContent.xml b/repos/org.eclipse.tm.terminal.repo/composite/compositeContent.xml
new file mode 100644
index 00000000000..4b2021b5d48
--- /dev/null
+++ b/repos/org.eclipse.tm.terminal.repo/composite/compositeContent.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<?compositeMetadataRepository version='1.0.0'?>
+<repository
+        name='TM Terminal - Nightly Development Builds'
+    type='org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository'
+    version='1.0.0'>
+
+        <properties size='1'>
+			<property name='p2.timestamp' value='1433150343971'/>
+        </properties>
+
+        <children size='2'>
+			<child location='common'/>
+			<child location='remote'/>
+        </children>
+</repository>
diff --git a/repos/org.eclipse.tm.terminal.repo/pom.xml b/repos/org.eclipse.tm.terminal.repo/pom.xml
index b80720908cb..f8368dd225b 100644
--- a/repos/org.eclipse.tm.terminal.repo/pom.xml
+++ b/repos/org.eclipse.tm.terminal.repo/pom.xml
@@ -33,17 +33,32 @@
                                     <target>
                                         <delete includeemptydirs="false">
                                             <fileset dir="${terminal-install}">
-                                                <include name="**"/>
+                                                <include name="composite*"/>
+                                            </fileset>
+                                            <fileset dir="${terminal-install}">
+                                                <include name="${terminal-zipfile}"/>
                                             </fileset>
                                         </delete>
                                         <copy includeemptydirs="false" todir="${terminal-install}">
-                                            <fileset dir="target/repository">
+                                            <fileset dir="composite">
                                                 <include name="**"/>
                                             </fileset>
                                             <fileset dir="target">
                                                 <include name="${terminal-zipfile}"/>
                                             </fileset>
                                         </copy>
+                                    
+                                        <delete includeemptydirs="false">
+                                            <fileset dir="${terminal-install}/common">
+                                                <include name="**"/>
+                                            </fileset>
+                                        </delete>
+                                        <copy includeemptydirs="false" todir="${terminal-install}/common">
+                                            <fileset dir="target/repository">
+                                                <include name="**"/>
+                                            </fileset>
+                                        </copy>
+                                        
                                         <chmod perm="g+w">
                                             <fileset dir="${terminal-install}">
                                                 <include name="**"/>