You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by hi...@apache.org on 2012/03/18 19:19:37 UTC

svn commit: r558 - in /dev/ant/updatesite: ivy-2.0.0/content.xml ivy-2.1.0/content.xml ivy-2.2.0/content.xml ivyde-2.0.0/content.xml ivyde-2.1.0/content.xml

Author: hibou
Date: Sun Mar 18 18:19:35 2012
New Revision: 558

Log:
Add the updatesite categories

Modified:
    dev/ant/updatesite/ivy-2.0.0/content.xml
    dev/ant/updatesite/ivy-2.1.0/content.xml
    dev/ant/updatesite/ivy-2.2.0/content.xml
    dev/ant/updatesite/ivyde-2.0.0/content.xml
    dev/ant/updatesite/ivyde-2.1.0/content.xml

Modified: dev/ant/updatesite/ivy-2.0.0/content.xml
==============================================================================
--- dev/ant/updatesite/ivy-2.0.0/content.xml (original)
+++ dev/ant/updatesite/ivy-2.0.0/content.xml Sun Mar 18 18:19:35 2012
@@ -18,9 +18,9 @@
    specific language governing permissions and limitations
    under the License.    
 -->
-<repository name='Apache Ivy P2 Eclipse repository' type='org.eclipse.equinox.internal.p2.metadata.repository.LocalMetadataRepository' version='1'>
-  <properties size='2'>
-    <property name='p2.timestamp' value='1331387279586'/>
+<repository name='Apache Ivy P2 Eclipse repository' type='org.eclipse.equinox.internal.p2.metadata.repository.LocalMetadataRepository' version='1.0.0'>
+  <properties size='3'>
+    <property name='p2.timestamp' value='1332090983548'/>
     <property name='p2.compressed' value='false'/>
     <property name='p2.mirrorsURL' value='http://ant.apache.org/ivy/ivyde/updatesite/p2-mirrors--xml.cgi?path=ivy-2.0.0'/>
   </properties>
@@ -28,7 +28,20 @@
     <repository uri='http://www.apache.org/dist/ant/ivyde/updatesite' url='http://www.apache.org/dist/ant/ivyde/updatesite' type='1' options='0'/>
     <repository uri='http://www.apache.org/dist/ant/ivyde/updatesite' url='http://www.apache.org/dist/ant/ivyde/updatesite' type='0' options='0'/>
   </references>
-  <units size='4'>
+  <units size='5'>
+    <unit id='file:/Users/hibou/dev/ivy/svn/updatesite/branches/p2repo-only/category.xml.org.apache.ivy.category' version='1.0.0.4--cKydnh8NScCXM733K353I77C355'>
+      <properties size='2'>
+        <property name='org.eclipse.equinox.p2.name' value='Apache Ivy library'/>
+        <property name='org.eclipse.equinox.p2.type.category' value='true'/>
+      </properties>
+      <provides size='1'>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='file:/Users/hibou/dev/ivy/svn/updatesite/branches/p2repo-only/category.xml.org.apache.ivy.category' version='1.0.0.4--cKydnh8NScCXM733K353I77C355'/>
+      </provides>
+      <requires size='1'>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.apache.ivy.feature.feature.group' range='[2.0.0.final_20090108225011,2.0.0.final_20090108225011]'/>
+      </requires>
+      <touchpoint id='null' version='0.0.0'/>
+    </unit>
     <unit id='org.apache.ivy.feature.feature.group' version='2.0.0.final_20090108225011' singleton='false'>
       <update id='org.apache.ivy.feature.feature.group' range='[0.0.0,2.0.0.final_20090108225011)' severity='0'/>
       <properties size='9'>
@@ -121,7 +134,7 @@
       <touchpointData size='1'>
         <instructions size='2'>
           <instruction key='manifest'>
-            Bundle-ManifestVersion: 2&#xA;Bundle-Name: Apache Ivy Ant Plugin&#xA;Bundle-Version: 2.0.0.final_20090108225011&#xA;Require-Bundle: org.eclipse.core.runtime,org.eclipse.ant.core,org.apache.ant;bundle-version=&quot;1.7.0&quot;&#xA;Created-By: 14.3-b01-101 (Apple Inc.)&#xA;Bundle-SymbolicName: org.apache.ivy.eclipse.ant;singleton:=true&#xA;Manifest-Version: 1.0&#xA;Bundle-Vendor: Apache Software Foundation&#xA;Ant-Version: Apache Ant 1.7.1&#xA;
+            Bundle-ManifestVersion: 2&#xA;Bundle-Name: Apache Ivy Ant Plugin&#xA;Bundle-Version: 2.0.0.final_20090108225011&#xA;Require-Bundle: org.eclipse.core.runtime,org.eclipse.ant.core,org.apache.ant;bundle-version=&quot;1.7.0&quot;&#xA;Created-By: 14.3-b01-101 (Apple Inc.)&#xA;Bundle-SymbolicName: org.apache.ivy.eclipse.ant;singleton:=true&#xA;Manifest-Version: 1.0&#xA;Bundle-Vendor: Apache Software Foundation&#xA;Ant-Version: Apache Ant 1.7.1
           </instruction>
           <instruction key='zipped'>
             true
@@ -233,7 +246,7 @@
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
-            Bundle-Vendor: Apache Software Foundation&#xA;Bundle-ManifestVersion: 2&#xA;Implementation-Title: org.apache.ivy&#xA;Manifest-Version: 1.0&#xA;Implementation-Vendor-Id: org.apache&#xA;Bundle-SymbolicName: org.apache.ivy&#xA;Created-By: 10.0-b19 (Sun Microsystems Inc.)&#xA;Implementation-Vendor: Apache Software Foundation&#xA;Implementation-Version: 2.0.0&#xA;Export-Package: org.apache.ivy;version=&quot;2.0.0&quot;,org.apache.ivy.ant;version=&quot;2.0.0&quot;,org.apache.ivy.core;version=&quot;2.0.0&quot;,org.apache.ivy.core.cache;version=&quot;2.0.0&quot;,org.apache.ivy.core.check;version=&quot;2.0.0&quot;,org.apache.ivy.core.deliver;version=&quot;2.0.0&quot;,org.apache.ivy.core.event;version=&quot;2.0.0&quot;,org.apache.ivy.core.event.download;version=&quot;2.0.0&quot;,org.apache.ivy.core.event.publish;version=&quot;2.0.0&quot;,org.apache.ivy.core.event.resolve;version=&quot;2.0.0&quot;,org.apache.ivy.core.event.retrieve;version=&quot;2.0.0&quot;,org.apache.ivy.core.install;version=&quot;2.0.0&quot;,org.apache.ivy.core.module.descriptor;version=&quot;2.0.0&quot;,org.apache.ivy.core.module.id;version=&quot;2.0.0&quot;,org.apache.ivy.core.module.status;version=&quot;2.0.0&quot;,org.apache.ivy.core.publish;version=&quot;2.0.0&quot;,org.apache.ivy.core.report;version=&quot;2.0.0&quot;,org.apache.ivy.core.repository;version=&quot;2.0.0&quot;,org.apache.ivy.core.resolve;version=&quot;2.0.0&quot;,org.apache.ivy.core.retrieve;version=&quot;2.0.0&quot;,org.apache.ivy.core.search;version=&quot;2.0.0&quot;,org.apache.ivy.core.settings;version=&quot;2.0.0&quot;,org.apache.ivy.core.sort;version=&quot;2.0.0&quot;,org.apache.ivy.plugins;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.circular;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.conflict;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.latest;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.lock;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.matcher;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.namespace;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.parser;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.parser.m2;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.parser.xml;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.report;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.repository;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.repository.file;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.repository.sftp;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.repository.ssh;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.repository.url;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.repository.vfs;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.repository.vsftp;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.resolver;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.resolver.packager;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.resolver.util;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.trigger;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.version;version=&quot;2.0.0&quot;,org.apache.ivy.tools.analyser;version=&quot;2.0.0&quot;,org.apache.ivy.util;version=&quot;2.0.0&quot;,org.apache.ivy.util.cli;version=&quot;2.0.0&quot;,org.apache.ivy.util.extendable;version=&quot;2.0.0&quot;,org.apache.ivy.util.filter;version=&quot;2.0.0&quot;,org.apache.ivy.util.url;version=&quot;2.0.0&quot;&#xA;Ant-Version: Apache Ant 1.7.0&#xA;Build-Version: 2.0.0&#xA;Extension-name: org.apache.ivy&#xA;Main-Class: org.apache.ivy.Main&#xA;Import-Package: com.jcraft.jsch;resolution:=optional,javax.crypto,javax.swing;resolution:=optional,javax.swing.event;resolution:=optional,javax.xml.parsers,javax.xml.transform,javax.xml.transform.sax,javax.xml.transform.stream,org.apache.commons.httpclient;resolution:=optional,org.apache.commons.httpclient.methods;resolution:=optional,org.apache.commons.httpclient.params;resolution:=optional,org.apache.commons.httpclient.protocol;resolution:=optional,org.apache.commons.net.ftp;resolution:=optional,org.apache.commons.vfs;resolution:=optional,org.apache.commons.vfs.impl;resolution:=optional,org.apache.commons.vfs.provider;resolution:=optional,org.apache.commons.vfs.provider.ftp;resolution:=optional,org.apache.commons.vfs.provider.local;resolution:=optional,org.apache.commons.vfs.provider.sftp;resolution:=optional,org.apache.commons.vfs.provider.url;resolution:=optional,org.apache.oro.text;resolution:=optional,org.apache.oro.text.regex;resolution:=optional,org.apache.tools.ant;resolution:=optional,org.apache.tools.ant.filters;resolution:=optional,org.apache.tools.ant.taskdefs;resolution:=optional,org.apache.tools.ant.types;resolution:=optional,org.apache.tools.ant.util;resolution:=optional,org.apache.webdav;resolution:=optional,org.xml.sax,org.xml.sax.ext,org.xml.sax.helpers&#xA;Bundle-Name: Ivy&#xA;Bundle-ClassPath: .&#xA;Specification-Title: Apache Ivy with Ant tasks&#xA;Bundle-Version: 2.0.0.final_20090108225011&#xA;Bundle-DocURL: http://incubator.apache.org/ivy&#xA;Specification-Vendor: Apache Software Foundation&#xA;Specification-Version: 2.0.0&#xA;
+            Bundle-Vendor: Apache Software Foundation&#xA;Bundle-ManifestVersion: 2&#xA;Implementation-Title: org.apache.ivy&#xA;Manifest-Version: 1.0&#xA;Implementation-Vendor-Id: org.apache&#xA;Bundle-SymbolicName: org.apache.ivy&#xA;Created-By: 10.0-b19 (Sun Microsystems Inc.)&#xA;Implementation-Vendor: Apache Software Foundation&#xA;Implementation-Version: 2.0.0&#xA;Export-Package: org.apache.ivy;version=&quot;2.0.0&quot;,org.apache.ivy.ant;version=&quot;2.0.0&quot;,org.apache.ivy.core;version=&quot;2.0.0&quot;,org.apache.ivy.core.cache;version=&quot;2.0.0&quot;,org.apache.ivy.core.check;version=&quot;2.0.0&quot;,org.apache.ivy.core.deliver;version=&quot;2.0.0&quot;,org.apache.ivy.core.event;version=&quot;2.0.0&quot;,org.apache.ivy.core.event.download;version=&quot;2.0.0&quot;,org.apache.ivy.core.event.publish;version=&quot;2.0.0&quot;,org.apache.ivy.core.event.resolve;version=&quot;2.0.0&quot;,org.apache.ivy.core.event.retrieve;version=&quot;2.0.0&quot;,org.apache.ivy.core.install;version=&quot;2.0.0&quot;,org.apache.ivy.core.module.descriptor;version=&quot;2.0.0&quot;,org.apache.ivy.core.module.id;version=&quot;2.0.0&quot;,org.apache.ivy.core.module.status;version=&quot;2.0.0&quot;,org.apache.ivy.core.publish;version=&quot;2.0.0&quot;,org.apache.ivy.core.report;version=&quot;2.0.0&quot;,org.apache.ivy.core.repository;version=&quot;2.0.0&quot;,org.apache.ivy.core.resolve;version=&quot;2.0.0&quot;,org.apache.ivy.core.retrieve;version=&quot;2.0.0&quot;,org.apache.ivy.core.search;version=&quot;2.0.0&quot;,org.apache.ivy.core.settings;version=&quot;2.0.0&quot;,org.apache.ivy.core.sort;version=&quot;2.0.0&quot;,org.apache.ivy.plugins;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.circular;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.conflict;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.latest;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.lock;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.matcher;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.namespace;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.parser;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.parser.m2;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.parser.xml;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.report;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.repository;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.repository.file;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.repository.sftp;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.repository.ssh;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.repository.url;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.repository.vfs;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.repository.vsftp;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.resolver;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.resolver.packager;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.resolver.util;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.trigger;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.version;version=&quot;2.0.0&quot;,org.apache.ivy.tools.analyser;version=&quot;2.0.0&quot;,org.apache.ivy.util;version=&quot;2.0.0&quot;,org.apache.ivy.util.cli;version=&quot;2.0.0&quot;,org.apache.ivy.util.extendable;version=&quot;2.0.0&quot;,org.apache.ivy.util.filter;version=&quot;2.0.0&quot;,org.apache.ivy.util.url;version=&quot;2.0.0&quot;&#xA;Ant-Version: Apache Ant 1.7.0&#xA;Build-Version: 2.0.0&#xA;Extension-name: org.apache.ivy&#xA;Main-Class: org.apache.ivy.Main&#xA;Import-Package: com.jcraft.jsch;resolution:=optional,javax.crypto,javax.swing;resolution:=optional,javax.swing.event;resolution:=optional,javax.xml.parsers,javax.xml.transform,javax.xml.transform.sax,javax.xml.transform.stream,org.apache.commons.httpclient;resolution:=optional,org.apache.commons.httpclient.methods;resolution:=optional,org.apache.commons.httpclient.params;resolution:=optional,org.apache.commons.httpclient.protocol;resolution:=optional,org.apache.commons.net.ftp;resolution:=optional,org.apache.commons.vfs;resolution:=optional,org.apache.commons.vfs.impl;resolution:=optional,org.apache.commons.vfs.provider;resolution:=optional,org.apache.commons.vfs.provider.ftp;resolution:=optional,org.apache.commons.vfs.provider.local;resolution:=optional,org.apache.commons.vfs.provider.sftp;resolution:=optional,org.apache.commons.vfs.provider.url;resolution:=optional,org.apache.oro.text;resolution:=optional,org.apache.oro.text.regex;resolution:=optional,org.apache.tools.ant;resolution:=optional,org.apache.tools.ant.filters;resolution:=optional,org.apache.tools.ant.taskdefs;resolution:=optional,org.apache.tools.ant.types;resolution:=optional,org.apache.tools.ant.util;resolution:=optional,org.apache.webdav;resolution:=optional,org.xml.sax,org.xml.sax.ext,org.xml.sax.helpers&#xA;Bundle-Name: Ivy&#xA;Bundle-ClassPath: .&#xA;Specification-Title: Apache Ivy with Ant tasks&#xA;Bundle-Version: 2.0.0.final_20090108225011&#xA;Bundle-DocURL: http://incubator.apache.org/ivy&#xA;Specification-Vendor: Apache Software Foundation&#xA;Specification-Version: 2.0.0
           </instruction>
         </instructions>
       </touchpointData>

Modified: dev/ant/updatesite/ivy-2.1.0/content.xml
==============================================================================
--- dev/ant/updatesite/ivy-2.1.0/content.xml (original)
+++ dev/ant/updatesite/ivy-2.1.0/content.xml Sun Mar 18 18:19:35 2012
@@ -18,9 +18,9 @@
    specific language governing permissions and limitations
    under the License.    
 -->
-<repository name='Apache Ivy P2 Eclipse repository' type='org.eclipse.equinox.internal.p2.metadata.repository.LocalMetadataRepository' version='1'>
-  <properties size='2'>
-    <property name='p2.timestamp' value='1331387334357'/>
+<repository name='Apache Ivy P2 Eclipse repository' type='org.eclipse.equinox.internal.p2.metadata.repository.LocalMetadataRepository' version='1.0.0'>
+  <properties size='3'>
+    <property name='p2.timestamp' value='1332091615747'/>
     <property name='p2.compressed' value='false'/>
     <property name='p2.mirrorsURL' value='http://ant.apache.org/ivy/ivyde/updatesite/p2-mirrors--xml.cgi?path=ivy-2.1.0-'/>
   </properties>
@@ -28,7 +28,7 @@
     <repository uri='http://www.apache.org/dist/ant/ivyde/updatesite' url='http://www.apache.org/dist/ant/ivyde/updatesite' type='1' options='0'/>
     <repository uri='http://www.apache.org/dist/ant/ivyde/updatesite' url='http://www.apache.org/dist/ant/ivyde/updatesite' type='0' options='0'/>
   </references>
-  <units size='4'>
+  <units size='5'>
     <unit id='org.apache.ivy' version='2.1.0.final_20090925235825' singleton='false'>
       <update id='org.apache.ivy' range='[0.0.0,2.1.0.final_20090925235825)' severity='0'/>
       <properties size='3'>
@@ -133,7 +133,38 @@
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
-            Bundle-Vendor: Apache Software Foundation&#xA;Bundle-ManifestVersion: 2&#xA;Implementation-Title: org.apache.ivy&#xA;Manifest-Version: 1.0&#xA;Implementation-Vendor-Id: org.apache&#xA;Bundle-SymbolicName: org.apache.ivy&#xA;Created-By: 10.0-b19 (Sun Microsystems Inc.)&#xA;Implementation-Vendor: Apache Software Foundation&#xA;Implementation-Version: 2.1.0&#xA;Export-Package: org.apache.ivy;version=&quot;2.0.0&quot;,org.apache.ivy.ant;version=&quot;2.0.0&quot;,org.apache.ivy.core;version=&quot;2.0.0&quot;,org.apache.ivy.core.cache;version=&quot;2.0.0&quot;,org.apache.ivy.core.check;version=&quot;2.0.0&quot;,org.apache.ivy.core.deliver;version=&quot;2.0.0&quot;,org.apache.ivy.core.event;version=&quot;2.0.0&quot;,org.apache.ivy.core.event.download;version=&quot;2.0.0&quot;,org.apache.ivy.core.event.publish;version=&quot;2.0.0&quot;,org.apache.ivy.core.event.resolve;version=&quot;2.0.0&quot;,org.apache.ivy.core.event.retrieve;version=&quot;2.0.0&quot;,org.apache.ivy.core.install;version=&quot;2.0.0&quot;,org.apache.ivy.core.module.descriptor;version=&quot;2.0.0&quot;,org.apache.ivy.core.module.id;version=&quot;2.0.0&quot;,org.apache.ivy.core.module.status;version=&quot;2.0.0&quot;,org.apache.ivy.core.publish;version=&quot;2.0.0&quot;,org.apache.ivy.core.report;version=&quot;2.0.0&quot;,org.apache.ivy.core.repository;version=&quot;2.0.0&quot;,org.apache.ivy.core.resolve;version=&quot;2.0.0&quot;,org.apache.ivy.core.retrieve;version=&quot;2.0.0&quot;,org.apache.ivy.core.search;version=&quot;2.0.0&quot;,org.apache.ivy.core.settings;version=&quot;2.0.0&quot;,org.apache.ivy.core.sort;version=&quot;2.0.0&quot;,org.apache.ivy.plugins;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.circular;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.conflict;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.latest;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.lock;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.matcher;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.namespace;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.parser;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.parser.m2;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.parser.xml;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.report;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.repository;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.repository.file;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.repository.sftp;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.repository.ssh;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.repository.url;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.repository.vfs;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.repository.vsftp;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.resolver;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.resolver.packager;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.resolver.util;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.trigger;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.version;version=&quot;2.0.0&quot;,org.apache.ivy.tools.analyser;version=&quot;2.0.0&quot;,org.apache.ivy.util;version=&quot;2.0.0&quot;,org.apache.ivy.util.cli;version=&quot;2.0.0&quot;,org.apache.ivy.util.extendable;version=&quot;2.0.0&quot;,org.apache.ivy.util.filter;version=&quot;2.0.0&quot;,org.apache.ivy.util.url;version=&quot;2.0.0&quot;&#xA;Ant-Version: Apache Ant 1.7.0&#xA;Build-Version: 2.1.0&#xA;Extension-name: org.apache.ivy&#xA;Main-Class: org.apache.ivy.Main&#xA;Import-Package: com.jcraft.jsch;resolution:=optional,javax.crypto,javax.swing;resolution:=optional,javax.swing.event;resolution:=optional,javax.xml.parsers,javax.xml.transform,javax.xml.transform.sax,javax.xml.transform.stream,org.apache.commons.httpclient;resolution:=optional,org.apache.commons.httpclient.methods;resolution:=optional,org.apache.commons.httpclient.params;resolution:=optional,org.apache.commons.httpclient.protocol;resolution:=optional,org.apache.commons.net.ftp;resolution:=optional,org.apache.commons.vfs;resolution:=optional,org.apache.commons.vfs.impl;resolution:=optional,org.apache.commons.vfs.provider;resolution:=optional,org.apache.commons.vfs.provider.ftp;resolution:=optional,org.apache.commons.vfs.provider.local;resolution:=optional,org.apache.commons.vfs.provider.sftp;resolution:=optional,org.apache.commons.vfs.provider.url;resolution:=optional,org.apache.oro.text;resolution:=optional,org.apache.oro.text.regex;resolution:=optional,org.apache.tools.ant;resolution:=optional,org.apache.tools.ant.filters;resolution:=optional,org.apache.tools.ant.taskdefs;resolution:=optional,org.apache.tools.ant.types;resolution:=optional,org.apache.tools.ant.util;resolution:=optional,org.apache.webdav;resolution:=optional,org.xml.sax,org.xml.sax.ext,org.xml.sax.helpers&#xA;Bundle-Name: Ivy&#xA;Bundle-ClassPath: .&#xA;Specification-Title: Apache Ivy with Ant tasks&#xA;Bundle-Version: 2.1.0.final_20090925235825&#xA;Bundle-DocURL: http://incubator.apache.org/ivy&#xA;Specification-Vendor: Apache Software Foundation&#xA;Specification-Version: 2.1.0&#xA;
+            Bundle-Vendor: Apache Software Foundation&#xA;Bundle-ManifestVersion: 2&#xA;Implementation-Title: org.apache.ivy&#xA;Manifest-Version: 1.0&#xA;Implementation-Vendor-Id: org.apache&#xA;Bundle-SymbolicName: org.apache.ivy&#xA;Created-By: 10.0-b19 (Sun Microsystems Inc.)&#xA;Implementation-Vendor: Apache Software Foundation&#xA;Implementation-Version: 2.1.0&#xA;Export-Package: org.apache.ivy;version=&quot;2.0.0&quot;,org.apache.ivy.ant;version=&quot;2.0.0&quot;,org.apache.ivy.core;version=&quot;2.0.0&quot;,org.apache.ivy.core.cache;version=&quot;2.0.0&quot;,org.apache.ivy.core.check;version=&quot;2.0.0&quot;,org.apache.ivy.core.deliver;version=&quot;2.0.0&quot;,org.apache.ivy.core.event;version=&quot;2.0.0&quot;,org.apache.ivy.core.event.download;version=&quot;2.0.0&quot;,org.apache.ivy.core.event.publish;version=&quot;2.0.0&quot;,org.apache.ivy.core.event.resolve;version=&quot;2.0.0&quot;,org.apache.ivy.core.event.retrieve;version=&quot;2.0.0&quot;,org.apache.ivy.core.install;version=&quot;2.0.0&quot;,org.apache.ivy.core.module.descriptor;version=&quot;2.0.0&quot;,org.apache.ivy.core.module.id;version=&quot;2.0.0&quot;,org.apache.ivy.core.module.status;version=&quot;2.0.0&quot;,org.apache.ivy.core.publish;version=&quot;2.0.0&quot;,org.apache.ivy.core.report;version=&quot;2.0.0&quot;,org.apache.ivy.core.repository;version=&quot;2.0.0&quot;,org.apache.ivy.core.resolve;version=&quot;2.0.0&quot;,org.apache.ivy.core.retrieve;version=&quot;2.0.0&quot;,org.apache.ivy.core.search;version=&quot;2.0.0&quot;,org.apache.ivy.core.settings;version=&quot;2.0.0&quot;,org.apache.ivy.core.sort;version=&quot;2.0.0&quot;,org.apache.ivy.plugins;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.circular;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.conflict;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.latest;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.lock;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.matcher;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.namespace;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.parser;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.parser.m2;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.parser.xml;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.report;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.repository;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.repository.file;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.repository.sftp;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.repository.ssh;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.repository.url;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.repository.vfs;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.repository.vsftp;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.resolver;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.resolver.packager;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.resolver.util;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.trigger;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.version;version=&quot;2.0.0&quot;,org.apache.ivy.tools.analyser;version=&quot;2.0.0&quot;,org.apache.ivy.util;version=&quot;2.0.0&quot;,org.apache.ivy.util.cli;version=&quot;2.0.0&quot;,org.apache.ivy.util.extendable;version=&quot;2.0.0&quot;,org.apache.ivy.util.filter;version=&quot;2.0.0&quot;,org.apache.ivy.util.url;version=&quot;2.0.0&quot;&#xA;Ant-Version: Apache Ant 1.7.0&#xA;Build-Version: 2.1.0&#xA;Extension-name: org.apache.ivy&#xA;Main-Class: org.apache.ivy.Main&#xA;Import-Package: com.jcraft.jsch;resolution:=optional,javax.crypto,javax.swing;resolution:=optional,javax.swing.event;resolution:=optional,javax.xml.parsers,javax.xml.transform,javax.xml.transform.sax,javax.xml.transform.stream,org.apache.commons.httpclient;resolution:=optional,org.apache.commons.httpclient.methods;resolution:=optional,org.apache.commons.httpclient.params;resolution:=optional,org.apache.commons.httpclient.protocol;resolution:=optional,org.apache.commons.net.ftp;resolution:=optional,org.apache.commons.vfs;resolution:=optional,org.apache.commons.vfs.impl;resolution:=optional,org.apache.commons.vfs.provider;resolution:=optional,org.apache.commons.vfs.provider.ftp;resolution:=optional,org.apache.commons.vfs.provider.local;resolution:=optional,org.apache.commons.vfs.provider.sftp;resolution:=optional,org.apache.commons.vfs.provider.url;resolution:=optional,org.apache.oro.text;resolution:=optional,org.apache.oro.text.regex;resolution:=optional,org.apache.tools.ant;resolution:=optional,org.apache.tools.ant.filters;resolution:=optional,org.apache.tools.ant.taskdefs;resolution:=optional,org.apache.tools.ant.types;resolution:=optional,org.apache.tools.ant.util;resolution:=optional,org.apache.webdav;resolution:=optional,org.xml.sax,org.xml.sax.ext,org.xml.sax.helpers&#xA;Bundle-Name: Ivy&#xA;Bundle-ClassPath: .&#xA;Specification-Title: Apache Ivy with Ant tasks&#xA;Bundle-Version: 2.1.0.final_20090925235825&#xA;Bundle-DocURL: http://incubator.apache.org/ivy&#xA;Specification-Vendor: Apache Software Foundation&#xA;Specification-Version: 2.1.0
+          </instruction>
+        </instructions>
+      </touchpointData>
+    </unit>
+    <unit id='org.apache.ivy.eclipse.ant' version='2.1.0.final_20090925235825'>
+      <update id='org.apache.ivy.eclipse.ant' range='[0.0.0,2.1.0.final_20090925235825)' severity='0'/>
+      <properties size='2'>
+        <property name='org.eclipse.equinox.p2.name' value='Apache Ivy Ant Plugin'/>
+        <property name='org.eclipse.equinox.p2.provider' value='Apache Software Foundation'/>
+      </properties>
+      <provides size='3'>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='org.apache.ivy.eclipse.ant' version='2.1.0.final_20090925235825'/>
+        <provided namespace='osgi.bundle' name='org.apache.ivy.eclipse.ant' version='2.1.0.final_20090925235825'/>
+        <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
+      </provides>
+      <requires size='3'>
+        <required namespace='osgi.bundle' name='org.eclipse.core.runtime' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.ant.core' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.apache.ant' range='1.7.0'/>
+      </requires>
+      <artifacts size='1'>
+        <artifact classifier='osgi.bundle' id='org.apache.ivy.eclipse.ant' version='2.1.0.final_20090925235825'/>
+      </artifacts>
+      <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
+      <touchpointData size='1'>
+        <instructions size='2'>
+          <instruction key='manifest'>
+            Bundle-ManifestVersion: 2&#xA;Bundle-Name: Apache Ivy Ant Plugin&#xA;Bundle-Version: 2.1.0.final_20090925235825&#xA;Require-Bundle: org.eclipse.core.runtime,org.eclipse.ant.core,org.apache.ant;bundle-version=&quot;1.7.0&quot;&#xA;Created-By: 14.3-b01-101 (Apple Inc.)&#xA;Bundle-SymbolicName: org.apache.ivy.eclipse.ant;singleton:=true&#xA;Manifest-Version: 1.0&#xA;Bundle-Vendor: Apache Software Foundation&#xA;Ant-Version: Apache Ant 1.7.1
+          </instruction>
+          <instruction key='zipped'>
+            true
           </instruction>
         </instructions>
       </touchpointData>
@@ -171,36 +202,18 @@
         </license>
       </licenses>
     </unit>
-    <unit id='org.apache.ivy.eclipse.ant' version='2.1.0.final_20090925235825'>
-      <update id='org.apache.ivy.eclipse.ant' range='[0.0.0,2.1.0.final_20090925235825)' severity='0'/>
+    <unit id='file:/Users/hibou/dev/ivy/svn/updatesite/branches/p2repo-only/category.xml.org.apache.ivy.category' version='1.0.0.41-cKydnh8NScCXM733K3K7C79CI7C'>
       <properties size='2'>
-        <property name='org.eclipse.equinox.p2.name' value='Apache Ivy Ant Plugin'/>
-        <property name='org.eclipse.equinox.p2.provider' value='Apache Software Foundation'/>
+        <property name='org.eclipse.equinox.p2.name' value='Apache Ivy library'/>
+        <property name='org.eclipse.equinox.p2.type.category' value='true'/>
       </properties>
-      <provides size='3'>
-        <provided namespace='org.eclipse.equinox.p2.iu' name='org.apache.ivy.eclipse.ant' version='2.1.0.final_20090925235825'/>
-        <provided namespace='osgi.bundle' name='org.apache.ivy.eclipse.ant' version='2.1.0.final_20090925235825'/>
-        <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
+      <provides size='1'>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='file:/Users/hibou/dev/ivy/svn/updatesite/branches/p2repo-only/category.xml.org.apache.ivy.category' version='1.0.0.41-cKydnh8NScCXM733K3K7C79CI7C'/>
       </provides>
-      <requires size='3'>
-        <required namespace='osgi.bundle' name='org.eclipse.core.runtime' range='0.0.0'/>
-        <required namespace='osgi.bundle' name='org.eclipse.ant.core' range='0.0.0'/>
-        <required namespace='osgi.bundle' name='org.apache.ant' range='1.7.0'/>
+      <requires size='1'>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.apache.ivy.feature.feature.group' range='[2.1.0.final_20090925235825,2.1.0.final_20090925235825]'/>
       </requires>
-      <artifacts size='1'>
-        <artifact classifier='osgi.bundle' id='org.apache.ivy.eclipse.ant' version='2.1.0.final_20090925235825'/>
-      </artifacts>
-      <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
-      <touchpointData size='1'>
-        <instructions size='2'>
-          <instruction key='manifest'>
-            Bundle-ManifestVersion: 2&#xA;Bundle-Name: Apache Ivy Ant Plugin&#xA;Bundle-Version: 2.1.0.final_20090925235825&#xA;Require-Bundle: org.eclipse.core.runtime,org.eclipse.ant.core,org.apache.ant;bundle-version=&quot;1.7.0&quot;&#xA;Created-By: 14.3-b01-101 (Apple Inc.)&#xA;Bundle-SymbolicName: org.apache.ivy.eclipse.ant;singleton:=true&#xA;Manifest-Version: 1.0&#xA;Bundle-Vendor: Apache Software Foundation&#xA;Ant-Version: Apache Ant 1.7.1&#xA;
-          </instruction>
-          <instruction key='zipped'>
-            true
-          </instruction>
-        </instructions>
-      </touchpointData>
+      <touchpoint id='null' version='0.0.0'/>
     </unit>
     <unit id='org.apache.ivy.feature.feature.jar' version='2.1.0.final_20090925235825'>
       <properties size='8'>

Modified: dev/ant/updatesite/ivy-2.2.0/content.xml
==============================================================================
--- dev/ant/updatesite/ivy-2.2.0/content.xml (original)
+++ dev/ant/updatesite/ivy-2.2.0/content.xml Sun Mar 18 18:19:35 2012
@@ -18,9 +18,9 @@
    specific language governing permissions and limitations
    under the License.    
 -->
-<repository name='Apache Ivy P2 Eclipse repository' type='org.eclipse.equinox.internal.p2.metadata.repository.LocalMetadataRepository' version='1'>
-  <properties size='2'>
-    <property name='p2.timestamp' value='1331387363753'/>
+<repository name='Apache Ivy P2 Eclipse repository' type='org.eclipse.equinox.internal.p2.metadata.repository.LocalMetadataRepository' version='1.0.0'>
+  <properties size='3'>
+    <property name='p2.timestamp' value='1332091740726'/>
     <property name='p2.compressed' value='false'/>
     <property name='p2.mirrorsURL' value='http://ant.apache.org/ivy/ivyde/updatesite/p2-mirrors--xml.cgi?path=ivy-2.2.0'/>
   </properties>
@@ -28,7 +28,7 @@
     <repository uri='http://www.apache.org/dist/ant/ivyde/updatesite' url='http://www.apache.org/dist/ant/ivyde/updatesite' type='1' options='0'/>
     <repository uri='http://www.apache.org/dist/ant/ivyde/updatesite' url='http://www.apache.org/dist/ant/ivyde/updatesite' type='0' options='0'/>
   </references>
-  <units size='4'>
+  <units size='5'>
     <unit id='org.apache.ivy.eclipse.ant' version='2.2.0.final_20100923230623'>
       <update id='org.apache.ivy.eclipse.ant' range='[0.0.0,2.2.0.final_20100923230623)' severity='0'/>
       <properties size='2'>
@@ -52,7 +52,7 @@
       <touchpointData size='1'>
         <instructions size='2'>
           <instruction key='manifest'>
-            Bundle-ManifestVersion: 2&#xA;Bundle-Name: Apache Ivy Ant Plugin&#xA;Bundle-Version: 2.2.0.final_20100923230623&#xA;Require-Bundle: org.eclipse.core.runtime,org.eclipse.ant.core,org.apache.ant;bundle-version=&quot;1.7.0&quot;&#xA;Created-By: 1.6.0_20-b02-279-10M3065 (Apple Inc.)&#xA;Bundle-SymbolicName: org.apache.ivy.eclipse.ant;singleton:=true&#xA;Manifest-Version: 1.0&#xA;Bundle-Vendor: Apache Software Foundation&#xA;Ant-Version: Apache Ant 1.8.1&#xA;
+            Bundle-ManifestVersion: 2&#xA;Bundle-Name: Apache Ivy Ant Plugin&#xA;Bundle-Version: 2.2.0.final_20100923230623&#xA;Require-Bundle: org.eclipse.core.runtime,org.eclipse.ant.core,org.apache.ant;bundle-version=&quot;1.7.0&quot;&#xA;Created-By: 1.6.0_20-b02-279-10M3065 (Apple Inc.)&#xA;Bundle-SymbolicName: org.apache.ivy.eclipse.ant;singleton:=true&#xA;Manifest-Version: 1.0&#xA;Bundle-Vendor: Apache Software Foundation&#xA;Ant-Version: Apache Ant 1.8.1
           </instruction>
           <instruction key='zipped'>
             true
@@ -164,7 +164,7 @@
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
-            Bundle-Vendor: Apache Software Foundation&#xA;Bundle-ManifestVersion: 2&#xA;Implementation-Title: org.apache.ivy&#xA;Manifest-Version: 1.0&#xA;Implementation-Vendor-Id: org.apache&#xA;Bundle-SymbolicName: org.apache.ivy&#xA;Created-By: 1.6.0_04-b12 (Sun Microsystems Inc.)&#xA;Implementation-Vendor: Apache Software Foundation&#xA;Implementation-Version: 2.2.0&#xA;Export-Package: org.apache.ivy;version=&quot;2.0.0&quot;,org.apache.ivy.ant;version=&quot;2.0.0&quot;,org.apache.ivy.core;version=&quot;2.0.0&quot;,org.apache.ivy.core.cache;version=&quot;2.0.0&quot;,org.apache.ivy.core.check;version=&quot;2.0.0&quot;,org.apache.ivy.core.deliver;version=&quot;2.0.0&quot;,org.apache.ivy.core.event;version=&quot;2.0.0&quot;,org.apache.ivy.core.event.download;version=&quot;2.0.0&quot;,org.apache.ivy.core.event.publish;version=&quot;2.0.0&quot;,org.apache.ivy.core.event.resolve;version=&quot;2.0.0&quot;,org.apache.ivy.core.event.retrieve;version=&quot;2.0.0&quot;,org.apache.ivy.core.install;version=&quot;2.0.0&quot;,org.apache.ivy.core.module.descriptor;version=&quot;2.0.0&quot;,org.apache.ivy.core.module.id;version=&quot;2.0.0&quot;,org.apache.ivy.core.module.status;version=&quot;2.0.0&quot;,org.apache.ivy.core.publish;version=&quot;2.0.0&quot;,org.apache.ivy.core.report;version=&quot;2.0.0&quot;,org.apache.ivy.core.repository;version=&quot;2.0.0&quot;,org.apache.ivy.core.resolve;version=&quot;2.0.0&quot;,org.apache.ivy.core.retrieve;version=&quot;2.0.0&quot;,org.apache.ivy.core.search;version=&quot;2.0.0&quot;,org.apache.ivy.core.settings;version=&quot;2.0.0&quot;,org.apache.ivy.core.sort;version=&quot;2.0.0&quot;,org.apache.ivy.plugins;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.circular;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.conflict;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.latest;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.lock;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.matcher;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.namespace;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.parser;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.parser.m2;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.parser.xml;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.report;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.repository;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.repository.file;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.repository.sftp;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.repository.ssh;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.repository.url;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.repository.vfs;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.repository.vsftp;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.resolver;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.resolver.packager;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.resolver.util;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.trigger;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.version;version=&quot;2.0.0&quot;,org.apache.ivy.tools.analyser;version=&quot;2.0.0&quot;,org.apache.ivy.util;version=&quot;2.0.0&quot;,org.apache.ivy.util.cli;version=&quot;2.0.0&quot;,org.apache.ivy.util.extendable;version=&quot;2.0.0&quot;,org.apache.ivy.util.filter;version=&quot;2.0.0&quot;,org.apache.ivy.util.url;version=&quot;2.0.0&quot;&#xA;Ant-Version: Apache Ant 1.8.1&#xA;Build-Version: 2.2.0&#xA;Extension-name: org.apache.ivy&#xA;Main-Class: org.apache.ivy.Main&#xA;Import-Package: com.jcraft.jsch;resolution:=optional,javax.crypto,javax.swing;resolution:=optional,javax.swing.event;resolution:=optional,javax.xml.parsers,javax.xml.transform,javax.xml.transform.sax,javax.xml.transform.stream,org.apache.commons.httpclient;resolution:=optional,org.apache.commons.httpclient.methods;resolution:=optional,org.apache.commons.httpclient.params;resolution:=optional,org.apache.commons.httpclient.protocol;resolution:=optional,org.apache.commons.net.ftp;resolution:=optional,org.apache.commons.vfs;resolution:=optional,org.apache.commons.vfs.impl;resolution:=optional,org.apache.commons.vfs.provider;resolution:=optional,org.apache.commons.vfs.provider.ftp;resolution:=optional,org.apache.commons.vfs.provider.local;resolution:=optional,org.apache.commons.vfs.provider.sftp;resolution:=optional,org.apache.commons.vfs.provider.url;resolution:=optional,org.apache.oro.text;resolution:=optional,org.apache.oro.text.regex;resolution:=optional,org.apache.tools.ant;resolution:=optional,org.apache.tools.ant.filters;resolution:=optional,org.apache.tools.ant.taskdefs;resolution:=optional,org.apache.tools.ant.types;resolution:=optional,org.apache.tools.ant.util;resolution:=optional,org.apache.webdav;resolution:=optional,org.xml.sax,org.xml.sax.ext,org.xml.sax.helpers&#xA;Bundle-Name: Ivy&#xA;Bundle-ClassPath: .&#xA;Specification-Title: Apache Ivy with Ant tasks&#xA;Bundle-Version: 2.2.0.final_20100923230623&#xA;Bundle-DocURL: http://ant.apache.org/ivy/&#xA;Specification-Vendor: Apache Software Foundation&#xA;Specification-Version: 2.2.0&#xA;
+            Bundle-Vendor: Apache Software Foundation&#xA;Bundle-ManifestVersion: 2&#xA;Implementation-Title: org.apache.ivy&#xA;Manifest-Version: 1.0&#xA;Implementation-Vendor-Id: org.apache&#xA;Bundle-SymbolicName: org.apache.ivy&#xA;Created-By: 1.6.0_04-b12 (Sun Microsystems Inc.)&#xA;Implementation-Vendor: Apache Software Foundation&#xA;Implementation-Version: 2.2.0&#xA;Export-Package: org.apache.ivy;version=&quot;2.0.0&quot;,org.apache.ivy.ant;version=&quot;2.0.0&quot;,org.apache.ivy.core;version=&quot;2.0.0&quot;,org.apache.ivy.core.cache;version=&quot;2.0.0&quot;,org.apache.ivy.core.check;version=&quot;2.0.0&quot;,org.apache.ivy.core.deliver;version=&quot;2.0.0&quot;,org.apache.ivy.core.event;version=&quot;2.0.0&quot;,org.apache.ivy.core.event.download;version=&quot;2.0.0&quot;,org.apache.ivy.core.event.publish;version=&quot;2.0.0&quot;,org.apache.ivy.core.event.resolve;version=&quot;2.0.0&quot;,org.apache.ivy.core.event.retrieve;version=&quot;2.0.0&quot;,org.apache.ivy.core.install;version=&quot;2.0.0&quot;,org.apache.ivy.core.module.descriptor;version=&quot;2.0.0&quot;,org.apache.ivy.core.module.id;version=&quot;2.0.0&quot;,org.apache.ivy.core.module.status;version=&quot;2.0.0&quot;,org.apache.ivy.core.publish;version=&quot;2.0.0&quot;,org.apache.ivy.core.report;version=&quot;2.0.0&quot;,org.apache.ivy.core.repository;version=&quot;2.0.0&quot;,org.apache.ivy.core.resolve;version=&quot;2.0.0&quot;,org.apache.ivy.core.retrieve;version=&quot;2.0.0&quot;,org.apache.ivy.core.search;version=&quot;2.0.0&quot;,org.apache.ivy.core.settings;version=&quot;2.0.0&quot;,org.apache.ivy.core.sort;version=&quot;2.0.0&quot;,org.apache.ivy.plugins;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.circular;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.conflict;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.latest;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.lock;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.matcher;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.namespace;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.parser;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.parser.m2;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.parser.xml;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.report;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.repository;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.repository.file;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.repository.sftp;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.repository.ssh;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.repository.url;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.repository.vfs;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.repository.vsftp;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.resolver;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.resolver.packager;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.resolver.util;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.trigger;version=&quot;2.0.0&quot;,org.apache.ivy.plugins.version;version=&quot;2.0.0&quot;,org.apache.ivy.tools.analyser;version=&quot;2.0.0&quot;,org.apache.ivy.util;version=&quot;2.0.0&quot;,org.apache.ivy.util.cli;version=&quot;2.0.0&quot;,org.apache.ivy.util.extendable;version=&quot;2.0.0&quot;,org.apache.ivy.util.filter;version=&quot;2.0.0&quot;,org.apache.ivy.util.url;version=&quot;2.0.0&quot;&#xA;Ant-Version: Apache Ant 1.8.1&#xA;Build-Version: 2.2.0&#xA;Extension-name: org.apache.ivy&#xA;Main-Class: org.apache.ivy.Main&#xA;Import-Package: com.jcraft.jsch;resolution:=optional,javax.crypto,javax.swing;resolution:=optional,javax.swing.event;resolution:=optional,javax.xml.parsers,javax.xml.transform,javax.xml.transform.sax,javax.xml.transform.stream,org.apache.commons.httpclient;resolution:=optional,org.apache.commons.httpclient.methods;resolution:=optional,org.apache.commons.httpclient.params;resolution:=optional,org.apache.commons.httpclient.protocol;resolution:=optional,org.apache.commons.net.ftp;resolution:=optional,org.apache.commons.vfs;resolution:=optional,org.apache.commons.vfs.impl;resolution:=optional,org.apache.commons.vfs.provider;resolution:=optional,org.apache.commons.vfs.provider.ftp;resolution:=optional,org.apache.commons.vfs.provider.local;resolution:=optional,org.apache.commons.vfs.provider.sftp;resolution:=optional,org.apache.commons.vfs.provider.url;resolution:=optional,org.apache.oro.text;resolution:=optional,org.apache.oro.text.regex;resolution:=optional,org.apache.tools.ant;resolution:=optional,org.apache.tools.ant.filters;resolution:=optional,org.apache.tools.ant.taskdefs;resolution:=optional,org.apache.tools.ant.types;resolution:=optional,org.apache.tools.ant.util;resolution:=optional,org.apache.webdav;resolution:=optional,org.xml.sax,org.xml.sax.ext,org.xml.sax.helpers&#xA;Bundle-Name: Ivy&#xA;Bundle-ClassPath: .&#xA;Specification-Title: Apache Ivy with Ant tasks&#xA;Bundle-Version: 2.2.0.final_20100923230623&#xA;Bundle-DocURL: http://ant.apache.org/ivy/&#xA;Specification-Vendor: Apache Software Foundation&#xA;Specification-Version: 2.2.0
           </instruction>
         </instructions>
       </touchpointData>
@@ -205,6 +205,19 @@
         </license>
       </licenses>
     </unit>
+    <unit id='file:/Users/hibou/dev/ivy/svn/updatesite/branches/p2repo-only/category.xml.org.apache.ivy.category' version='1.0.0.43-cKydnh8NScCXM73533K79793E79'>
+      <properties size='2'>
+        <property name='org.eclipse.equinox.p2.name' value='Apache Ivy library'/>
+        <property name='org.eclipse.equinox.p2.type.category' value='true'/>
+      </properties>
+      <provides size='1'>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='file:/Users/hibou/dev/ivy/svn/updatesite/branches/p2repo-only/category.xml.org.apache.ivy.category' version='1.0.0.43-cKydnh8NScCXM73533K79793E79'/>
+      </provides>
+      <requires size='1'>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.apache.ivy.feature.feature.group' range='[2.2.0.final_20100923230623,2.2.0.final_20100923230623]'/>
+      </requires>
+      <touchpoint id='null' version='0.0.0'/>
+    </unit>
     <unit id='org.apache.ivy.feature.feature.group' version='2.2.0.final_20100923230623' singleton='false'>
       <update id='org.apache.ivy.feature.feature.group' range='[0.0.0,2.2.0.final_20100923230623)' severity='0'/>
       <properties size='9'>

Modified: dev/ant/updatesite/ivyde-2.0.0/content.xml
==============================================================================
--- dev/ant/updatesite/ivyde-2.0.0/content.xml (original)
+++ dev/ant/updatesite/ivyde-2.0.0/content.xml Sun Mar 18 18:19:35 2012
@@ -18,9 +18,9 @@
    specific language governing permissions and limitations
    under the License.    
 -->
-<repository name='Apache IvyDE P2 Eclipse repository' type='org.eclipse.equinox.internal.p2.metadata.repository.LocalMetadataRepository' version='1'>
-  <properties size='2'>
-    <property name='p2.timestamp' value='1331387424042'/>
+<repository name='Apache IvyDE P2 Eclipse repository' type='org.eclipse.equinox.internal.p2.metadata.repository.LocalMetadataRepository' version='1.0.0'>
+  <properties size='3'>
+    <property name='p2.timestamp' value='1332092819369'/>
     <property name='p2.compressed' value='false'/>
     <property name='p2.mirrorsURL' value='http://ant.apache.org/ivy/ivyde/updatesite/p2-mirrors--xml.cgi?path=ivyde-2.0.0'/>
   </properties>
@@ -28,7 +28,7 @@
     <repository uri='http://ant.apache.org/ivy/ivyde/updatesite' url='http://ant.apache.org/ivy/ivyde/updatesite' type='0' options='0'/>
     <repository uri='http://ant.apache.org/ivy/ivyde/updatesite' url='http://ant.apache.org/ivy/ivyde/updatesite' type='1' options='0'/>
   </references>
-  <units size='3'>
+  <units size='4'>
     <unit id='org.apache.ivyde.feature.feature.group' version='2.0.0.final-200907011148-RELEASE' singleton='false'>
       <update id='org.apache.ivyde.feature.feature.group' range='[0.0.0,2.0.0.final-200907011148-RELEASE)' severity='0'/>
       <properties size='9'>
@@ -77,6 +77,19 @@
         </license>
       </licenses>
     </unit>
+    <unit id='file:/Users/hibou/dev/ivy/svn/updatesite/branches/p2repo-only/category.xml.org.apache.ivyde.category' version='1.0.0.4--cL0mnh8NScCX1733K3G3555AI1wWkWOyW'>
+      <properties size='2'>
+        <property name='org.eclipse.equinox.p2.name' value='Apache IvyDE Eclipse plugins'/>
+        <property name='org.eclipse.equinox.p2.type.category' value='true'/>
+      </properties>
+      <provides size='1'>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='file:/Users/hibou/dev/ivy/svn/updatesite/branches/p2repo-only/category.xml.org.apache.ivyde.category' version='1.0.0.4--cL0mnh8NScCX1733K3G3555AI1wWkWOyW'/>
+      </provides>
+      <requires size='1'>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.apache.ivyde.feature.feature.group' range='[2.0.0.final-200907011148-RELEASE,2.0.0.final-200907011148-RELEASE]'/>
+      </requires>
+      <touchpoint id='null' version='0.0.0'/>
+    </unit>
     <unit id='org.apache.ivyde.eclipse' version='2.0.0.final-200907011148-RELEASE'>
       <update id='org.apache.ivyde.eclipse' range='[0.0.0,2.0.0.final-200907011148-RELEASE)' severity='0'/>
       <properties size='3'>
@@ -125,7 +138,7 @@
       <touchpointData size='1'>
         <instructions size='2'>
           <instruction key='manifest'>
-            Bundle-ManifestVersion: 2&#xA;Export-Package: org.apache.ivyde.eclipse,org.apache.ivyde.eclipse.cpcontainer,org.apache.ivyde.eclipse.cpcontainer.fragmentinfo,org.apache.ivyde.eclipse.ui.actions,org.apache.ivyde.eclipse.ui.console,org.apache.ivyde.eclipse.ui.core,org.apache.ivyde.eclipse.ui.editors,org.apache.ivyde.eclipse.ui.editors.pages,org.apache.ivyde.eclipse.ui.editors.xml,org.apache.ivyde.eclipse.ui.preferences,org.apache.ivyde.eclipse.ui.views,org.apache.ivyde.eclipse.ui.wizards&#xA;Bundle-Localization: plugin&#xA;Require-Bundle: org.apache.xerces;resolution:=optional,org.eclipse.ui,org.eclipse.core.runtime,org.eclipse.jface.text,org.eclipse.ui.editors,org.eclipse.ui.workbench.texteditor,org.eclipse.core.resources,org.eclipse.ui.ide,org.eclipse.ui.forms,org.eclipse.search,org.eclipse.jdt.core,org.eclipse.jdt.ui,org.eclipse.ui.console,org.apache.ivy,org.eclipse.help&#xA;Bundle-Activator: org.apache.ivyde.eclipse.IvyPlugin&#xA;Bundle-Name: IvyDE Eclipse Plug-in&#xA;Bundle-Version: 2.0.0.final-200907011148-RELEASE&#xA;Bundle-Vendor: Apache Software Foundation&#xA;Bundle-SymbolicName: org.apache.ivyde.eclipse; singleton:=true&#xA;Bundle-ClassPath: ivyde-eclipse.jar&#xA;Manifest-Version: 1.0&#xA;Eclipse-LazyStart: true&#xA;
+            Bundle-ManifestVersion: 2&#xA;Export-Package: org.apache.ivyde.eclipse,org.apache.ivyde.eclipse.cpcontainer,org.apache.ivyde.eclipse.cpcontainer.fragmentinfo,org.apache.ivyde.eclipse.ui.actions,org.apache.ivyde.eclipse.ui.console,org.apache.ivyde.eclipse.ui.core,org.apache.ivyde.eclipse.ui.editors,org.apache.ivyde.eclipse.ui.editors.pages,org.apache.ivyde.eclipse.ui.editors.xml,org.apache.ivyde.eclipse.ui.preferences,org.apache.ivyde.eclipse.ui.views,org.apache.ivyde.eclipse.ui.wizards&#xA;Bundle-Localization: plugin&#xA;Require-Bundle: org.apache.xerces;resolution:=optional,org.eclipse.ui,org.eclipse.core.runtime,org.eclipse.jface.text,org.eclipse.ui.editors,org.eclipse.ui.workbench.texteditor,org.eclipse.core.resources,org.eclipse.ui.ide,org.eclipse.ui.forms,org.eclipse.search,org.eclipse.jdt.core,org.eclipse.jdt.ui,org.eclipse.ui.console,org.apache.ivy,org.eclipse.help&#xA;Bundle-Activator: org.apache.ivyde.eclipse.IvyPlugin&#xA;Bundle-Name: IvyDE Eclipse Plug-in&#xA;Bundle-Version: 2.0.0.final-200907011148-RELEASE&#xA;Bundle-Vendor: Apache Software Foundation&#xA;Bundle-SymbolicName: org.apache.ivyde.eclipse; singleton:=true&#xA;Bundle-ClassPath: ivyde-eclipse.jar&#xA;Manifest-Version: 1.0&#xA;Eclipse-LazyStart: true
           </instruction>
           <instruction key='zipped'>
             true

Modified: dev/ant/updatesite/ivyde-2.1.0/content.xml
==============================================================================
--- dev/ant/updatesite/ivyde-2.1.0/content.xml (original)
+++ dev/ant/updatesite/ivyde-2.1.0/content.xml Sun Mar 18 18:19:35 2012
@@ -18,9 +18,9 @@
    specific language governing permissions and limitations
    under the License.    
 -->
-<repository name='Apache IvyDE P2 Eclipse repository' type='org.eclipse.equinox.internal.p2.metadata.repository.LocalMetadataRepository' version='1'>
-  <properties size='2'>
-    <property name='p2.timestamp' value='1331387468886'/>
+<repository name='Apache IvyDE P2 Eclipse repository' type='org.eclipse.equinox.internal.p2.metadata.repository.LocalMetadataRepository' version='1.0.0'>
+  <properties size='3'>
+    <property name='p2.timestamp' value='1332092864450'/>
     <property name='p2.compressed' value='false'/>
     <property name='p2.mirrorsURL' value='http://ant.apache.org/ivy/ivyde/updatesite/p2-mirrors--xml.cgi?path=ivyde-2.1.0'/>
   </properties>
@@ -28,7 +28,20 @@
     <repository uri='http://ant.apache.org/ivy/ivyde/updatesite' url='http://ant.apache.org/ivy/ivyde/updatesite' type='0' options='0'/>
     <repository uri='http://ant.apache.org/ivy/ivyde/updatesite' url='http://ant.apache.org/ivy/ivyde/updatesite' type='1' options='0'/>
   </references>
-  <units size='3'>
+  <units size='4'>
+    <unit id='file:/Users/hibou/dev/ivy/svn/updatesite/branches/p2repo-only/category.xml.org.apache.ivyde.category' version='1.0.0.41-cL0mnh773533I535I3G1wWkWOyW'>
+      <properties size='2'>
+        <property name='org.eclipse.equinox.p2.name' value='Apache IvyDE Eclipse plugins'/>
+        <property name='org.eclipse.equinox.p2.type.category' value='true'/>
+      </properties>
+      <provides size='1'>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='file:/Users/hibou/dev/ivy/svn/updatesite/branches/p2repo-only/category.xml.org.apache.ivyde.category' version='1.0.0.41-cL0mnh773533I535I3G1wWkWOyW'/>
+      </provides>
+      <requires size='1'>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.apache.ivyde.feature.feature.group' range='[2.1.0.201008101807-RELEASE,2.1.0.201008101807-RELEASE]'/>
+      </requires>
+      <touchpoint id='null' version='0.0.0'/>
+    </unit>
     <unit id='org.apache.ivyde.feature.feature.group' version='2.1.0.201008101807-RELEASE' singleton='false'>
       <update id='org.apache.ivyde.feature.feature.group' range='[0.0.0,2.1.0.201008101807-RELEASE)' severity='0'/>
       <properties size='9'>
@@ -165,7 +178,7 @@
       <touchpointData size='1'>
         <instructions size='2'>
           <instruction key='manifest'>
-            Bundle-ManifestVersion: 2&#xA;Export-Package: org.apache.ivyde.eclipse,org.apache.ivyde.eclipse.cpcontainer,org.apache.ivyde.eclipse.cpcontainer.fragmentinfo,org.apache.ivyde.eclipse.ui.actions,org.apache.ivyde.eclipse.ui.console,org.apache.ivyde.eclipse.ui.core,org.apache.ivyde.eclipse.ui.editors,org.apache.ivyde.eclipse.ui.editors.pages,org.apache.ivyde.eclipse.ui.editors.xml,org.apache.ivyde.eclipse.ui.preferences,org.apache.ivyde.eclipse.ui.views,org.apache.ivyde.eclipse.ui.wizards&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.4&#xA;Require-Bundle: org.apache.xerces;resolution:=optional,org.eclipse.ui,org.eclipse.core.runtime,org.eclipse.jface.text,org.eclipse.ui.editors,org.eclipse.ui.workbench.texteditor,org.eclipse.core.resources,org.eclipse.ui.ide,org.eclipse.ui.forms,org.eclipse.search,org.eclipse.jdt.core,org.eclipse.jdt.ui,org.eclipse.ui.console,org.apache.ivy;bundle-version=&quot;[2.1.0,3.0.0)&quot;,org.eclipse.help,org.eclipse.wst.xml.core;resolution:=optional,org.eclipse.debug.core,org.eclipse.jdt.launching,org.eclipse.debug.ui,org.eclipse.core.variables&#xA;Bundle-Activator: org.apache.ivyde.eclipse.IvyPlugin&#xA;Bundle-Name: IvyDE Eclipse Plug-in&#xA;Bundle-Version: 2.1.0.201008101807-RELEASE&#xA;Bundle-Vendor: Apache Software Foundation&#xA;Bundle-SymbolicName: org.apache.ivyde.eclipse; singleton:=true&#xA;Bundle-ActivationPolicy: lazy&#xA;Bundle-ClassPath: ivyde-eclipse.jar&#xA;Manifest-Version: 1.0&#xA;
+            Bundle-ManifestVersion: 2&#xA;Export-Package: org.apache.ivyde.eclipse,org.apache.ivyde.eclipse.cpcontainer,org.apache.ivyde.eclipse.cpcontainer.fragmentinfo,org.apache.ivyde.eclipse.ui.actions,org.apache.ivyde.eclipse.ui.console,org.apache.ivyde.eclipse.ui.core,org.apache.ivyde.eclipse.ui.editors,org.apache.ivyde.eclipse.ui.editors.pages,org.apache.ivyde.eclipse.ui.editors.xml,org.apache.ivyde.eclipse.ui.preferences,org.apache.ivyde.eclipse.ui.views,org.apache.ivyde.eclipse.ui.wizards&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.4&#xA;Require-Bundle: org.apache.xerces;resolution:=optional,org.eclipse.ui,org.eclipse.core.runtime,org.eclipse.jface.text,org.eclipse.ui.editors,org.eclipse.ui.workbench.texteditor,org.eclipse.core.resources,org.eclipse.ui.ide,org.eclipse.ui.forms,org.eclipse.search,org.eclipse.jdt.core,org.eclipse.jdt.ui,org.eclipse.ui.console,org.apache.ivy;bundle-version=&quot;[2.1.0,3.0.0)&quot;,org.eclipse.help,org.eclipse.wst.xml.core;resolution:=optional,org.eclipse.debug.core,org.eclipse.jdt.launching,org.eclipse.debug.ui,org.eclipse.core.variables&#xA;Bundle-Activator: org.apache.ivyde.eclipse.IvyPlugin&#xA;Bundle-Name: IvyDE Eclipse Plug-in&#xA;Bundle-Version: 2.1.0.201008101807-RELEASE&#xA;Bundle-Vendor: Apache Software Foundation&#xA;Bundle-SymbolicName: org.apache.ivyde.eclipse; singleton:=true&#xA;Bundle-ActivationPolicy: lazy&#xA;Bundle-ClassPath: ivyde-eclipse.jar&#xA;Manifest-Version: 1.0
           </instruction>
           <instruction key='zipped'>
             true