move to unified archived repos
diff --git a/releng.wtpbuilder/distribution/wtp.package/createFinalRepo.xml b/releng.wtpbuilder/distribution/wtp.package/createFinalRepo.xml
index 6b6ea85..5519ddc 100644
--- a/releng.wtpbuilder/distribution/wtp.package/createFinalRepo.xml
+++ b/releng.wtpbuilder/distribution/wtp.package/createFinalRepo.xml
@@ -54,6 +54,7 @@
         unless="baseComparatorRepoDir"
         message="baseComparatorRepoDir must be defined for this ant script"/>
 
+     <property name="baseComparatorRepoDirTests" value="${baseComparatorRepoDir}"/>
 
 	<!-- if not otherwise set, use these default properties 
     <property
@@ -109,16 +110,17 @@
 
 		<!-- remember, repoLocation won't exist until later, since it is at the "site", not the 
        working directory -->
+    	
+    	<!-- remember that repos are added to comparator set only when they are promoted to download location -->
         <property
             name="repoLocation"
             value="${repoDownloadBaseURL}/committers/${projectname}/${timestamp}/${buildLabel}/repository/"/>
         <echo
             message="${line.separator}    
-     adding final build repoository location:${line.separator} 
+     created final build repoository at location:${line.separator} 
          ${repoLocation}${line.separator}
-     to composite repo: ${line.separator}
-         ${baseComparatorRepoDir}"/>
-
+              "/>
+<!--
         <p2.composite.repository
             destination="file:/${baseComparatorRepoDir}">
             <add>
@@ -126,7 +128,7 @@
                     location="${repoLocation}"/>
             </add>
         </p2.composite.repository>
-
+-->
     </target>
     <target
         name="init">
@@ -155,6 +157,26 @@
             type="dir"
             property="baseComparatorRepoDirExists"/>
     </target>
+       <!-- normally, the "prime repository" should be created from previous release, 
+       or similar, but if that hasn't been done, we'll automatically create an empty 
+       composite repo which we've stored away for simplicity.-->
+    <target
+        name="primeTestRepo"
+        depends="init"
+        unless="baseComparatorTestRepoDirExists">
+        <mkdir
+            dir="${baseComparatorTestRepoDir}"/>
+        <copy
+            todir="${baseComparatorTestRepoDir}">
+            <fileset
+                dir="${wtp.builder.home}/emptyRepository/"/>
+        </copy>
+              <!-- could probably just set to true, but we'll use same logic as in init, just in case -->
+        <available
+            file="${baseComparatorTestRepoDir}"
+            type="dir"
+            property="baseComparatorTestRepoDirExists"/>
+    </target>	
     <target
         name="doMirror"
         depends="primeRepo">
@@ -245,17 +267,17 @@
     </target>
     <target
         name="doMirrorTests"
-        depends="primeRepo">
+        depends="primeTestRepo">
         <property
             name="destinationDir"
-            value="${buildDirectory}/${buildLabel}/repository"/>
+            value="${buildDirectory}/${buildLabel}/unittestrepository"/>
         <echo
             message="destinationDir: ${destinationDir}"/>
 
         <p2.mirror
             ignoreErrors="true"
             verbose="true"
-            log="${buildDirectory}/${buildLabel}/finalMirrorTestsRepo.log">
+            log="${buildDirectory}/${buildLabel}/finalMirror-unittestrepository.log">
 
 
             <destination