move to improved p2 functions
diff --git a/releng.wtpbuilder/components/wtp-patches312-tests/category.xml b/releng.wtpbuilder/components/wtp-patches312-tests/category.xml
new file mode 100644
index 0000000..2d2ee37
--- /dev/null
+++ b/releng.wtpbuilder/components/wtp-patches312-tests/category.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+   <category-def name="Galileo SR2 Patches Tests" label="Patches for tests">
+      <description>
+         Patches applicable to Galileo SR2 version of WTP unit test features.
+      </description>
+   </category-def>
+</site>
diff --git a/releng.wtpbuilder/components/wtp-patches312-tests/customTargets.xml b/releng.wtpbuilder/components/wtp-patches312-tests/customTargets.xml
index fcf7fe9..7b04cec 100644
--- a/releng.wtpbuilder/components/wtp-patches312-tests/customTargets.xml
+++ b/releng.wtpbuilder/components/wtp-patches312-tests/customTargets.xml
@@ -239,7 +239,7 @@
             destfile="${buildDirectory}/${buildLabel}/${ziparchiveName}">
             <zipfileset
                 dir="${buildDirectory}/${buildLabel}/${component}/runnable"
-                excludes="content.xml,content.jar,archives.xml,archives.jar"/>
+                excludes="content.xml,content.jar,artifacts.xml,artifacts.jar"/>
         </zip>
     </target>
 
diff --git a/releng.wtpbuilder/components/wtp-patches312/category.xml b/releng.wtpbuilder/components/wtp-patches312/category.xml
new file mode 100644
index 0000000..b56c2ae
--- /dev/null
+++ b/releng.wtpbuilder/components/wtp-patches312/category.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+   <category-def name="Galileo SR2 Patches" label="Patches">
+      <description>
+         Patches applicable to Galileo SR2 version of WTP features.
+      </description>
+   </category-def>
+</site>
diff --git a/releng.wtpbuilder/components/wtp-patches312/customTargets.xml b/releng.wtpbuilder/components/wtp-patches312/customTargets.xml
index f7f5f76..b3584ac 100644
--- a/releng.wtpbuilder/components/wtp-patches312/customTargets.xml
+++ b/releng.wtpbuilder/components/wtp-patches312/customTargets.xml
@@ -244,7 +244,7 @@
            destfile="${buildDirectory}/${buildLabel}/${ziparchiveName}">
            <zipfileset 
            	 dir="${buildDirectory}/${buildLabel}/${component}/runnable"
-               excludes="content.xml,content.jar,archives.xml,archives.jar"/>
+           	 excludes="content.xml,content.jar,artifacts.xml,artifacts.jar"/>
        </zip>
    
     </target>