diff --git a/build.versions b/build.versions
index 3a8c9c2..cdc3a7b 100644
--- a/build.versions
+++ b/build.versions
@@ -1,10 +1,10 @@
 # Compile
-org.eclipse.virgo.kernel=3.6.0.D-20120927113130
-org.eclipse.virgo.nano=3.6.0.D-20120926150825
-org.eclipse.virgo.medic=3.6.0.D-20120926150452
-org.eclipse.virgo.repository=3.6.0.D-20120926151253
-org.eclipse.virgo.util=3.6.0.D-20120926145613
-org.eclipse.virgo.web=3.6.0.D-20120930191447
+org.eclipse.virgo.kernel=3.6.0.D-20121003031818
+org.eclipse.virgo.nano=3.6.0.D-20121003031232
+org.eclipse.virgo.medic=3.6.0.D-20121003030924
+org.eclipse.virgo.repository=3.6.0.D-20121003031628
+org.eclipse.virgo.util=3.6.0.D-20121003030151
+org.eclipse.virgo.web=3.6.0.D-20121003041439
 org.eclipse.gemini.web=2.2.0.BUILD-20120829065106
 javax.jms=1.1.0.v201205091237
 javax.servlet.jsp.jstl=1.2.0.v20110728
@@ -15,7 +15,7 @@
 org.apache.commons.fileupload=1.2.0.v20110525
 org.apache.taglibs.standard=1.1.2.v20110517
 org.aspectj=1.6.12.RELEASE
-org.eclipse.osgi=3.8.0.v20120508-2119
+org.eclipse.osgi=3.8.1.v20120830-144521
 org.slf4j=1.6.1
 org.slf4j.api=1.6.4.v20120130-2120
 org.slf4j.jul=1.6.4.v20120130-2120
@@ -28,7 +28,7 @@
 org.eclipse.gemini.management=1.0.3.RELEASE
 
 # Test
-org.eclipse.virgo.test=3.6.0.D-20120926150233
+org.eclipse.virgo.test=3.6.0.D-20121003030708
 org.junit=4.7.0
 org.easymock=2.3.0
 
diff --git a/org.eclipse.virgo.apps.repository.core/.classpath b/org.eclipse.virgo.apps.repository.core/.classpath
index c4f0e9f..d59e69d 100644
--- a/org.eclipse.virgo.apps.repository.core/.classpath
+++ b/org.eclipse.virgo.apps.repository.core/.classpath
@@ -22,21 +22,21 @@
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi/3.8.0.v20120508-2119/org.eclipse.osgi-3.8.0.v20120508-2119.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.repository/org.eclipse.virgo.repository/3.6.0.D-20120926151253/org.eclipse.virgo.repository-3.6.0.D-20120926151253.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.repository/org.eclipse.virgo.repository/2.1.0.D-20100218173658/org.eclipse.virgo.repository-sources-2.1.0.D-20100218173658.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.6.0.D-20120926145613/org.eclipse.virgo.util.osgi.manifest-3.6.0.D-20120926145613.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi/3.8.1.v20120830-144521/org.eclipse.osgi-3.8.1.v20120830-144521.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.repository/org.eclipse.virgo.repository/3.6.0.D-20121003031628/org.eclipse.virgo.repository-3.6.0.D-20121003031628.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.repository/org.eclipse.virgo.repository/2.1.0.D-20100218173658/org.eclipse.virgo.repository-sources-2.1.0.D-20100218173658.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.6.0.D-20121003030151/org.eclipse.virgo.util.osgi.manifest-3.6.0.D-20121003030151.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.core/1.0.2.RELEASE/org.eclipse.gemini.blueprint.core-1.0.2.RELEASE.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.beans/3.1.0.RELEASE/org.springframework.beans-3.1.0.RELEASE.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.beans/3.1.0.RELEASE/org.springframework.beans-sources-3.1.0.RELEASE.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.6.0.D-20120926145613/org.eclipse.virgo.util.io-3.6.0.D-20120926145613.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/2.1.0.D-20100218173020/org.eclipse.virgo.util.io-sources-2.1.0.D-20100218173020.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.services/3.6.0.D-20120927113130/org.eclipse.virgo.kernel.services-3.6.0.D-20120927113130.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.services/2.1.0.D-20100218174319/org.eclipse.virgo.kernel.services-sources-2.1.0.D-20100218174319.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.6.0.D-20121003030151/org.eclipse.virgo.util.io-3.6.0.D-20121003030151.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/2.1.0.D-20100218173020/org.eclipse.virgo.util.io-sources-2.1.0.D-20100218173020.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.services/3.6.0.D-20121003031818/org.eclipse.virgo.kernel.services-3.6.0.D-20121003031818.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.services/2.1.0.D-20100218174319/org.eclipse.virgo.kernel.services-sources-2.1.0.D-20100218174319.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.slf4j.api/1.6.4.v20120130-2120/org.slf4j.api-1.6.4.v20120130-2120.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.slf4j/com.springsource.slf4j.nop/1.6.1/com.springsource.slf4j.nop-1.6.1.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.math/3.6.0.D-20120926145613/org.eclipse.virgo.util.math-3.6.0.D-20120926145613.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.math/3.6.0.D-20121003030151/org.eclipse.virgo.util.math-3.6.0.D-20121003030151.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-2.3.0.jar" sourcepath="/IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-sources-2.3.0.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.web.core/2.1.0.RELEASE/org.eclipse.gemini.web.core-2.1.0.RELEASE.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.test/3.6.0.D-20120926150452/org.eclipse.virgo.medic.test-3.6.0.D-20120926150452.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.test/1.0.1.CI-59/org.eclipse.virgo.medic.test-sources-1.0.1.CI-59.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.test/3.6.0.D-20121003030924/org.eclipse.virgo.medic.test-3.6.0.D-20121003030924.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.test/1.0.1.CI-59/org.eclipse.virgo.medic.test-sources-1.0.1.CI-59.jar"/>
 	<classpathentry kind="con" path="org.eclipse.ajdt.core.ASPECTJRT_CONTAINER"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.6.0.D-20120926150452/org.eclipse.virgo.medic-3.6.0.D-20120926150452.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/1.0.1.CI-59/org.eclipse.virgo.medic-sources-1.0.1.CI-59.jar">
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.6.0.D-20121003030924/org.eclipse.virgo.medic-3.6.0.D-20121003030924.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/1.0.1.CI-59/org.eclipse.virgo.medic-sources-1.0.1.CI-59.jar">
 		<attributes>
 			<attribute name="org.eclipse.ajdt.aspectpath" value="org.eclipse.ajdt.aspectpath"/>
 		</attributes>
diff --git a/org.eclipse.virgo.apps.repository.test/.classpath b/org.eclipse.virgo.apps.repository.test/.classpath
index 6ba5576..953c0b6 100644
--- a/org.eclipse.virgo.apps.repository.test/.classpath
+++ b/org.eclipse.virgo.apps.repository.test/.classpath
@@ -5,19 +5,19 @@
 	<classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi/3.8.0.v20120508-2119/org.eclipse.osgi-3.8.0.v20120508-2119.jar" sourcepath="/IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.1.R37x_v20110808-1106/org.eclipse.osgi-sources-3.7.1.R37x_v20110808-1106.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi/3.8.1.v20120830-144521/org.eclipse.osgi-3.8.1.v20120830-144521.jar" sourcepath="/IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.1.R37x_v20110808-1106/org.eclipse.osgi-sources-3.7.1.R37x_v20110808-1106.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.core/3.1.0.RELEASE/org.springframework.core-3.1.0.RELEASE.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.core/3.1.0.RELEASE/org.springframework.core-sources-3.1.0.RELEASE.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.nano.deployer.api/3.6.0.D-20120926150825/org.eclipse.virgo.nano.deployer.api-3.6.0.D-20120926150825.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.nano.deployer.api/3.6.0.D-20121003031232/org.eclipse.virgo.nano.deployer.api-3.6.0.D-20121003031232.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.equinox.extensions/3.6.0.D-20120711092707/org.eclipse.virgo.kernel.equinox.extensions-3.6.0.D-20120711092707.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.6.0.D-20120926145613/org.eclipse.virgo.util.osgi.manifest-3.6.0.D-20120926145613.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.repository/org.eclipse.virgo.repository/3.6.0.D-20120926151253/org.eclipse.virgo.repository-3.6.0.D-20120926151253.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.repository/org.eclipse.virgo.repository/2.1.0.D-20100218173658/org.eclipse.virgo.repository-sources-2.1.0.D-20100218173658.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.6.0.D-20120926145613/org.eclipse.virgo.util.io-3.6.0.D-20120926145613.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/2.0.0.M5/org.eclipse.virgo.util.io-sources-2.0.0.M5.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.6.0.D-20121003030151/org.eclipse.virgo.util.osgi.manifest-3.6.0.D-20121003030151.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.repository/org.eclipse.virgo.repository/3.6.0.D-20121003031628/org.eclipse.virgo.repository-3.6.0.D-20121003031628.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.repository/org.eclipse.virgo.repository/2.1.0.D-20100218173658/org.eclipse.virgo.repository-sources-2.1.0.D-20100218173658.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.6.0.D-20121003030151/org.eclipse.virgo.util.io-3.6.0.D-20121003030151.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/2.0.0.M5/org.eclipse.virgo.util.io-sources-2.0.0.M5.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.beans/3.1.0.RELEASE/org.springframework.beans-3.1.0.RELEASE.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.beans/3.1.0.RELEASE/org.springframework.beans-sources-3.1.0.RELEASE.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/3.6.0.D-20120927113130/org.eclipse.virgo.kernel.deployer-3.6.0.D-20120927113130.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/2.1.0.D-20100218174319/org.eclipse.virgo.kernel.deployer-sources-2.1.0.D-20100218174319.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/3.6.0.D-20120927113130/org.eclipse.virgo.kernel.osgi-3.6.0.D-20120927113130.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/2.1.0.D-20100218174319/org.eclipse.virgo.kernel.osgi-sources-2.1.0.D-20100218174319.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.6.0.D-20120926145613/org.eclipse.virgo.util.common-3.6.0.D-20120926145613.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.6.0.D-20120926145613/org.eclipse.virgo.util.common-sources-3.6.0.D-20120926145613.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/3.6.0.D-20121003031818/org.eclipse.virgo.kernel.deployer-3.6.0.D-20121003031818.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/2.1.0.D-20100218174319/org.eclipse.virgo.kernel.deployer-sources-2.1.0.D-20100218174319.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/3.6.0.D-20121003031818/org.eclipse.virgo.kernel.osgi-3.6.0.D-20121003031818.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/2.1.0.D-20100218174319/org.eclipse.virgo.kernel.osgi-sources-2.1.0.D-20100218174319.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.6.0.D-20121003030151/org.eclipse.virgo.util.common-3.6.0.D-20121003030151.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.6.0.D-20121003030151/org.eclipse.virgo.util.common-sources-3.6.0.D-20121003030151.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi.services/3.3.0.v20120307-2102/org.eclipse.osgi.services-3.3.0.v20120307-2102.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.framework/3.6.0.D-20120926150233/org.eclipse.virgo.test.framework-3.6.0.D-20120926150233.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.framework/3.6.0.D-20120926150233/org.eclipse.virgo.test.framework-sources-3.6.0.D-20120926150233.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.framework/3.6.0.D-20121003030708/org.eclipse.virgo.test.framework-3.6.0.D-20121003030708.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.framework/3.6.0.D-20121003030708/org.eclipse.virgo.test.framework-sources-3.6.0.D-20121003030708.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.launcher/3.6.0.D-20120711092707/org.eclipse.virgo.test.launcher-3.6.0.D-20120711092707.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.launcher/2.0.0.CI-B50/org.eclipse.virgo.test.launcher-sources-2.0.0.CI-B50.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.apps.repository.core"/>
 	<classpathentry kind="output" path="target/classes"/>
diff --git a/org.eclipse.virgo.apps.repository.web/.classpath b/org.eclipse.virgo.apps.repository.web/.classpath
index 6ace789..dfbc07c 100644
--- a/org.eclipse.virgo.apps.repository.web/.classpath
+++ b/org.eclipse.virgo.apps.repository.web/.classpath
@@ -27,7 +27,7 @@
 	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.test/3.1.0.RELEASE/org.springframework.test-3.1.0.RELEASE.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.core/3.1.0.RELEASE/org.springframework.core-3.1.0.RELEASE.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-1.1.1.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi/3.8.0.v20120508-2119/org.eclipse.osgi-3.8.0.v20120508-2119.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi/3.8.1.v20120830-144521/org.eclipse.osgi-3.8.1.v20120830-144521.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.apps.repository.core"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>