From f16611360e27dee41447f3bd3a12af09d2b61e67 Mon Sep 17 00:00:00 2001
From: Greg Watson <g.watson@computer.org>
Date: Wed, 3 Jun 2015 10:02:16 -0400
Subject: [PATCH] Revert "Releng: Make the nightly build repository a composite
 repository to make it easier to access the remote connector pieces"

This reverts commit a7484f418f472c892b59ce84800d2126a0008102.
---
 .../pom.xml                                   | 15 ---------------
 .../composite/compositeArtifacts.xml          | 16 ----------------
 .../composite/compositeContent.xml            | 16 ----------------
 repos/org.eclipse.tm.terminal.repo/pom.xml    | 19 ++-----------------
 4 files changed, 2 insertions(+), 64 deletions(-)
 delete mode 100644 repos/org.eclipse.tm.terminal.repo/composite/compositeArtifacts.xml
 delete 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 ae77d6bd587..690cf855a83 100644
--- a/repos/org.eclipse.tm.terminal.remote.repo/pom.xml
+++ b/repos/org.eclipse.tm.terminal.remote.repo/pom.xml
@@ -41,22 +41,7 @@
                                                 <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
deleted file mode 100644
index 3ac7eaa10dc..00000000000
--- a/repos/org.eclipse.tm.terminal.repo/composite/compositeArtifacts.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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
deleted file mode 100644
index 4b2021b5d48..00000000000
--- a/repos/org.eclipse.tm.terminal.repo/composite/compositeContent.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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 f753ce2bb00..62470c8750e 100644
--- a/repos/org.eclipse.tm.terminal.repo/pom.xml
+++ b/repos/org.eclipse.tm.terminal.repo/pom.xml
@@ -33,34 +33,19 @@
                                     <target>
                                         <delete includeemptydirs="true">
                                             <fileset dir="${terminal-install}">
-                                                <include name="composite*"/>
-                                            </fileset>
-                                            <fileset dir="${terminal-install}">
-                                                <include name="${terminal-zipfile}"/>
+                                                <include name="**"/>
                                             </fileset>
                                         </delete>
                                         <mkdir dir="${terminal-install}/common"/>
                                         <mkdir dir="${terminal-install}/remote"/>
                                         <copy includeemptydirs="false" todir="${terminal-install}">
-                                            <fileset dir="composite">
+                                            <fileset dir="target/repository">
                                                 <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="**"/>