bug 320382: virgoising dm server 'slices' to virgo 'snaps'

63 files changed, 370 insertions, 333 deletions

diff --git a/build.versions b/build.versions
index b36cf6d..695c4b9 100644
--- a/build.versions
+++ b/build.versions
@@ -7,25 +7,25 @@ javax.servlet=2.5.0
 javax.servlet.jsp=2.1.0
 org.springframework=3.0.0.RELEASE
 org.springframework.webflow=2.0.7.RELEASE
-com.springsource.kernel=2.0.0.RC1
-com.springsource.util=2.0.0.RC1
-com.springsource.repository=2.0.0.RC1
-com.springsource.osgi.webcontainer=1.0.0.M1
-com.springsource.osgi.test=2.0.0.RC1
-com.springsource.server.web=2.0.0.RC1
+org.eclipse.virgo.kernel=2.1.0.M01
+org.eclipse.virgo.util=2.1.0.M01
+org.eclipse.virgo.repository=2.1.0.M01
+org.eclipse.gemini.web=1.1.0.M01
+org.eclipse.virgo.test=2.1.0.M01
+org.eclipse.virgo.web=2.1.0.M01
 
 # Test
-com.springsource.osgi.medic=1.0.0.CI-54
+org.eclipse.virgo.medic=2.1.0.M01
 org.apache.commons.codec=1.3.0
 org.apache.commons.httpclient=3.1.0
 org.apache.felix.configadmin=1.0.10
 org.aspectj=1.6.6.RELEASE
 javax.servlet.jsp.jstl=1.1.2
 org.apache.taglibs=1.1.2
-org.junit=4.5.0
+org.junit=4.7.0
 org.easymock=2.3.0
 net.sourceforge.jwebunit=2.1.0
-com.springsource.osgi.test.stubs=1.0.0.CI-B40
+org.eclipse.virgo.teststubs.osgi=2.1.0.M01
 org.apache.felix.eventadmin=1.0.0
 org.apache.felix=1.2.4
 org.springframework.osgi=1.2.1
diff --git a/java6-server.profile b/java6-server.profile
index 207121d..1037198 100644
--- a/java6-server.profile
+++ b/java6-server.profile
@@ -191,9 +191,9 @@ org.osgi.framework.bootdelegation = \
  com_cenqua_clover,\
  com.cenqua.*,\
  com.yourkit.*,\
- com.springsource.osgi.extensions.*,\
- com.springsource.osgi.launcher.*,\
- com.springsource.kernel.authentication,\
+ org.eclipse.virgo.osgi.extensions.*,\
+ org.eclipse.virgo.osgi.launcher.*,\
+ org.eclipse.virgo.kernel.authentication,\
  com.sun.*,\
  javax.xml.*,\
  org.apache.xerces.jaxp.*,\
diff --git a/org.eclipse.virgo.snaps.api/.classpath b/org.eclipse.virgo.snaps.api/.classpath
index ed286c4..eadde53 100644
--- a/org.eclipse.virgo.snaps.api/.classpath
+++ b/org.eclipse.virgo.snaps.api/.classpath
@@ -2,34 +2,34 @@
 <classpath>
 	<classpathentry kind="src" path="src/main/java">
 		<attributes>
-			<attribute name="com.springsource.server.ide.jdt.core.test.classpathentry" value="false"/>
+			<attribute name="org.eclipse.virgo.ide.jdt.core.test.classpathentry" value="false"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="src" path="src/main/resources">
 		<attributes>
-			<attribute name="com.springsource.server.ide.jdt.core.test.classpathentry" value="false"/>
+			<attribute name="org.eclipse.virgo.ide.jdt.core.test.classpathentry" value="false"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
 		<attributes>
-			<attribute name="com.springsource.server.ide.jdt.core.test.classpathentry" value="true"/>
+			<attribute name="org.eclipse.virgo.ide.jdt.core.test.classpathentry" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/resources">
 		<attributes>
-			<attribute name="com.springsource.server.ide.jdt.core.test.classpathentry" value="true"/>
+			<attribute name="org.eclipse.virgo.ide.jdt.core.test.classpathentry" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="var" path="SLICES_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.5.1.R35x_v20091005/org.eclipse.osgi-3.5.1.R35x_v20091005.jar" sourcepath="/SLICES_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.5.1.R35x_v20091005/org.eclipse.osgi-sources-3.5.1.R35x_v20091005.jar"/>
-	<classpathentry kind="var" path="SLICES_IVY_CACHE/javax.servlet/com.springsource.javax.servlet/2.5.0/com.springsource.javax.servlet-2.5.0.jar" sourcepath="/SLICES_IVY_CACHE/javax.servlet/com.springsource.javax.servlet/2.5.0/com.springsource.javax.servlet-sources-2.5.0.jar"/>
-	<classpathentry kind="var" path="SLICES_IVY_CACHE/javax.servlet/com.springsource.javax.servlet.jsp/2.1.0/com.springsource.javax.servlet.jsp-2.1.0.jar" sourcepath="/SLICES_IVY_CACHE/javax.servlet/com.springsource.javax.servlet.jsp/2.1.0/com.springsource.javax.servlet.jsp-sources-2.1.0.jar"/>
-	<classpathentry kind="var" path="SLICES_IVY_CACHE/com.springsource.osgi.webcontainer/com.springsource.osgi.webcontainer.core/1.0.0.M1/com.springsource.osgi.webcontainer.core-1.0.0.M1.jar" sourcepath="/SLICES_IVY_CACHE/com.springsource.osgi.webcontainer/com.springsource.osgi.webcontainer.core/1.0.0.M1/com.springsource.osgi.webcontainer.core-sources-1.0.0.M1.jar"/>
-	<classpathentry kind="var" path="SLICES_IVY_CACHE/org.junit/com.springsource.org.junit/4.5.0/com.springsource.org.junit-4.5.0.jar" sourcepath="/SLICES_IVY_CACHE/org.junit/com.springsource.org.junit/4.5.0/com.springsource.org.junit-sources-4.5.0.jar"/>
-	<classpathentry kind="var" path="SLICES_IVY_CACHE/org.springframework/org.springframework.test/3.0.0.RELEASE/org.springframework.test-3.0.0.RELEASE.jar" sourcepath="/SLICES_IVY_CACHE/org.springframework/org.springframework.test/3.0.0.RELEASE/org.springframework.test-sources-3.0.0.RELEASE.jar"/>
-	<classpathentry kind="var" path="SLICES_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-2.3.0.jar" sourcepath="/SLICES_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-sources-2.3.0.jar"/>
-	<classpathentry kind="var" path="SLICES_IVY_CACHE/org.springframework/org.springframework.core/3.0.0.RELEASE/org.springframework.core-3.0.0.RELEASE.jar" sourcepath="/SLICES_IVY_CACHE/org.springframework/org.springframework.core/3.0.0.RELEASE/org.springframework.core-sources-3.0.0.RELEASE.jar"/>
-	<classpathentry kind="var" path="SLICES_IVY_CACHE/org.aspectj/com.springsource.org.aspectj.runtime/1.6.5.RELEASE/com.springsource.org.aspectj.runtime-1.6.5.RELEASE.jar" sourcepath="/SLICES_IVY_CACHE/org.aspectj/com.springsource.org.aspectj.runtime/1.6.5.RELEASE/com.springsource.org.aspectj.runtime-sources-1.6.5.RELEASE.jar"/>
-	<classpathentry kind="var" path="SLICES_IVY_CACHE/com.springsource.osgi.test/com.springsource.osgi.test.stubs/1.0.0.CI-B40/com.springsource.osgi.test.stubs-1.0.0.CI-B40.jar" sourcepath="/SLICES_IVY_CACHE/com.springsource.osgi.test/com.springsource.osgi.test.stubs/1.0.0.CI-B40/com.springsource.osgi.test.stubs-sources-1.0.0.CI-B40.jar"/>
+	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.5.1.R35x_v20091005/org.eclipse.osgi-3.5.1.R35x_v20091005.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.5.1.R35x_v20091005/org.eclipse.osgi-sources-3.5.1.R35x_v20091005.jar"/>
+	<classpathentry kind="var" path="SNAPS_IVY_CACHE/javax.servlet/com.springsource.javax.servlet/2.5.0/com.springsource.javax.servlet-2.5.0.jar" sourcepath="/SNAPS_IVY_CACHE/javax.servlet/com.springsource.javax.servlet/2.5.0/com.springsource.javax.servlet-sources-2.5.0.jar"/>
+	<classpathentry kind="var" path="SNAPS_IVY_CACHE/javax.servlet/com.springsource.javax.servlet.jsp/2.1.0/com.springsource.javax.servlet.jsp-2.1.0.jar" sourcepath="/SNAPS_IVY_CACHE/javax.servlet/com.springsource.javax.servlet.jsp/2.1.0/com.springsource.javax.servlet.jsp-sources-2.1.0.jar"/>
+	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.gemini.web/org.eclipse.gemini.web.core/1.1.0.M01/org.eclipse.gemini.web.core-1.1.0.M01.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.gemini.web/org.eclipse.gemini.web.core/1.1.0.M01/org.eclipse.gemini.web.core-sources-1.1.0.M01.jar"/>
+	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/SNAPS_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar"/>
+	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.springframework/org.springframework.test/3.0.0.RELEASE/org.springframework.test-3.0.0.RELEASE.jar" sourcepath="/SNAPS_IVY_CACHE/org.springframework/org.springframework.test/3.0.0.RELEASE/org.springframework.test-sources-3.0.0.RELEASE.jar"/>
+	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-2.3.0.jar" sourcepath="/SNAPS_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-sources-2.3.0.jar"/>
+	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.springframework/org.springframework.core/3.0.0.RELEASE/org.springframework.core-3.0.0.RELEASE.jar" sourcepath="/SNAPS_IVY_CACHE/org.springframework/org.springframework.core/3.0.0.RELEASE/org.springframework.core-sources-3.0.0.RELEASE.jar"/>
+	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.aspectj/com.springsource.org.aspectj.runtime/1.6.6.RELEASE/com.springsource.org.aspectj.runtime-1.6.6.RELEASE.jar" sourcepath="/SNAPS_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="SNAPS_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.teststubs.osgi/2.1.0.M01/org.eclipse.virgo.teststubs.osgi-2.1.0.M01.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.teststubs.osgi/2.1.0.M01/org.eclipse.virgo.teststubs.osgi-sources-2.1.0.M01.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/org.eclipse.virgo.snaps.api/ivy.xml b/org.eclipse.virgo.snaps.api/ivy.xml
index 882f630..cc1605b 100644
--- a/org.eclipse.virgo.snaps.api/ivy.xml
+++ b/org.eclipse.virgo.snaps.api/ivy.xml
@@ -13,11 +13,11 @@
         <dependency name='org.eclipse.osgi' rev='${org.eclipse.osgi}' org='org.eclipse.osgi' conf='compile->compile'/>
         <dependency name='com.springsource.javax.servlet' rev='${javax.servlet}' org='javax.servlet' conf='compile->runtime'/>
         <dependency name='com.springsource.javax.servlet.jsp' rev='${javax.servlet.jsp}' conf='compile->compile' org='javax.servlet'/>
-        <dependency name='com.springsource.osgi.webcontainer.core' rev='${com.springsource.osgi.webcontainer}' conf='compile->compile' org='com.springsource.osgi.webcontainer'/>
+        <dependency name='org.eclipse.gemini.web.core' rev='${org.eclipse.gemini.web}' conf='compile->compile' org='org.eclipse.gemini.web'/>
         <dependency name='com.springsource.org.junit' rev='${org.junit}' conf='test->runtime' org='org.junit'/>
         <dependency name='org.springframework.test' rev='${org.springframework}' conf='test->runtime' org='org.springframework'/>
         <dependency name='org.springframework.core' rev='${org.springframework}' conf='test->runtime' org='org.springframework'/>
         <dependency name='com.springsource.org.easymock' rev='${org.easymock}' conf='test->runtime' org='org.easymock'/>
-        <dependency name='com.springsource.osgi.test.stubs' rev='${com.springsource.osgi.test.stubs}' conf='test->runtime' org='com.springsource.osgi.test'/>
+        <dependency name='org.eclipse.virgo.teststubs.osgi' rev='${org.eclipse.virgo.teststubs.osgi}' conf='test->runtime' org='org.eclipse.virgo.teststubs'/>
     </dependencies>
 </ivy-module>
diff --git a/org.eclipse.virgo.snaps.api/src/main/java/org/eclipse/virgo/snaps/SnapsTag.java b/org.eclipse.virgo.snaps.api/src/main/java/org/eclipse/virgo/snaps/SnapsTag.java
index 260f5a2..1ab5ed3 100644
--- a/org.eclipse.virgo.snaps.api/src/main/java/org/eclipse/virgo/snaps/SnapsTag.java
+++ b/org.eclipse.virgo.snaps.api/src/main/java/org/eclipse/virgo/snaps/SnapsTag.java
@@ -24,7 +24,7 @@ import org.osgi.framework.BundleContext;
 import org.osgi.framework.InvalidSyntaxException;
 import org.osgi.framework.ServiceReference;
 
-import com.springsource.osgi.webcontainer.core.WebContainer;
+import org.eclipse.gemini.web.core.WebContainer;
 
 /**
  * TODO Document SnapsTag
@@ -39,11 +39,11 @@ public final class SnapsTag extends BodyTagSupport {
 
     private static final long serialVersionUID = 4715961747733658692L;
 
-    private static final String SLICE_SERVICE_CLASS = "org.eclipse.virgo.snaps.core.internal.Snap";
+    private static final String SNAP_SERVICE_CLASS = "org.eclipse.virgo.snaps.core.internal.Snap";
 
-    public static final String SLICES_ATTRIBUTE_NAME = "snaps";
+    public static final String SNAPS_ATTRIBUTE_NAME = "snaps";
 
-    private volatile String attributeName = SLICES_ATTRIBUTE_NAME;
+    private volatile String attributeName = SNAPS_ATTRIBUTE_NAME;
 
     public void setVar(String attributeName) {
         this.attributeName = attributeName;
@@ -61,7 +61,7 @@ public final class SnapsTag extends BodyTagSupport {
         BundleContext bundleContext = (BundleContext) this.pageContext.getServletContext().getAttribute(WebContainer.ATTRIBUTE_BUNDLE_CONTEXT);
         long hostId = bundleContext.getBundle().getBundleId();
         try {
-            ServiceReference[] serviceReferences = bundleContext.getServiceReferences(SLICE_SERVICE_CLASS, "(snap.host.id=" + hostId + ")");
+            ServiceReference[] serviceReferences = bundleContext.getServiceReferences(SNAP_SERVICE_CLASS, "(snap.host.id=" + hostId + ")");
 
             List<Snap> snaps = new ArrayList<Snap>();
 
diff --git a/org.eclipse.virgo.snaps.api/src/main/resources/META-INF/MANIFEST.MF b/org.eclipse.virgo.snaps.api/src/main/resources/META-INF/MANIFEST.MF
index 9ba66b5..96be288 100644
--- a/org.eclipse.virgo.snaps.api/src/main/resources/META-INF/MANIFEST.MF
+++ b/org.eclipse.virgo.snaps.api/src/main/resources/META-INF/MANIFEST.MF
@@ -1,7 +1,6 @@
 Manifest-Version: 1.0

-Export-Package: org;version="1.0",org.eclipse;version="1.0",org.eclips

- e.virgo;version="1.0",org.eclipse.virgo.snaps;version="1.0";uses:="ja

- vax.servlet.jsp,javax.servlet.jsp.tagext,org.osgi.framework"

+Export-Package: org.eclipse.virgo.snaps;version="1.0";uses:="javax.ser

+ vlet.jsp,javax.servlet.jsp.tagext,org.osgi.framework"

 Bundle-Version: 1.0

 Tool: Bundlor 1.0.0.RELEASE

 Bundle-Name: Snaps API

diff --git a/org.eclipse.virgo.snaps.api/src/test/java/org/eclipse/virgo/snaps/SnapsTagTests.java b/org.eclipse.virgo.snaps.api/src/test/java/org/eclipse/virgo/snaps/SnapsTagTests.java
index 6e15a75..d1de190 100644
--- a/org.eclipse.virgo.snaps.api/src/test/java/org/eclipse/virgo/snaps/SnapsTagTests.java
+++ b/org.eclipse.virgo.snaps.api/src/test/java/org/eclipse/virgo/snaps/SnapsTagTests.java
@@ -38,7 +38,7 @@ import org.osgi.framework.InvalidSyntaxException;
 import org.osgi.framework.ServiceReference;
 import org.springframework.mock.web.MockPageContext;
 
-import com.springsource.osgi.webcontainer.core.WebContainer;
+import org.eclipse.gemini.web.core.WebContainer;
 
 
 /**
@@ -80,7 +80,7 @@ public class SnapsTagTests {
         
         verify(servletContext, bundleContext, bundle);
         
-        List<Snap> snaps = (List<Snap>)pageContext.getAttribute(SnapsTag.SLICES_ATTRIBUTE_NAME);
+        List<Snap> snaps = (List<Snap>)pageContext.getAttribute(SnapsTag.SNAPS_ATTRIBUTE_NAME);
         assertNotNull(snaps);
         assertEquals(0, snaps.size());
     }
@@ -116,7 +116,7 @@ public class SnapsTagTests {
         
         verify(servletContext, bundleContext, serviceReference1, serviceReference2, bundle);
         
-        List<Snap> snaps = (List<Snap>)pageContext.getAttribute(SnapsTag.SLICES_ATTRIBUTE_NAME);
+        List<Snap> snaps = (List<Snap>)pageContext.getAttribute(SnapsTag.SNAPS_ATTRIBUTE_NAME);
         assertNotNull(snaps);
         assertEquals(2, snaps.size());
         
diff --git a/org.eclipse.virgo.snaps.api/template.mf b/org.eclipse.virgo.snaps.api/template.mf
index 8c8cfc0..b78df8a 100644
--- a/org.eclipse.virgo.snaps.api/template.mf
+++ b/org.eclipse.virgo.snaps.api/template.mf
@@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2
 Bundle-Version: 1.0
 Bundle-Name: Snaps API
 Import-Template: 
- com.springsource.osgi.webcontainer.*;version="[1.0.0,2.0.0)",
+ org.eclipse.gemini.web.*;version="[1.0.0,2.0.0)",
  javax.servlet.*;version="2.5",
  javax.servlet.jsp.*;version="2.1",
  org.osgi.framework;version="0"
diff --git a/org.eclipse.virgo.snaps.core/.classpath b/org.eclipse.virgo.snaps.core/.classpath
index f01d99f..efd382e 100644
--- a/org.eclipse.virgo.snaps.core/.classpath
+++ b/org.eclipse.virgo.snaps.core/.classpath
@@ -2,49 +2,49 @@
 <classpath>
 	<classpathentry kind="src" path="src/main/java">
 		<attributes>
-			<attribute name="com.springsource.server.ide.jdt.core.test.classpathentry" value="false"/>
+			<attribute name="org.eclipse.virgo.ide.jdt.core.test.classpathentry" value="false"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="src" path="src/main/resources">
 		<attributes>
-			<attribute name="com.springsource.server.ide.jdt.core.test.classpathentry" value="false"/>
+			<attribute name="org.eclipse.virgo.ide.jdt.core.test.classpathentry" value="false"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
 		<attributes>
-			<attribute name="com.springsource.server.ide.jdt.core.test.classpathentry" value="true"/>
+			<attribute name="org.eclipse.virgo.ide.jdt.core.test.classpathentry" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/resources">
 		<attributes>
-			<attribute name="com.springsource.server.ide.jdt.core.test.classpathentry" value="true"/>
+			<attribute name="org.eclipse.virgo.ide.jdt.core.test.classpathentry" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="var" path="SLICES_IVY_CACHE/javax.servlet/com.springsource.javax.servlet/2.5.0/com.springsource.javax.servlet-2.5.0.jar" sourcepath="/SLICES_IVY_CACHE/javax.servlet/com.springsource.javax.servlet/2.5.0/com.springsource.javax.servlet-sources-2.5.0.jar"/>
-	<classpathentry kind="var" path="SLICES_IVY_CACHE/org.springframework/org.springframework.test/3.0.0.RELEASE/org.springframework.test-3.0.0.RELEASE.jar" sourcepath="/SLICES_IVY_CACHE/org.springframework/org.springframework.test/2.5.6.SEC01/org.springframework.test-sources-2.5.6.SEC01.jar"/>
-	<classpathentry kind="var" path="SLICES_IVY_CACHE/org.junit/com.springsource.org.junit/4.5.0/com.springsource.org.junit-4.5.0.jar" sourcepath="/SLICES_IVY_CACHE/org.junit/com.springsource.org.junit/4.5.0/com.springsource.org.junit-sources-4.5.0.jar"/>
-	<classpathentry kind="var" path="SLICES_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="SLICES_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-2.3.0.jar" sourcepath="/SLICES_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-sources-2.3.0.jar"/>
-	<classpathentry kind="var" path="SLICES_IVY_CACHE/com.springsource.kernel/com.springsource.kernel.deployer/2.0.0.RC1/com.springsource.kernel.deployer-2.0.0.RC1.jar" sourcepath="/SLICES_IVY_CACHE/com.springsource.kernel/com.springsource.kernel.deployer/2.0.0.RC1/com.springsource.kernel.deployer-sources-2.0.0.RC1.jar"/>
-	<classpathentry kind="var" path="SLICES_IVY_CACHE/com.springsource.util/com.springsource.util.osgi/2.0.0.RC1/com.springsource.util.osgi-2.0.0.RC1.jar" sourcepath="/SLICES_IVY_CACHE/com.springsource.util/com.springsource.util.osgi/2.0.0.RC1/com.springsource.util.osgi-sources-2.0.0.RC1.jar"/>
-	<classpathentry kind="var" path="SLICES_IVY_CACHE/com.springsource.kernel/com.springsource.kernel.osgi/2.0.0.RC1/com.springsource.kernel.osgi-2.0.0.RC1.jar" sourcepath="/SLICES_IVY_CACHE/com.springsource.kernel/com.springsource.kernel.osgi/2.0.0.RC1/com.springsource.kernel.osgi-sources-2.0.0.RC1.jar"/>
-	<classpathentry kind="var" path="SLICES_IVY_CACHE/com.springsource.osgi.webcontainer/com.springsource.osgi.webcontainer.core/1.0.0.M1/com.springsource.osgi.webcontainer.core-1.0.0.M1.jar" sourcepath="/SLICES_IVY_CACHE/com.springsource.osgi.webcontainer/com.springsource.osgi.webcontainer.core/1.0.0.M1/com.springsource.osgi.webcontainer.core-sources-1.0.0.M1.jar"/>
-	<classpathentry kind="var" path="SLICES_IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.5.10/com.springsource.slf4j.api-1.5.10.jar"/>
-	<classpathentry kind="var" path="SLICES_IVY_CACHE/com.springsource.util/com.springsource.util.io/2.0.0.RC1/com.springsource.util.io-2.0.0.RC1.jar"/>
-	<classpathentry kind="var" path="SLICES_IVY_CACHE/com.springsource.osgi.webcontainer/com.springsource.osgi.webcontainer.tomcat/1.0.0.M1/com.springsource.osgi.webcontainer.tomcat-1.0.0.M1.jar" sourcepath="/SLICES_IVY_CACHE/com.springsource.osgi.webcontainer/com.springsource.osgi.webcontainer.tomcat/1.0.0.M1/com.springsource.osgi.webcontainer.tomcat-sources-1.0.0.M1.jar"/>
-	<classpathentry kind="var" path="SLICES_IVY_CACHE/com.springsource.util/com.springsource.util.common/2.0.0.RC1/com.springsource.util.common-2.0.0.RC1.jar"/>
-	<classpathentry kind="var" path="SLICES_IVY_CACHE/org.springframework/org.springframework.core/3.0.0.RELEASE/org.springframework.core-3.0.0.RELEASE.jar" sourcepath="/SLICES_IVY_CACHE/org.springframework/org.springframework.core/3.0.0.RELEASE/org.springframework.core-sources-3.0.0.RELEASE.jar"/>
-	<classpathentry kind="var" path="SLICES_IVY_CACHE/org.apache.catalina.springsource/com.springsource.org.apache.catalina.springsource/6.0.20.S2-r5956/com.springsource.org.apache.catalina.springsource-6.0.20.S2-r5956.jar" sourcepath="/SLICES_IVY_CACHE/org.apache.catalina.springsource/com.springsource.org.apache.catalina.springsource/6.0.20.S2-r5956/com.springsource.org.apache.catalina.springsource-sources-6.0.20.S2-r5956.jar"/>
-	<classpathentry kind="var" path="SLICES_IVY_CACHE/com.springsource.osgi.test/com.springsource.osgi.test.stubs/1.0.0.CI-B40/com.springsource.osgi.test.stubs-1.0.0.CI-B40.jar" sourcepath="/SLICES_IVY_CACHE/com.springsource.osgi.test/com.springsource.osgi.test.stubs/1.0.0.CI-B40/com.springsource.osgi.test.stubs-sources-1.0.0.CI-B40.jar"/>
-	<classpathentry kind="var" path="SLICES_IVY_CACHE/com.springsource.util/com.springsource.util.parser.manifest/2.0.0.RC1/com.springsource.util.parser.manifest-2.0.0.RC1.jar" sourcepath="/SLICES_IVY_CACHE/com.springsource.util/com.springsource.util.parser.manifest/2.0.0.RC1/com.springsource.util.parser.manifest-sources-2.0.0.RC1.jar"/>
-	<classpathentry kind="var" path="SLICES_IVY_CACHE/org.aspectj/com.springsource.org.aspectj.runtime/1.6.5.RELEASE/com.springsource.org.aspectj.runtime-1.6.5.RELEASE.jar"/>
-	<classpathentry kind="var" path="SLICES_IVY_CACHE/org.slf4j/com.springsource.slf4j.nop/1.5.10/com.springsource.slf4j.nop-1.5.10.jar" sourcepath="/SLICES_IVY_CACHE/org.slf4j/com.springsource.slf4j.nop/1.5.10/com.springsource.slf4j.nop-sources-1.5.10.jar"/>
-	<classpathentry kind="var" path="SLICES_IVY_CACHE/com.springsource.osgi.medic/com.springsource.osgi.medic.core/1.0.0.CI-54/com.springsource.osgi.medic.core-1.0.0.CI-54.jar" sourcepath="/SLICES_IVY_CACHE/com.springsource.osgi.medic/com.springsource.osgi.medic/1.0.0.CI-B20/com.springsource.osgi.medic-sources-1.0.0.CI-B20.jar"/>
-	<classpathentry kind="var" path="SLICES_IVY_CACHE/com.springsource.osgi.medic/com.springsource.osgi.medic.test/1.0.0.CI-54/com.springsource.osgi.medic.test-1.0.0.CI-54.jar" sourcepath="/SLICES_IVY_CACHE/com.springsource.osgi.medic/com.springsource.osgi.medic.test/1.0.0.CI-B20/com.springsource.osgi.medic.test-sources-1.0.0.CI-B20.jar"/>
-	<classpathentry kind="var" path="SLICES_IVY_CACHE/com.springsource.osgi.medic/com.springsource.osgi.medic/1.0.0.CI-54/com.springsource.osgi.medic-1.0.0.CI-54.jar"/>
-	<classpathentry kind="var" path="SLICES_IVY_CACHE/com.springsource.kernel/com.springsource.kernel.artifact/2.0.0.RC1/com.springsource.kernel.artifact-2.0.0.RC1.jar" sourcepath="/SLICES_IVY_CACHE/com.springsource.kernel/com.springsource.kernel.artifact/2.0.0.RC1/com.springsource.kernel.artifact-sources-2.0.0.RC1.jar"/>
-	<classpathentry kind="var" path="SLICES_IVY_CACHE/com.springsource.kernel/com.springsource.kernel.core/2.0.0.RC1/com.springsource.kernel.core-2.0.0.RC1.jar" sourcepath="/SLICES_IVY_CACHE/com.springsource.kernel/com.springsource.kernel.core/2.0.0.RC1/com.springsource.kernel.core-sources-2.0.0.RC1.jar"/>
-	<classpathentry kind="var" path="SLICES_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.5.1.R35x_v20091005/org.eclipse.osgi-3.5.1.R35x_v20091005.jar" sourcepath="/SLICES_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.5.1.R35x_v20091005/org.eclipse.osgi-sources-3.5.1.R35x_v20091005.jar"/>
+	<classpathentry kind="var" path="SNAPS_IVY_CACHE/javax.servlet/com.springsource.javax.servlet/2.5.0/com.springsource.javax.servlet-2.5.0.jar" sourcepath="/SNAPS_IVY_CACHE/javax.servlet/com.springsource.javax.servlet/2.5.0/com.springsource.javax.servlet-sources-2.5.0.jar"/>
+	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.springframework/org.springframework.test/3.0.0.RELEASE/org.springframework.test-3.0.0.RELEASE.jar" sourcepath="/SNAPS_IVY_CACHE/org.springframework/org.springframework.test/2.5.6.SEC01/org.springframework.test-sources-2.5.6.SEC01.jar"/>
+	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/SNAPS_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar"/>
+	<classpathentry kind="var" path="SNAPS_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="SNAPS_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-2.3.0.jar" sourcepath="/SNAPS_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-sources-2.3.0.jar"/>
+	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/2.1.0.M01/org.eclipse.virgo.kernel.deployer-2.1.0.M01.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/2.1.0.M01/org.eclipse.virgo.kernel.deployer-sources-2.1.0.M01.jar"/>
+	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/2.1.0.M01/org.eclipse.virgo.util.osgi-2.1.0.M01.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/2.1.0.M01/org.eclipse.virgo.util.osgi-sources-2.1.0.M01.jar"/>
+	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/2.1.0.M01/org.eclipse.virgo.kernel.osgi-2.1.0.M01.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/2.1.0.M01/org.eclipse.virgo.kernel.osgi-sources-2.1.0.M01.jar"/>
+	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.gemini.web/org.eclipse.gemini.web.core/1.1.0.M01/org.eclipse.gemini.web.core-1.1.0.M01.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.gemini.web/org.eclipse.gemini.web.core/1.1.0.M01/org.eclipse.gemini.web.core-sources-1.1.0.M01.jar"/>
+	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.5.10/com.springsource.slf4j.api-1.5.10.jar"/>
+	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/2.1.0.M01/org.eclipse.virgo.util.io-2.1.0.M01.jar"/>
+	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.gemini.web/org.eclipse.gemini.web.tomcat/1.1.0.M01/org.eclipse.gemini.web.tomcat-1.1.0.M01.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.gemini.web/org.eclipse.gemini.web.tomcat/1.1.0.M01/org.eclipse.gemini.web.tomcat-sources-1.1.0.M01.jar"/>
+	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/2.1.0.M01/org.eclipse.virgo.util.common-2.1.0.M01.jar"/>
+	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.springframework/org.springframework.core/3.0.0.RELEASE/org.springframework.core-3.0.0.RELEASE.jar" sourcepath="/SNAPS_IVY_CACHE/org.springframework/org.springframework.core/3.0.0.RELEASE/org.springframework.core-sources-3.0.0.RELEASE.jar"/>
+	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.apache.catalina.springsource/com.springsource.org.apache.catalina.springsource/6.0.20.S2-r5956/com.springsource.org.apache.catalina.springsource-6.0.20.S2-r5956.jar" sourcepath="/SNAPS_IVY_CACHE/org.apache.catalina.springsource/com.springsource.org.apache.catalina.springsource/6.0.20.S2-r5956/com.springsource.org.apache.catalina.springsource-sources-6.0.20.S2-r5956.jar"/>
+	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.teststubs.osgi/2.1.0.M01/org.eclipse.virgo.teststubs.osgi-2.1.0.M01.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.teststubs.osgi/2.1.0.M01/org.eclipse.virgo.teststubs.osgi-sources-2.1.0.M01.jar"/>
+	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/2.1.0.M01/org.eclipse.virgo.util.parser.manifest-2.1.0.M01.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/2.1.0.M01/org.eclipse.virgo.util.parser.manifest-sources-2.1.0.M01.jar"/>
+	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.aspectj/com.springsource.org.aspectj.runtime/1.6.6.RELEASE/com.springsource.org.aspectj.runtime-1.6.6.RELEASE.jar"/>
+	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.slf4j/com.springsource.slf4j.nop/1.5.10/com.springsource.slf4j.nop-1.5.10.jar" sourcepath="/SNAPS_IVY_CACHE/org.slf4j/com.springsource.slf4j.nop/1.5.10/com.springsource.slf4j.nop-sources-1.5.10.jar"/>
+	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.core/2.1.0.M01/org.eclipse.virgo.medic.core-2.1.0.M01.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/1.0.0.CI-B20/org.eclipse.virgo.medic-sources-1.0.0.CI-B20.jar"/>
+	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.test/2.1.0.M01/org.eclipse.virgo.medic.test-2.1.0.M01.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.test/1.0.0.CI-B20/org.eclipse.virgo.medic.test-sources-1.0.0.CI-B20.jar"/>
+	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/2.1.0.M01/org.eclipse.virgo.medic-2.1.0.M01.jar"/>
+	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.artifact/2.1.0.M01/org.eclipse.virgo.kernel.artifact-2.1.0.M01.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.artifact/2.1.0.M01/org.eclipse.virgo.kernel.artifact-sources-2.1.0.M01.jar"/>
+	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.core/2.1.0.M01/org.eclipse.virgo.kernel.core-2.1.0.M01.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.core/2.1.0.M01/org.eclipse.virgo.kernel.core-sources-2.1.0.M01.jar"/>
+	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.5.1.R35x_v20091005/org.eclipse.osgi-3.5.1.R35x_v20091005.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.5.1.R35x_v20091005/org.eclipse.osgi-sources-3.5.1.R35x_v20091005.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/org.eclipse.virgo.snaps.core/ivy.xml b/org.eclipse.virgo.snaps.core/ivy.xml
index 5cf6774..f353a02 100644
--- a/org.eclipse.virgo.snaps.core/ivy.xml
+++ b/org.eclipse.virgo.snaps.core/ivy.xml
@@ -21,22 +21,22 @@
         <dependency org="javax.servlet" name="com.springsource.javax.servlet" rev="${javax.servlet}" conf="compile->runtime"/>
         <dependency org="org.eclipse.virgo.snaps" name="org.eclipse.virgo.snaps.api" rev="latest.integration"/>
            
-        <dependency org="com.springsource.kernel" name="com.springsource.kernel.deployer" rev="${com.springsource.kernel}" conf="compile->compile"/>
+        <dependency org="org.eclipse.virgo.kernel" name="org.eclipse.virgo.kernel.deployer" rev="${org.eclipse.virgo.kernel}" conf="compile->compile"/>
            
-        <dependency org="com.springsource.osgi.webcontainer" name="com.springsource.osgi.webcontainer.core" rev="${com.springsource.osgi.webcontainer}" conf="compile->compile"/>
-        <dependency org="com.springsource.osgi.webcontainer" name="com.springsource.osgi.webcontainer.tomcat" rev="${com.springsource.osgi.webcontainer}" conf="compile->compile"/>
+        <dependency org="org.eclipse.gemini.web" name="org.eclipse.gemini.web.core" rev="${org.eclipse.gemini.web}" conf="compile->compile"/>
+        <dependency org="org.eclipse.gemini.web" name="org.eclipse.gemini.web.tomcat" rev="${org.eclipse.gemini.web}" conf="compile->compile"/>
         
         <dependency org="org.slf4j" name="com.springsource.slf4j.api" rev="${org.slf4j}" conf="compile->runtime"/>
         <dependency org="org.slf4j" name="com.springsource.slf4j.nop" rev="${org.slf4j}" conf="test->runtime"/>
-		<dependency org="com.springsource.osgi.medic" name="com.springsource.osgi.medic" rev="${com.springsource.osgi.medic}" conf="compile->runtime"/>
-		<dependency org="com.springsource.osgi.medic" name="com.springsource.osgi.medic.core" rev="${com.springsource.osgi.medic}" conf="test->runtime"/>
-		<dependency org="com.springsource.osgi.medic" name="com.springsource.osgi.medic.test" rev="${com.springsource.osgi.medic}" conf="test->runtime"/>
+		<dependency org="org.eclipse.virgo.medic" name="org.eclipse.virgo.medic" rev="${org.eclipse.virgo.medic}" conf="compile->runtime"/>
+		<dependency org="org.eclipse.virgo.medic" name="org.eclipse.virgo.medic.core" rev="${org.eclipse.virgo.medic}" conf="test->runtime"/>
+		<dependency org="org.eclipse.virgo.medic" name="org.eclipse.virgo.medic.test" rev="${org.eclipse.virgo.medic}" conf="test->runtime"/>
            
         <dependency org="org.springframework" name="org.springframework.test" rev="${org.springframework}" conf="test->compile"/>
         <dependency org="org.springframework" name="org.springframework.core" rev="${org.springframework}" conf="test->compile"/>
  		<dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit}" conf="test->runtime"/>
  		<dependency org="org.easymock" name="com.springsource.org.easymock" rev="${org.easymock}" conf="test->runtime"/>
-	   	<dependency org="com.springsource.osgi.test" name="com.springsource.osgi.test.stubs" rev="${com.springsource.osgi.test.stubs}" conf="test->runtime"/>
+	   	<dependency org="org.eclipse.virgo.teststubs" name="org.eclipse.virgo.teststubs.osgi" rev="${org.eclipse.virgo.teststubs.osgi}" conf="test->runtime"/>
     </dependencies>
 
 </ivy-module>
diff --git a/org.eclipse.virgo.snaps.core/src/main/java/org/eclipse/virgo/snaps/core/OsgiSnapRegistry.java b/org.eclipse.virgo.snaps.core/src/main/java/org/eclipse/virgo/snaps/core/OsgiSnapRegistry.java
index 32f903c..b1f3f30 100644
--- a/org.eclipse.virgo.snaps.core/src/main/java/org/eclipse/virgo/snaps/core/OsgiSnapRegistry.java
+++ b/org.eclipse.virgo.snaps.core/src/main/java/org/eclipse/virgo/snaps/core/OsgiSnapRegistry.java
@@ -28,7 +28,7 @@ import org.slf4j.LoggerFactory;
 
 final class OsgiSnapRegistry implements SnapRegistry {
 
-    private static final String PROPERTY_SLICE_CONTEXT_PATH = "snap.context.path";
+    private static final String PROPERTY_SNAP_CONTEXT_PATH = "snap.context.path";
 
     private static final String FILTER_PATTERN = "(& (objectClass=" + Snap.class.getName() + ")(snap.host.id=%d))";
 
@@ -101,7 +101,7 @@ final class OsgiSnapRegistry implements SnapRegistry {
         }
 
         private String getSnapContextPath(ServiceReference reference) {
-            return (String) reference.getProperty(PROPERTY_SLICE_CONTEXT_PATH);
+            return (String) reference.getProperty(PROPERTY_SNAP_CONTEXT_PATH);
         }
 
     }
diff --git a/org.eclipse.virgo.snaps.core/src/main/java/org/eclipse/virgo/snaps/core/SnapHostFilter.java b/org.eclipse.virgo.snaps.core/src/main/java/org/eclipse/virgo/snaps/core/SnapHostFilter.java
index 6d90613..3128d7a 100644
--- a/org.eclipse.virgo.snaps.core/src/main/java/org/eclipse/virgo/snaps/core/SnapHostFilter.java
+++ b/org.eclipse.virgo.snaps.core/src/main/java/org/eclipse/virgo/snaps/core/SnapHostFilter.java
@@ -30,7 +30,7 @@ import org.osgi.framework.InvalidSyntaxException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.springsource.osgi.medic.eventlog.EventLogger;
+import org.eclipse.virgo.medic.eventlog.EventLogger;
 
 public class SnapHostFilter implements Filter {
 
diff --git a/org.eclipse.virgo.snaps.core/src/main/java/org/eclipse/virgo/snaps/core/internal/SnapFactoryMonitor.java b/org.eclipse.virgo.snaps.core/src/main/java/org/eclipse/virgo/snaps/core/internal/SnapFactoryMonitor.java
index f4393cd..dc5e911 100644
--- a/org.eclipse.virgo.snaps.core/src/main/java/org/eclipse/virgo/snaps/core/internal/SnapFactoryMonitor.java
+++ b/org.eclipse.virgo.snaps.core/src/main/java/org/eclipse/virgo/snaps/core/internal/SnapFactoryMonitor.java
@@ -32,8 +32,8 @@ import org.osgi.util.tracker.ServiceTrackerCustomizer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.springsource.osgi.medic.eventlog.EventLogger;
-import com.springsource.util.osgi.ServiceRegistrationTracker;
+import org.eclipse.virgo.medic.eventlog.EventLogger;
+import org.eclipse.virgo.util.osgi.ServiceRegistrationTracker;
 
 final class SnapFactoryMonitor implements ServiceTrackerCustomizer {
 
@@ -91,7 +91,7 @@ final class SnapFactoryMonitor implements ServiceTrackerCustomizer {
     
     private static final class SnapBinder implements ServiceListener {
 
-        private static final String SLICE_ORDER = "snap.order";
+        private static final String SNAP_ORDER = "snap.order";
 
         private final Logger logger = LoggerFactory.getLogger(this.getClass());
 
@@ -164,7 +164,7 @@ final class SnapFactoryMonitor implements ServiceTrackerCustomizer {
                     publishSnapService(snap, hostBundle);
                     
                 } catch (ServletException e) {
-                    this.eventLogger.log(SnapsLogEvents.SLICE_INIT_FAILURE, SnapUtils.boundContextPath(servletContext.getContextPath(), snap.getContextPath()));
+                    this.eventLogger.log(SnapsLogEvents.SNAP_INIT_FAILURE, SnapUtils.boundContextPath(servletContext.getContextPath(), snap.getContextPath()));
                 } finally {
                 	synchronized (this.snapStateMonitor) {                		
 						if (newState == SnapLifecycleState.INIT_SUCCEEDED) {
@@ -180,7 +180,7 @@ final class SnapFactoryMonitor implements ServiceTrackerCustomizer {
         private void publishSnapService(Snap snap, Bundle hostBundle) {
             Dictionary serviceProperties = snap.getSnapProperties();
 
-            String snapOrder = (String) serviceProperties.get(SLICE_ORDER);
+            String snapOrder = (String) serviceProperties.get(SNAP_ORDER);
             if (snapOrder != null) {
                 serviceProperties.put(Constants.SERVICE_RANKING, Integer.parseInt(snapOrder));
             }
diff --git a/org.eclipse.virgo.snaps.core/src/main/java/org/eclipse/virgo/snaps/core/internal/SnapHostDefinition.java b/org.eclipse.virgo.snaps.core/src/main/java/org/eclipse/virgo/snaps/core/internal/SnapHostDefinition.java
index 475dcfa..9046c85 100644
--- a/org.eclipse.virgo.snaps.core/src/main/java/org/eclipse/virgo/snaps/core/internal/SnapHostDefinition.java
+++ b/org.eclipse.virgo.snaps.core/src/main/java/org/eclipse/virgo/snaps/core/internal/SnapHostDefinition.java
@@ -19,11 +19,11 @@ import org.osgi.framework.ServiceReference;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.springsource.util.osgi.VersionRange;
-import com.springsource.util.osgi.manifest.parse.HeaderDeclaration;
-import com.springsource.util.osgi.manifest.parse.HeaderParser;
-import com.springsource.util.osgi.manifest.parse.HeaderParserFactory;
-import com.springsource.util.osgi.manifest.parse.ParserLogger;
+import org.eclipse.virgo.util.osgi.VersionRange;
+import org.eclipse.virgo.util.osgi.manifest.parse.HeaderDeclaration;
+import org.eclipse.virgo.util.osgi.manifest.parse.HeaderParser;
+import org.eclipse.virgo.util.osgi.manifest.parse.HeaderParserFactory;
+import org.eclipse.virgo.util.osgi.manifest.parse.ParserLogger;
 
 public final class SnapHostDefinition {
 
diff --git a/org.eclipse.virgo.snaps.core/src/main/java/org/eclipse/virgo/snaps/core/internal/SnapUtils.java b/org.eclipse.virgo.snaps.core/src/main/java/org/eclipse/virgo/snaps/core/internal/SnapUtils.java
index 42475ca..2db87b3 100644
--- a/org.eclipse.virgo.snaps.core/src/main/java/org/eclipse/virgo/snaps/core/internal/SnapUtils.java
+++ b/org.eclipse.virgo.snaps.core/src/main/java/org/eclipse/virgo/snaps/core/internal/SnapUtils.java
@@ -15,13 +15,13 @@ import javax.servlet.http.HttpServletRequest;
 
 import org.osgi.framework.Bundle;
 
-import com.springsource.util.osgi.manifest.BundleManifest;
+import org.eclipse.virgo.util.osgi.manifest.BundleManifest;
 
 public final class SnapUtils {
 
-    public static final String HEADER_SLICE_HOST = "Snap-Host";
+    public static final String HEADER_SNAP_HOST = "Snap-Host";
     
-    public static final String HEADER_SLICE_CONTEXT_PATH = "Snap-ContextPath";
+    public static final String HEADER_SNAP_CONTEXT_PATH = "Snap-ContextPath";
 
     private static final String PATH_ELEMENT_SEPARATOR = "/";
 
@@ -45,16 +45,16 @@ public final class SnapUtils {
     }
 
     public static boolean hasSnapHostHeader(BundleManifest manifest) {
-        return manifest.getHeader(HEADER_SLICE_HOST) != null;
+        return manifest.getHeader(HEADER_SNAP_HOST) != null;
     }
 
     public static SnapHostDefinition getSnapHostHeader(BundleManifest manifest) {
-        String header = manifest.getHeader(HEADER_SLICE_HOST);
+        String header = manifest.getHeader(HEADER_SNAP_HOST);
         return (header == null ? null : SnapHostDefinition.parse(header));
     }
 
     public static String getSnapContextPath(Bundle bundle) {
-        String contextPath = (String) bundle.getHeaders().get(HEADER_SLICE_CONTEXT_PATH);
+        String contextPath = (String) bundle.getHeaders().get(HEADER_SNAP_CONTEXT_PATH);
         if(contextPath == null) {
             contextPath = generateDefaultContextPath(bundle);
         }
diff --git a/org.eclipse.virgo.snaps.core/src/main/java/org/eclipse/virgo/snaps/core/internal/SnapsLogEvents.java b/org.eclipse.virgo.snaps.core/src/main/java/org/eclipse/virgo/snaps/core/internal/SnapsLogEvents.java
index 6f8afa2..b3505aa 100644
--- a/org.eclipse.virgo.snaps.core/src/main/java/org/eclipse/virgo/snaps/core/internal/SnapsLogEvents.java
+++ b/org.eclipse.virgo.snaps.core/src/main/java/org/eclipse/virgo/snaps/core/internal/SnapsLogEvents.java
@@ -11,17 +11,17 @@
 
 package org.eclipse.virgo.snaps.core.internal;
 
-import com.springsource.kernel.serviceability.LogEventDelegate;
-import com.springsource.osgi.medic.eventlog.Level;
-import com.springsource.osgi.medic.eventlog.LogEvent;
+import org.eclipse.virgo.kernel.serviceability.LogEventDelegate;
+import org.eclipse.virgo.medic.eventlog.Level;
+import org.eclipse.virgo.medic.eventlog.LogEvent;
 
 public enum SnapsLogEvents implements LogEvent {
     HOST_CREATED(0, Level.INFO), //
     HOST_DESTROYED(1, Level.INFO), //
 
-    SLICE_BOUND(10, Level.INFO), //
-    SLICE_UNBOUND(11, Level.INFO), //
-    SLICE_INIT_FAILURE(12, Level.ERROR);
+    SNAP_BOUND(10, Level.INFO), //
+    SNAP_UNBOUND(11, Level.INFO), //
+    SNAP_INIT_FAILURE(12, Level.ERROR);
 
     private static final String PREFIX = "SL";
 
diff --git a/org.eclipse.virgo.snaps.core/src/main/java/org/eclipse/virgo/snaps/core/internal/deployer/SnapLifecycleListener.java b/org.eclipse.virgo.snaps.core/src/main/java/org/eclipse/virgo/snaps/core/internal/deployer/SnapLifecycleListener.java
index d703480..3d91ad4 100644
--- a/org.eclipse.virgo.snaps.core/src/main/java/org/eclipse/virgo/snaps/core/internal/deployer/SnapLifecycleListener.java
+++ b/org.eclipse.virgo.snaps.core/src/main/java/org/eclipse/virgo/snaps/core/internal/deployer/SnapLifecycleListener.java
@@ -24,14 +24,14 @@ import org.osgi.framework.ServiceRegistration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.springsource.kernel.deployer.core.DeploymentException;
-import com.springsource.kernel.install.artifact.BundleInstallArtifact;
-import com.springsource.kernel.install.artifact.InstallArtifact;
-import com.springsource.kernel.install.artifact.InstallArtifactLifecycleListenerSupport;
-import com.springsource.osgi.medic.eventlog.EventLogger;
-import com.springsource.osgi.webcontainer.tomcat.spi.WebBundleClassLoaderFactory;
-import com.springsource.util.osgi.ServiceRegistrationTracker;
-import com.springsource.util.osgi.manifest.BundleManifest;
+import org.eclipse.virgo.kernel.deployer.core.DeploymentException;
+import org.eclipse.virgo.kernel.install.artifact.BundleInstallArtifact;
+import org.eclipse.virgo.kernel.install.artifact.InstallArtifact;
+import org.eclipse.virgo.kernel.install.artifact.InstallArtifactLifecycleListenerSupport;
+import org.eclipse.virgo.medic.eventlog.EventLogger;
+import org.eclipse.gemini.web.tomcat.spi.WebBundleClassLoaderFactory;
+import org.eclipse.virgo.util.osgi.ServiceRegistrationTracker;
+import org.eclipse.virgo.util.osgi.manifest.BundleManifest;
 
 /**
  * <strong>Concurrent Semantics</strong><br />
diff --git a/org.eclipse.virgo.snaps.core/src/main/java/org/eclipse/virgo/snaps/core/internal/deployer/SnapTransformer.java b/org.eclipse.virgo.snaps.core/src/main/java/org/eclipse/virgo/snaps/core/internal/deployer/SnapTransformer.java
index 5aff18f..3e2cbc5 100644
--- a/org.eclipse.virgo.snaps.core/src/main/java/org/eclipse/virgo/snaps/core/internal/deployer/SnapTransformer.java
+++ b/org.eclipse.virgo.snaps.core/src/main/java/org/eclipse/virgo/snaps/core/internal/deployer/SnapTransformer.java
@@ -19,15 +19,15 @@ import java.net.URL;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.springsource.kernel.deployer.core.DeploymentException;
-import com.springsource.kernel.install.artifact.BundleInstallArtifact;
-import com.springsource.kernel.install.artifact.InstallArtifact;
-import com.springsource.kernel.install.environment.InstallEnvironment;
-import com.springsource.kernel.install.pipeline.stage.transform.Transformer;
-import com.springsource.osgi.webcontainer.core.WebBundleManifestTransformer;
-import com.springsource.util.common.Tree;
-import com.springsource.util.common.Tree.ExceptionThrowingTreeVisitor;
-import com.springsource.util.osgi.manifest.BundleManifest;
+import org.eclipse.virgo.kernel.deployer.core.DeploymentException;
+import org.eclipse.virgo.kernel.install.artifact.BundleInstallArtifact;
+import org.eclipse.virgo.kernel.install.artifact.InstallArtifact;
+import org.eclipse.virgo.kernel.install.environment.InstallEnvironment;
+import org.eclipse.virgo.kernel.install.pipeline.stage.transform.Transformer;
+import org.eclipse.gemini.web.core.WebBundleManifestTransformer;
+import org.eclipse.virgo.util.common.Tree;
+import org.eclipse.virgo.util.common.Tree.ExceptionThrowingTreeVisitor;
+import org.eclipse.virgo.util.osgi.manifest.BundleManifest;
 
 /**
  * <strong>Concurrent Semantics</strong><br />
@@ -37,7 +37,7 @@ import com.springsource.util.osgi.manifest.BundleManifest;
  */
 final class SnapTransformer implements Transformer {
 
-    private static final String SLICE_MODULE_TYPE = "web-snap";
+    private static final String SNAP_MODULE_TYPE = "web-snap";
 
     private static final Logger logger = LoggerFactory.getLogger(SnapTransformer.class);
 
@@ -66,9 +66,9 @@ final class SnapTransformer implements Transformer {
 
     void doTransform(BundleManifest bundleManifest, URL sourceUrl) throws DeploymentException {
         logger.info("Transforming bundle at '{}'", sourceUrl.toExternalForm());
-        bundleManifest.setModuleType(SLICE_MODULE_TYPE);
+        bundleManifest.setModuleType(SNAP_MODULE_TYPE);
         try {
-            this.manifestTransformer.transform(bundleManifest, sourceUrl, null);
+            this.manifestTransformer.transform(bundleManifest, sourceUrl, null, false);
         } catch (IOException ioe) {
             logger.error(String.format("Error transforming manifest for snap '%s' version '%s'",
                 bundleManifest.getBundleSymbolicName().getSymbolicName(), bundleManifest.getBundleVersion()), ioe);
diff --git a/org.eclipse.virgo.snaps.core/src/main/java/org/eclipse/virgo/snaps/core/internal/webapp/SnapServletContext.java b/org.eclipse.virgo.snaps.core/src/main/java/org/eclipse/virgo/snaps/core/internal/webapp/SnapServletContext.java
index 7556dc7..2d9ecdb 100644
--- a/org.eclipse.virgo.snaps.core/src/main/java/org/eclipse/virgo/snaps/core/internal/webapp/SnapServletContext.java
+++ b/org.eclipse.virgo.snaps.core/src/main/java/org/eclipse/virgo/snaps/core/internal/webapp/SnapServletContext.java
@@ -30,7 +30,7 @@ import javax.servlet.ServletException;
 import org.eclipse.virgo.snaps.core.internal.SnapException;
 import org.osgi.framework.Bundle;
 
-import com.springsource.util.common.IterableEnumeration;
+import org.eclipse.virgo.util.common.IterableEnumeration;
 
 /**
  * TODO Document SnapServletContext
diff --git a/org.eclipse.virgo.snaps.core/src/main/java/org/eclipse/virgo/snaps/core/internal/webapp/StaticResourceServlet.java b/org.eclipse.virgo.snaps.core/src/main/java/org/eclipse/virgo/snaps/core/internal/webapp/StaticResourceServlet.java
index 15c475f..ae16c3a 100644
--- a/org.eclipse.virgo.snaps.core/src/main/java/org/eclipse/virgo/snaps/core/internal/webapp/StaticResourceServlet.java
+++ b/org.eclipse.virgo.snaps.core/src/main/java/org/eclipse/virgo/snaps/core/internal/webapp/StaticResourceServlet.java
@@ -26,7 +26,7 @@ import javax.servlet.http.HttpServletResponse;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.springsource.util.io.IOUtils;
+import org.eclipse.virgo.util.io.IOUtils;
 
 
 /**
diff --git a/org.eclipse.virgo.snaps.core/src/main/java/org/eclipse/virgo/snaps/core/internal/webapp/WebAppSnap.java b/org.eclipse.virgo.snaps.core/src/main/java/org/eclipse/virgo/snaps/core/internal/webapp/WebAppSnap.java
index b8a6986..30d7994 100644
--- a/org.eclipse.virgo.snaps.core/src/main/java/org/eclipse/virgo/snaps/core/internal/webapp/WebAppSnap.java
+++ b/org.eclipse.virgo.snaps.core/src/main/java/org/eclipse/virgo/snaps/core/internal/webapp/WebAppSnap.java
@@ -36,10 +36,10 @@ import org.osgi.framework.Bundle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.springsource.osgi.medic.eventlog.EventLogger;
-import com.springsource.osgi.webcontainer.core.WebContainer;
-import com.springsource.osgi.webcontainer.tomcat.spi.WebBundleClassLoaderFactory;
-import com.springsource.util.io.IOUtils;
+import org.eclipse.virgo.medic.eventlog.EventLogger;
+import org.eclipse.gemini.web.core.WebContainer;
+import org.eclipse.gemini.web.tomcat.spi.WebBundleClassLoaderFactory;
+import org.eclipse.virgo.util.io.IOUtils;
 
 /**
  * TODO Document WebAppSnap
@@ -106,7 +106,7 @@ class WebAppSnap implements Snap {
         virtualContainer.init();
 
         this.virtualContainer = virtualContainer;
-        this.eventLogger.log(SnapsLogEvents.SLICE_BOUND, SnapUtils.boundContextPath(this.host.getServletContext().getContextPath(), this.contextPath));
+        this.eventLogger.log(SnapsLogEvents.SNAP_BOUND, SnapUtils.boundContextPath(this.host.getServletContext().getContextPath(), this.contextPath));
     }
 
     /**
@@ -133,7 +133,7 @@ class WebAppSnap implements Snap {
         } else {
             // TODO Log warning that class loader was null during destroy
         }
-        this.eventLogger.log(SnapsLogEvents.SLICE_UNBOUND, SnapUtils.boundContextPath(this.host.getServletContext().getContextPath(), this.contextPath));
+        this.eventLogger.log(SnapsLogEvents.SNAP_UNBOUND, SnapUtils.boundContextPath(this.host.getServletContext().getContextPath(), this.contextPath));
     }
 
     /**
diff --git a/org.eclipse.virgo.snaps.core/src/main/java/org/eclipse/virgo/snaps/core/internal/webapp/WebAppSnapFactory.java b/org.eclipse.virgo.snaps.core/src/main/java/org/eclipse/virgo/snaps/core/internal/webapp/WebAppSnapFactory.java
index 881734b..63b7342 100644
--- a/org.eclipse.virgo.snaps.core/src/main/java/org/eclipse/virgo/snaps/core/internal/webapp/WebAppSnapFactory.java
+++ b/org.eclipse.virgo.snaps.core/src/main/java/org/eclipse/virgo/snaps/core/internal/webapp/WebAppSnapFactory.java
@@ -18,8 +18,8 @@ import org.osgi.framework.Bundle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.springsource.osgi.medic.eventlog.EventLogger;
-import com.springsource.osgi.webcontainer.tomcat.spi.WebBundleClassLoaderFactory;
+import org.eclipse.virgo.medic.eventlog.EventLogger;
+import org.eclipse.gemini.web.tomcat.spi.WebBundleClassLoaderFactory;
 
 public final class WebAppSnapFactory implements SnapFactory {
 
diff --git a/org.eclipse.virgo.snaps.core/src/main/java/org/eclipse/virgo/snaps/core/internal/webapp/config/BundleWebXmlLoader.java b/org.eclipse.virgo.snaps.core/src/main/java/org/eclipse/virgo/snaps/core/internal/webapp/config/BundleWebXmlLoader.java
index ee05da9..6ce0010 100644
--- a/org.eclipse.virgo.snaps.core/src/main/java/org/eclipse/virgo/snaps/core/internal/webapp/config/BundleWebXmlLoader.java
+++ b/org.eclipse.virgo.snaps.core/src/main/java/org/eclipse/virgo/snaps/core/internal/webapp/config/BundleWebXmlLoader.java
@@ -20,7 +20,7 @@ import org.osgi.framework.FrameworkUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.springsource.util.io.IOUtils;
+import org.eclipse.virgo.util.io.IOUtils;
 
 public final class BundleWebXmlLoader {
 
diff --git a/org.eclipse.virgo.snaps.core/src/main/resources/META-INF/MANIFEST.MF b/org.eclipse.virgo.snaps.core/src/main/resources/META-INF/MANIFEST.MF
index efab320..3d7cfe1 100644
--- a/org.eclipse.virgo.snaps.core/src/main/resources/META-INF/MANIFEST.MF
+++ b/org.eclipse.virgo.snaps.core/src/main/resources/META-INF/MANIFEST.MF
@@ -1,28 +1,17 @@
 Manifest-Version: 1.0

-Export-Package: org.eclipse.virgo.snaps.core;version="1.0";uses:="com.

- springsource.osgi.medic.eventlog,javax.servlet,javax.servlet.http,org

- .eclipse.virgo.snaps.core.internal,org.osgi.framework,org.osgi.util.t

- racker,org.slf4j"

+Export-Package: org.eclipse.virgo.snaps.core;version="1.0"

 Bundle-Version: 1.0

 Tool: Bundlor 1.0.0.RELEASE

 Bundle-Name: Snaps Core

 Bundle-ManifestVersion: 2

-Import-Package: com.springsource.kernel.artifact.fs;version="[2.0, 2.1

- )",com.springsource.kernel.deployer.core;version="[2.0, 2.1)",com.spr

- ingsource.kernel.install.artifact;version="[2.0, 2.1)",com.springsour

- ce.kernel.install.environment;version="[2.0, 2.1)",com.springsource.k

- ernel.install.pipeline.stage.transform;version="[2.0, 2.1)",com.sprin

- gsource.kernel.serviceability;version="[2.0, 2.1)",com.springsource.o

- sgi.medic.eventlog;version="[1.0, 1.1)",com.springsource.osgi.webcont

- ainer.core;version="[1.0, 1.1)",com.springsource.osgi.webcontainer.to

- mcat.spi;version="[1.0, 1.1)",com.springsource.util.common;version="[

- 2.0, 2.1)",com.springsource.util.io;version="[2.0, 2.1)",com.springso

- urce.util.osgi;version="[2.0, 2.1)",com.springsource.util.osgi.manife

- st;version="[2.0, 2.1)",com.springsource.util.osgi.manifest.parse;ver

- sion="[2.0, 2.1)",javax.servlet;version="2.5",javax.servlet.http;vers

- ion="2.5",javax.xml.parsers;version="0",org.apache.catalina;version="

- [6.0,6.1)",org.osgi.framework;version="[1.5, 2.0)",org.osgi.util.trac

- ker;version="[1.4.2, 1.5)",org.slf4j;version="[1.5.6, 1.6)",org.w3c.d

- om;version="0",org.xml.sax;version="0"

+Import-Package: javax.servlet;version="2.5",javax.servlet.http;version

+ ="2.5",org.eclipse.gemini.web.core;version="[1.0, 1.1)",org.eclipse.g

+ emini.web.tomcat.spi;version="[1.0, 1.1)",org.eclipse.virgo.kernel.in

+ stall.artifact;version="[2.0, 2.1)",org.eclipse.virgo.kernel.install.

+ pipeline.stage.transform;version="[2.0, 2.1)",org.eclipse.virgo.medic

+ .eventlog;version="[1.0, 1.1)",org.eclipse.virgo.snaps.core.internal,

+ org.eclipse.virgo.snaps.core.internal.deployer,org.eclipse.virgo.snap

+ s.core.internal.webapp,org.osgi.framework;version="[1.5, 2.0)",org.w3

+ c.dom;version="0"

 Bundle-SymbolicName: org.eclipse.virgo.snaps.core

 

diff --git a/org.eclipse.virgo.snaps.core/src/main/resources/META-INF/spring/osgi-context.xml b/org.eclipse.virgo.snaps.core/src/main/resources/META-INF/spring/osgi-context.xml
index 4afd02a..ec0d6a5 100644
--- a/org.eclipse.virgo.snaps.core/src/main/resources/META-INF/spring/osgi-context.xml
+++ b/org.eclipse.virgo.snaps.core/src/main/resources/META-INF/spring/osgi-context.xml
@@ -5,12 +5,12 @@
 		http://www.springframework.org/schema/osgi http://www.springframework.org/schema/osgi/spring-osgi.xsd"
 	xmlns:osgi="http://www.springframework.org/schema/osgi">
 
-	<osgi:reference id="webBundleManifestTransformer" interface="com.springsource.osgi.webcontainer.core.WebBundleManifestTransformer"/>
-	<osgi:reference id="webBundleClassLoaderFactory" interface="com.springsource.osgi.webcontainer.tomcat.spi.WebBundleClassLoaderFactory"/>
-	<osgi:reference id="eventLogger" interface="com.springsource.osgi.medic.eventlog.EventLogger"/>
+	<osgi:reference id="webBundleManifestTransformer" interface="org.eclipse.gemini.web.core.WebBundleManifestTransformer"/>
+	<osgi:reference id="webBundleClassLoaderFactory" interface="org.eclipse.gemini.web.tomcat.spi.WebBundleClassLoaderFactory"/>
+	<osgi:reference id="eventLogger" interface="org.eclipse.virgo.medic.eventlog.EventLogger"/>
 	
-	<osgi:service ref="lifecycleListener" interface="com.springsource.kernel.install.artifact.InstallArtifactLifecycleListener"/>
+	<osgi:service ref="lifecycleListener" interface="org.eclipse.virgo.kernel.install.artifact.InstallArtifactLifecycleListener"/>
 	
-	<osgi:service ref="transformer" interface="com.springsource.kernel.install.pipeline.stage.transform.Transformer" ranking="1500"/>
+	<osgi:service ref="transformer" interface="org.eclipse.virgo.kernel.install.pipeline.stage.transform.Transformer" ranking="1500"/>
 	
 </beans>
diff --git a/org.eclipse.virgo.snaps.core/src/test/java/org/eclipse/virgo/snaps/core/SnapHostFilterTests.java b/org.eclipse.virgo.snaps.core/src/test/java/org/eclipse/virgo/snaps/core/SnapHostFilterTests.java
index baebe78..7e893ce 100644
--- a/org.eclipse.virgo.snaps.core/src/test/java/org/eclipse/virgo/snaps/core/SnapHostFilterTests.java
+++ b/org.eclipse.virgo.snaps.core/src/test/java/org/eclipse/virgo/snaps/core/SnapHostFilterTests.java
@@ -37,7 +37,7 @@ import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
 import org.springframework.mock.web.MockServletContext;
 
-import com.springsource.osgi.medic.test.eventlog.MockEventLogger;
+import org.eclipse.virgo.medic.test.eventlog.MockEventLogger;
 
 public class SnapHostFilterTests {
 
diff --git a/org.eclipse.virgo.snaps.core/src/test/java/org/eclipse/virgo/snaps/core/internal/SnapFactoryMonitorTests.java b/org.eclipse.virgo.snaps.core/src/test/java/org/eclipse/virgo/snaps/core/internal/SnapFactoryMonitorTests.java
index 4eba310..64b8d0e 100644
--- a/org.eclipse.virgo.snaps.core/src/test/java/org/eclipse/virgo/snaps/core/internal/SnapFactoryMonitorTests.java
+++ b/org.eclipse.virgo.snaps.core/src/test/java/org/eclipse/virgo/snaps/core/internal/SnapFactoryMonitorTests.java
@@ -38,7 +38,7 @@ import org.osgi.framework.ServiceReference;
 import org.osgi.framework.ServiceRegistration;
 import org.springframework.mock.web.MockServletContext;
 
-import com.springsource.osgi.medic.test.eventlog.MockEventLogger;
+import org.eclipse.virgo.medic.test.eventlog.MockEventLogger;
 
 public class SnapFactoryMonitorTests extends AbstractEquinoxLaunchingTests {
 
diff --git a/org.eclipse.virgo.snaps.core/src/test/java/org/eclipse/virgo/snaps/core/internal/SnapHostDefinitionTests.java b/org.eclipse.virgo.snaps.core/src/test/java/org/eclipse/virgo/snaps/core/internal/SnapHostDefinitionTests.java
index 305593b..fc3670c 100644
--- a/org.eclipse.virgo.snaps.core/src/test/java/org/eclipse/virgo/snaps/core/internal/SnapHostDefinitionTests.java
+++ b/org.eclipse.virgo.snaps.core/src/test/java/org/eclipse/virgo/snaps/core/internal/SnapHostDefinitionTests.java
@@ -16,7 +16,7 @@ import static org.junit.Assert.assertEquals;
 import org.eclipse.virgo.snaps.core.internal.SnapHostDefinition;
 import org.junit.Test;
 
-import com.springsource.util.osgi.VersionRange;
+import org.eclipse.virgo.util.osgi.VersionRange;
 
 
 public class SnapHostDefinitionTests {
diff --git a/org.eclipse.virgo.snaps.core/src/test/java/org/eclipse/virgo/snaps/core/internal/SnapUtilsTests.java b/org.eclipse.virgo.snaps.core/src/test/java/org/eclipse/virgo/snaps/core/internal/SnapUtilsTests.java
index d3c6bf8..51d0fe3 100644
--- a/org.eclipse.virgo.snaps.core/src/test/java/org/eclipse/virgo/snaps/core/internal/SnapUtilsTests.java
+++ b/org.eclipse.virgo.snaps.core/src/test/java/org/eclipse/virgo/snaps/core/internal/SnapUtilsTests.java
@@ -29,7 +29,7 @@ import org.junit.Test;
 import org.osgi.framework.Bundle;
 import org.springframework.mock.web.MockHttpServletRequest;
 
-import com.springsource.util.osgi.manifest.BundleManifest;
+import org.eclipse.virgo.util.osgi.manifest.BundleManifest;
 
 public class SnapUtilsTests {
 
@@ -60,7 +60,7 @@ public class SnapUtilsTests {
     @Test
     public void hasSnapHostHeaderTrue() {
         BundleManifest manifest = createMock(BundleManifest.class);
-        expect(manifest.getHeader(SnapUtils.HEADER_SLICE_HOST)).andReturn("foo");
+        expect(manifest.getHeader(SnapUtils.HEADER_SNAP_HOST)).andReturn("foo");
         
         replay(manifest);
         assertTrue(SnapUtils.hasSnapHostHeader(manifest));
@@ -70,7 +70,7 @@ public class SnapUtilsTests {
     @Test
     public void hasSnapHostHeaderFalse() {
         BundleManifest manifest = createMock(BundleManifest.class);
-        expect(manifest.getHeader(SnapUtils.HEADER_SLICE_HOST)).andReturn(null);
+        expect(manifest.getHeader(SnapUtils.HEADER_SNAP_HOST)).andReturn(null);
         
         replay(manifest);
         assertFalse(SnapUtils.hasSnapHostHeader(manifest));
@@ -80,7 +80,7 @@ public class SnapUtilsTests {
     @Test
     public void getSnapHostHeader() {
         BundleManifest manifest = createMock(BundleManifest.class);
-        expect(manifest.getHeader(SnapUtils.HEADER_SLICE_HOST)).andReturn("travel;version=\"[1.2, 1.3)\"");
+        expect(manifest.getHeader(SnapUtils.HEADER_SNAP_HOST)).andReturn("travel;version=\"[1.2, 1.3)\"");
         
         replay(manifest);
         SnapHostDefinition header = SnapUtils.getSnapHostHeader(manifest);
@@ -92,7 +92,7 @@ public class SnapUtilsTests {
     @Test
     public void getSnapHostHeaderNull() {
         BundleManifest manifest = createMock(BundleManifest.class);
-        expect(manifest.getHeader(SnapUtils.HEADER_SLICE_HOST)).andReturn(null);
+        expect(manifest.getHeader(SnapUtils.HEADER_SNAP_HOST)).andReturn(null);
         
         replay(manifest);
         SnapHostDefinition header = SnapUtils.getSnapHostHeader(manifest);
@@ -103,7 +103,7 @@ public class SnapUtilsTests {
     @Test
     public void getSnapContextPath() {
         Properties p = new Properties();
-        p.setProperty(SnapUtils.HEADER_SLICE_CONTEXT_PATH, "snap");
+        p.setProperty(SnapUtils.HEADER_SNAP_CONTEXT_PATH, "snap");
         
         Bundle bundle = createMock(Bundle.class);
         expect(bundle.getHeaders()).andReturn(p);
diff --git a/org.eclipse.virgo.snaps.core/src/test/java/org/eclipse/virgo/snaps/core/internal/deployer/SnapLifecycleListenerTests.java b/org.eclipse.virgo.snaps.core/src/test/java/org/eclipse/virgo/snaps/core/internal/deployer/SnapLifecycleListenerTests.java
index 718248a..b9b7d7e 100644
--- a/org.eclipse.virgo.snaps.core/src/test/java/org/eclipse/virgo/snaps/core/internal/deployer/SnapLifecycleListenerTests.java
+++ b/org.eclipse.virgo.snaps.core/src/test/java/org/eclipse/virgo/snaps/core/internal/deployer/SnapLifecycleListenerTests.java
@@ -23,15 +23,15 @@ import org.eclipse.virgo.snaps.core.internal.deployer.SnapLifecycleListener;
 import org.junit.Test;
 import org.osgi.framework.Version;
 
-import com.springsource.kernel.deployer.core.DeploymentException;
-import com.springsource.kernel.install.artifact.BundleInstallArtifact;
-import com.springsource.osgi.medic.test.eventlog.MockEventLogger;
-import com.springsource.osgi.teststubs.framework.OSGiAssert;
-import com.springsource.osgi.teststubs.framework.StubBundle;
-import com.springsource.osgi.teststubs.framework.StubBundleContext;
-import com.springsource.osgi.webcontainer.tomcat.spi.WebBundleClassLoaderFactory;
-import com.springsource.util.osgi.manifest.BundleManifest;
-import com.springsource.util.osgi.manifest.internal.StandardBundleManifest;
+import org.eclipse.virgo.kernel.deployer.core.DeploymentException;
+import org.eclipse.virgo.kernel.install.artifact.BundleInstallArtifact;
+import org.eclipse.virgo.medic.test.eventlog.MockEventLogger;
+import org.eclipse.virgo.teststubs.osgi.framework.OSGiAssert;
+import org.eclipse.virgo.teststubs.osgi.framework.StubBundle;
+import org.eclipse.virgo.teststubs.osgi.framework.StubBundleContext;
+import org.eclipse.gemini.web.tomcat.spi.WebBundleClassLoaderFactory;
+import org.eclipse.virgo.util.osgi.manifest.BundleManifest;
+import org.eclipse.virgo.util.osgi.manifest.internal.StandardBundleManifest;
 
 public class SnapLifecycleListenerTests {
 
diff --git a/org.eclipse.virgo.snaps.core/src/test/java/org/eclipse/virgo/snaps/core/internal/deployer/SnapTransformerTests.java b/org.eclipse.virgo.snaps.core/src/test/java/org/eclipse/virgo/snaps/core/internal/deployer/SnapTransformerTests.java
index 6acfbc3..2d5e249 100644
--- a/org.eclipse.virgo.snaps.core/src/test/java/org/eclipse/virgo/snaps/core/internal/deployer/SnapTransformerTests.java
+++ b/org.eclipse.virgo.snaps.core/src/test/java/org/eclipse/virgo/snaps/core/internal/deployer/SnapTransformerTests.java
@@ -29,16 +29,16 @@ import java.net.URL;
 import org.eclipse.virgo.snaps.core.internal.deployer.SnapTransformer;
 import org.junit.Test;
 
-import com.springsource.kernel.artifact.fs.ArtifactFS;
-import com.springsource.kernel.deployer.core.DeploymentException;
-import com.springsource.kernel.install.artifact.BundleInstallArtifact;
-import com.springsource.kernel.install.artifact.InstallArtifact;
-import com.springsource.osgi.webcontainer.core.InstallationOptions;
-import com.springsource.osgi.webcontainer.core.WebBundleManifestTransformer;
-import com.springsource.util.common.ThreadSafeArrayListTree;
-import com.springsource.util.common.Tree;
-import com.springsource.util.osgi.manifest.BundleManifest;
-import com.springsource.util.osgi.manifest.internal.StandardBundleManifest;
+import org.eclipse.virgo.kernel.artifact.fs.ArtifactFS;
+import org.eclipse.virgo.kernel.deployer.core.DeploymentException;
+import org.eclipse.virgo.kernel.install.artifact.BundleInstallArtifact;
+import org.eclipse.virgo.kernel.install.artifact.InstallArtifact;
+import org.eclipse.gemini.web.core.InstallationOptions;
+import org.eclipse.gemini.web.core.WebBundleManifestTransformer;
+import org.eclipse.virgo.util.common.ThreadSafeArrayListTree;
+import org.eclipse.virgo.util.common.Tree;
+import org.eclipse.virgo.util.osgi.manifest.BundleManifest;
+import org.eclipse.virgo.util.osgi.manifest.internal.StandardBundleManifest;
 
 public class SnapTransformerTests {
     
@@ -51,7 +51,7 @@ public class SnapTransformerTests {
     @Test(expected = DeploymentException.class)
     public void testInvalidTransformation() throws Exception {
 
-        this.manifestTransformer.transform(eq(this.bundleManifest), isA(URL.class), (InstallationOptions) isNull());
+        this.manifestTransformer.transform(eq(this.bundleManifest), isA(URL.class), (InstallationOptions) isNull(), eq(false));
         expectLastCall().andThrow(new IOException());
         replayAll();
         snapTransformer.doTransform(bundleManifest, URI.create("file:bar").toURL());
@@ -60,7 +60,7 @@ public class SnapTransformerTests {
 
     @Test
     public void testValidTransformation() throws Exception {
-        this.manifestTransformer.transform(eq(this.bundleManifest), isA(URL.class), (InstallationOptions) isNull());        
+        this.manifestTransformer.transform(eq(this.bundleManifest), isA(URL.class), (InstallationOptions) isNull(), eq(false));        
         replayAll();
         snapTransformer.doTransform(bundleManifest, URI.create("file:bar").toURL());
         verifyAll();
@@ -86,8 +86,8 @@ public class SnapTransformerTests {
         File f2 = new File("/bar2");
         expect(artifactFS2.getFile()).andReturn(f2);
         
-        this.manifestTransformer.transform(bundleManifest1, f1.toURI().toURL(), null);
-        this.manifestTransformer.transform(bundleManifest2, f2.toURI().toURL(), null);
+        this.manifestTransformer.transform(bundleManifest1, f1.toURI().toURL(), null, false);
+        this.manifestTransformer.transform(bundleManifest2, f2.toURI().toURL(), null, false);
         
         replay(installArtifact1, artifactFS1, installArtifact2, artifactFS2, manifestTransformer);
         
@@ -118,7 +118,7 @@ public class SnapTransformerTests {
         expect(installArtifact2.getArtifactFS()).andReturn(artifactFS2).anyTimes();        
         expect(artifactFS2.getFile()).andReturn(null);
         
-        this.manifestTransformer.transform(bundleManifest1, f1.toURI().toURL(), null);
+        this.manifestTransformer.transform(bundleManifest1, f1.toURI().toURL(), null, false);
         
         replay(installArtifact1, artifactFS1, installArtifact2, artifactFS2, manifestTransformer);
         
diff --git a/org.eclipse.virgo.snaps.core/src/test/java/org/eclipse/virgo/snaps/core/internal/webapp/SnapServletContextTests.java b/org.eclipse.virgo.snaps.core/src/test/java/org/eclipse/virgo/snaps/core/internal/webapp/SnapServletContextTests.java
index 52e07d6..ad99f9f 100644
--- a/org.eclipse.virgo.snaps.core/src/test/java/org/eclipse/virgo/snaps/core/internal/webapp/SnapServletContextTests.java
+++ b/org.eclipse.virgo.snaps.core/src/test/java/org/eclipse/virgo/snaps/core/internal/webapp/SnapServletContextTests.java
@@ -29,7 +29,7 @@ import org.eclipse.virgo.snaps.core.internal.webapp.SnapServletContext;
 import org.junit.Test;
 import org.osgi.framework.Bundle;
 
-import com.springsource.util.common.IterableEnumeration;
+import org.eclipse.virgo.util.common.IterableEnumeration;
 
 public class SnapServletContextTests {
     
diff --git a/org.eclipse.virgo.snaps.core/src/test/resources/META-INF/TEST.MF b/org.eclipse.virgo.snaps.core/src/test/resources/META-INF/TEST.MF
index 2895e01..c7471fb 100644
--- a/org.eclipse.virgo.snaps.core/src/test/resources/META-INF/TEST.MF
+++ b/org.eclipse.virgo.snaps.core/src/test/resources/META-INF/TEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0

 Bundle-ManifestVersion: 2

-Import-Package: com.springsource.osgi.medic.test.eventlog;version="[1.

- 0, 1.1)",com.springsource.osgi.teststubs.framework,com.springsource.u

+Import-Package: org.eclipse.virgo.medic.test.eventlog;version="[1.

+ 0, 1.1)",org.eclipse.virgo.teststubs.osgi.framework,com.springsource.u

  til.osgi.manifest.internal;version="[2.0, 2.1)",org.easymock,org.ecli

  pse.osgi.launch,org.junit,org.osgi.framework.launch;version="[1.5, 2.

  0)",org.springframework.mock.web

diff --git a/org.eclipse.virgo.snaps.core/template.mf b/org.eclipse.virgo.snaps.core/template.mf
index b197bb8..ea27f98 100644
--- a/org.eclipse.virgo.snaps.core/template.mf
+++ b/org.eclipse.virgo.snaps.core/template.mf
@@ -4,10 +4,10 @@ Bundle-SymbolicName: org.eclipse.virgo.snaps.core
 Bundle-Version: 1.0
 Bundle-Name: Snaps Core
 Import-Template: 
- com.springsource.kernel.*;version="[2.0, 2.1)",
- com.springsource.util.*;version="[2.0, 2.1)",
- com.springsource.osgi.webcontainer.*;version="[1.0, 1.1)",
- com.springsource.osgi.medic.*;version="[1.0, 1.1)", 
+ org.eclipse.virgo.kernel.*;version="[2.0, 2.1)",
+ org.eclipse.virgo.util.*;version="[2.0, 2.1)",
+ org.eclipse.gemini.web.*;version="[1.0, 1.1)",
+ org.eclipse.virgo.medic.*;version="[1.0, 1.1)", 
  javax.servlet.*;version="2.5",
  javax.servlet.jsp.*;version="2.1",
  javax.xml.parsers.*;version="0",
diff --git a/org.eclipse.virgo.snaps.test/.classpath b/org.eclipse.virgo.snaps.test/.classpath
index e628ef9..53a048d 100644
--- a/org.eclipse.virgo.snaps.test/.classpath
+++ b/org.eclipse.virgo.snaps.test/.classpath
@@ -5,17 +5,17 @@
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
 	<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="SLICES_IVY_CACHE/org.junit/com.springsource.org.junit/4.5.0/com.springsource.org.junit-4.5.0.jar" sourcepath="/SLICES_IVY_CACHE/org.junit/com.springsource.org.junit/4.5.0/com.springsource.org.junit-sources-4.5.0.jar"/>
-	<classpathentry kind="var" path="SLICES_IVY_CACHE/com.springsource.osgi.test/com.springsource.osgi.test.framework/2.0.0.RC1/com.springsource.osgi.test.framework-2.0.0.RC1.jar" sourcepath="/SLICES_IVY_CACHE/com.springsource.osgi.test/com.springsource.osgi.test.framework/2.0.0.RC1/com.springsource.osgi.test.framework-sources-2.0.0.RC1.jar"/>
-	<classpathentry kind="var" path="SLICES_IVY_CACHE/com.springsource.osgi/com.springsource.osgi.launcher/2.0.0.RC1/com.springsource.osgi.launcher-2.0.0.RC1.jar" sourcepath="/SLICES_IVY_CACHE/com.springsource.osgi/com.springsource.osgi.launcher/2.0.0.D-20091110173422/com.springsource.osgi.launcher-sources-2.0.0.D-20091110173422.jar"/>
-	<classpathentry kind="var" path="SLICES_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.5.1.R35x_v20091005/org.eclipse.osgi-3.5.1.R35x_v20091005.jar" sourcepath="/SLICES_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.5.1.R35x_v20091005/org.eclipse.osgi-sources-3.5.1.R35x_v20091005.jar"/>
-	<classpathentry kind="var" path="SLICES_IVY_CACHE/com.springsource.util/com.springsource.util.common/2.0.0.RC1/com.springsource.util.common-2.0.0.RC1.jar"/>
-	<classpathentry kind="var" path="SLICES_IVY_CACHE/com.springsource.util/com.springsource.util.osgi/2.0.0.RC1/com.springsource.util.osgi-2.0.0.RC1.jar" sourcepath="/SLICES_IVY_CACHE/com.springsource.util/com.springsource.util.osgi/2.0.0.RC1/com.springsource.util.osgi-sources-2.0.0.RC1.jar"/>
-	<classpathentry kind="var" path="SLICES_IVY_CACHE/com.springsource.osgi/com.springsource.osgi.extensions.equinox/2.0.0.RC1/com.springsource.osgi.extensions.equinox-2.0.0.RC1.jar" sourcepath="/SLICES_IVY_CACHE/com.springsource.osgi/com.springsource.osgi.extensions.equinox/2.0.0.RC1/com.springsource.osgi.extensions.equinox-sources-2.0.0.RC1.jar"/>
-	<classpathentry kind="var" path="SLICES_IVY_CACHE/com.springsource.kernel/com.springsource.kernel.core/2.0.0.RC1/com.springsource.kernel.core-2.0.0.RC1.jar" sourcepath="/SLICES_IVY_CACHE/com.springsource.kernel/com.springsource.kernel.core/2.0.0.RC1/com.springsource.kernel.core-sources-2.0.0.RC1.jar"/>
-	<classpathentry kind="var" path="SLICES_IVY_CACHE/com.springsource.kernel/com.springsource.kernel.deployer/2.0.0.RC1/com.springsource.kernel.deployer-2.0.0.RC1.jar" sourcepath="/SLICES_IVY_CACHE/com.springsource.kernel/com.springsource.kernel.deployer.core/2.0.0.RC1/com.springsource.kernel.deployer.core-sources-2.0.0.RC1.jar"/>
-	<classpathentry kind="var" path="SLICES_IVY_CACHE/com.springsource.util/com.springsource.util.io/2.0.0.RC1/com.springsource.util.io-2.0.0.RC1.jar"/>
-	<classpathentry kind="var" path="SLICES_IVY_CACHE/com.springsource.server/com.springsource.server.web.core/2.0.0.RC1/com.springsource.server.web.core-2.0.0.RC1.jar" sourcepath="/SLICES_IVY_CACHE/com.springsource.server/com.springsource.server.web.core/2.0.0.RC1/com.springsource.server.web.core-sources-2.0.0.RC1.jar"/>
-	<classpathentry kind="var" path="SLICES_IVY_CACHE/org.apache.felix/org.apache.felix.eventadmin/1.0.0/org.apache.felix.eventadmin-1.0.0.jar"/>
+	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/SNAPS_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar"/>
+	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.framework/2.1.0.M01/org.eclipse.virgo.test.framework-2.1.0.M01.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.framework/2.1.0.M01/org.eclipse.virgo.test.framework-sources-2.1.0.M01.jar"/>
+	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.launcher/2.0.0.RC1/org.eclipse.virgo.osgi.launcher-2.0.0.RC1.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.launcher/2.0.0.D-20091110173422/org.eclipse.virgo.osgi.launcher-sources-2.0.0.D-20091110173422.jar"/>
+	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.5.1.R35x_v20091005/org.eclipse.osgi-3.5.1.R35x_v20091005.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.5.1.R35x_v20091005/org.eclipse.osgi-sources-3.5.1.R35x_v20091005.jar"/>
+	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/2.1.0.M01/org.eclipse.virgo.util.common-2.1.0.M01.jar"/>
+	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/2.1.0.M01/org.eclipse.virgo.util.osgi-2.1.0.M01.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/2.1.0.M01/org.eclipse.virgo.util.osgi-sources-2.1.0.M01.jar"/>
+	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.extensions.equinox/2.0.0.RC1/org.eclipse.virgo.osgi.extensions.equinox-2.0.0.RC1.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.extensions.equinox/2.0.0.RC1/org.eclipse.virgo.osgi.extensions.equinox-sources-2.0.0.RC1.jar"/>
+	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.core/2.1.0.M01/org.eclipse.virgo.kernel.core-2.1.0.M01.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.core/2.1.0.M01/org.eclipse.virgo.kernel.core-sources-2.1.0.M01.jar"/>
+	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/2.1.0.M01/org.eclipse.virgo.kernel.deployer-2.1.0.M01.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer.core/2.1.0.M01/org.eclipse.virgo.kernel.deployer.core-sources-2.1.0.M01.jar"/>
+	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/2.1.0.M01/org.eclipse.virgo.util.io-2.1.0.M01.jar"/>
+	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo/org.eclipse.virgo.web.core/2.1.0.M01/org.eclipse.virgo.web.core-2.1.0.M01.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo/org.eclipse.virgo.web.core/2.1.0.M01/org.eclipse.virgo.web.core-sources-2.1.0.M01.jar"/>
+	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.apache.felix/org.apache.felix.eventadmin/1.0.0/org.apache.felix.eventadmin-1.0.0.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/org.eclipse.virgo.snaps.test/ivy.xml b/org.eclipse.virgo.snaps.test/ivy.xml
index 1f604a8..858c154 100644
--- a/org.eclipse.virgo.snaps.test/ivy.xml
+++ b/org.eclipse.virgo.snaps.test/ivy.xml
@@ -20,9 +20,9 @@
 		<dependency org="org.eclipse.virgo.snaps" name="org.eclipse.virgo.snaps.api" rev="latest.integration"/>
 		<dependency org="org.eclipse.virgo.snaps" name="org.eclipse.virgo.snaps.core" rev="latest.integration"/>
 
-		<dependency org="com.springsource.kernel" name="com.springsource.kernel" rev="${com.springsource.kernel}" conf="test->compile"/>
-		<dependency org="com.springsource.server" name="com.springsource.server.web" rev="${com.springsource.server.web}" conf="test->compile"/>
-		<dependency org="com.springsource.osgi.test" name="com.springsource.osgi.test.framework" rev="${com.springsource.osgi.test}" conf="test->runtime"/>
+		<dependency org="org.eclipse.virgo.kernel" name="org.eclipse.virgo.kernel" rev="${org.eclipse.virgo.kernel}" conf="test->compile"/>
+		<dependency org="org.eclipse.virgo.web" name="org.eclipse.virgo.web.tomcat" rev="${org.eclipse.virgo.web}" conf="test->compile"/>
+		<dependency org="org.eclipse.virgo.test" name="org.eclipse.virgo.test.framework" rev="${org.eclipse.virgo.test}" conf="test->runtime"/>
 
 		<dependency org="org.springframework" name="org.springframework.test" rev="${org.springframework}" conf="test->runtime"/>
 		<dependency org="org.springframework" name="org.springframework.spring-library" rev="${org.springframework}" conf="test->runtime"/>
@@ -30,8 +30,8 @@
 
 		<dependency org="org.slf4j" name="com.springsource.slf4j.org.apache.commons.logging" rev="${org.slf4j}" conf="test->runtime"/>
 		<dependency org="org.slf4j" name="com.springsource.slf4j.bridge" rev="${org.slf4j}" conf="test->runtime"/>
-		<dependency org="com.springsource.osgi.medic" name="com.springsource.osgi.medic" rev="${com.springsource.osgi.medic}" conf="test->runtime"/>
-		<dependency org="com.springsource.osgi.medic" name="com.springsource.osgi.medic.core" rev="${com.springsource.osgi.medic}" conf="test->runtime"/>
+		<dependency org="org.eclipse.virgo.medic" name="org.eclipse.virgo.medic" rev="${org.eclipse.virgo.medic}" conf="test->runtime"/>
+		<dependency org="org.eclipse.virgo.medic" name="org.eclipse.virgo.medic.core" rev="${org.eclipse.virgo.medic}" conf="test->runtime"/>
 		<dependency org="javax.servlet" name="com.springsource.javax.servlet.jsp.jstl" rev="${javax.servlet.jsp.jstl}" conf="test->runtime"/>
 		<dependency org="org.apache.taglibs" name="com.springsource.org.apache.taglibs.standard" rev="${org.apache.taglibs}" conf="test->runtime" />
 		<dependency name='org.apache.felix.eventadmin' rev='${org.apache.felix.eventadmin}' conf='test->runtime' org='org.apache.felix'/>
@@ -48,10 +48,10 @@
 		<!--  Prevent Derby coming down until we move to a Spring version when its JDCB bundle's Derby dependency is optional -->
 		<exclude org="org.apache.derby"/>
 
-		<override org="com.springsource.util" rev="${com.springsource.util}"/>
-		<override org="com.springsource.repository" rev="${com.springsource.repository}"/>
-		<override org="com.springsource.kernel" rev="${com.springsource.kernel}"/>
-		<override org="com.springsource.osgi.webcontainer" rev="${com.springsource.osgi.webcontainer}"/>
+		<override org="org.eclipse.virgo.util" rev="${org.eclipse.virgo.util}"/>
+		<override org="org.eclipse.virgo.repository" rev="${org.eclipse.virgo.repository}"/>
+		<override org="org.eclipse.virgo.kernel" rev="${org.eclipse.virgo.kernel}"/>
+		<override org="org.eclipse.gemini.web" rev="${org.eclipse.gemini.web}"/>
 	</dependencies>
 
 </ivy-module>
diff --git a/org.eclipse.virgo.snaps.test/src/test/java/org/eclipse/virgo/snaps/test/AbstractCapabilityTests.java b/org.eclipse.virgo.snaps.test/src/test/java/org/eclipse/virgo/snaps/test/AbstractCapabilityTests.java
index 8443443..b42c412 100644
--- a/org.eclipse.virgo.snaps.test/src/test/java/org/eclipse/virgo/snaps/test/AbstractCapabilityTests.java
+++ b/org.eclipse.virgo.snaps.test/src/test/java/org/eclipse/virgo/snaps/test/AbstractCapabilityTests.java
@@ -11,8 +11,8 @@
 
 package org.eclipse.virgo.snaps.test;
 
-import com.springsource.kernel.deployer.core.DeploymentException;
-import com.springsource.kernel.deployer.core.DeploymentIdentity;
+import org.eclipse.virgo.kernel.deployer.core.DeploymentException;
+import org.eclipse.virgo.kernel.deployer.core.DeploymentIdentity;
 
 
 public abstract class AbstractCapabilityTests extends AbstractDeployerTests {
diff --git a/org.eclipse.virgo.snaps.test/src/test/java/org/eclipse/virgo/snaps/test/AbstractDeployerTests.java b/org.eclipse.virgo.snaps.test/src/test/java/org/eclipse/virgo/snaps/test/AbstractDeployerTests.java
index 618cd12..84687d4 100644
--- a/org.eclipse.virgo.snaps.test/src/test/java/org/eclipse/virgo/snaps/test/AbstractDeployerTests.java
+++ b/org.eclipse.virgo.snaps.test/src/test/java/org/eclipse/virgo/snaps/test/AbstractDeployerTests.java
@@ -29,10 +29,10 @@ import org.osgi.framework.ServiceReference;
 import org.osgi.service.event.Event;
 import org.osgi.service.event.EventHandler;
 
-import com.springsource.kernel.deployer.core.ApplicationDeployer;
-import com.springsource.kernel.deployer.core.DeploymentException;
-import com.springsource.kernel.deployer.core.DeploymentIdentity;
-import com.springsource.osgi.test.framework.dmkernel.DmKernelTestRunner;
+import org.eclipse.virgo.kernel.deployer.core.ApplicationDeployer;
+import org.eclipse.virgo.kernel.deployer.core.DeploymentException;
+import org.eclipse.virgo.kernel.deployer.core.DeploymentIdentity;
+import org.eclipse.virgo.test.framework.dmkernel.DmKernelTestRunner;
 
 @RunWith(DmKernelTestRunner.class)
 public abstract class AbstractDeployerTests {
diff --git a/org.eclipse.virgo.snaps.test/src/test/java/org/eclipse/virgo/snaps/test/BasicDeployLifecycleTests.java b/org.eclipse.virgo.snaps.test/src/test/java/org/eclipse/virgo/snaps/test/BasicDeployLifecycleTests.java
index 2a36438..c16ed84 100644
--- a/org.eclipse.virgo.snaps.test/src/test/java/org/eclipse/virgo/snaps/test/BasicDeployLifecycleTests.java
+++ b/org.eclipse.virgo.snaps.test/src/test/java/org/eclipse/virgo/snaps/test/BasicDeployLifecycleTests.java
@@ -15,7 +15,7 @@ import static org.junit.Assert.assertNotNull;
 
 import org.junit.Test;
 
-import com.springsource.kernel.deployer.core.DeploymentIdentity;
+import org.eclipse.virgo.kernel.deployer.core.DeploymentIdentity;
 
 public class BasicDeployLifecycleTests extends AbstractDeployerTests {
 
diff --git a/org.eclipse.virgo.snaps.test/src/test/java/org/eclipse/virgo/snaps/test/PlanDeploymentTests.java b/org.eclipse.virgo.snaps.test/src/test/java/org/eclipse/virgo/snaps/test/PlanDeploymentTests.java
index 0d1e272..c32c9d5 100644
--- a/org.eclipse.virgo.snaps.test/src/test/java/org/eclipse/virgo/snaps/test/PlanDeploymentTests.java
+++ b/org.eclipse.virgo.snaps.test/src/test/java/org/eclipse/virgo/snaps/test/PlanDeploymentTests.java
@@ -15,7 +15,7 @@ import java.io.File;
 
 import org.junit.Test;
 
-import com.springsource.kernel.deployer.core.DeploymentIdentity;
+import org.eclipse.virgo.kernel.deployer.core.DeploymentIdentity;
 
 
 /**
diff --git a/org.eclipse.virgo.snaps.test/src/test/java/org/eclipse/virgo/snaps/test/SnapCapabilityTests.java b/org.eclipse.virgo.snaps.test/src/test/java/org/eclipse/virgo/snaps/test/SnapCapabilityTests.java
index 2222dc4..233bf2b 100644
--- a/org.eclipse.virgo.snaps.test/src/test/java/org/eclipse/virgo/snaps/test/SnapCapabilityTests.java
+++ b/org.eclipse.virgo.snaps.test/src/test/java/org/eclipse/virgo/snaps/test/SnapCapabilityTests.java
@@ -24,8 +24,8 @@ import javax.management.ObjectName;
 import org.junit.Test;
 import org.osgi.framework.Constants;
 
-import com.springsource.kernel.deployer.core.DeploymentException;
-import com.springsource.kernel.deployer.core.DeploymentIdentity;
+import org.eclipse.virgo.kernel.deployer.core.DeploymentException;
+import org.eclipse.virgo.kernel.deployer.core.DeploymentIdentity;
 
 public class SnapCapabilityTests extends AbstractCapabilityTests {
 
diff --git a/org.eclipse.virgo.snaps.test/src/test/java/org/eclipse/virgo/snaps/test/SpringCapabilityTests.java b/org.eclipse.virgo.snaps.test/src/test/java/org/eclipse/virgo/snaps/test/SpringCapabilityTests.java
index edfa894..8ded30e 100644
--- a/org.eclipse.virgo.snaps.test/src/test/java/org/eclipse/virgo/snaps/test/SpringCapabilityTests.java
+++ b/org.eclipse.virgo.snaps.test/src/test/java/org/eclipse/virgo/snaps/test/SpringCapabilityTests.java
@@ -15,8 +15,8 @@ import java.io.IOException;
 
 import org.junit.Test;
 
-import com.springsource.kernel.deployer.core.DeploymentException;
-import com.springsource.kernel.deployer.core.DeploymentIdentity;
+import org.eclipse.virgo.kernel.deployer.core.DeploymentException;
+import org.eclipse.virgo.kernel.deployer.core.DeploymentIdentity;
 
 public class SpringCapabilityTests extends AbstractCapabilityTests {
     
diff --git a/org.eclipse.virgo.snaps.test/src/test/java/org/eclipse/virgo/snaps/test/TagLibraryTests.java b/org.eclipse.virgo.snaps.test/src/test/java/org/eclipse/virgo/snaps/test/TagLibraryTests.java
index a21d78b..ad6d0af 100644
--- a/org.eclipse.virgo.snaps.test/src/test/java/org/eclipse/virgo/snaps/test/TagLibraryTests.java
+++ b/org.eclipse.virgo.snaps.test/src/test/java/org/eclipse/virgo/snaps/test/TagLibraryTests.java
@@ -19,8 +19,8 @@ import org.junit.Test;
 import org.osgi.framework.ServiceEvent;
 import org.osgi.framework.ServiceListener;
 
-import com.springsource.kernel.deployer.core.DeploymentException;
-import com.springsource.kernel.deployer.core.DeploymentIdentity;
+import org.eclipse.virgo.kernel.deployer.core.DeploymentException;
+import org.eclipse.virgo.kernel.deployer.core.DeploymentIdentity;
 
 public class TagLibraryTests extends AbstractDeployerTests {
     
diff --git a/org.eclipse.virgo.snaps.test/src/test/resources/META-INF/MANIFEST.MF b/org.eclipse.virgo.snaps.test/src/test/resources/META-INF/MANIFEST.MF
index 3efbce4..7ce0512 100644
--- a/org.eclipse.virgo.snaps.test/src/test/resources/META-INF/MANIFEST.MF
+++ b/org.eclipse.virgo.snaps.test/src/test/resources/META-INF/MANIFEST.MF
@@ -1,12 +1,12 @@
 Manifest-Version: 1.0

 Export-Package: config.management;version="1",org.eclipse.virgo.snaps.

- test;version="1";uses:="com.springsource.kernel.deployer.core,org.jun

+ test;version="1";uses:="org.eclipse.virgo.kernel.deployer.core,org.jun

  it,org.junit.runner,org.osgi.framework,org.osgi.service.event"

 Bundle-Version: 1

 Tool: Bundlor 1.0.0.M6

 Bundle-Name: Snaps Test Bundle

 Bundle-ManifestVersion: 2

-Import-Package: com.springsource.kernel.deployer.core;version="0",java

+Import-Package: org.eclipse.virgo.kernel.deployer.core;version="0",java

  x.management;version="0",org.junit;version="0",org.junit.runner;versi

  on="0",org.osgi.framework;version="0",org.osgi.service.event;version=

  "0"

diff --git a/org.eclipse.virgo.snaps.test/src/test/resources/META-INF/test.config.properties b/org.eclipse.virgo.snaps.test/src/test/resources/META-INF/test.config.properties
index 293eaa3..8fe9190 100644
--- a/org.eclipse.virgo.snaps.test/src/test/resources/META-INF/test.config.properties
+++ b/org.eclipse.virgo.snaps.test/src/test/resources/META-INF/test.config.properties
@@ -2,39 +2,39 @@ launcher.bundles =\
  file:../ivy-cache/repository/org.slf4j/com.springsource.slf4j.api/${org.slf4j}/com.springsource.slf4j.api-${org.slf4j}.jar@start,\
  file:../ivy-cache/repository/org.slf4j/com.springsource.slf4j.org.apache.commons.logging/${org.slf4j}/com.springsource.slf4j.org.apache.commons.logging-${org.slf4j}.jar@start,\
  file:../ivy-cache/repository/org.aspectj/com.springsource.org.aspectj.weaver/${org.aspectj}/com.springsource.org.aspectj.weaver-${org.aspectj}.jar@start,\
- file:../ivy-cache/repository/com.springsource.osgi.medic/com.springsource.osgi.medic/${com.springsource.osgi.medic}/com.springsource.osgi.medic-${com.springsource.osgi.medic}.jar@start,\
+ file:../ivy-cache/repository/org.eclipse.virgo.medic/org.eclipse.virgo.medic/${org.eclipse.virgo.medic}/org.eclipse.virgo.medic-${org.eclipse.virgo.medic}.jar@start,\
  file:../ivy-cache/repository/org.apache.felix/org.apache.felix.configadmin/${org.apache.felix}/org.apache.felix.configadmin-${org.apache.felix}.jar@start,\
- file:../ivy-cache/repository/com.springsource.osgi.medic/com.springsource.osgi.medic.core/${com.springsource.osgi.medic}/com.springsource.osgi.medic.core-${com.springsource.osgi.medic}.jar@start,\
- file:../ivy-cache/repository/com.springsource.util/com.springsource.util.osgi/${com.springsource.util}/com.springsource.util.osgi-${com.springsource.util}.jar@start,\
+ file:../ivy-cache/repository/org.eclipse.virgo.medic/org.eclipse.virgo.medic.core/${org.eclipse.virgo.medic}/org.eclipse.virgo.medic.core-${org.eclipse.virgo.medic}.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.apache.felix/org.apache.felix.eventadmin/${org.apache.felix.eventadmin}/org.apache.felix.eventadmin-${org.apache.felix.eventadmin}.jar@start,\
- file:../ivy-cache/repository/com.springsource.util/com.springsource.util.common/${com.springsource.util}/com.springsource.util.common-${com.springsource.util}.jar@start,\
- file:../ivy-cache/repository/com.springsource.util/com.springsource.util.io/${com.springsource.util}/com.springsource.util.io-${com.springsource.util}.jar@start,\
- file:../ivy-cache/repository/com.springsource.util/com.springsource.util.math/${com.springsource.util}/com.springsource.util.math-${com.springsource.util}.jar@start,\
- file:../ivy-cache/repository/com.springsource.util/com.springsource.util.parser.manifest/${com.springsource.util}/com.springsource.util.parser.manifest-${com.springsource.util}.jar@start,\
- file:../ivy-cache/repository/com.springsource.util/com.springsource.util.jmx/${com.springsource.util}/com.springsource.util.jmx-${com.springsource.util}.jar@start,\
+ file:../ivy-cache/repository/org.eclipse.virgo.util/org.eclipse.virgo.util.common/${org.eclipse.virgo.util}/org.eclipse.virgo.util.common-${org.eclipse.virgo.util}.jar@start,\
+ 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.parser.manifest/${org.eclipse.virgo.util}/org.eclipse.virgo.util.parser.manifest-${org.eclipse.virgo.util}.jar@start,\
+ file:../ivy-cache/repository/org.eclipse.virgo.util/org.eclipse.virgo.util.jmx/${org.eclipse.virgo.util}/org.eclipse.virgo.util.jmx-${org.eclipse.virgo.util}.jar@start,\
  file:../ivy-cache/repository/org.apache.commons/com.springsource.org.apache.commons.codec/1.3.0/com.springsource.org.apache.commons.codec-1.3.0.jar@start,\
  file:../ivy-cache/repository/org.apache.commons/com.springsource.org.apache.commons.httpclient/3.1.0/com.springsource.org.apache.commons.httpclient-3.1.0.jar@start,\
- file:../ivy-cache/repository/com.springsource.repository/com.springsource.repository/${com.springsource.repository}/com.springsource.repository-${com.springsource.repository}.jar@start,\
+ file:../ivy-cache/repository/org.eclipse.virgo.repository/org.eclipse.virgo.repository/${org.eclipse.virgo.repository}/org.eclipse.virgo.repository-${org.eclipse.virgo.repository}.jar@start,\
  file:../ivy-cache/repository/org.springframework/org.springframework.aop/3.0.0.RELEASE/org.springframework.aop-3.0.0.RELEASE.jar,\
  file:../ivy-cache/repository/org.springframework/org.springframework.asm/3.0.0.RELEASE/org.springframework.asm-3.0.0.RELEASE.jar,\
  file:../ivy-cache/repository/org.springframework/org.springframework.expression/3.0.0.RELEASE/org.springframework.expression-3.0.0.RELEASE.jar,\
  file:../ivy-cache/repository/org.springframework/org.springframework.beans/3.0.0.RELEASE/org.springframework.beans-3.0.0.RELEASE.jar,\
  file:../ivy-cache/repository/org.springframework/org.springframework.core/3.0.0.RELEASE/org.springframework.core-3.0.0.RELEASE.jar,\
  file:../ivy-cache/repository/org.springframework/org.springframework.context/3.0.0.RELEASE/org.springframework.context-3.0.0.RELEASE.jar,\
- file:../ivy-cache/repository/com.springsource.kernel/com.springsource.kernel.core/${com.springsource.kernel}/com.springsource.kernel.core-${com.springsource.kernel}.jar@start,\
- file:../ivy-cache/repository/com.springsource.kernel/com.springsource.kernel.agent.dm/${com.springsource.kernel}/com.springsource.kernel.agent.dm-${com.springsource.kernel}.jar@start,\
+ file:../ivy-cache/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.core/${org.eclipse.virgo.kernel}/org.eclipse.virgo.kernel.core-${org.eclipse.virgo.kernel}.jar@start,\
+ file:../ivy-cache/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.agent.dm/${org.eclipse.virgo.kernel}/org.eclipse.virgo.kernel.agent.dm-${org.eclipse.virgo.kernel}.jar@start,\
  file:../ivy-cache/repository/org.springframework.osgi/org.springframework.osgi.core/1.2.1/org.springframework.osgi.core-1.2.1.jar,\
  file:../ivy-cache/repository/org.springframework.osgi/org.springframework.osgi.extender/1.2.1/org.springframework.osgi.extender-1.2.1.jar@start,\
  file:../ivy-cache/repository/org.springframework.osgi/org.springframework.osgi.io/1.2.1/org.springframework.osgi.io-1.2.1.jar,\
  file:../ivy-cache/repository/org.aopalliance/com.springsource.org.aopalliance/1.0.0/com.springsource.org.aopalliance-1.0.0.jar,\
- file:../ivy-cache/repository/com.springsource.kernel/com.springsource.kernel.artifact/${com.springsource.kernel}/com.springsource.kernel.artifact-${com.springsource.kernel}.jar@start,\
- file:../ivy-cache/repository/com.springsource.kernel/com.springsource.kernel.services/${com.springsource.kernel}/com.springsource.kernel.services-${com.springsource.kernel}.jar@start,\
- file:../ivy-cache/repository/com.springsource.kernel/com.springsource.kernel.osgi/${com.springsource.kernel}/com.springsource.kernel.osgi-${com.springsource.kernel}.jar@start,\
- file:../ivy-cache/repository/com.springsource.kernel/com.springsource.kernel.deployer/${com.springsource.kernel}/com.springsource.kernel.deployer-${com.springsource.kernel}.jar@start,\
- file:../ivy-cache/repository/com.springsource.kernel/com.springsource.kernel.dm/${com.springsource.kernel}/com.springsource.kernel.dm-${com.springsource.kernel}.jar@start,\
- file:../ivy-cache/repository/com.springsource.kernel/com.springsource.kernel.model/${com.springsource.kernel}/com.springsource.kernel.model-${com.springsource.kernel}.jar@start
+ file:../ivy-cache/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.artifact/${org.eclipse.virgo.kernel}/org.eclipse.virgo.kernel.artifact-${org.eclipse.virgo.kernel}.jar@start,\
+ file:../ivy-cache/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.services/${org.eclipse.virgo.kernel}/org.eclipse.virgo.kernel.services-${org.eclipse.virgo.kernel}.jar@start,\
+ file:../ivy-cache/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/${org.eclipse.virgo.kernel}/org.eclipse.virgo.kernel.osgi-${org.eclipse.virgo.kernel}.jar@start,\
+ file:../ivy-cache/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/${org.eclipse.virgo.kernel}/org.eclipse.virgo.kernel.deployer-${org.eclipse.virgo.kernel}.jar@start,\
+ file:../ivy-cache/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.dm/${org.eclipse.virgo.kernel}/org.eclipse.virgo.kernel.dm-${org.eclipse.virgo.kernel}.jar@start,\
+ file:../ivy-cache/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.model/${org.eclipse.virgo.kernel}/org.eclipse.virgo.kernel.model-${org.eclipse.virgo.kernel}.jar@start
 
-com.springsource.osgi.test.properties.include=file:../build.versions,file:../build.properties
+org.eclipse.virgo.test.properties.include=file:../build.versions,file:../build.properties
 
 #Equinox Configuration 
 osgi.parentClassloader=fwk
@@ -46,15 +46,15 @@ osgi.console=2401
 
 osgi.java.profile=file:../java6-server.profile
 osgi.java.profile.bootdelegation=override
-osgi.hook.configurators.include=com.springsource.osgi.extensions.equinox.hooks.ExtensionsHookConfigurator
+osgi.hook.configurators.include=org.eclipse.virgo.osgi.extensions.equinox.hooks.ExtensionsHookConfigurator
 
-com.springsource.kernel.home=target
-com.springsource.kernel.domain=com.springsource.kernel
+org.eclipse.virgo.kernel.home=target
+org.eclipse.virgo.kernel.domain=org.eclipse.virgo.kernel
 # Paths are relative to the current working directory
-com.springsource.kernel.config=src/test/resources/config
+org.eclipse.virgo.kernel.config=src/test/resources/config
 
-com.springsource.osgi.medic.log.config.path=src/test/resources/config/serviceability.xml
+org.eclipse.virgo.medic.log.config.path=src/test/resources/config/serviceability.xml
 
-com.springsource.osgi.webcontainer.tomcat.config.path=src/test/resources/config/tomcat-server.xml
+org.eclipse.gemini.web.tomcat.config.path=src/test/resources/config/tomcat-server.xml
 
-com.springsource.kernel.deployer.disableRecovery=true
+org.eclipse.virgo.kernel.deployer.disableRecovery=true
diff --git a/org.eclipse.virgo.snaps.test/src/test/resources/config/com.springsource.kernel.properties b/org.eclipse.virgo.snaps.test/src/test/resources/config/com.springsource.kernel.properties
index 648d41f..399c664 100644
--- a/org.eclipse.virgo.snaps.test/src/test/resources/config/com.springsource.kernel.properties
+++ b/org.eclipse.virgo.snaps.test/src/test/resources/config/com.springsource.kernel.properties
@@ -1,5 +1,5 @@
 deployer.timeout=			300
 deployer.pickupDirectory=	target/pickup
-deployer.systemArtifacts=	repository:plan/com.springsource.server.web,repository:plan/org.eclipse.virgo.snaps
+deployer.systemArtifacts=	repository:plan/org.eclipse.virgo.web,repository:plan/org.eclipse.virgo.snaps
 shell.enabled=				true
 shell.port=					2401
diff --git a/org.eclipse.virgo.snaps.test/src/test/resources/config/com.springsource.kernel.userregion.properties b/org.eclipse.virgo.snaps.test/src/test/resources/config/com.springsource.kernel.userregion.properties
index 5039255..c511d11 100644
--- a/org.eclipse.virgo.snaps.test/src/test/resources/config/com.springsource.kernel.userregion.properties
+++ b/org.eclipse.virgo.snaps.test/src/test/resources/config/com.springsource.kernel.userregion.properties
@@ -9,31 +9,31 @@ baseBundles = \
  file:../ivy-cache/repository/org.springframework.osgi/org.springframework.osgi.extender/1.2.1/org.springframework.osgi.extender-1.2.1.jar@start,\
  file:../ivy-cache/repository/org.springframework.osgi/org.springframework.osgi.io/1.2.1/org.springframework.osgi.io-1.2.1.jar,\
  file:../ivy-cache/repository/org.aopalliance/com.springsource.org.aopalliance/1.0.0/com.springsource.org.aopalliance-1.0.0.jar,\
- file:../ivy-cache/repository/com.springsource.kernel/com.springsource.kernel.agent.dm/2.0.0.RC1/com.springsource.kernel.agent.dm-2.0.0.RC1.jar@start,\
- file:../ivy-cache/repository/com.springsource.kernel/com.springsource.kernel.deployer.dm/2.0.0.RC1/com.springsource.kernel.deployer.dm-2.0.0.RC1.jar@start,\
- file:../ivy-cache/repository/com.springsource.kernel/com.springsource.kernel.dmfragment/2.0.0.RC1/com.springsource.kernel.dmfragment-2.0.0.RC1.jar,\
- file:../ivy-cache/repository/com.springsource.kernel/com.springsource.kernel.userregion/2.0.0.RC1/com.springsource.kernel.userregion-2.0.0.RC1.jar@start,\
+ file:../ivy-cache/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.agent.dm/2.1.0.M01/org.eclipse.virgo.kernel.agent.dm-2.1.0.M01.jar@start,\
+ file:../ivy-cache/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer.dm/2.1.0.M01/org.eclipse.virgo.kernel.deployer.dm-2.1.0.M01.jar@start,\
+ file:../ivy-cache/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.dmfragment/2.1.0.M01/org.eclipse.virgo.kernel.dmfragment-2.1.0.M01.jar,\
+ file:../ivy-cache/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.userregion/2.1.0.M01/org.eclipse.virgo.kernel.userregion-2.1.0.M01.jar@start,\
 
 packageImports =\
- com.springsource.kernel.artifact.*;version="[2.0.0,2.0.1)",\
- com.springsource.kernel.core;version="[2.0.0,2.0.1)",\
- com.springsource.kernel.deployer.core;version="[2.0.0,2.0.1)",\
- com.springsource.kernel.deployer.core.event;version="[2.0.0,2.0.1)",\
- com.springsource.kernel.install.*;version="[2.0.0,2.0.1)",\
- com.springsource.kernel.osgi.*;version="[2.0.0,2.0.1)",\
- com.springsource.kernel.model.management;version="[2.0.0,2.0.1)",\
- com.springsource.kernel.module;version="[2.0.0,2.0.1)",\
- com.springsource.kernel.serviceability;version="[2.0.0,2.0.1)",\
- com.springsource.kernel.serviceability.*;version="[2.0.0,2.0.1)",\
- com.springsource.kernel.services.work;version="[2.0.0,2.0.1)",\
- com.springsource.kernel.shim.*;version="[2.0.0,2.0.1)",\
- com.springsource.osgi.medic.*;version="[1.0,2)",\
- com.springsource.repository;version="[2.0,3)",\
- com.springsource.repository.*;version="[2.0,3)",\
- com.springsource.util.*;version="[2.0,3)",\
+ org.eclipse.virgo.kernel.artifact.*;version="[2.0.0,2.0.1)",\
+ org.eclipse.virgo.kernel.core;version="[2.0.0,2.0.1)",\
+ org.eclipse.virgo.kernel.deployer.core;version="[2.0.0,2.0.1)",\
+ org.eclipse.virgo.kernel.deployer.core.event;version="[2.0.0,2.0.1)",\
+ org.eclipse.virgo.kernel.install.*;version="[2.0.0,2.0.1)",\
+ org.eclipse.virgo.kernel.osgi.*;version="[2.0.0,2.0.1)",\
+ org.eclipse.virgo.kernel.model.management;version="[2.0.0,2.0.1)",\
+ org.eclipse.virgo.kernel.module;version="[2.0.0,2.0.1)",\
+ org.eclipse.virgo.kernel.serviceability;version="[2.0.0,2.0.1)",\
+ org.eclipse.virgo.kernel.serviceability.*;version="[2.0.0,2.0.1)",\
+ org.eclipse.virgo.kernel.services.work;version="[2.0.0,2.0.1)",\
+ org.eclipse.virgo.kernel.shim.*;version="[2.0.0,2.0.1)",\
+ org.eclipse.virgo.medic.*;version="[1.0,2)",\
+ org.eclipse.virgo.repository;version="[2.0,3)",\
+ org.eclipse.virgo.repository.*;version="[2.0,3)",\
+ org.eclipse.virgo.util.*;version="[2.0,3)",\
  org.apache.commons.logging;version="[1.0.0,2.0.0)",\
  org.apache.commons.logging.impl;version="[1.0.0,2.0.0)",\
- org.aspectj.*;version="[1.6.5.RELEASE,2.0.0)",\
+ org.aspectj.*;version="[1.6.6.RELEASE,2.0.0)",\
  org.osgi.service.cm;version="0",\
  org.osgi.service.event;version="0",\
  org.slf4j;version="[1.5.10,2)",\
@@ -42,33 +42,33 @@ packageImports =\
  org.junit.*
 
 serviceImports =\
- com.springsource.kernel.deployer.core.ApplicationDeployer,\
- com.springsource.kernel.deployer.core.DeployUriNormaliser,\
- com.springsource.kernel.install.artifact.ScopeServiceRepository,\
- com.springsource.kernel.services.work.WorkArea,\
- com.springsource.repository.ArtifactBridge,\
- com.springsource.kernel.shell.state.StateService,\
- com.springsource.repository.RepositoryFactory,\
- com.springsource.repository.HashGenerator,\
- com.springsource.osgi.medic.eventlog.EventLoggerFactory,\
- com.springsource.repository.Repository,\
- com.springsource.kernel.core.Shutdown,\
+ org.eclipse.virgo.kernel.deployer.core.ApplicationDeployer,\
+ org.eclipse.virgo.kernel.deployer.core.DeployUriNormaliser,\
+ org.eclipse.virgo.kernel.install.artifact.ScopeServiceRepository,\
+ org.eclipse.virgo.kernel.services.work.WorkArea,\
+ org.eclipse.virgo.repository.ArtifactBridge,\
+ org.eclipse.virgo.kernel.shell.state.StateService,\
+ org.eclipse.virgo.repository.RepositoryFactory,\
+ org.eclipse.virgo.repository.HashGenerator,\
+ org.eclipse.virgo.medic.eventlog.EventLoggerFactory,\
+ org.eclipse.virgo.repository.Repository,\
+ org.eclipse.virgo.kernel.core.Shutdown,\
  org.osgi.service.cm.ConfigurationAdmin,\
  org.osgi.service.event.EventAdmin,\
- com.springsource.osgi.medic.dump.DumpGenerator,\
- com.springsource.kernel.shim.scope.ScopeFactory,\
- com.springsource.kernel.shim.serviceability.TracingService
+ org.eclipse.virgo.medic.dump.DumpGenerator,\
+ org.eclipse.virgo.kernel.shim.scope.ScopeFactory,\
+ org.eclipse.virgo.kernel.shim.serviceability.TracingService
 
 serviceExports =\
- com.springsource.kernel.install.artifact.InstallArtifactLifecycleListener,\
- com.springsource.kernel.install.artifact.ArtifactIdentityDeterminer,\
- com.springsource.kernel.install.pipeline.stage.transform.Transformer,\
- com.springsource.kernel.module.ModuleContextAccessor,\
- com.springsource.osgi.medic.dump.DumpContributor,\
- com.springsource.kernel.osgi.quasi.QuasiFrameworkFactory,\
- com.springsource.kernel.osgi.framework.OsgiFramework,\
- com.springsource.kernel.osgi.framework.ImportExpander,\
- com.springsource.kernel.osgi.framework.PackageAdminUtil,\
+ org.eclipse.virgo.kernel.install.artifact.InstallArtifactLifecycleListener,\
+ org.eclipse.virgo.kernel.install.artifact.ArtifactIdentityDeterminer,\
+ org.eclipse.virgo.kernel.install.pipeline.stage.transform.Transformer,\
+ org.eclipse.virgo.kernel.module.ModuleContextAccessor,\
+ org.eclipse.virgo.medic.dump.DumpContributor,\
+ org.eclipse.virgo.kernel.osgi.quasi.QuasiFrameworkFactory,\
+ org.eclipse.virgo.kernel.osgi.framework.OsgiFramework,\
+ org.eclipse.virgo.kernel.osgi.framework.ImportExpander,\
+ org.eclipse.virgo.kernel.osgi.framework.PackageAdminUtil,\
  org.osgi.service.event.EventHandler,\
  org.osgi.service.cm.ConfigurationListener,\
  org.osgi.service.cm.ManagedService,\
@@ -85,7 +85,7 @@ inheritedFrameworkProperties =\
  osgi.hook.configurators.include
 
 initialArtifacts =\
- repository:plan/com.springsource.server.web,\
+ repository:plan/org.eclipse.virgo.web,\
  repository:plan/org.eclipse.virgo.snaps
 
 osgi.console=2402
diff --git a/org.eclipse.virgo.snaps.test/src/test/resources/config/serviceability.xml b/org.eclipse.virgo.snaps.test/src/test/resources/config/serviceability.xml
index 720e85f..ef6ce05 100644
--- a/org.eclipse.virgo.snaps.test/src/test/resources/config/serviceability.xml
+++ b/org.eclipse.virgo.snaps.test/src/test/resources/config/serviceability.xml
@@ -42,7 +42,7 @@
 		</layout>
 	</appender>
 
-	<logger name="com.springsource.osgi.medic.eventlog.localized" level="INFO">
+	<logger name="org.eclipse.virgo.medic.eventlog.localized" level="INFO">
 		<appender-ref ref="EVENT_LOG_STDOUT" />
 		<appender-ref ref="EVENT_LOG_FILE" />
 	</logger>
diff --git a/org.eclipse.virgo.snaps.test/src/test/resources/config/tomcat-server.xml b/org.eclipse.virgo.snaps.test/src/test/resources/config/tomcat-server.xml
index 147138b..893948e 100644
--- a/org.eclipse.virgo.snaps.test/src/test/resources/config/tomcat-server.xml
+++ b/org.eclipse.virgo.snaps.test/src/test/resources/config/tomcat-server.xml
@@ -28,7 +28,7 @@
   <!-- JMX Support for the Tomcat server. Documentation at /docs/non-existent.html-->
   <Listener className="org.apache.catalina.mbeans.ServerLifecycleListener" />
   
-  <Listener className="com.springsource.server.web.tomcat.ServerLifecycleLoggingListener"/>
+  <Listener className="org.eclipse.virgo.web.tomcat.ServerLifecycleLoggingListener"/>
   
   <!-- A "Service" is a collection of one or more "Connectors" that share
        a single "Container" Note:  A "Service" is not itself a "Container", 
@@ -65,14 +65,14 @@
     --> 
     <Engine name="Catalina" defaultHost="localhost">
 
-	  <Valve className="com.springsource.server.web.tomcat.ApplicationNameTrackingValve"/>
+	  <Valve className="org.eclipse.virgo.web.tomcat.ApplicationNameTrackingValve"/>
 	  
       <!-- Define the default virtual host
            Note: XML Schema validation will not work with Xerces 2.2.
        -->
       <Host name="localhost" deployOnStartup="false" autoDeploy="false"
             unpackWARs="true" xmlValidation="false" xmlNamespaceAware="false">
-			<Listener className="com.springsource.server.web.tomcat.ApplicationNameTrackingListener"/>
+			<Listener className="org.eclipse.virgo.web.tomcat.ApplicationNameTrackingListener"/>
       </Host>
     </Engine>
   </Service>
diff --git a/org.eclipse.virgo.snaps.test/src/test/resources/java6-server.profile b/org.eclipse.virgo.snaps.test/src/test/resources/java6-server.profile
index d478453..74afd8c 100644
--- a/org.eclipse.virgo.snaps.test/src/test/resources/java6-server.profile
+++ b/org.eclipse.virgo.snaps.test/src/test/resources/java6-server.profile
@@ -191,7 +191,7 @@ org.osgi.framework.bootdelegation = \
  com_cenqua_clover,\
  com.cenqua.*,\
  com.yourkit.*,\
- com.springsource.osgi.extensions.*,\
+ org.eclipse.virgo.osgi.extensions.*,\
  com.sun.*,\
  javax.xml.*,\
  org.apache.xerces.jaxp.*,\
diff --git a/org.eclipse.virgo.snaps.test/template.mf b/org.eclipse.virgo.snaps.test/template.mf
index eefe697..a82acc8 100644
--- a/org.eclipse.virgo.snaps.test/template.mf
+++ b/org.eclipse.virgo.snaps.test/template.mf
@@ -4,9 +4,9 @@ Bundle-Name: Snaps Test Bundle
 Bundle-Version: 1
 Bundle-ManifestVersion: 2
 Excluded-Imports: com.springsource,
- com.springsource.osgi.extensions.*,
- com.springsource.osgi.test.*,
- com.springsource.osgi.webcontainer.tomcat.config
+ org.eclipse.virgo.osgi.extensions.*,
+ org.eclipse.virgo.test.*,
+ org.eclipse.gemini.web.tomcat.config
 Excluded-Exports: *
 Import-Package: org.osgi.framework;version="0"
 Import-Template: 
diff --git a/org.eclipse.virgo.snaps/ivy.xml b/org.eclipse.virgo.snaps/ivy.xml
index 959afd9..e8540b7 100644
--- a/org.eclipse.virgo.snaps/ivy.xml
+++ b/org.eclipse.virgo.snaps/ivy.xml
@@ -16,7 +16,7 @@
 	</publications>
 
 	<dependencies>
-		<dependency org="com.springsource.kernel" name="com.springsource.kernel" rev="${com.springsource.kernel}" conf="provided->compile"/>
+		<dependency org="org.eclipse.virgo.kernel" name="org.eclipse.virgo.kernel" rev="${org.eclipse.virgo.kernel}" conf="provided->compile"/>
 		<dependency org="org.eclipse.virgo.snaps" name="org.eclipse.virgo.snaps.core" rev="latest.integration"/>
 		<dependency org="org.eclipse.virgo.snaps" name="org.eclipse.virgo.snaps.api" rev="latest.integration"/>
 	</dependencies>
diff --git a/samples/menu-bar/animal.menu.bar/.classpath b/samples/menu-bar/animal.menu.bar/.classpath
index 204a6ca..a5985e6 100644
--- a/samples/menu-bar/animal.menu.bar/.classpath
+++ b/samples/menu-bar/animal.menu.bar/.classpath
@@ -4,7 +4,7 @@
 	<classpathentry kind="src" path="src/main/resources"/>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>
-	<classpathentry kind="var" path="SLICES_IVY_CACHE/org.apache.taglibs/com.springsource.org.apache.taglibs.standard/1.1.2/com.springsource.org.apache.taglibs.standard-1.1.2.jar" sourcepath="/SLICES_IVY_CACHE/org.apache.taglibs/com.springsource.org.apache.taglibs.standard/1.1.2/com.springsource.org.apache.taglibs.standard-sources-1.1.2.jar"/>
+	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.apache.taglibs/com.springsource.org.apache.taglibs.standard/1.1.2/com.springsource.org.apache.taglibs.standard-1.1.2.jar" sourcepath="/SNAPS_IVY_CACHE/org.apache.taglibs/com.springsource.org.apache.taglibs.standard/1.1.2/com.springsource.org.apache.taglibs.standard-sources-1.1.2.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.snaps.api"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/JVM 1.6.0 (MacOS X Default)">
 		<attributes>
diff --git a/samples/menu-bar/ivysettings.xml b/samples/menu-bar/ivysettings.xml
index aaa8aa8..8b8aec9 100644
--- a/samples/menu-bar/ivysettings.xml
+++ b/samples/menu-bar/ivysettings.xml
@@ -64,7 +64,7 @@
 	<modules>
 		<module organisation="org.springframework.*"	name="*"	resolver="spring-portfolio-lookup"/>
 		<module organisation="com.springsource.*"		name="*"	resolver="spring-portfolio-lookup"/>
-		<module organisation="com.springsource.kernel"	name="*"	resolver="integration"/>
+		<module organisation="org.eclipse.virgo.kernel"	name="*"	resolver="integration"/>
 	</modules>
 
 </ivysettings>
diff --git a/samples/multiple-styles/ivysettings.xml b/samples/multiple-styles/ivysettings.xml
index aaa8aa8..8b8aec9 100644
--- a/samples/multiple-styles/ivysettings.xml
+++ b/samples/multiple-styles/ivysettings.xml
@@ -64,7 +64,7 @@
 	<modules>
 		<module organisation="org.springframework.*"	name="*"	resolver="spring-portfolio-lookup"/>
 		<module organisation="com.springsource.*"		name="*"	resolver="spring-portfolio-lookup"/>
-		<module organisation="com.springsource.kernel"	name="*"	resolver="integration"/>
+		<module organisation="org.eclipse.virgo.kernel"	name="*"	resolver="integration"/>
 	</modules>
 
 </ivysettings>
diff --git a/samples/pluggable-styling/ivysettings.xml b/samples/pluggable-styling/ivysettings.xml
index aaa8aa8..8b8aec9 100644
--- a/samples/pluggable-styling/ivysettings.xml
+++ b/samples/pluggable-styling/ivysettings.xml
@@ -64,7 +64,7 @@
 	<modules>
 		<module organisation="org.springframework.*"	name="*"	resolver="spring-portfolio-lookup"/>
 		<module organisation="com.springsource.*"		name="*"	resolver="spring-portfolio-lookup"/>
-		<module organisation="com.springsource.kernel"	name="*"	resolver="integration"/>
+		<module organisation="org.eclipse.virgo.kernel"	name="*"	resolver="integration"/>
 	</modules>
 
 </ivysettings>
diff --git a/scripts/virgoise.sh b/scripts/virgoise.sh
new file mode 100644
index 0000000..263424b
--- a/dev/null
+++ b/scripts/virgoise.sh
@@ -0,0 +1,49 @@
+#!/usr/bin/env bash
+dir=`dirname $0`
+dir=`cd $dir;pwd`
+
+for f in $(find . -iname "*.java" -or -iname "*.aj" -or -iname "*.xml" -or -iname ".project" -or -iname "*.MF" -or -iname "*.mf" -or -iname ".prefs"  -or -iname ".classpath" -or -iname "build.versions" -or -iname "*.properties" -or -iname "*.bat" -or -iname "*.sh" -or -iname "*.conf" -or -iname "*.profile" -or -iname "*.config" -or -iname "*.plan" -or -iname "runner.bundles")
+do
+	
+sed -i -e 's/SLICES_IVY_CACHE/SNAPS_IVY_CACHE/g' $f
+sed -i -e 's/SLICE_/SNAP_/g' $f
+sed -i -e 's/SLICES_/SNAPS_/g' $f
+
+sed -i -e 's/com\.springsource\.osgi\.teststubs/org.eclipse.virgo.teststubs.osgi/g' $f
+sed -i -e 's/com\.springsource\.osgi\.test\.stubs/org.eclipse.virgo.teststubs.osgi/g' $f
+
+sed -i -e 's/com\.springsource\.osgi\.test\.framework/org.eclipse.virgo.test.framework/g' $f
+sed -i -e 's/com\.springsource\.osgi\.test/org.eclipse.virgo.test/g' $f
+
+sed -i -e 's/com\.springsource\.osgi\.webcontainer/org.eclipse.gemini.web/g' $f
+
+sed -i -e 's/com\.springsource\.util/org.eclipse.virgo.util/g' $f
+
+sed -i -e 's/com\.springsource\.osgi\.medic/org.eclipse.virgo.medic/g' $f
+sed -i -e 's/com\.springsource\.osgi\.launcher/org.eclipse.virgo.osgi.launcher/g' $f
+
+sed -i -e 's/com\.springsource\.kernel/org.eclipse.virgo.kernel/g' $f
+sed -i -e 's/com\.springsource\.repository/org.eclipse.virgo.repository/g' $f
+
+sed -i -e 's/com\.springsource\.server/org.eclipse.virgo/g' $f
+sed -i -e 's/com\.springsource\.osgi/org.eclipse.virgo.osgi/g' $f
+
+sed -i -e 's/com\.springsource\.ch\.qos\.logback\.classic\.woven/org.eclipse.virgo.ch.qos.logback.classic.woven/g' $f
+
+# AspectJ update
+sed -i -e 's/1\.6\.5\.RELEASE/1.6.6.RELEASE/g' $f
+# JUnit update
+sed -i -e 's/4\.5\.0/4.7.0/g' $f
+
+rm $f-e
+done
+
+$dir/update-dependency.rb -v org.eclipse.virgo.teststubs.osgi=2.1.0.M01 build.versions
+$dir/update-dependency.rb -v org.eclipse.virgo.test=2.1.0.M01 build.versions
+$dir/update-dependency.rb -v org.eclipse.virgo.util=2.1.0.M01 build.versions
+$dir/update-dependency.rb -v org.eclipse.virgo.web=2.1.0.M01 build.versions
+$dir/update-dependency.rb -v org.eclipse.virgo.medic=2.1.0.M01 build.versions
+$dir/update-dependency.rb -v org.eclipse.virgo.kernel=2.1.0.M01 build.version
+$dir/update-dependency.rb -v org.eclipse.virgo.repository=2.1.0.M01 build.version
+
+$dir/update-dependency.rb -v org.eclipse.gemini.web=1.1.0.M01 build.versions
diff --git a/test-apps/simple-host/.classpath b/test-apps/simple-host/.classpath
index b41e39f..53348fb 100644
--- a/test-apps/simple-host/.classpath
+++ b/test-apps/simple-host/.classpath
@@ -4,7 +4,7 @@
 	<classpathentry kind="src" path="src/main/webapp"/>
 	<classpathentry kind="src" path="src/main/resources"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="var" path="SLICES_IVY_CACHE/javax.servlet/com.springsource.javax.servlet/2.5.0/com.springsource.javax.servlet-2.5.0.jar"/>
+	<classpathentry kind="var" path="SNAPS_IVY_CACHE/javax.servlet/com.springsource.javax.servlet/2.5.0/com.springsource.javax.servlet-2.5.0.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.snaps.core"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/test-apps/simple-snap/.classpath b/test-apps/simple-snap/.classpath
index e030ba3..84b760c 100644
--- a/test-apps/simple-snap/.classpath
+++ b/test-apps/simple-snap/.classpath
@@ -4,8 +4,8 @@
 	<classpathentry kind="src" path="src/main/webapp"/>
 	<classpathentry kind="src" path="src/main/resources"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="var" path="SLICES_IVY_CACHE/javax.servlet/com.springsource.javax.servlet/2.5.0/com.springsource.javax.servlet-2.5.0.jar" sourcepath="/SLICES_IVY_CACHE/javax.servlet/com.springsource.javax.servlet/2.5.0/com.springsource.javax.servlet-sources-2.5.0.jar"/>
-	<classpathentry kind="var" path="SLICES_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.5.1.R35x_v20091005/org.eclipse.osgi-3.5.1.R35x_v20091005.jar" sourcepath="/SLICES_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.5.1.R35x_v20091005/org.eclipse.osgi-sources-3.5.1.R35x_v20091005.jar"/>
+	<classpathentry kind="var" path="SNAPS_IVY_CACHE/javax.servlet/com.springsource.javax.servlet/2.5.0/com.springsource.javax.servlet-2.5.0.jar" sourcepath="/SNAPS_IVY_CACHE/javax.servlet/com.springsource.javax.servlet/2.5.0/com.springsource.javax.servlet-sources-2.5.0.jar"/>
+	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.5.1.R35x_v20091005/org.eclipse.osgi-3.5.1.R35x_v20091005.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.5.1.R35x_v20091005/org.eclipse.osgi-sources-3.5.1.R35x_v20091005.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.snaps.core"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/test-apps/spring-snap/.classpath b/test-apps/spring-snap/.classpath
index bd6320a..b76ca7a 100644
--- a/test-apps/spring-snap/.classpath
+++ b/test-apps/spring-snap/.classpath
@@ -4,12 +4,12 @@
 	<classpathentry kind="src" path="src/main/webapp"/>
 	<classpathentry kind="src" path="src/main/resources"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="var" path="SLICES_IVY_CACHE/javax.servlet/com.springsource.javax.servlet/2.5.0/com.springsource.javax.servlet-2.5.0.jar" sourcepath="/SLICES_IVY_CACHE/javax.servlet/com.springsource.javax.servlet/2.5.0/com.springsource.javax.servlet-sources-2.5.0.jar"/>
-	<classpathentry kind="var" path="SLICES_IVY_CACHE/org.springframework/org.springframework.web.servlet/3.0.0.RELEASE/org.springframework.web.servlet-3.0.0.RELEASE.jar" sourcepath="/SLICES_IVY_CACHE/org.springframework/org.springframework.web.servlet/3.0.0.RELEASE/org.springframework.web.servlet-sources-3.0.0.RELEASE.jar"/>
-	<classpathentry kind="var" path="SLICES_IVY_CACHE/org.springframework/org.springframework.core/3.0.0.RELEASE/org.springframework.core-3.0.0.RELEASE.jar" sourcepath="/SLICES_IVY_CACHE/org.springframework/org.springframework.core/3.0.0.RELEASE/org.springframework.core-sources-3.0.0.RELEASE.jar"/>
-	<classpathentry kind="var" path="SLICES_IVY_CACHE/org.springframework/org.springframework.context/3.0.0.RELEASE/org.springframework.context-3.0.0.RELEASE.jar" sourcepath="/SLICES_IVY_CACHE/org.springframework/org.springframework.context/3.0.0.RELEASE/org.springframework.context-sources-3.0.0.RELEASE.jar"/>
-	<classpathentry kind="var" path="SLICES_IVY_CACHE/org.springframework/org.springframework.web/3.0.0.RELEASE/org.springframework.web-3.0.0.RELEASE.jar" sourcepath="/SLICES_IVY_CACHE/org.springframework/org.springframework.web/3.0.0.RELEASE/org.springframework.web-sources-3.0.0.RELEASE.jar"/>
-	<classpathentry kind="var" path="SLICES_IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.RELEASE/org.springframework.beans-3.0.0.RELEASE.jar" sourcepath="/SLICES_IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.RELEASE/org.springframework.beans-sources-3.0.0.RELEASE.jar"/>
+	<classpathentry kind="var" path="SNAPS_IVY_CACHE/javax.servlet/com.springsource.javax.servlet/2.5.0/com.springsource.javax.servlet-2.5.0.jar" sourcepath="/SNAPS_IVY_CACHE/javax.servlet/com.springsource.javax.servlet/2.5.0/com.springsource.javax.servlet-sources-2.5.0.jar"/>
+	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.springframework/org.springframework.web.servlet/3.0.0.RELEASE/org.springframework.web.servlet-3.0.0.RELEASE.jar" sourcepath="/SNAPS_IVY_CACHE/org.springframework/org.springframework.web.servlet/3.0.0.RELEASE/org.springframework.web.servlet-sources-3.0.0.RELEASE.jar"/>
+	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.springframework/org.springframework.core/3.0.0.RELEASE/org.springframework.core-3.0.0.RELEASE.jar" sourcepath="/SNAPS_IVY_CACHE/org.springframework/org.springframework.core/3.0.0.RELEASE/org.springframework.core-sources-3.0.0.RELEASE.jar"/>
+	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.springframework/org.springframework.context/3.0.0.RELEASE/org.springframework.context-3.0.0.RELEASE.jar" sourcepath="/SNAPS_IVY_CACHE/org.springframework/org.springframework.context/3.0.0.RELEASE/org.springframework.context-sources-3.0.0.RELEASE.jar"/>
+	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.springframework/org.springframework.web/3.0.0.RELEASE/org.springframework.web-3.0.0.RELEASE.jar" sourcepath="/SNAPS_IVY_CACHE/org.springframework/org.springframework.web/3.0.0.RELEASE/org.springframework.web-sources-3.0.0.RELEASE.jar"/>
+	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.RELEASE/org.springframework.beans-3.0.0.RELEASE.jar" sourcepath="/SNAPS_IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.RELEASE/org.springframework.beans-sources-3.0.0.RELEASE.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.snaps.core"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/test-apps/taglib-host/.classpath b/test-apps/taglib-host/.classpath
index 39026f4..9c8009f 100644
--- a/test-apps/taglib-host/.classpath
+++ b/test-apps/taglib-host/.classpath
@@ -4,7 +4,7 @@
 	<classpathentry kind="src" path="src/main/webapp"/>
 	<classpathentry kind="src" path="src/main/resources"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="var" path="SLICES_IVY_CACHE/javax.servlet/com.springsource.javax.servlet/2.5.0/com.springsource.javax.servlet-2.5.0.jar"/>
+	<classpathentry kind="var" path="SNAPS_IVY_CACHE/javax.servlet/com.springsource.javax.servlet/2.5.0/com.springsource.javax.servlet-2.5.0.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.snaps.api"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/test-apps/taglib-snap-one/.classpath b/test-apps/taglib-snap-one/.classpath
index e030ba3..84b760c 100644
--- a/test-apps/taglib-snap-one/.classpath
+++ b/test-apps/taglib-snap-one/.classpath
@@ -4,8 +4,8 @@
 	<classpathentry kind="src" path="src/main/webapp"/>
 	<classpathentry kind="src" path="src/main/resources"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="var" path="SLICES_IVY_CACHE/javax.servlet/com.springsource.javax.servlet/2.5.0/com.springsource.javax.servlet-2.5.0.jar" sourcepath="/SLICES_IVY_CACHE/javax.servlet/com.springsource.javax.servlet/2.5.0/com.springsource.javax.servlet-sources-2.5.0.jar"/>
-	<classpathentry kind="var" path="SLICES_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.5.1.R35x_v20091005/org.eclipse.osgi-3.5.1.R35x_v20091005.jar" sourcepath="/SLICES_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.5.1.R35x_v20091005/org.eclipse.osgi-sources-3.5.1.R35x_v20091005.jar"/>
+	<classpathentry kind="var" path="SNAPS_IVY_CACHE/javax.servlet/com.springsource.javax.servlet/2.5.0/com.springsource.javax.servlet-2.5.0.jar" sourcepath="/SNAPS_IVY_CACHE/javax.servlet/com.springsource.javax.servlet/2.5.0/com.springsource.javax.servlet-sources-2.5.0.jar"/>
+	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.5.1.R35x_v20091005/org.eclipse.osgi-3.5.1.R35x_v20091005.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.5.1.R35x_v20091005/org.eclipse.osgi-sources-3.5.1.R35x_v20091005.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.snaps.core"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/test-apps/taglib-snap-two/.classpath b/test-apps/taglib-snap-two/.classpath
index e030ba3..84b760c 100644
--- a/test-apps/taglib-snap-two/.classpath
+++ b/test-apps/taglib-snap-two/.classpath
@@ -4,8 +4,8 @@
 	<classpathentry kind="src" path="src/main/webapp"/>
 	<classpathentry kind="src" path="src/main/resources"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="var" path="SLICES_IVY_CACHE/javax.servlet/com.springsource.javax.servlet/2.5.0/com.springsource.javax.servlet-2.5.0.jar" sourcepath="/SLICES_IVY_CACHE/javax.servlet/com.springsource.javax.servlet/2.5.0/com.springsource.javax.servlet-sources-2.5.0.jar"/>
-	<classpathentry kind="var" path="SLICES_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.5.1.R35x_v20091005/org.eclipse.osgi-3.5.1.R35x_v20091005.jar" sourcepath="/SLICES_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.5.1.R35x_v20091005/org.eclipse.osgi-sources-3.5.1.R35x_v20091005.jar"/>
+	<classpathentry kind="var" path="SNAPS_IVY_CACHE/javax.servlet/com.springsource.javax.servlet/2.5.0/com.springsource.javax.servlet-2.5.0.jar" sourcepath="/SNAPS_IVY_CACHE/javax.servlet/com.springsource.javax.servlet/2.5.0/com.springsource.javax.servlet-sources-2.5.0.jar"/>
+	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.5.1.R35x_v20091005/org.eclipse.osgi-3.5.1.R35x_v20091005.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.5.1.R35x_v20091005/org.eclipse.osgi-sources-3.5.1.R35x_v20091005.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.snaps.core"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>