move to improved p2 functions
diff --git a/releng.wtpbuilder/components/wtp-patches312-tests/customTargets.xml b/releng.wtpbuilder/components/wtp-patches312-tests/customTargets.xml
index f8ebf05..ff4f8aa 100644
--- a/releng.wtpbuilder/components/wtp-patches312-tests/customTargets.xml
+++ b/releng.wtpbuilder/components/wtp-patches312-tests/customTargets.xml
@@ -3,7 +3,7 @@
     default="noDefault"
     basedir=".">
     <property
-        name="patchFeature"
+        name="buildfeature"
         value="org.eclipse.wtp.patch.tests.assembly.feature"/>
     <!--
         = = = standard properties pattern = = = Note to be
@@ -34,6 +34,14 @@
         message="buildDirectory must be set"/>
     <echo
         message="buildDirectory: ${buildDirectory}"/>
+	
+	    <property 
+	       name="p2.build.repo"
+	       value="${buildDirectory}/${buildLabel}/${component}/repository" />
+	       
+	       <echo
+	       message="p2.build.repo: ${p2.build.repo}" />	
+	
     <!--
         Run a given ${target} on all elements being built Add on <ant>
         task for each top level element being built.
@@ -60,7 +68,7 @@
             message="generic target: ${genericTargets}"/>
         <echo
             level="info"
-            message="patchFeature: ${patchFeature}"/>
+            message="buildfeature: ${buildfeature}"/>
         <echo
             message="compilerArg: ${compilerArg}"/>
         <echo
@@ -73,7 +81,7 @@
                 value="feature"/>
             <property
                 name="id"
-                value="${patchFeature}"/>
+                value="${buildfeature}"/>
         </ant>
     </target>
     <!--
@@ -299,7 +307,7 @@
             dest="${buildDirectory}/${buildLabel}/testcompilelogs"
             overwrite="true">
             <fileset
-                dir="${buildDirectory}/features/${patchFeature}">
+                dir="${buildDirectory}/features/${buildfeature}">
                 <include
                     name="**/*.log.zip"/>
             </fileset>
diff --git a/releng.wtpbuilder/components/wtp-patches312/customTargets.xml b/releng.wtpbuilder/components/wtp-patches312/customTargets.xml
index 604397d..d21efaa 100644
--- a/releng.wtpbuilder/components/wtp-patches312/customTargets.xml
+++ b/releng.wtpbuilder/components/wtp-patches312/customTargets.xml
@@ -34,6 +34,14 @@
         message="buildDirectory must be set"/>
     <echo
         message="buildDirectory: ${buildDirectory}"/>
+	
+    <property 
+	name="p2.build.repo"
+	value="${buildDirectory}/${buildLabel}/${component}/repository" />
+	
+	<echo
+	message="p2.build.repo: ${p2.build.repo}" />
+	
     <!--
         Run a given ${target} on all elements being built Add on <ant>
         task for each top level element being built.
@@ -60,7 +68,7 @@
             message="generic target: ${genericTargets}"/>
         <echo
             level="info"
-            message="patchFeature: ${patchFeature}"/>
+            message="buildfeature: ${buildfeature}"/>
        <echo
             message="compilerArg: ${compilerArg}"/>
         <echo