bug 320387: bring snaps up to date with Virgo 2.1.0.M02-incubation

18 files changed, 169 insertions, 83 deletions

diff --git a/build.properties b/build.properties
index bc6ace0..3ac3013 100644
--- a/build.properties
+++ b/build.properties
@@ -11,7 +11,7 @@ target.version=1.5
 findbugs.enforce=true

 clover.enforce=true

 clover.coverage=50%

-ivy.settings.file=${basedir}/../ivysettings.xml

+#ivy.settings.file=${basedir}/../ivysettings.xml

 

 test.vm.args= -Xmx1024M -XX:MaxPermSize=512M -XX:+HeapDumpOnOutOfMemoryError

 #test.vm.args= -Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n

diff --git a/build.versions b/build.versions
index 695c4b9..432233e 100644
--- a/build.versions
+++ b/build.versions
@@ -7,15 +7,17 @@ javax.servlet=2.5.0
 javax.servlet.jsp=2.1.0
 org.springframework=3.0.0.RELEASE
 org.springframework.webflow=2.0.7.RELEASE
-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
+org.eclipse.virgo.kernel=2.1.0.M02-incubation
+org.eclipse.virgo.util=2.1.0.M02-incubation
+org.eclipse.virgo.repository=2.1.0.M02-incubation
+org.eclipse.gemini.web=1.1.0.M02-incubation
+org.eclipse.virgo.test=2.1.0.M02-incubation
+org.eclipse.virgo.web=2.1.0.M02-incubation
+org.eclipse.virgo.osgi=2.1.0.M02-incubation
+
 
 # Test
-org.eclipse.virgo.medic=2.1.0.M01
+org.eclipse.virgo.medic=2.1.0.M02-incubation
 org.apache.commons.codec=1.3.0
 org.apache.commons.httpclient=3.1.0
 org.apache.felix.configadmin=1.0.10
@@ -25,7 +27,7 @@ org.apache.taglibs=1.1.2
 org.junit=4.7.0
 org.easymock=2.3.0
 net.sourceforge.jwebunit=2.1.0
-org.eclipse.virgo.teststubs.osgi=2.1.0.M01
+org.eclipse.virgo.teststubs.osgi=2.1.0.M02-incubation
 org.apache.felix.eventadmin=1.0.0
 org.apache.felix=1.2.4
 org.springframework.osgi=1.2.1
diff --git a/org.eclipse.virgo.snaps.api/.classpath b/org.eclipse.virgo.snaps.api/.classpath
index eadde53..4d77074 100644
--- a/org.eclipse.virgo.snaps.api/.classpath
+++ b/org.eclipse.virgo.snaps.api/.classpath
@@ -24,12 +24,12 @@
 	<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.eclipse.gemini.web/org.eclipse.gemini.web.core/1.1.0.M02-incubation/org.eclipse.gemini.web.core-1.1.0.M02-incubation.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.gemini.web/org.eclipse.gemini.web.core/1.1.0.M02-incubation/org.eclipse.gemini.web.core-sources-1.1.0.M02-incubation.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="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.teststubs/org.eclipse.virgo.teststubs.osgi/2.1.0.M02-incubation/org.eclipse.virgo.teststubs.osgi-2.1.0.M02-incubation.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.teststubs/org.eclipse.virgo.teststubs.osgi/2.1.0.M02-incubation/org.eclipse.virgo.teststubs.osgi-sources-2.1.0.M02-incubation.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/org.eclipse.virgo.snaps.core/.classpath b/org.eclipse.virgo.snaps.core/.classpath
index efd382e..4dc9f23 100644
--- a/org.eclipse.virgo.snaps.core/.classpath
+++ b/org.eclipse.virgo.snaps.core/.classpath
@@ -26,25 +26,25 @@
 	<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.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/2.1.0.M02-incubation/org.eclipse.virgo.kernel.deployer-2.1.0.M02-incubation.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/2.1.0.M02-incubation/org.eclipse.virgo.kernel.deployer-sources-2.1.0.M02-incubation.jar"/>
+	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/2.1.0.M02-incubation/org.eclipse.virgo.util.osgi-2.1.0.M02-incubation.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/2.1.0.M02-incubation/org.eclipse.virgo.util.osgi-sources-2.1.0.M02-incubation.jar"/>
+	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/2.1.0.M02-incubation/org.eclipse.virgo.kernel.osgi-2.1.0.M02-incubation.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/2.1.0.M02-incubation/org.eclipse.virgo.kernel.osgi-sources-2.1.0.M02-incubation.jar"/>
+	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.gemini.web/org.eclipse.gemini.web.core/1.1.0.M02-incubation/org.eclipse.gemini.web.core-1.1.0.M02-incubation.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.gemini.web/org.eclipse.gemini.web.core/1.1.0.M02-incubation/org.eclipse.gemini.web.core-sources-1.1.0.M02-incubation.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.eclipse.virgo.util/org.eclipse.virgo.util.io/2.1.0.M02-incubation/org.eclipse.virgo.util.io-2.1.0.M02-incubation.jar"/>
+	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.gemini.web/org.eclipse.gemini.web.tomcat/1.1.0.M02-incubation/org.eclipse.gemini.web.tomcat-1.1.0.M02-incubation.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.gemini.web/org.eclipse.gemini.web.tomcat/1.1.0.M02-incubation/org.eclipse.gemini.web.tomcat-sources-1.1.0.M02-incubation.jar"/>
+	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/2.1.0.M02-incubation/org.eclipse.virgo.util.common-2.1.0.M02-incubation.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.eclipse.virgo.teststubs/org.eclipse.virgo.teststubs.osgi/2.1.0.M02-incubation/org.eclipse.virgo.teststubs.osgi-2.1.0.M02-incubation.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.teststubs/org.eclipse.virgo.teststubs.osgi/2.1.0.M02-incubation/org.eclipse.virgo.teststubs.osgi-sources-2.1.0.M02-incubation.jar"/>
+	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/2.1.0.M02-incubation/org.eclipse.virgo.util.parser.manifest-2.1.0.M02-incubation.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/2.1.0.M02-incubation/org.eclipse.virgo.util.parser.manifest-sources-2.1.0.M02-incubation.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.virgo.medic/org.eclipse.virgo.medic.core/2.1.0.M02-incubation/org.eclipse.virgo.medic.core-2.1.0.M02-incubation.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.M02-incubation/org.eclipse.virgo.medic.test-2.1.0.M02-incubation.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.M02-incubation/org.eclipse.virgo.medic-2.1.0.M02-incubation.jar"/>
+	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.artifact/2.1.0.M02-incubation/org.eclipse.virgo.kernel.artifact-2.1.0.M02-incubation.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.artifact/2.1.0.M02-incubation/org.eclipse.virgo.kernel.artifact-sources-2.1.0.M02-incubation.jar"/>
+	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.core/2.1.0.M02-incubation/org.eclipse.virgo.kernel.core-2.1.0.M02-incubation.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.core/2.1.0.M02-incubation/org.eclipse.virgo.kernel.core-sources-2.1.0.M02-incubation.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/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 b3505aa..dc4b93c 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
@@ -23,7 +23,7 @@ public enum SnapsLogEvents implements LogEvent {
     SNAP_UNBOUND(11, Level.INFO), //
     SNAP_INIT_FAILURE(12, Level.ERROR);
 
-    private static final String PREFIX = "SL";
+    private static final String PREFIX = "SN";
 
     private final LogEventDelegate delegate;
 
diff --git a/org.eclipse.virgo.snaps.core/src/main/java/org/eclipse/virgo/snaps/core/internal/deployer/DefaultInstallOptionsFactory.java b/org.eclipse.virgo.snaps.core/src/main/java/org/eclipse/virgo/snaps/core/internal/deployer/DefaultInstallOptionsFactory.java
new file mode 100644
index 0000000..9ad9498
--- a/dev/null
+++ b/org.eclipse.virgo.snaps.core/src/main/java/org/eclipse/virgo/snaps/core/internal/deployer/DefaultInstallOptionsFactory.java
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * This file is part of the Virgo Web Server.
+ *
+ * Copyright (c) 2010 Eclipse Foundation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    SpringSource, a division of VMware - initial API and implementation and/or initial documentation
+ *******************************************************************************/
+
+
+package org.eclipse.virgo.snaps.core.internal.deployer;
+
+import java.util.Collections;
+
+import org.eclipse.gemini.web.core.InstallationOptions;
+
+/**
+ * User: dsklyut Date: Jun 22, 2010 Time: 12:25:51 PM
+ */
+public class DefaultInstallOptionsFactory implements InstallOptionsFactory {
+
+    public InstallationOptions createDefaultInstallOptions() {
+        InstallationOptions installationOptions = new InstallationOptions(Collections.<String, String> emptyMap());
+        installationOptions.setDefaultWABHeaders(true);
+        return installationOptions;
+    }
+
+}
diff --git a/org.eclipse.virgo.snaps.core/src/main/java/org/eclipse/virgo/snaps/core/internal/deployer/InstallOptionsFactory.java b/org.eclipse.virgo.snaps.core/src/main/java/org/eclipse/virgo/snaps/core/internal/deployer/InstallOptionsFactory.java
new file mode 100644
index 0000000..8a65c03
--- a/dev/null
+++ b/org.eclipse.virgo.snaps.core/src/main/java/org/eclipse/virgo/snaps/core/internal/deployer/InstallOptionsFactory.java
@@ -0,0 +1,13 @@
+package org.eclipse.virgo.snaps.core.internal.deployer;
+
+import org.eclipse.gemini.web.core.InstallationOptions;
+
+/**
+ * User: dsklyut
+ * Date: Jun 22, 2010
+ * Time: 12:25:02 PM
+ */
+public interface InstallOptionsFactory {
+
+    InstallationOptions createDefaultInstallOptions();
+}
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 3e2cbc5..a9121f6 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
@@ -16,18 +16,18 @@ import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
+import org.eclipse.gemini.web.core.InstallationOptions;
+import org.eclipse.gemini.web.core.WebBundleManifestTransformer;
 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;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * <strong>Concurrent Semantics</strong><br />
@@ -42,6 +42,8 @@ final class SnapTransformer implements Transformer {
     private static final Logger logger = LoggerFactory.getLogger(SnapTransformer.class);
 
     private final WebBundleManifestTransformer manifestTransformer;
+    
+    private InstallOptionsFactory installOptionFactory = new DefaultInstallOptionsFactory();
 
     public SnapTransformer(WebBundleManifestTransformer manifestTransformer) {
         this.manifestTransformer = manifestTransformer;
@@ -66,9 +68,12 @@ final class SnapTransformer implements Transformer {
 
     void doTransform(BundleManifest bundleManifest, URL sourceUrl) throws DeploymentException {
         logger.info("Transforming bundle at '{}'", sourceUrl.toExternalForm());
-        bundleManifest.setModuleType(SNAP_MODULE_TYPE);
+        
         try {
-            this.manifestTransformer.transform(bundleManifest, sourceUrl, null, false);
+            bundleManifest.setModuleType(SNAP_MODULE_TYPE);
+            bundleManifest.setHeader("SpringSource-DefaultWABHeaders", "true");
+            InstallationOptions installationOptions = installOptionFactory.createDefaultInstallOptions();
+            this.manifestTransformer.transform(bundleManifest, sourceUrl, installationOptions, false);
         } catch (IOException ioe) {
             logger.error(String.format("Error transforming manifest for snap '%s' version '%s'",
                 bundleManifest.getBundleSymbolicName().getSymbolicName(), bundleManifest.getBundleVersion()), ioe);
@@ -91,4 +96,8 @@ final class SnapTransformer implements Transformer {
             throw new DeploymentException("Install artifact '" + installArtifact + "' has a null source URI");
         }
     }
+
+    public void setInstallOptionFactory(InstallOptionsFactory installOptionsFactory) {
+        this.installOptionFactory = installOptionsFactory;
+    }
 }
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 2d5e249..adbd419 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
@@ -16,7 +16,6 @@ import static org.easymock.EasyMock.eq;
 import static org.easymock.EasyMock.expect;
 import static org.easymock.EasyMock.expectLastCall;
 import static org.easymock.EasyMock.isA;
-import static org.easymock.EasyMock.isNull;
 import static org.easymock.EasyMock.replay;
 import static org.easymock.EasyMock.verify;
 import static org.junit.Assert.fail;
@@ -27,6 +26,7 @@ import java.net.URI;
 import java.net.URL;
 
 import org.eclipse.virgo.snaps.core.internal.deployer.SnapTransformer;
+import org.junit.Before;
 import org.junit.Test;
 
 import org.eclipse.virgo.kernel.artifact.fs.ArtifactFS;
@@ -42,16 +42,29 @@ import org.eclipse.virgo.util.osgi.manifest.internal.StandardBundleManifest;
 
 public class SnapTransformerTests {
     
-    private final WebBundleManifestTransformer manifestTransformer = createMock(WebBundleManifestTransformer.class);
-    
-    private final BundleManifest bundleManifest = new StandardBundleManifest(null);
+    private WebBundleManifestTransformer manifestTransformer;
+
+    private BundleManifest bundleManifest;
+
+    private InstallOptionsFactory installOptionsFactory;
+
+    private SnapTransformer snapTransformer;
     
-    private SnapTransformer snapTransformer = new SnapTransformer(manifestTransformer);
+    @Before
+    public void setUp() {
+        bundleManifest = new StandardBundleManifest(null);
+        manifestTransformer = createMock(WebBundleManifestTransformer.class);
+        snapTransformer = new SnapTransformer(manifestTransformer);
+        installOptionsFactory = createMock(InstallOptionsFactory.class);
+        snapTransformer.setInstallOptionFactory(installOptionsFactory);
+    }
     
     @Test(expected = DeploymentException.class)
     public void testInvalidTransformation() throws Exception {
 
-        this.manifestTransformer.transform(eq(this.bundleManifest), isA(URL.class), (InstallationOptions) isNull(), eq(false));
+        InstallationOptions options = new DefaultInstallOptionsFactory().createDefaultInstallOptions();
+        expect(this.installOptionsFactory.createDefaultInstallOptions()).andReturn(options);
+        this.manifestTransformer.transform(eq(this.bundleManifest), isA(URL.class), eq(options), eq(false));
         expectLastCall().andThrow(new IOException());
         replayAll();
         snapTransformer.doTransform(bundleManifest, URI.create("file:bar").toURL());
@@ -60,7 +73,11 @@ public class SnapTransformerTests {
 
     @Test
     public void testValidTransformation() throws Exception {
-        this.manifestTransformer.transform(eq(this.bundleManifest), isA(URL.class), (InstallationOptions) isNull(), eq(false));        
+        
+        InstallationOptions options = new DefaultInstallOptionsFactory().createDefaultInstallOptions();
+        expect(this.installOptionsFactory.createDefaultInstallOptions()).andReturn(options);
+        
+        this.manifestTransformer.transform(eq(this.bundleManifest), isA(URL.class), eq(options), eq(false));        
         replayAll();
         snapTransformer.doTransform(bundleManifest, URI.create("file:bar").toURL());
         verifyAll();
@@ -86,17 +103,24 @@ public class SnapTransformerTests {
         File f2 = new File("/bar2");
         expect(artifactFS2.getFile()).andReturn(f2);
         
-        this.manifestTransformer.transform(bundleManifest1, f1.toURI().toURL(), null, false);
-        this.manifestTransformer.transform(bundleManifest2, f2.toURI().toURL(), null, false);
+        InstallOptionsFactory factory = new DefaultInstallOptionsFactory();
+        
+        InstallationOptions options1 = factory.createDefaultInstallOptions();
+        expect(this.installOptionsFactory.createDefaultInstallOptions()).andReturn(options1);
+        this.manifestTransformer.transform(bundleManifest1, f1.toURI().toURL(), options1, false);
+        
+        InstallationOptions options2 = factory.createDefaultInstallOptions();
+        expect(this.installOptionsFactory.createDefaultInstallOptions()).andReturn(options2);
+        this.manifestTransformer.transform(bundleManifest2, f2.toURI().toURL(), options2, false);
         
-        replay(installArtifact1, artifactFS1, installArtifact2, artifactFS2, manifestTransformer);
+        replay(installArtifact1, artifactFS1, installArtifact2, artifactFS2, installOptionsFactory, manifestTransformer);
         
         Tree<InstallArtifact> installTree = new ThreadSafeArrayListTree<InstallArtifact>(installArtifact1);
         installTree.addChild(new ThreadSafeArrayListTree<InstallArtifact>(installArtifact2));
         
         snapTransformer.transform(installTree, null);
         
-        verify(installArtifact1, artifactFS1, installArtifact2, artifactFS2, manifestTransformer);
+        verify(installArtifact1, artifactFS1, installArtifact2, artifactFS2, installOptionsFactory, manifestTransformer);
     }
     
     @Test(expected=DeploymentException.class)
@@ -118,9 +142,15 @@ public class SnapTransformerTests {
         expect(installArtifact2.getArtifactFS()).andReturn(artifactFS2).anyTimes();        
         expect(artifactFS2.getFile()).andReturn(null);
         
-        this.manifestTransformer.transform(bundleManifest1, f1.toURI().toURL(), null, false);
         
-        replay(installArtifact1, artifactFS1, installArtifact2, artifactFS2, manifestTransformer);
+InstallOptionsFactory factory = new DefaultInstallOptionsFactory();
+        
+        InstallationOptions options1 = factory.createDefaultInstallOptions();
+        expect(this.installOptionsFactory.createDefaultInstallOptions()).andReturn(options1);
+        
+        this.manifestTransformer.transform(bundleManifest1, f1.toURI().toURL(), options1, false);
+        
+        replay(installArtifact1, artifactFS1, installArtifact2, artifactFS2, installOptionsFactory, manifestTransformer);
         
         Tree<InstallArtifact> installTree = new ThreadSafeArrayListTree<InstallArtifact>(installArtifact1);
         installTree.addChild(new ThreadSafeArrayListTree<InstallArtifact>(installArtifact2));
@@ -129,17 +159,17 @@ public class SnapTransformerTests {
             snapTransformer.transform(installTree, null);
             fail();
         } catch (Exception e) {
-            verify(installArtifact1, artifactFS1, installArtifact2, artifactFS2, manifestTransformer);
+            verify(installArtifact1, artifactFS1, installArtifact2, artifactFS2, installOptionsFactory, manifestTransformer);
             throw e;
         }                
     }
     
 
     private void verifyAll() {
-        verify(this.manifestTransformer);
+        verify(installOptionsFactory, this.manifestTransformer);
     }
 
     private void replayAll() {
-        replay(this.manifestTransformer);
+        replay(installOptionsFactory, this.manifestTransformer);
     }
 }
diff --git a/org.eclipse.virgo.snaps.core/template.mf b/org.eclipse.virgo.snaps.core/template.mf
index ea27f98..95bcbe5 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: 
- 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)", 
+ org.eclipse.virgo.kernel.*;version="[2.1, 2.2)",
+ org.eclipse.virgo.util.*;version="[2.1, 2.2)",
+ org.eclipse.gemini.web.*;version="[1.1, 1.2)",
+ org.eclipse.virgo.medic.*;version="[2.1, 2.2)", 
  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 53a048d..7ee484a 100644
--- a/org.eclipse.virgo.snaps.test/.classpath
+++ b/org.eclipse.virgo.snaps.test/.classpath
@@ -6,16 +6,15 @@
 	<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="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.virgo.test/org.eclipse.virgo.test.framework/2.1.0.M02-incubation/org.eclipse.virgo.test.framework-2.1.0.M02-incubation.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.framework/2.1.0.M02-incubation/org.eclipse.virgo.test.framework-sources-2.1.0.M02-incubation.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.eclipse.virgo.util/org.eclipse.virgo.util.common/2.1.0.M02-incubation/org.eclipse.virgo.util.common-2.1.0.M02-incubation.jar"/>
+	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/2.1.0.M02-incubation/org.eclipse.virgo.util.osgi-2.1.0.M02-incubation.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/2.1.0.M02-incubation/org.eclipse.virgo.util.osgi-sources-2.1.0.M02-incubation.jar"/>
+	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.core/2.1.0.M02-incubation/org.eclipse.virgo.kernel.core-2.1.0.M02-incubation.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.core/2.1.0.M02-incubation/org.eclipse.virgo.kernel.core-sources-2.1.0.M02-incubation.jar"/>
+	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/2.1.0.M02-incubation/org.eclipse.virgo.kernel.deployer-2.1.0.M02-incubation.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer.core/2.1.0.M02-incubation/org.eclipse.virgo.kernel.deployer.core-sources-2.1.0.M02-incubation.jar"/>
+	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/2.1.0.M02-incubation/org.eclipse.virgo.util.io-2.1.0.M02-incubation.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="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.launcher/2.1.0.M02-incubation/org.eclipse.virgo.osgi.launcher-2.1.0.M02-incubation.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.launcher/2.1.0.M02-incubation/org.eclipse.virgo.osgi.launcher-sources-2.1.0.M02-incubation.jar"/>
+	<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.extensions.equinox/2.1.0.M02-incubation/org.eclipse.virgo.osgi.extensions.equinox-2.1.0.M02-incubation.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.extensions.equinox/2.1.0.M02-incubation/org.eclipse.virgo.osgi.extensions.equinox-sources-2.1.0.M02-incubation.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 858c154..45d649d 100644
--- a/org.eclipse.virgo.snaps.test/ivy.xml
+++ b/org.eclipse.virgo.snaps.test/ivy.xml
@@ -22,6 +22,7 @@
 
 		<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.web" name="org.eclipse.virgo.web" rev="${org.eclipse.virgo.web}" conf="test->runtime"/>
 		<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"/>
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 84687d4..3c6cf54 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
@@ -63,7 +63,7 @@ public abstract class AbstractDeployerTests {
         EventHandler eventHandler = new InitialArtifactDeploymentAwaitingEventHandler();
         
         Properties properties = new Properties();
-        properties.setProperty("event.topics", "com/springsource/kernel/*");
+        properties.setProperty("event.topics", "org/eclipse/virgo/kernel/*");
         
         FrameworkUtil.getBundle(AbstractDeployerTests.class).getBundleContext().registerService(EventHandler.class.getName(), eventHandler, properties);       
     }
@@ -71,7 +71,7 @@ public abstract class AbstractDeployerTests {
     private static final class InitialArtifactDeploymentAwaitingEventHandler implements EventHandler {
         
         public void handleEvent(Event event) {
-            if ("com/springsource/kernel/userregion/systemartifacts/DEPLOYED".equals(event.getTopic())) {
+            if ("org/eclipse/virgo/kernel/userregion/systemartifacts/DEPLOYED".equals(event.getTopic())) {
                 latch.countDown();  
             }
         }
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/org.eclipse.virgo.kernel.properties
index 399c664..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/org.eclipse.virgo.kernel.properties
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/org.eclipse.virgo.kernel.userregion.properties
index c511d11..461b0bf 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/org.eclipse.virgo.kernel.userregion.properties
@@ -9,28 +9,28 @@ 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/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,\
+ file:../ivy-cache/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.agent.dm/2.1.0.M02-incubation/org.eclipse.virgo.kernel.agent.dm-2.1.0.M02-incubation.jar@start,\
+ file:../ivy-cache/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer.dm/2.1.0.M02-incubation/org.eclipse.virgo.kernel.deployer.dm-2.1.0.M02-incubation.jar@start,\
+ file:../ivy-cache/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.dmfragment/2.1.0.M02-incubation/org.eclipse.virgo.kernel.dmfragment-2.1.0.M02-incubation.jar,\
+ file:../ivy-cache/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.userregion/2.1.0.M02-incubation/org.eclipse.virgo.kernel.userregion-2.1.0.M02-incubation.jar@start,\
 
 packageImports =\
- 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.eclipse.virgo.kernel.artifact.*;version="0",\
+ org.eclipse.virgo.kernel.core;version="0",\
+ org.eclipse.virgo.kernel.deployer.core;version="0",\
+ org.eclipse.virgo.kernel.deployer.core.event;version="0",\
+ org.eclipse.virgo.kernel.install.*;version="0",\
+ org.eclipse.virgo.kernel.osgi.*;version="0",\
+ org.eclipse.virgo.kernel.model.management;version="0",\
+ org.eclipse.virgo.kernel.module;version="0",\
+ org.eclipse.virgo.kernel.serviceability;version="0",\
+ org.eclipse.virgo.kernel.serviceability.*;version="0",\
+ org.eclipse.virgo.kernel.services.work;version="0",\
+ org.eclipse.virgo.kernel.shim.*;version="0",\
+ org.eclipse.virgo.medic.*;version="0",\
+ org.eclipse.virgo.repository;version="0",\
+ org.eclipse.virgo.repository.*;version="0",\
+ org.eclipse.virgo.util.*;version="0",\
  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.6.RELEASE,2.0.0)",\
diff --git a/org.eclipse.virgo.snaps.test/src/test/resources/config/com.springsource.osgi.medic.properties b/org.eclipse.virgo.snaps.test/src/test/resources/config/org.eclipse.virgo.medic.properties
index 9a52283..9a52283 100644
--- a/org.eclipse.virgo.snaps.test/src/test/resources/config/com.springsource.osgi.medic.properties
+++ b/org.eclipse.virgo.snaps.test/src/test/resources/config/org.eclipse.virgo.medic.properties
diff --git a/org.eclipse.virgo.snaps.test/src/test/resources/config/com.springsource.repository.properties b/org.eclipse.virgo.snaps.test/src/test/resources/config/org.eclipse.virgo.repository.properties
index 02d1a2c..02d1a2c 100644
--- a/org.eclipse.virgo.snaps.test/src/test/resources/config/com.springsource.repository.properties
+++ b/org.eclipse.virgo.snaps.test/src/test/resources/config/org.eclipse.virgo.repository.properties
diff --git a/virgo-build b/virgo-build
-Subproject 6fe9313cb2721098dbf7963f8334c74746dbfa2
+Subproject 3f4bdeda733311d2945601e1a3f0117abab3b0c