bug358707 - Consume the new util.osgi bundles from Virgo

13 files changed, 22 insertions, 17 deletions

diff --git a/build.versions b/build.versions
index d74ff78..7b5f3c6 100644
--- a/build.versions
+++ b/build.versions
@@ -6,7 +6,7 @@ org.eclipse.virgo.test=3.0.0.RC2
 
 # Compile
 org.eclipse.virgo.osgi=3.0.0.RC2
-org.eclipse.virgo.util=3.0.0.RC2
+org.eclipse.virgo.util=3.1.0.D-20110927204747
 javax.activation=1.1.1
 javax.annotation=1.1.0.v201105051105
 javax.ejb=3.0.0
diff --git a/org.eclipse.gemini.web.core/.classpath b/org.eclipse.gemini.web.core/.classpath
index 968b5f4..f8c2204 100644
--- a/org.eclipse.gemini.web.core/.classpath
+++ b/org.eclipse.gemini.web.core/.classpath
@@ -22,9 +22,6 @@
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/WEB_CONTAINER_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar"/>
-	<classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.0.0.RC2/org.eclipse.virgo.util.osgi-3.0.0.RC2.jar" sourcepath="/WEB_CONTAINER_IVY_CACHE/org.eclispe.virgo.util/org.eclipse.virgo.util.osgi/3.0.0.RC2/org.eclipse.virgo.util.osgi-sources-3.0.0.RC2.jar"/>
-	<classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.0.0.RC2/org.eclipse.virgo.util.io-3.0.0.RC2.jar" sourcepath="/WEB_CONTAINER_IVY_CACHE/org.eclispe.virgo.util/org.eclipse.virgo.util.io/3.0.0.RC2/org.eclipse.virgo.util.io-sources-3.0.0.RC2.jar"/>
-	<classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.0.0.RC2/org.eclipse.virgo.util.common-3.0.0.RC2.jar" sourcepath="/WEB_CONTAINER_IVY_CACHE/org.eclispe.virgo.util/org.eclipse.virgo.util.common/3.0.0.RC2/org.eclipse.virgo.util.common-sources-3.0.0.RC2.jar"/>
 	<classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.6.1/com.springsource.slf4j.api-1.6.1.jar" sourcepath="/WEB_CONTAINER_IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.6.1/com.springsource.slf4j.api-sources-1.6.1.jar"/>
 	<classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.apache.catalina/com.springsource.org.apache.catalina/7.0.21/com.springsource.org.apache.catalina-7.0.21.jar" sourcepath="/WEB_CONTAINER_IVY_CACHE/org.apache.catalina/com.springsource.org.apache.catalina/7.0.21/com.springsource.org.apache.catalina-sources-7.0.21.jar"/>
 	<classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.apache.juli/com.springsource.org.apache.juli.extras/7.0.21/com.springsource.org.apache.juli.extras-7.0.21.jar" sourcepath="/WEB_CONTAINER_IVY_CACHE/org.apache.juli/com.springsource.org.apache.juli.extras/7.0.21/com.springsource.org.apache.juli.extras-sources-7.0.21.jar"/>
@@ -38,8 +35,12 @@
 	<classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.slf4j/com.springsource.slf4j.nop/1.6.1/com.springsource.slf4j.nop-1.6.1.jar" sourcepath="/WEB_CONTAINER_IVY_CACHE/org.slf4j/com.springsource.slf4j.nop/1.6.1/com.springsource.slf4j.nop-sources-1.6.1.jar"/>
 	<classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.eclipse.virgo.teststubs/org.eclipse.virgo.teststubs.osgi/3.0.0.RC2/org.eclipse.virgo.teststubs.osgi-3.0.0.RC2.jar" sourcepath="/WEB_CONTAINER_IVY_CACHE/org.eclipse.virgo.teststubs/org.eclipse.virgo.teststubs.osgi/3.0.0.RC2/org.eclipse.virgo.teststubs.osgi-sources-3.0.0.RC2.jar"/>
 	<classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.aspectj/com.springsource.org.aspectj.runtime/1.6.6.RELEASE/com.springsource.org.aspectj.runtime-1.6.6.RELEASE.jar" sourcepath="/WEB_CONTAINER_IVY_CACHE/org.aspectj/com.springsource.org.aspectj.runtime/1.6.6.RELEASE/com.springsource.org.aspectj.runtime-sources-1.6.6.RELEASE.jar"/>
-	<classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/3.0.0.RC2/org.eclipse.virgo.util.parser.manifest-3.0.0.RC2.jar" sourcepath="/WEB_CONTAINER_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/3.0.0.RC2/org.eclipse.virgo.util.parser.manifest-sources-3.0.0.RC2.jar"/>
 	<classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi.services/3.3.0.v20110110/org.eclipse.osgi.services-3.3.0.v20110110.jar" sourcepath="/WEB_CONTAINER_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi.services/3.3.0.v20110110/org.eclipse.osgi.services-sources-3.3.0.v20110110.jar"/>
 	<classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.0.v20110613/org.eclipse.osgi-3.7.0.v20110613.jar" sourcepath="/WEB_CONTAINER_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.0.v20110613/org.eclipse.osgi-sources-3.7.0.v20110613.jar"/>
+	<classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.1.0.D-20110927204747/org.eclipse.virgo.util.common-3.1.0.D-20110927204747.jar"/>
+	<classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.1.0.D-20110927204747/org.eclipse.virgo.util.io-3.1.0.D-20110927204747.jar"/>
+	<classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.1.0.D-20110927204747/org.eclipse.virgo.util.osgi-3.1.0.D-20110927204747.jar"/>
+	<classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.1.0.D-20110927204747/org.eclipse.virgo.util.osgi.manifest-3.1.0.D-20110927204747.jar"/>
+	<classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/3.1.0.D-20110927204747/org.eclipse.virgo.util.parser.manifest-3.1.0.D-20110927204747.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/org.eclipse.gemini.web.core/ivy.xml b/org.eclipse.gemini.web.core/ivy.xml
index 562c258..5bae8e3 100644
--- a/org.eclipse.gemini.web.core/ivy.xml
+++ b/org.eclipse.gemini.web.core/ivy.xml
@@ -18,6 +18,7 @@
 
     <dependencies>
 		<dependency org="org.eclipse.virgo.util" name="org.eclipse.virgo.util.osgi" rev="${org.eclipse.virgo.util}" conf="compile->runtime"/>
+		<dependency org="org.eclipse.virgo.util" name="org.eclipse.virgo.util.osgi.manifest" rev="${org.eclipse.virgo.util}" conf="compile->runtime"/>
 		<dependency org="org.eclipse.virgo.util" name="org.eclipse.virgo.util.io" rev="${org.eclipse.virgo.util}" conf="compile->runtime"/>
 		<dependency org="javax.servlet" name="javax.servlet" rev="${javax.servlet}" conf="compile->runtime"/>
 		<dependency org="org.slf4j" name="com.springsource.slf4j.api" rev="${org.slf4j}" conf="compile->runtime"/>
diff --git a/org.eclipse.gemini.web.core/src/main/java/org/eclipse/gemini/web/internal/SystemBundleExportsResolver.java b/org.eclipse.gemini.web.core/src/main/java/org/eclipse/gemini/web/internal/SystemBundleExportsResolver.java
index 2903cad..e8e59cd 100644
--- a/org.eclipse.gemini.web.core/src/main/java/org/eclipse/gemini/web/internal/SystemBundleExportsResolver.java
+++ b/org.eclipse.gemini.web.core/src/main/java/org/eclipse/gemini/web/internal/SystemBundleExportsResolver.java
@@ -20,7 +20,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.eclipse.virgo.util.osgi.VersionRange;
+import org.eclipse.virgo.util.osgi.manifest.VersionRange;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.Version;
diff --git a/org.eclipse.gemini.web.core/src/main/java/org/eclipse/gemini/web/internal/WebContainerActivator.java b/org.eclipse.gemini.web.core/src/main/java/org/eclipse/gemini/web/internal/WebContainerActivator.java
index 48e2766..af4cd0b 100644
--- a/org.eclipse.gemini.web.core/src/main/java/org/eclipse/gemini/web/internal/WebContainerActivator.java
+++ b/org.eclipse.gemini.web.core/src/main/java/org/eclipse/gemini/web/internal/WebContainerActivator.java
@@ -42,7 +42,7 @@ import org.eclipse.gemini.web.internal.url.SystemBundleExportsImportingWebBundle
 import org.eclipse.gemini.web.internal.url.WebBundleUrl;
 import org.eclipse.gemini.web.internal.url.WebBundleUrlStreamHandlerService;
 import org.eclipse.virgo.util.osgi.ServiceRegistrationTracker;
-import org.eclipse.virgo.util.osgi.VersionRange;
+import org.eclipse.virgo.util.osgi.manifest.VersionRange;
 
 public class WebContainerActivator implements BundleActivator {
 
diff --git a/org.eclipse.gemini.web.core/src/main/java/org/eclipse/gemini/web/internal/url/SystemBundleExportsImportingWebBundleManifestTransformer.java b/org.eclipse.gemini.web.core/src/main/java/org/eclipse/gemini/web/internal/url/SystemBundleExportsImportingWebBundleManifestTransformer.java
index 6a56bfb..271ba7d 100644
--- a/org.eclipse.gemini.web.core/src/main/java/org/eclipse/gemini/web/internal/url/SystemBundleExportsImportingWebBundleManifestTransformer.java
+++ b/org.eclipse.gemini.web.core/src/main/java/org/eclipse/gemini/web/internal/url/SystemBundleExportsImportingWebBundleManifestTransformer.java
@@ -24,7 +24,7 @@ import java.util.Map.Entry;
 
 import org.eclipse.gemini.web.core.InstallationOptions;
 import org.eclipse.gemini.web.core.WebBundleManifestTransformer;
-import org.eclipse.virgo.util.osgi.VersionRange;
+import org.eclipse.virgo.util.osgi.manifest.VersionRange;
 import org.eclipse.virgo.util.osgi.manifest.BundleManifest;
 
 
diff --git a/org.eclipse.gemini.web.core/src/test/java/org/eclipse/gemini/web/internal/ManifestAsserts.java b/org.eclipse.gemini.web.core/src/test/java/org/eclipse/gemini/web/internal/ManifestAsserts.java
index 429e8eb..a1f12a5 100644
--- a/org.eclipse.gemini.web.core/src/test/java/org/eclipse/gemini/web/internal/ManifestAsserts.java
+++ b/org.eclipse.gemini.web.core/src/test/java/org/eclipse/gemini/web/internal/ManifestAsserts.java
@@ -24,7 +24,7 @@ import java.util.List;
 import org.osgi.framework.Constants;
 import org.osgi.framework.Version;
 
-import org.eclipse.virgo.util.osgi.VersionRange;
+import org.eclipse.virgo.util.osgi.manifest.VersionRange;
 import org.eclipse.virgo.util.osgi.manifest.BundleManifest;
 import org.eclipse.virgo.util.osgi.manifest.ExportedPackage;
 import org.eclipse.virgo.util.osgi.manifest.ImportedPackage;
diff --git a/org.eclipse.gemini.web.core/src/test/java/org/eclipse/gemini/web/internal/SystemBundleExportsResolverTests.java b/org.eclipse.gemini.web.core/src/test/java/org/eclipse/gemini/web/internal/SystemBundleExportsResolverTests.java
index 303b4eb..17d38a1 100644
--- a/org.eclipse.gemini.web.core/src/test/java/org/eclipse/gemini/web/internal/SystemBundleExportsResolverTests.java
+++ b/org.eclipse.gemini.web.core/src/test/java/org/eclipse/gemini/web/internal/SystemBundleExportsResolverTests.java
@@ -27,7 +27,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.eclipse.virgo.util.osgi.VersionRange;
+import org.eclipse.virgo.util.osgi.manifest.VersionRange;
 import org.junit.Before;
 import org.junit.Test;
 import org.osgi.framework.Version;
diff --git a/org.eclipse.gemini.web.core/src/test/java/org/eclipse/gemini/web/internal/url/SystemBundleExportsImportingWebBundleManifestTransformerTests.java b/org.eclipse.gemini.web.core/src/test/java/org/eclipse/gemini/web/internal/url/SystemBundleExportsImportingWebBundleManifestTransformerTests.java
index 1caeabc..0fb04ef 100644
--- a/org.eclipse.gemini.web.core/src/test/java/org/eclipse/gemini/web/internal/url/SystemBundleExportsImportingWebBundleManifestTransformerTests.java
+++ b/org.eclipse.gemini.web.core/src/test/java/org/eclipse/gemini/web/internal/url/SystemBundleExportsImportingWebBundleManifestTransformerTests.java
@@ -32,7 +32,7 @@ import org.junit.Test;
 import org.eclipse.gemini.web.core.InstallationOptions;
 import org.eclipse.gemini.web.internal.WebContainerUtils;
 import org.eclipse.gemini.web.internal.url.SystemBundleExportsImportingWebBundleManifestTransformer;
-import org.eclipse.virgo.util.osgi.VersionRange;
+import org.eclipse.virgo.util.osgi.manifest.VersionRange;
 import org.eclipse.virgo.util.osgi.manifest.BundleManifest;
 import org.eclipse.virgo.util.osgi.manifest.BundleManifestFactory;
 import org.eclipse.virgo.util.osgi.manifest.ImportedPackage;
diff --git a/org.eclipse.gemini.web.test/.classpath b/org.eclipse.gemini.web.test/.classpath
index 549b76d..1bb0d49 100644
--- a/org.eclipse.gemini.web.test/.classpath
+++ b/org.eclipse.gemini.web.test/.classpath
@@ -7,9 +7,10 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/WEB_CONTAINER_IVY_CACHE/org.junit/com.springsource.org.junit/4.5.0/com.springsource.org.junit-sources-4.5.0.jar"/>
 	<classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.0.v20110613/org.eclipse.osgi-3.7.0.v20110613.jar" sourcepath="/WEB_CONTAINER_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.0.v20110613/org.eclipse.osgi-sources-3.7.0.v20110613.jar"/>
-	<classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.0.0.RC2/org.eclipse.virgo.util.osgi-3.0.0.RC2.jar" sourcepath="/WEB_CONTAINER_IVY_CACHE/org.eclispe.virgo.util/org.eclipse.virgo.util.osgi/3.0.0.RC2/org.eclipse.virgo.util.osgi-sources-3.0.0.RC2.jar"/>
-	<classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.0.0.RC2/org.eclipse.virgo.util.io-3.0.0.RC2.jar" sourcepath="/WEB_CONTAINER_IVY_CACHE/org.eclispe.virgo.util/org.eclipse.virgo.util.io/3.0.0.RC2/org.eclipse.virgo.util.io-sources-3.0.0.RC2.jar"/>
-	<classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.0.0.RC2/org.eclipse.virgo.util.common-3.0.0.RC2.jar" sourcepath="/WEB_CONTAINER_IVY_CACHE/org.eclispe.virgo.util/org.eclipse.virgo.util.common/3.0.0.RC2/org.eclipse.virgo.util.common-sources-3.0.0.RC2.jar"/>
+	<classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.1.0.D-20110927204747/org.eclipse.virgo.util.osgi-3.1.0.D-20110927204747.jar" sourcepath="/WEB_CONTAINER_IVY_CACHE/org.eclispe.virgo.util/org.eclipse.virgo.util.osgi/3.1.0.D-20110927204747/org.eclipse.virgo.util.osgi-sources-3.1.0.D-20110927204747.jar"/>
+	<classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.1.0.D-20110927204747/org.eclipse.virgo.util.osgi.manifest-3.1.0.D-20110927204747.jar" sourcepath="/WEB_CONTAINER_IVY_CACHE/org.eclispe.virgo.util/org.eclipse.virgo.util.osgi/3.1.0.D-20110927204747/org.eclipse.virgo.util.osgi-sources-3.1.0.D-20110927204747.jar"/>
+	<classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.1.0.D-20110927204747/org.eclipse.virgo.util.io-3.1.0.D-20110927204747.jar" sourcepath="/WEB_CONTAINER_IVY_CACHE/org.eclispe.virgo.util/org.eclipse.virgo.util.io/3.1.0.D-20110927204747/org.eclipse.virgo.util.io-sources-3.1.0.D-20110927204747.jar"/>
+	<classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.1.0.D-20110927204747/org.eclipse.virgo.util.common-3.1.0.D-20110927204747.jar" sourcepath="/WEB_CONTAINER_IVY_CACHE/org.eclispe.virgo.util/org.eclipse.virgo.util.common/3.1.0.D-20110927204747/org.eclipse.virgo.util.common-sources-3.1.0.D-20110927204747.jar"/>
 	<classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.6.1/com.springsource.slf4j.api-1.6.1.jar" sourcepath="/WEB_CONTAINER_IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.6.1/com.springsource.slf4j.api-sources-1.6.1.jar"/>
 	<classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.apache.catalina/com.springsource.org.apache.catalina/7.0.21/com.springsource.org.apache.catalina-7.0.21.jar" sourcepath="/WEB_CONTAINER_IVY_CACHE/org.apache.catalina/com.springsource.org.apache.catalina/7.0.21/com.springsource.org.apache.catalina-sources-7.0.21.jar"/>
 	<classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.apache.juli/com.springsource.org.apache.juli.extras/7.0.21/com.springsource.org.apache.juli.extras-7.0.21.jar" sourcepath="/WEB_CONTAINER_IVY_CACHE/org.apache.juli/com.springsource.org.apache.juli.extras/7.0.21/com.springsource.org.apache.juli.extras-sources-7.0.21.jar"/>
diff --git a/org.eclipse.gemini.web.test/ivy.xml b/org.eclipse.gemini.web.test/ivy.xml
index 90de1dd..58e2867 100644
--- a/org.eclipse.gemini.web.test/ivy.xml
+++ b/org.eclipse.gemini.web.test/ivy.xml
@@ -18,6 +18,7 @@
 
     <dependencies>
            <dependency org="org.eclipse.virgo.util" name="org.eclipse.virgo.util.osgi" rev="${org.eclipse.virgo.util}" conf="compile->runtime"/>
+           <dependency org="org.eclipse.virgo.util" name="org.eclipse.virgo.util.osgi.manifest" rev="${org.eclipse.virgo.util}" conf="compile->runtime"/>
            <dependency org="org.eclipse.virgo.util" name="org.eclipse.virgo.util.io" rev="${org.eclipse.virgo.util}" conf="compile->runtime"/>
            <dependency org="org.eclipse.osgi" name="org.eclipse.osgi" rev="${org.eclipse.osgi}" conf="compile->compile"/>
 		   <dependency org="org.eclipse.osgi" name="org.eclipse.osgi.services" rev="${org.eclipse.osgi.services}" conf="compile->runtime"/>
diff --git a/org.eclipse.gemini.web.test/src/test/resources/META-INF/test.config.properties b/org.eclipse.gemini.web.test/src/test/resources/META-INF/test.config.properties
index 7255bef..7c10a41 100644
--- a/org.eclipse.gemini.web.test/src/test/resources/META-INF/test.config.properties
+++ b/org.eclipse.gemini.web.test/src/test/resources/META-INF/test.config.properties
@@ -4,6 +4,7 @@ file:../ivy-cache/repository/org.eclipse.virgo.util/org.eclipse.virgo.util.commo
 file:../ivy-cache/repository/org.eclipse.virgo.util/org.eclipse.virgo.util.io/${org.eclipse.virgo.util}/org.eclipse.virgo.util.io-${org.eclipse.virgo.util}.jar@start,\
 file:../ivy-cache/repository/org.eclipse.virgo.util/org.eclipse.virgo.util.math/${org.eclipse.virgo.util}/org.eclipse.virgo.util.math-${org.eclipse.virgo.util}.jar@start,\
 file:../ivy-cache/repository/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/${org.eclipse.virgo.util}/org.eclipse.virgo.util.osgi-${org.eclipse.virgo.util}.jar@start,\
+file:../ivy-cache/repository/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/${org.eclipse.virgo.util}/org.eclipse.virgo.util.osgi.manifest-${org.eclipse.virgo.util}.jar@start,\
 file:../ivy-cache/repository/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/${org.eclipse.virgo.util}/org.eclipse.virgo.util.parser.manifest-${org.eclipse.virgo.util}.jar@start,\
 file:../ivy-cache/repository/javax.annotation/javax.annotation/${javax.annotation}/javax.annotation-${javax.annotation}.jar@start,\
 file:../ivy-cache/repository/javax.activation/com.springsource.javax.activation/${javax.activation}/com.springsource.javax.activation-${javax.activation}.jar@start,\
diff --git a/org.eclipse.gemini.web.tomcat/.classpath b/org.eclipse.gemini.web.tomcat/.classpath
index 05c2311..9481027 100644
--- a/org.eclipse.gemini.web.tomcat/.classpath
+++ b/org.eclipse.gemini.web.tomcat/.classpath
@@ -23,9 +23,9 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/WEB_CONTAINER_IVY_CACHE/org.junit/com.springsource.org.junit/4.5.0/com.springsource.org.junit-sources-4.5.0.jar"/>
 	<classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.0.v20110613/org.eclipse.osgi-3.7.0.v20110613.jar" sourcepath="/WEB_CONTAINER_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.0.v20110613/org.eclipse.osgi-sources-3.7.0.v20110613.jar"/>
-	<classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.0.0.RC2/org.eclipse.virgo.util.osgi-3.0.0.RC2.jar" sourcepath="/WEB_CONTAINER_IVY_CACHE/org.eclispe.virgo.util/org.eclipse.virgo.util.osgi/3.0.0.RC2/org.eclipse.virgo.util.osgi-sources-3.0.0.RC2.jar"/>
-	<classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.0.0.RC2/org.eclipse.virgo.util.io-3.0.0.RC2.jar" sourcepath="/WEB_CONTAINER_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.0.0.RC2/org.eclipse.virgo.util.io-sources-3.0.0.RC2.jar"/>
-	<classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.0.0.RC2/org.eclipse.virgo.util.common-3.0.0.RC2.jar" sourcepath="/WEB_CONTAINER_IVY_CACHE/org.eclispe.virgo.util/org.eclipse.virgo.util.common/3.0.0.RC2/org.eclipse.virgo.util.common-sources-3.0.0.RC2.jar"/>
+	<classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.1.0.D-20110927204747/org.eclipse.virgo.util.osgi-3.1.0.D-20110927204747.jar" sourcepath="/WEB_CONTAINER_IVY_CACHE/org.eclispe.virgo.util/org.eclipse.virgo.util.osgi/3.1.0.D-20110927204747/org.eclipse.virgo.util.osgi-sources-3.1.0.D-20110927204747.jar"/>
+	<classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.1.0.D-20110927204747/org.eclipse.virgo.util.io-3.1.0.D-20110927204747.jar" sourcepath="/WEB_CONTAINER_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.1.0.D-20110927204747/org.eclipse.virgo.util.io-sources-3.1.0.D-20110927204747.jar"/>
+	<classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.1.0.D-20110927204747/org.eclipse.virgo.util.common-3.1.0.D-20110927204747.jar" sourcepath="/WEB_CONTAINER_IVY_CACHE/org.eclispe.virgo.util/org.eclipse.virgo.util.common/3.1.0.D-20110927204747/org.eclipse.virgo.util.common-sources-3.1.0.D-20110927204747.jar"/>
 	<classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.6.1/com.springsource.slf4j.api-1.6.1.jar" sourcepath="/WEB_CONTAINER_IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.6.1/com.springsource.slf4j.api-sources-1.6.1.jar"/>
 	<classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.apache.catalina/com.springsource.org.apache.catalina/7.0.21/com.springsource.org.apache.catalina-7.0.21.jar" sourcepath="/WEB_CONTAINER_IVY_CACHE/org.apache.catalina/com.springsource.org.apache.catalina/7.0.21/com.springsource.org.apache.catalina-sources-7.0.21.jar"/>
 	<classpathentry kind="var" path="WEB_CONTAINER_IVY_CACHE/org.apache.juli/com.springsource.org.apache.juli.extras/7.0.21/com.springsource.org.apache.juli.extras-7.0.21.jar" sourcepath="/WEB_CONTAINER_IVY_CACHE/org.apache.juli/com.springsource.org.apache.juli.extras/7.0.21/com.springsource.org.apache.juli.extras-sources-7.0.21.jar"/>