use comparator to fine tune delivered bundles
diff --git a/releng.wtpbuilder/emptyRepository/artifacts.xml b/releng.wtpbuilder/emptyRepository/artifacts.xml
deleted file mode 100644
index dc1974c..0000000
--- a/releng.wtpbuilder/emptyRepository/artifacts.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<?artifactRepository version='1.1.0'?>
-<repository
-    name='Exported Repository'
-    type='org.eclipse.equinox.p2.artifact.repository.simpleRepository'
-    version='1.0.0'>
-    <properties
-        size='2'>
-        <property
-            name='p2.timestamp'
-            value='1284335726321'/>
-        <property
-            name='p2.compressed'
-            value='false'/>
-    </properties>
-    <mappings
-        size='3'>
-        <rule
-            filter='(&amp; (classifier=osgi.bundle))'
-            output='${repoUrl}/plugins/${id}_${version}.jar'/>
-        <rule
-            filter='(&amp; (classifier=binary))'
-            output='${repoUrl}/binary/${id}_${version}'/>
-        <rule
-            filter='(&amp; (classifier=org.eclipse.update.feature))'
-            output='${repoUrl}/features/${id}_${version}.jar'/>
-    </mappings>
-    <artifacts
-        size='0'/>
-</repository>
diff --git a/releng.wtpbuilder/emptyRepository/compositeArtifacts.xml b/releng.wtpbuilder/emptyRepository/compositeArtifacts.xml
new file mode 100644
index 0000000..a1bc4a7
--- /dev/null
+++ b/releng.wtpbuilder/emptyRepository/compositeArtifacts.xml
@@ -0,0 +1,7 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<?compositeArtifactRepository version='1.0.0'?>
+<repository name='Integration repository' type='org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository' version='1'>
+  <properties size='1'>
+    <property name='p2.timestamp' value='1284404115388'/>
+  </properties>
+</repository>
diff --git a/releng.wtpbuilder/emptyRepository/compositeContent.xml b/releng.wtpbuilder/emptyRepository/compositeContent.xml
new file mode 100644
index 0000000..b510a44
--- /dev/null
+++ b/releng.wtpbuilder/emptyRepository/compositeContent.xml
@@ -0,0 +1,7 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<?compositeMetadataRepository version='1.0.0'?>
+<repository name='Integration repository' type='org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository' version='1'>
+  <properties size='1'>
+    <property name='p2.timestamp' value='1284404115815'/>
+  </properties>
+</repository>
diff --git a/releng.wtpbuilder/emptyRepository/content.xml b/releng.wtpbuilder/emptyRepository/content.xml
deleted file mode 100644
index 3f33c3b..0000000
--- a/releng.wtpbuilder/emptyRepository/content.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<?metadataRepository version='1.1.0'?>
-<repository
-    name='Empty Repository'
-    type='org.eclipse.equinox.internal.p2.metadata.repository.LocalMetadataRepository'
-    version='1.0.0'>
-    <properties
-        size='2'>
-        <property
-            name='p2.timestamp'
-            value='1284335726323'/>
-        <property
-            name='p2.compressed'
-            value='false'/>
-    </properties>
-</repository>