Merge branch 'master' of ssh://git.eclipse.org/gitroot/virgo/org.eclipse.virgo.snaps into 369907-rework-dag-interface
diff --git a/build.versions b/build.versions
index 4770123..f8a192a 100644
--- a/build.versions
+++ b/build.versions
@@ -9,15 +9,15 @@
javax.servlet=3.0.0.v201112011016
javax.servlet.jsp=2.2.0.v201112011158
org.springframework=3.0.5.RELEASE
-org.eclipse.virgo.kernel=3.6.0.D-20120711101519
-org.eclipse.virgo.util=3.6.0.D-20120711093140
+org.eclipse.virgo.kernel=3.6.0.D-20120727123513
+org.eclipse.virgo.util=3.6.0.D-20120717181632
org.eclipse.gemini.web=2.1.0.RELEASE
-org.eclipse.virgo.test=3.6.0.D-20120711093701
-org.eclipse.virgo.web=3.6.0.D-20120711110258
+org.eclipse.virgo.test=3.6.0.D-20120717182335
+org.eclipse.virgo.web=3.6.0.D-20120727132746
org.eclipse.virgo.osgi=3.6.0.D-20120711092707
org.eclipse.virgo.snaps.samples=1.1.0
org.apache.catalina=7.0.26.v201205021508
-org.eclipse.virgo.nano=3.6.0.D-20120711095111
+org.eclipse.virgo.nano=3.6.0.D-20120727121316
# Test/Sample
ch.qos.logback.core=1.0.0.v20111214-2030
@@ -38,6 +38,6 @@
org.easymock=2.3.0
net.sourceforge.jwebunit=2.1.0
org.eclipse.virgo.teststubs=3.6.0.D-20120711092322
-org.eclipse.virgo.medic=3.6.0.D-20120711093918
-org.eclipse.virgo.repository=3.6.0.D-20120711094540
+org.eclipse.virgo.medic=3.6.0.D-20120717201225
+org.eclipse.virgo.repository=3.6.0.D-20120717202028
org.eclipse.gemini.blueprint=1.0.0.RELEASE
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 38b4e68..3dc9496 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
@@ -106,7 +106,8 @@
expect(bundleContext.getServiceReferences("org.eclipse.virgo.snaps.core.internal.Snap", "(snap.host.id=27)")).andReturn(new ServiceReference[] {serviceReference1, serviceReference2});
- expect(serviceReference1.compareTo(serviceReference2)).andReturn(1);
+ expect(serviceReference1.compareTo(serviceReference2)).andReturn(1).anyTimes();
+ expect(serviceReference2.compareTo(serviceReference1)).andReturn(-1).anyTimes();
replay(servletContext, bundleContext, serviceReference1, serviceReference2, bundle);
diff --git a/org.eclipse.virgo.snaps.core/.classpath b/org.eclipse.virgo.snaps.core/.classpath
index c07408e..626267d 100644
--- a/org.eclipse.virgo.snaps.core/.classpath
+++ b/org.eclipse.virgo.snaps.core/.classpath
@@ -26,27 +26,27 @@
<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/3.6.0.D-20120711101519/org.eclipse.virgo.kernel.deployer-3.6.0.D-20120711101519.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/3.6.0.D-20120711101519/org.eclipse.virgo.kernel.deployer-sources-3.6.0.D-20120711101519.jar"/>
- <classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.6.0.D-20120711093140/org.eclipse.virgo.util.osgi-3.6.0.D-20120711093140.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.6.0.D-20120711093140/org.eclipse.virgo.util.osgi-sources-3.6.0.D-20120711093140.jar"/>
- <classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.6.0.D-20120711093140/org.eclipse.virgo.util.osgi.manifest-3.6.0.D-20120711093140.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.6.0.D-20120711093140/org.eclipse.virgo.util.osgi.manifest-sources-3.6.0.D-20120711093140.jar"/>
- <classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/3.6.0.D-20120711101519/org.eclipse.virgo.kernel.osgi-3.6.0.D-20120711101519.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/3.6.0.D-20120711101519/org.eclipse.virgo.kernel.osgi-sources-3.6.0.D-20120711101519.jar"/>
+ <classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/3.6.0.D-20120727123513/org.eclipse.virgo.kernel.deployer-3.6.0.D-20120727123513.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/3.6.0.D-20120727123513/org.eclipse.virgo.kernel.deployer-sources-3.6.0.D-20120727123513.jar"/>
+ <classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.6.0.D-20120717181632/org.eclipse.virgo.util.osgi-3.6.0.D-20120717181632.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.6.0.D-20120717181632/org.eclipse.virgo.util.osgi-sources-3.6.0.D-20120717181632.jar"/>
+ <classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.6.0.D-20120717181632/org.eclipse.virgo.util.osgi.manifest-3.6.0.D-20120717181632.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.6.0.D-20120717181632/org.eclipse.virgo.util.osgi.manifest-sources-3.6.0.D-20120717181632.jar"/>
+ <classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/3.6.0.D-20120727123513/org.eclipse.virgo.kernel.osgi-3.6.0.D-20120727123513.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/3.6.0.D-20120727123513/org.eclipse.virgo.kernel.osgi-sources-3.6.0.D-20120727123513.jar"/>
<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.web.core/2.1.0.RELEASE/org.eclipse.gemini.web.core-2.1.0.RELEASE.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.web.core/2.1.0.RELEASE/org.eclipse.gemini.web.core-sources-2.1.0.RELEASE.jar"/>
<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.mirrored/org.slf4j.api/1.6.4.v20120130-2120/org.slf4j.api-1.6.4.v20120130-2120.jar"/>
- <classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.6.0.D-20120711093140/org.eclipse.virgo.util.io-3.6.0.D-20120711093140.jar"/>
+ <classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.6.0.D-20120717181632/org.eclipse.virgo.util.io-3.6.0.D-20120717181632.jar"/>
<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.web.tomcat/2.1.0.RELEASE/org.eclipse.gemini.web.tomcat-2.1.0.RELEASE.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.web.tomcat/2.1.0.RELEASE/org.eclipse.gemini.web.tomcat-sources-2.1.0.RELEASE.jar"/>
- <classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.6.0.D-20120711093140/org.eclipse.virgo.util.common-3.6.0.D-20120711093140.jar"/>
+ <classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.6.0.D-20120717181632/org.eclipse.virgo.util.common-3.6.0.D-20120717181632.jar"/>
<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.springframework/org.springframework.core/3.0.5.RELEASE/org.springframework.core-3.0.5.RELEASE.jar" sourcepath="/SNAPS_IVY_CACHE/org.springframework/org.springframework.core/3.0.5.RELEASE/org.springframework.core-sources-3.0.5.RELEASE.jar"/>
<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.apache.catalina/com.springsource.org.apache.catalina/7.0.26/com.springsource.org.apache.catalina-7.0.26.jar" sourcepath="/SNAPS_IVY_CACHE/org.apache.catalina/com.springsource.org.apache.catalina/7.0.26/com.springsource.org.apache.catalina-sources-7.0.26.jar"/>
<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.teststubs/org.eclipse.virgo.teststubs.osgi/3.6.0.D-20120711092322/org.eclipse.virgo.teststubs.osgi-3.6.0.D-20120711092322.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.teststubs/org.eclipse.virgo.teststubs.osgi/3.6.0.D-20120711092322/org.eclipse.virgo.teststubs.osgi-sources-3.6.0.D-20120711092322.jar"/>
- <classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/3.6.0.D-20120711093140/org.eclipse.virgo.util.parser.manifest-3.6.0.D-20120711093140.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/3.6.0.D-20120711093140/org.eclipse.virgo.util.parser.manifest-sources-3.6.0.D-20120711093140.jar"/>
+ <classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/3.6.0.D-20120717181632/org.eclipse.virgo.util.parser.manifest-3.6.0.D-20120717181632.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/3.6.0.D-20120717181632/org.eclipse.virgo.util.parser.manifest-sources-3.6.0.D-20120717181632.jar"/>
<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.aspectj/com.springsource.org.aspectj.runtime/1.6.12.RELEASE/com.springsource.org.aspectj.runtime-1.6.12.RELEASE.jar"/>
<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.slf4j/com.springsource.slf4j.nop/1.6.1/com.springsource.slf4j.nop-1.6.1.jar" sourcepath="/SNAPS_IVY_CACHE/org.slf4j/com.springsource.slf4j.nop/1.6.1/com.springsource.slf4j.nop-sources-1.6.1.jar"/>
- <classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.core/3.6.0.D-20120711093918/org.eclipse.virgo.medic.core-3.6.0.D-20120711093918.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/3.6.0.D-20120711093918/org.eclipse.virgo.medic.test-3.6.0.D-20120711093918.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/3.6.0.D-20120711093918/org.eclipse.virgo.medic-3.6.0.D-20120711093918.jar"/>
- <classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.artifact/3.6.0.D-20120711101519/org.eclipse.virgo.kernel.artifact-3.6.0.D-20120711101519.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.artifact/3.6.0.D-20120711101519/org.eclipse.virgo.kernel.artifact-sources-3.6.0.D-20120711101519.jar"/>
- <classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.kernel.core/3.6.0.D-20120711095111/org.eclipse.virgo.kernel.core-3.6.0.D-20120711095111.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.core/3.6.0.D-20120711095111/org.eclipse.virgo.kernel.core-sources-3.6.0.D-20120711095111.jar"/>
+ <classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.core/3.6.0.D-20120717201225/org.eclipse.virgo.medic.core-3.6.0.D-20120717201225.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/3.6.0.D-20120717201225/org.eclipse.virgo.medic.test-3.6.0.D-20120717201225.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/3.6.0.D-20120717201225/org.eclipse.virgo.medic-3.6.0.D-20120717201225.jar"/>
+ <classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.artifact/3.6.0.D-20120727123513/org.eclipse.virgo.kernel.artifact-3.6.0.D-20120727123513.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.artifact/3.6.0.D-20120727123513/org.eclipse.virgo.kernel.artifact-sources-3.6.0.D-20120727123513.jar"/>
+ <classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.kernel.core/3.6.0.D-20120727121316/org.eclipse.virgo.kernel.core-3.6.0.D-20120727121316.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.core/3.6.0.D-20120727121316/org.eclipse.virgo.kernel.core-sources-3.6.0.D-20120727121316.jar"/>
<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi/3.8.0.v20120508-2119/org.eclipse.osgi-3.8.0.v20120508-2119.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.1.R37x_v20110808-1106/org.eclipse.osgi-sources-3.7.1.R37x_v20110808-1106.jar"/>
- <classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.deployer.api/3.6.0.D-20120711095111/org.eclipse.virgo.deployer.api-3.6.0.D-20120711095111.jar"/>
+ <classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.deployer.api/3.6.0.D-20120727121316/org.eclipse.virgo.deployer.api-3.6.0.D-20120727121316.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/org.eclipse.virgo.snaps.test/.classpath b/org.eclipse.virgo.snaps.test/.classpath
index 23dea95..20ba460 100644
--- a/org.eclipse.virgo.snaps.test/.classpath
+++ b/org.eclipse.virgo.snaps.test/.classpath
@@ -5,18 +5,18 @@
<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/3.6.0.D-20120711093701/org.eclipse.virgo.test.framework-3.6.0.D-20120711093701.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.framework/3.6.0.D-20120711093701/org.eclipse.virgo.test.framework-sources-3.6.0.D-20120711093701.jar"/>
+ <classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.framework/3.6.0.D-20120717182335/org.eclipse.virgo.test.framework-3.6.0.D-20120717182335.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.framework/3.6.0.D-20120717182335/org.eclipse.virgo.test.framework-sources-3.6.0.D-20120717182335.jar"/>
<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi/3.8.0.v20120508-2119/org.eclipse.osgi-3.8.0.v20120508-2119.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.1.R37x_v20110808-1106/org.eclipse.osgi-sources-3.7.1.R37x_v20110808-1106.jar"/>
- <classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.6.0.D-20120711093140/org.eclipse.virgo.util.common-3.6.0.D-20120711093140.jar"/>
- <classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.6.0.D-20120711093140/org.eclipse.virgo.util.osgi-3.6.0.D-20120711093140.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.6.0.D-20120711093140/org.eclipse.virgo.util.osgi-sources-3.6.0.D-20120711093140.jar"/>
- <classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.6.0.D-20120711093140/org.eclipse.virgo.util.osgi.manifest-3.6.0.D-20120711093140.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.6.0.D-20120711093140/org.eclipse.virgo.util.osgi.manifest-sources-3.6.0.D-20120711093140.jar"/>
- <classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.kernel.core/3.6.0.D-20120711095111/org.eclipse.virgo.kernel.core-3.6.0.D-20120711095111.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.core/3.6.0.D-20120711095111/org.eclipse.virgo.kernel.core-sources-3.6.0.D-20120711095111.jar"/>
- <classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/3.6.0.D-20120711101519/org.eclipse.virgo.kernel.deployer-3.6.0.D-20120711101519.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer.core/3.6.0.D-20120711101519/org.eclipse.virgo.kernel.deployer.core-sources-3.6.0.D-20120711101519.jar"/>
- <classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.6.0.D-20120711093140/org.eclipse.virgo.util.io-3.6.0.D-20120711093140.jar"/>
+ <classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.6.0.D-20120717181632/org.eclipse.virgo.util.common-3.6.0.D-20120717181632.jar"/>
+ <classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.6.0.D-20120717181632/org.eclipse.virgo.util.osgi-3.6.0.D-20120717181632.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.6.0.D-20120717181632/org.eclipse.virgo.util.osgi-sources-3.6.0.D-20120717181632.jar"/>
+ <classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.6.0.D-20120717181632/org.eclipse.virgo.util.osgi.manifest-3.6.0.D-20120717181632.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.6.0.D-20120717181632/org.eclipse.virgo.util.osgi.manifest-sources-3.6.0.D-20120717181632.jar"/>
+ <classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.kernel.core/3.6.0.D-20120727121316/org.eclipse.virgo.kernel.core-3.6.0.D-20120727121316.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.core/3.6.0.D-20120727121316/org.eclipse.virgo.kernel.core-sources-3.6.0.D-20120727121316.jar"/>
+ <classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/3.6.0.D-20120727123513/org.eclipse.virgo.kernel.deployer-3.6.0.D-20120727123513.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer.core/3.6.0.D-20120727123513/org.eclipse.virgo.kernel.deployer.core-sources-3.6.0.D-20120727123513.jar"/>
+ <classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.6.0.D-20120717181632/org.eclipse.virgo.util.io-3.6.0.D-20120717181632.jar"/>
<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.equinox.event/1.2.100.v20111010-1614/org.eclipse.equinox.event-1.2.100.v20111010-1614.jar"/>
<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.launcher/3.6.0.D-20120711092707/org.eclipse.virgo.osgi.launcher-3.6.0.D-20120711092707.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.launcher/3.6.0.D-20120711092707/org.eclipse.virgo.osgi.launcher-sources-3.6.0.D-20120711092707.jar"/>
<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.extensions.equinox/3.6.0.D-20120711092707/org.eclipse.virgo.osgi.extensions.equinox-3.6.0.D-20120711092707.jar" sourcepath="/SNAPS_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.extensions.equinox/3.6.0.D-20120711092707/org.eclipse.virgo.osgi.extensions.equinox-sources-3.6.0.D-20120711092707.jar"/>
<classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi.services/3.3.0.v20120307-2102/org.eclipse.osgi.services-3.3.0.v20120307-2102.jar"/>
- <classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.deployer.api/3.6.0.D-20120711095111/org.eclipse.virgo.deployer.api-3.6.0.D-20120711095111.jar"/>
+ <classpathentry kind="var" path="SNAPS_IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.deployer.api/3.6.0.D-20120727121316/org.eclipse.virgo.deployer.api-3.6.0.D-20120727121316.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
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 5c4d8de..580ee2f 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
@@ -38,6 +38,11 @@
@Test
public void scopedPlan() throws Exception {
DeploymentIdentity deployed = getDeployer().deploy(new File("src/test/resources/scoped.plan").toURI());
+ // Allow snap to be published before proceeding with test
+ try {
+ Thread.sleep(1000);
+ } catch (InterruptedException e) {
+ }
try {
RequestUtils.assertContent("index", "/simple-host", "/index.jsp");
diff --git a/org.eclipse.virgo.snaps.test/src/test/resources/config/org.eclipse.virgo.kernel.userregion.properties b/org.eclipse.virgo.snaps.test/src/test/resources/config/org.eclipse.virgo.kernel.userregion.properties
index c117feb..c1e2f53 100644
--- a/org.eclipse.virgo.snaps.test/src/test/resources/config/org.eclipse.virgo.kernel.userregion.properties
+++ b/org.eclipse.virgo.snaps.test/src/test/resources/config/org.eclipse.virgo.kernel.userregion.properties
@@ -10,10 +10,10 @@
file:../ivy-cache/repository/org.eclipse.gemini/org.eclipse.gemini.blueprint.io/1.0.0.RELEASE/org.eclipse.gemini.blueprint.io-1.0.0.RELEASE.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.mirrored/org.eclipse.equinox.cm/1.0.400.v20120319-2029/org.eclipse.equinox.cm-1.0.400.v20120319-2029.jar,\
- file:../ivy-cache/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.agent.dm/3.6.0.D-20120711101519/org.eclipse.virgo.kernel.agent.dm-3.6.0.D-20120711101519.jar@start,\
- file:../ivy-cache/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer.dm/3.6.0.D-20120711101519/org.eclipse.virgo.kernel.deployer.dm-3.6.0.D-20120711101519.jar@start,\
- file:../ivy-cache/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.dmfragment/3.6.0.D-20120711101519/org.eclipse.virgo.kernel.dmfragment-3.6.0.D-20120711101519.jar,\
- file:../ivy-cache/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.userregion/3.6.0.D-20120711101519/org.eclipse.virgo.kernel.userregion-3.6.0.D-20120711101519.jar@start,\
+ file:../ivy-cache/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.agent.dm/3.6.0.D-20120727123513/org.eclipse.virgo.kernel.agent.dm-3.6.0.D-20120727123513.jar@start,\
+ file:../ivy-cache/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer.dm/3.6.0.D-20120727123513/org.eclipse.virgo.kernel.deployer.dm-3.6.0.D-20120727123513.jar@start,\
+ file:../ivy-cache/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.dmfragment/3.6.0.D-20120727123513/org.eclipse.virgo.kernel.dmfragment-3.6.0.D-20120727123513.jar,\
+ file:../ivy-cache/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.userregion/3.6.0.D-20120727123513/org.eclipse.virgo.kernel.userregion-3.6.0.D-20120727123513.jar@start,\
file:../ivy-cache/repository/org.eclipse.virgo.mirrored/org.eclipse.equinox.ds/1.4.0.v20120112-1400/org.eclipse.equinox.ds-1.4.0.v20120112-1400.jar@start,\
file:../ivy-cache/repository/org.eclipse.virgo.mirrored/org.eclipse.equinox.util/1.0.300.v20111010-1614/org.eclipse.equinox.util-1.0.300.v20111010-1614.jar@start,\
file:../ivy-cache/repository/org.eclipse.virgo.mirrored/org.eclipse.osgi.services/3.3.0.v20120307-2102/org.eclipse.osgi.services-3.3.0.v20120307-2102.jar,\
diff --git a/sample/org.eclipse.virgo.snaps.sample.animal/build.xml b/sample/org.eclipse.virgo.snaps.sample.animal/build.xml
index dc174b9..7f17a65 100644
--- a/sample/org.eclipse.virgo.snaps.sample.animal/build.xml
+++ b/sample/org.eclipse.virgo.snaps.sample.animal/build.xml
@@ -3,7 +3,7 @@
<property file="${basedir}/../build.properties"/>
<property file="${basedir}/../../build.versions"/>
- <!-- <import file="${basedir}/../../build-snaps/package-sample.xml"/> -->
+ <import file="${basedir}/../../build-snaps/package-sample.xml"/>
<import file="${basedir}/../../virgo-build/wab/default.xml"/>
</project>
