Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--build.versions18
-rw-r--r--org.eclipse.virgo.kernel.agent.dm/.classpath12
-rw-r--r--org.eclipse.virgo.kernel.artifact/.classpath16
-rw-r--r--org.eclipse.virgo.kernel.deployer.dm/.classpath12
-rw-r--r--org.eclipse.virgo.kernel.deployer.test/.classpath18
-rw-r--r--org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/no.heap.dump.test.config.properties38
-rw-r--r--org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/spring256.test.config.properties38
-rw-r--r--org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/test.config.properties38
-rw-r--r--org.eclipse.virgo.kernel.deployer.test/src/test/resources/config/org.eclipse.virgo.kernel.userregion.properties6
-rw-r--r--org.eclipse.virgo.kernel.deployer/.classpath30
-rw-r--r--org.eclipse.virgo.kernel.dmfragment/.classpath10
-rw-r--r--org.eclipse.virgo.kernel.equinox.extensions/.classpath2
-rw-r--r--org.eclipse.virgo.kernel.kerneldmfragment/.classpath8
-rw-r--r--org.eclipse.virgo.kernel.model/.classpath12
-rw-r--r--org.eclipse.virgo.kernel.model/src/main/java/org/eclipse/virgo/kernel/model/management/RuntimeArtifactModelObjectNameCreator.java19
-rw-r--r--org.eclipse.virgo.kernel.model/src/test/java/org/eclipse/virgo/kernel/model/StubCompositeArtifact.java3
-rw-r--r--org.eclipse.virgo.kernel.model/src/test/java/org/eclipse/virgo/kernel/model/StubRegion.java161
-rw-r--r--org.eclipse.virgo.kernel.model/src/test/java/org/eclipse/virgo/kernel/model/internal/AbztractArtifactTests.java18
-rw-r--r--org.eclipse.virgo.kernel.model/src/test/java/org/eclipse/virgo/kernel/model/internal/NotifyingArtifactRepositoryTests.java6
-rw-r--r--org.eclipse.virgo.kernel.model/src/test/java/org/eclipse/virgo/kernel/model/internal/bundle/ModelBundleListenerInitializerTests.java4
-rw-r--r--org.eclipse.virgo.kernel.model/src/test/java/org/eclipse/virgo/kernel/model/internal/bundle/ModelBundleListenerTests.java4
-rw-r--r--org.eclipse.virgo.kernel.model/src/test/java/org/eclipse/virgo/kernel/model/internal/configurationadmin/ConfgurationArtifactTests.java11
-rw-r--r--org.eclipse.virgo.kernel.model/src/test/java/org/eclipse/virgo/kernel/model/internal/configurationadmin/ModelConfigurationListenerInitializerTests.java4
-rw-r--r--org.eclipse.virgo.kernel.model/src/test/java/org/eclipse/virgo/kernel/model/internal/configurationadmin/ModelConfigurationListenerTests.java15
-rw-r--r--org.eclipse.virgo.kernel.model/src/test/java/org/eclipse/virgo/kernel/model/internal/deployer/DeployerArtifactTests.java4
-rw-r--r--org.eclipse.virgo.kernel.model/src/test/java/org/eclipse/virgo/kernel/model/internal/deployer/DeployerBundleArtifactTests.java13
-rw-r--r--org.eclipse.virgo.kernel.model/src/test/java/org/eclipse/virgo/kernel/model/internal/deployer/DeployerCompositeArtifactDependencyDeterminerTests.java8
-rw-r--r--org.eclipse.virgo.kernel.model/src/test/java/org/eclipse/virgo/kernel/model/internal/deployer/DeployerCompositeArtifactTests.java5
-rw-r--r--org.eclipse.virgo.kernel.model/src/test/java/org/eclipse/virgo/kernel/model/internal/deployer/ModelInstallArtifactLifecycleListenerInitializerTests.java4
-rw-r--r--org.eclipse.virgo.kernel.model/src/test/java/org/eclipse/virgo/kernel/model/internal/deployer/ModelInstallArtifactLifecycleListenerTests.java4
-rw-r--r--org.eclipse.virgo.kernel.model/src/test/java/org/eclipse/virgo/kernel/model/management/internal/DelegatingManageableArtifactTests.java6
-rw-r--r--org.eclipse.virgo.kernel.osgi/.classpath22
-rw-r--r--org.eclipse.virgo.kernel.osgicommand/.classpath4
-rw-r--r--org.eclipse.virgo.kernel.services/.classpath24
-rw-r--r--org.eclipse.virgo.kernel.smoketest/.classpath2
-rw-r--r--org.eclipse.virgo.kernel.stubs/.classpath8
-rw-r--r--org.eclipse.virgo.kernel.test/.classpath20
-rw-r--r--org.eclipse.virgo.kernel.test/src/test/resources/META-INF/test.config.properties38
-rw-r--r--org.eclipse.virgo.kernel.test/src/test/resources/config/org.eclipse.virgo.kernel.userregion.properties6
-rw-r--r--org.eclipse.virgo.kernel.userregion/.classpath24
-rw-r--r--org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/quasi/StandardQuasiBundleTests.java1
-rw-r--r--org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/quasi/StandardQuasiExportPackageTests.java1
-rw-r--r--org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/quasi/StandardQuasiImportPackageTests.java4
-rw-r--r--org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/quasi/StandardQuasiRequiredBundleTests.java1
-rw-r--r--org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/quasi/StubRegion.java161
-rw-r--r--org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/quasi/StubRegionDigraph.java146
-rw-r--r--org.eclipse.virgo.kernel.userregionfactory/.classpath16
-rw-r--r--org.eclipse.virgo.management.console/ivy.xml3
-rw-r--r--org.eclipse.virgo.shell.command/.classpath19
-rw-r--r--org.eclipse.virgo.shell.command/ivy.xml1
-rw-r--r--org.eclipse.virgo.shell.command/src/test/java/org/eclipse/virgo/shell/internal/commands/ConfigCommandsTests.java9
-rw-r--r--org.eclipse.virgo.shell.command/src/test/java/org/eclipse/virgo/shell/internal/commands/StubAbstractCompositeInstallArtifactBasedCommands.java3
-rw-r--r--org.eclipse.virgo.shell.command/src/test/java/org/eclipse/virgo/shell/internal/completers/ConfigCompleterTests.java7
-rw-r--r--org.eclipse.virgo.shell.command/src/test/java/org/eclipse/virgo/shell/stubs/StubRegion.java161
-rw-r--r--org.eclipse.virgo.shell.command/src/test/java/org/eclipse/virgo/shell/stubs/StubRegionDigraph.java146
-rw-r--r--test-apps/quartz-scheduler/quartz.bundle.a/.classpath2
-rw-r--r--test-apps/quartz-scheduler/quartz.bundle.b/.classpath2
-rw-r--r--test-apps/quartz-scheduler/quartz.bundle.same1/.classpath2
-rw-r--r--test-apps/quartz-scheduler/quartz.bundle.same2/.classpath2
m---------virgo-build0
60 files changed, 287 insertions, 1095 deletions
diff --git a/build.versions b/build.versions
index 4700c0b0..abd3332c 100644
--- a/build.versions
+++ b/build.versions
@@ -11,19 +11,19 @@ org.osgi.enterprise=4.2.0.v201108120515
org.eclipse.gemini.management=1.0.3.RELEASE
org.aspectj=1.6.12.RELEASE
org.eclipse.osgi=3.8.0.v20120508-2119
-ch.qos.logback.classic=1.0.0.v20111214-2030
-ch.qos.logback.core=1.0.0.v20111214-2030
-ch.qos.logback.slf4j=1.0.0.v20120123-1500
-org.eclipse.virgo.medic=3.6.0.D-20120830095745
-org.eclipse.virgo.repository=3.6.0.D-20120830100334
-org.eclipse.virgo.util=3.6.0.D-20120830095303
+ch.qos.logback.classic=1.0.3.v20120828-0612
+ch.qos.logback.core=1.0.3.v20120828-0612
+ch.qos.logback.slf4j=1.0.0.v201208311022
+org.eclipse.virgo.medic=3.6.0.D-20120903162943
+org.eclipse.virgo.repository=3.6.0.D-20120903163626
+org.eclipse.virgo.util=3.6.0.D-20120903162413
org.slf4j=1.6.1
org.slf4j.spi=1.6.1
org.slf4j.api=1.6.4.v20120130-2120
org.slf4j.jul=1.6.4.v20120130-2120
org.slf4j.jcl=1.6.4.v20120130-2120
org.slf4j.log4j=1.6.4.v20120130-2120
-org.eclipse.gemini.blueprint=1.0.0.RELEASE
+org.eclipse.gemini.blueprint=1.0.2.RELEASE
org.springframework.osgi=1.2.1
org.springframework=3.0.5.RELEASE
org.apache.mina.core=2.0.2.v201108120515
@@ -31,7 +31,7 @@ org.apache.sshd.core=0.5.0.v201108120515
org.apache.felix.gogo.command=0.8.0.v201108120515
org.apache.felix.gogo.runtime=0.8.0.v201108120515
org.apache.felix.gogo.shell=0.8.0.v201110170705
-org.eclipse.virgo.nano=3.6.0.D-20120830095954
+org.eclipse.virgo.nano=3.6.0.D-20120903163206
org.eclipse.virgo.build.tools=1.3.0.RELEASE
org.eclipse.equinox.launcher=1.3.0.v20120308-1358
org.apache.commons.fileupload=1.2.0.v20110525
@@ -53,6 +53,6 @@ javax.portlet=2.0.0.v20110525
javax.servlet.jsp=2.2.0.v201112011158
javax.transaction=1.1.1.v201105210645
org.easymock=2.3.0
-org.eclipse.virgo.test=3.6.0.D-20120830095553
+org.eclipse.virgo.test=3.6.0.D-20120903162719
org.hsqldb=1.8.0.9
org.junit=4.7.0
diff --git a/org.eclipse.virgo.kernel.agent.dm/.classpath b/org.eclipse.virgo.kernel.agent.dm/.classpath
index fe95792e..b71fc83c 100644
--- a/org.eclipse.virgo.kernel.agent.dm/.classpath
+++ b/org.eclipse.virgo.kernel.agent.dm/.classpath
@@ -22,20 +22,20 @@
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.ajdt.core.ASPECTJRT_CONTAINER"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.6.0.D-20120830095745/org.eclipse.virgo.medic-3.6.0.D-20120830095745.jar" sourcepath="/KERNEL_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="KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.6.0.D-20120903162943/org.eclipse.virgo.medic-3.6.0.D-20120903162943.jar" sourcepath="/KERNEL_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">
<attributes>
<attribute name="org.eclipse.ajdt.aspectpath" value="org.eclipse.ajdt.aspectpath"/>
</attributes>
</classpathentry>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.core/1.0.0.RELEASE/org.eclipse.gemini.blueprint.core-1.0.0.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.core/1.0.0.RELEASE/org.eclipse.gemini.blueprint.core-sources-1.0.0.RELEASE.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.extender/1.0.0.RELEASE/org.eclipse.gemini.blueprint.extender-1.0.0.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.extender/1.0.0.RELEASE/org.eclipse.gemini.blueprint.extender-sources-1.0.0.RELEASE.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.core/1.0.2.RELEASE/org.eclipse.gemini.blueprint.core-1.0.2.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.core/1.0.2.RELEASE/org.eclipse.gemini.blueprint.core-sources-1.0.2.RELEASE.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.extender/1.0.2.RELEASE/org.eclipse.gemini.blueprint.extender-1.0.2.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.extender/1.0.2.RELEASE/org.eclipse.gemini.blueprint.extender-sources-1.0.2.RELEASE.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi/3.8.0.v20120508-2119/org.eclipse.osgi-3.8.0.v20120508-2119.jar" sourcepath="/KERNEL_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="KERNEL_IVY_CACHE/org.eclipse.virgo.mirrored/org.slf4j.api/1.6.4.v20120130-2120/org.slf4j.api-1.6.4.v20120130-2120.jar" sourcepath="/KERNEL_IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.6.1/com.springsource.slf4j.api-sources-1.6.1.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework/org.springframework.context/3.0.5.RELEASE/org.springframework.context-3.0.5.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework/org.springframework.context/3.0.5.RELEASE/org.springframework.context-sources-3.0.5.RELEASE.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.stubs/3.6.0.D-20120830095553/org.eclipse.virgo.test.stubs-3.6.0.D-20120830095553.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.test.stubs/org.eclipse.virgo.test.stubs/3.6.0.D-20120711092322/org.eclipse.virgo.test.stubs-sources-3.6.0.D-20120711092322.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.stubs/3.6.0.D-20120903162719/org.eclipse.virgo.test.stubs-3.6.0.D-20120903162719.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.test.stubs/org.eclipse.virgo.test.stubs/3.6.0.D-20120711092322/org.eclipse.virgo.test.stubs-sources-3.6.0.D-20120711092322.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/KERNEL_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-2.3.0.jar" sourcepath="/KERNEL_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-sources-2.3.0.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.6.0.D-20120830095303/org.eclipse.virgo.util.osgi-3.6.0.D-20120830095303.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.1.0.M01/org.eclipse.virgo.util.osgi-sources-3.1.0.M01.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.6.0.D-20120903162413/org.eclipse.virgo.util.osgi-3.6.0.D-20120903162413.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.1.0.M01/org.eclipse.virgo.util.osgi-sources-3.1.0.M01.jar"/>
<classpathentry kind="src" path="/org.eclipse.virgo.kernel.deployer"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework/org.springframework.core/3.0.5.RELEASE/org.springframework.core-3.0.5.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework/org.springframework.core/3.0.5.RELEASE/org.springframework.core-sources-3.0.5.RELEASE.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework/org.springframework.beans/3.0.5.RELEASE/org.springframework.beans-3.0.5.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework/org.springframework.beans/3.0.5.RELEASE/org.springframework.beans-sources-3.0.5.RELEASE.jar"/>
@@ -43,6 +43,6 @@
<classpathentry kind="var" path="KERNEL_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="KERNEL_IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.equinox.region/1.1.0.v20120319-1602/org.eclipse.equinox.region-1.1.0.v20120319-1602.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.equinox.region/1.0.0.v20110503/org.eclipse.equinox.region-1.0.0.v20110503.jar"/>
<classpathentry kind="var" path="KERNEL_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" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi.services/3.3.0.v20110513/org.eclipse.osgi.services-sources-3.3.0.v20110513.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.nano.core/3.6.0.D-20120830095954/org.eclipse.virgo.nano.core-3.6.0.D-20120830095954.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.nano.core/3.6.0.D-20120830095954/org.eclipse.virgo.nano.core-sources-3.6.0.D-20120830095954.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.nano.core/3.6.0.D-20120903163206/org.eclipse.virgo.nano.core-3.6.0.D-20120903163206.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.nano.core/3.6.0.D-20120903163206/org.eclipse.virgo.nano.core-sources-3.6.0.D-20120903163206.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/org.eclipse.virgo.kernel.artifact/.classpath b/org.eclipse.virgo.kernel.artifact/.classpath
index 1c6eb49c..2f8b32a3 100644
--- a/org.eclipse.virgo.kernel.artifact/.classpath
+++ b/org.eclipse.virgo.kernel.artifact/.classpath
@@ -22,19 +22,19 @@
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/KERNEL_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.repository/org.eclipse.virgo.repository/3.6.0.D-20120830100334/org.eclipse.virgo.repository-3.6.0.D-20120830100334.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.repository/org.eclipse.virgo.repository/3.5.0.D-20120615071313/org.eclipse.virgo.repository-sources-3.5.0.D-20120615071313.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.6.0.D-20120830095303/org.eclipse.virgo.util.io-3.6.0.D-20120830095303.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.6.0.D-20120711093140/org.eclipse.virgo.util.io-sources-3.6.0.D-20120711093140.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.6.0.D-20120830095303/org.eclipse.virgo.util.osgi.manifest-3.6.0.D-20120830095303.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.5.0.D-20120615065828/org.eclipse.virgo.util.osgi.manifest-sources-3.5.0.D-20120615065828.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/3.6.0.D-20120830095303/org.eclipse.virgo.util.parser.manifest-3.6.0.D-20120830095303.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/3.5.0.D-20120615065828/org.eclipse.virgo.util.parser.manifest-sources-3.5.0.D-20120615065828.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.6.0.D-20120830095303/org.eclipse.virgo.util.common-3.6.0.D-20120830095303.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.5.0.D-20120615065828/org.eclipse.virgo.util.common-sources-2.0019103807.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.repository/org.eclipse.virgo.repository/3.6.0.D-20120903163626/org.eclipse.virgo.repository-3.6.0.D-20120903163626.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.repository/org.eclipse.virgo.repository/3.5.0.D-20120615071313/org.eclipse.virgo.repository-sources-3.5.0.D-20120615071313.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.6.0.D-20120903162413/org.eclipse.virgo.util.io-3.6.0.D-20120903162413.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.6.0.D-20120711093140/org.eclipse.virgo.util.io-sources-3.6.0.D-20120711093140.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.6.0.D-20120903162413/org.eclipse.virgo.util.osgi.manifest-3.6.0.D-20120903162413.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.5.0.D-20120615065828/org.eclipse.virgo.util.osgi.manifest-sources-3.5.0.D-20120615065828.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/3.6.0.D-20120903162413/org.eclipse.virgo.util.parser.manifest-3.6.0.D-20120903162413.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/3.5.0.D-20120615065828/org.eclipse.virgo.util.parser.manifest-sources-3.5.0.D-20120615065828.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.6.0.D-20120903162413/org.eclipse.virgo.util.common-3.6.0.D-20120903162413.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.5.0.D-20120615065828/org.eclipse.virgo.util.common-sources-2.0019103807.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.mirrored/org.slf4j.api/1.6.4.v20120130-2120/org.slf4j.api-1.6.4.v20120130-2120.jar" sourcepath="/KERNEL_IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.6.1/com.springsource.slf4j.api-sources-1.6.1.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.slf4j/com.springsource.slf4j.nop/1.6.1/com.springsource.slf4j.nop-1.6.1.jar" sourcepath="/KERNEL_IVY_CACHE/org.slf4j/com.springsource.slf4j.nop/1.6.1/com.springsource.slf4j.nop-sources-1.6.1.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi/3.8.0.v20120508-2119/org.eclipse.osgi-3.8.0.v20120508-2119.jar" sourcepath="/KERNEL_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="KERNEL_IVY_CACHE/org.aspectj/com.springsource.org.aspectj.runtime/1.6.12.RELEASE/com.springsource.org.aspectj.runtime-1.6.12.RELEASE.jar" sourcepath="/KERNEL_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="KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.6.0.D-20120830095745/org.eclipse.virgo.medic-3.6.0.D-20120830095745.jar" sourcepath="/KERNEL_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="KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.core/3.6.0.D-20120830095745/org.eclipse.virgo.medic.core-3.6.0.D-20120830095745.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.core/3.5.0.D-20120615070622/org.eclipse.virgo.medic.core-sources-3.5.0.D-20120615070622.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.6.0.D-20120903162943/org.eclipse.virgo.medic-3.6.0.D-20120903162943.jar" sourcepath="/KERNEL_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="KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.core/3.6.0.D-20120903162943/org.eclipse.virgo.medic.core-3.6.0.D-20120903162943.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.core/3.5.0.D-20120615070622/org.eclipse.virgo.medic.core-sources-3.5.0.D-20120615070622.jar"/>
<classpathentry kind="var" path="KERNEL_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" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi.services/3.3.0.v20110513/org.eclipse.osgi.services-sources-3.3.0.v20110513.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-2.3.0.jar" sourcepath="/KERNEL_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-sources-2.3.0.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.nano.core/3.6.0.D-20120830095954/org.eclipse.virgo.nano.core-3.6.0.D-20120830095954.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.nano.core/3.6.0.D-20120903163206/org.eclipse.virgo.nano.core-3.6.0.D-20120903163206.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/org.eclipse.virgo.kernel.deployer.dm/.classpath b/org.eclipse.virgo.kernel.deployer.dm/.classpath
index 20cbe4ca..74245024 100644
--- a/org.eclipse.virgo.kernel.deployer.dm/.classpath
+++ b/org.eclipse.virgo.kernel.deployer.dm/.classpath
@@ -26,22 +26,22 @@
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework/org.springframework.context/3.0.5.RELEASE/org.springframework.context-3.0.5.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework/org.springframework.context/3.0.5.RELEASE/org.springframework.context-sources-3.0.5.RELEASE.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi/3.8.0.v20120508-2119/org.eclipse.osgi-3.8.0.v20120508-2119.jar" sourcepath="/KERNEL_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="KERNEL_IVY_CACHE/org.springframework/org.springframework.context.support/3.0.5.RELEASE/org.springframework.context.support-3.0.5.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework/org.springframework.context.support/3.0.5.RELEASE/org.springframework.context.support-sources-3.0.5.RELEASE.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.core/1.0.0.RELEASE/org.eclipse.gemini.blueprint.core-1.0.0.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.core/1.0.0.RELEASE/org.eclipse.gemini.blueprint.core-sources-1.0.0.RELEASE.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.extender/1.0.0.RELEASE/org.eclipse.gemini.blueprint.extender-1.0.0.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.extender/1.0.0.RELEASE/org.eclipse.gemini.blueprint.extender-sources-1.0.0.RELEASE.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.io/1.0.0.RELEASE/org.eclipse.gemini.blueprint.io-1.0.0.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.io/1.0.0.RELEASE/org.eclipse.gemini.blueprint.io-sources-1.0.0.RELEASE.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.core/1.0.2.RELEASE/org.eclipse.gemini.blueprint.core-1.0.2.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.core/1.0.2.RELEASE/org.eclipse.gemini.blueprint.core-sources-1.0.2.RELEASE.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.extender/1.0.2.RELEASE/org.eclipse.gemini.blueprint.extender-1.0.2.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.extender/1.0.2.RELEASE/org.eclipse.gemini.blueprint.extender-sources-1.0.2.RELEASE.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.io/1.0.2.RELEASE/org.eclipse.gemini.blueprint.io-1.0.2.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.io/1.0.2.RELEASE/org.eclipse.gemini.blueprint.io-sources-1.0.2.RELEASE.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework/org.springframework.core/3.0.5.RELEASE/org.springframework.core-3.0.5.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework/org.springframework.core/3.0.5.RELEASE/org.springframework.core-sources-3.0.5.RELEASE.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.kernel.deployer"/>
<classpathentry kind="con" path="org.eclipse.ajdt.core.ASPECTJRT_CONTAINER"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.6.0.D-20120830095745/org.eclipse.virgo.medic-3.6.0.D-20120830095745.jar">
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.6.0.D-20120903162943/org.eclipse.virgo.medic-3.6.0.D-20120903162943.jar">
<attributes>
<attribute name="org.eclipse.ajdt.aspectpath" value="org.eclipse.ajdt.aspectpath"/>
</attributes>
</classpathentry>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.stubs/3.6.0.D-20120830095553/org.eclipse.virgo.test.stubs-3.6.0.D-20120830095553.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.test.stubs/org.eclipse.virgo.test.stubs/3.6.0.D-20120711092322/org.eclipse.virgo.test.stubs-sources-3.6.0.D-20120711092322.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.stubs/3.6.0.D-20120903162719/org.eclipse.virgo.test.stubs-3.6.0.D-20120903162719.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.test.stubs/org.eclipse.virgo.test.stubs/3.6.0.D-20120711092322/org.eclipse.virgo.test.stubs-sources-3.6.0.D-20120711092322.jar"/>
<classpathentry kind="var" path="KERNEL_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="KERNEL_IVY_CACHE/org.aopalliance/com.springsource.org.aopalliance/1.0.0/com.springsource.org.aopalliance-1.0.0.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-2.3.0.jar" sourcepath="/KERNEL_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-sources-2.3.0.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.kernel.dmfragment"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.nano.core/3.6.0.D-20120830095954/org.eclipse.virgo.nano.core-3.6.0.D-20120830095954.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.nano.core/3.6.0.D-20120903163206/org.eclipse.virgo.nano.core-3.6.0.D-20120903163206.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/org.eclipse.virgo.kernel.deployer.test/.classpath b/org.eclipse.virgo.kernel.deployer.test/.classpath
index d9bf7cf9..dda18ac5 100644
--- a/org.eclipse.virgo.kernel.deployer.test/.classpath
+++ b/org.eclipse.virgo.kernel.deployer.test/.classpath
@@ -27,20 +27,20 @@
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework/org.springframework.core/3.0.5.RELEASE/org.springframework.core-3.0.5.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework/org.springframework.core/3.0.5.RELEASE/org.springframework.core-sources-3.0.5.RELEASE.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework/org.springframework.orm/3.0.5.RELEASE/org.springframework.orm-3.0.5.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework/org.springframework.orm/3.0.5.RELEASE/org.springframework.orm-sources-3.0.5.RELEASE.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework/org.springframework.transaction/3.0.5.RELEASE/org.springframework.transaction-3.0.5.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework/org.springframework.transaction/3.0.5.RELEASE/org.springframework.transaction-sources-3.0.5.RELEASE.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.core/1.0.0.RELEASE/org.eclipse.gemini.blueprint.core-1.0.0.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.core/1.0.0.RELEASE/org.eclipse.gemini.blueprint.core-sources-1.0.0.RELEASE.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.6.0.D-20120830095303/org.eclipse.virgo.util.io-3.6.0.D-20120830095303.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.5.0.D-20120615065828/org.eclipse.virgo.util.io-sources-3.5.0.D-20120615065828.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.math/3.6.0.D-20120830095303/org.eclipse.virgo.util.math-3.6.0.D-20120830095303.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.math/3.5.0.D-20120615065828/org.eclipse.virgo.util.math-sources-3.5.0.D-20120615065828.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.core/1.0.2.RELEASE/org.eclipse.gemini.blueprint.core-1.0.2.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.core/1.0.2.RELEASE/org.eclipse.gemini.blueprint.core-sources-1.0.2.RELEASE.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.6.0.D-20120903162413/org.eclipse.virgo.util.io-3.6.0.D-20120903162413.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.5.0.D-20120615065828/org.eclipse.virgo.util.io-sources-3.5.0.D-20120615065828.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.math/3.6.0.D-20120903162413/org.eclipse.virgo.util.math-3.6.0.D-20120903162413.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.math/3.5.0.D-20120615065828/org.eclipse.virgo.util.math-sources-3.5.0.D-20120615065828.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi/3.8.0.v20120508-2119/org.eclipse.osgi-3.8.0.v20120508-2119.jar" sourcepath="/KERNEL_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="KERNEL_IVY_CACHE/org.eclipse.virgo.mirrored/javax.transaction/1.1.1.v201105210645/javax.transaction-1.1.1.v201105210645.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.repository/org.eclipse.virgo.repository/3.6.0.D-20120830100334/org.eclipse.virgo.repository-3.6.0.D-20120830100334.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.repository/org.eclipse.virgo.repository/3.5.0.D-20120615071313/org.eclipse.virgo.repository-sources-3.5.0.D-20120615071313.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.6.0.D-20120830095303/org.eclipse.virgo.util.common-3.6.0.D-20120830095303.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.5.0.D-20120615065828/org.eclipse.virgo.util.common-sources-3.5.0.D-20120615065828.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.repository/org.eclipse.virgo.repository/3.6.0.D-20120903163626/org.eclipse.virgo.repository-3.6.0.D-20120903163626.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.repository/org.eclipse.virgo.repository/3.5.0.D-20120615071313/org.eclipse.virgo.repository-sources-3.5.0.D-20120615071313.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.6.0.D-20120903162413/org.eclipse.virgo.util.common-3.6.0.D-20120903162413.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.5.0.D-20120615065828/org.eclipse.virgo.util.common-sources-3.5.0.D-20120615065828.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.kernel.osgi"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.framework/3.6.0.D-20120830095553/org.eclipse.virgo.test.framework-3.6.0.D-20120830095553.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.framework/3.6.0.D-20120830095553/org.eclipse.virgo.test.framework-sources-3.6.0.D-20120830095553.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.launcher/3.6.0.D-20120830095553/org.eclipse.virgo.test.launcher-3.6.0.D-20120830095553.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.launcher/3.5.0.D-20120615065435/org.eclipse.virgo.test.launcher-sources-3.5.0.D-20120615065435.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.framework/3.6.0.D-20120903162719/org.eclipse.virgo.test.framework-3.6.0.D-20120903162719.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.framework/3.6.0.D-20120903162719/org.eclipse.virgo.test.framework-sources-3.6.0.D-20120903162719.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.launcher/3.6.0.D-20120903162719/org.eclipse.virgo.test.launcher-3.6.0.D-20120903162719.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.launcher/3.5.0.D-20120615065435/org.eclipse.virgo.test.launcher-sources-3.5.0.D-20120615065435.jar"/>
<classpathentry kind="src" path="/org.eclipse.virgo.kernel.model"/>
<classpathentry kind="var" path="KERNEL_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" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi.services/3.3.0.v20110513/org.eclipse.osgi.services-sources-3.3.0.v20110513.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.equinox.region/1.1.0.v20120319-1602/org.eclipse.equinox.region-1.1.0.v20120319-1602.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.nano.deployer.api/3.6.0.D-20120830095954/org.eclipse.virgo.nano.deployer.api-3.6.0.D-20120830095954.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.launcher/3.6.0.D-20120830095303/org.eclipse.virgo.util.parser.launcher-3.6.0.D-20120830095303.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.launcher/2.2.0.D-20101207150035/org.eclipse.virgo.util.parser.launcher-sources-2.2.0.D-20101207150035.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.nano.deployer.api/3.6.0.D-20120903163206/org.eclipse.virgo.nano.deployer.api-3.6.0.D-20120903163206.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.launcher/3.6.0.D-20120903162413/org.eclipse.virgo.util.parser.launcher-3.6.0.D-20120903162413.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.launcher/2.2.0.D-20101207150035/org.eclipse.virgo.util.parser.launcher-sources-2.2.0.D-20101207150035.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/no.heap.dump.test.config.properties b/org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/no.heap.dump.test.config.properties
index 3123f4fb..cfb8866b 100644
--- a/org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/no.heap.dump.test.config.properties
+++ b/org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/no.heap.dump.test.config.properties
@@ -6,40 +6,40 @@ launcher.bundles =\
file:${ivy.cache}/repository/org.eclipse.virgo.mirrored/org.slf4j.jul/${org.slf4j.jul}/org.slf4j.jul-${org.slf4j.jul}.jar,\
file:${ivy.cache}/repository/org.eclipse.virgo.mirrored/org.slf4j.jcl/${org.slf4j.jcl}/org.slf4j.jcl-${org.slf4j.jcl}.jar@start,\
file:${ivy.cache}/repository/org.eclipse.virgo.mirrored/com.springsource.org.aspectj.weaver/${org.aspectj}/com.springsource.org.aspectj.weaver-${org.aspectj}.jar@start,\
- file:${integration.repo.dir}/org.eclipse.virgo.medic/org.eclipse.virgo.medic/${org.eclipse.virgo.medic}/org.eclipse.virgo.medic-${org.eclipse.virgo.medic}.jar@start,\
- file:${integration.repo.dir}/org.eclipse.virgo.medic/org.eclipse.virgo.medic.logbackcorefragment/${org.eclipse.virgo.medic}/org.eclipse.virgo.medic.logbackcorefragment-${org.eclipse.virgo.medic}.jar,\
- file:${integration.repo.dir}/org.eclipse.virgo.medic/org.eclipse.virgo.medic.logbackclassicfragment/${org.eclipse.virgo.medic}/org.eclipse.virgo.medic.logbackclassicfragment-${org.eclipse.virgo.medic}.jar,\
+ 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.eclipse.virgo.medic/org.eclipse.virgo.medic.logbackcorefragment/${org.eclipse.virgo.medic}/org.eclipse.virgo.medic.logbackcorefragment-${org.eclipse.virgo.medic}.jar,\
+ file:${ivy.cache}/repository/org.eclipse.virgo.medic/org.eclipse.virgo.medic.logbackclassicfragment/${org.eclipse.virgo.medic}/org.eclipse.virgo.medic.logbackclassicfragment-${org.eclipse.virgo.medic}.jar,\
file:${ivy.cache}/repository/org.eclipse.virgo.mirrored/ch.qos.logback.core/${ch.qos.logback.core}/ch.qos.logback.core-${ch.qos.logback.core}.jar,\
file:${ivy.cache}/repository/org.eclipse.virgo.mirrored/ch.qos.logback.classic/${ch.qos.logback.classic}/ch.qos.logback.classic-${ch.qos.logback.classic}.jar,\
file:${ivy.cache}/repository/org.eclipse.virgo.mirrored/ch.qos.logback.slf4j/${ch.qos.logback.slf4j}/ch.qos.logback.slf4j-${ch.qos.logback.slf4j}.jar,\
file:${ivy.cache}/repository/org.eclipse.virgo.mirrored/org.eclipse.osgi.services/${org.eclipse.osgi.services}/org.eclipse.osgi.services-${org.eclipse.osgi.services}.jar,\
file:${ivy.cache}/repository/org.eclipse.virgo.mirrored/org.eclipse.equinox.cm/${org.eclipse.equinox.cm}/org.eclipse.equinox.cm-${org.eclipse.equinox.cm}.jar@start,\
- file:${integration.repo.dir}/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:${integration.repo.dir}/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:${integration.repo.dir}/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/${org.eclipse.virgo.util}/org.eclipse.virgo.util.osgi.manifest-${org.eclipse.virgo.util}.jar@start,\
+ file:${ivy.cache}/repository/org.eclipse.virgo.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.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/${org.eclipse.virgo.util}/org.eclipse.virgo.util.osgi.manifest-${org.eclipse.virgo.util}.jar@start,\
file:${ivy.cache}/repository/org.eclipse.virgo.mirrored/org.eclipse.equinox.event/${org.eclipse.equinox.event}/org.eclipse.equinox.event-${org.eclipse.equinox.event}.jar@start,\
- file:${integration.repo.dir}/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:${integration.repo.dir}/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:${integration.repo.dir}/org.eclipse.virgo.util/org.eclipse.virgo.util.jmx/${org.eclipse.virgo.util}/org.eclipse.virgo.util.jmx-${org.eclipse.virgo.util}.jar,\
- file:${integration.repo.dir}/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:${integration.repo.dir}/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:${integration.repo.dir}/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.launcher/${org.eclipse.virgo.util}/org.eclipse.virgo.util.parser.launcher-${org.eclipse.virgo.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.jmx/${org.eclipse.virgo.util}/org.eclipse.virgo.util.jmx-${org.eclipse.virgo.util}.jar,\
+ 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.parser.launcher/${org.eclipse.virgo.util}/org.eclipse.virgo.util.parser.launcher-${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:${integration.repo.dir}/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.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.5.RELEASE/org.springframework.aop-3.0.5.RELEASE.jar,\
file:${ivy.cache}/repository/org.springframework/org.springframework.asm/3.0.5.RELEASE/org.springframework.asm-3.0.5.RELEASE.jar,\
file:${ivy.cache}/repository/org.springframework/org.springframework.expression/3.0.5.RELEASE/org.springframework.expression-3.0.5.RELEASE.jar,\
file:${ivy.cache}/repository/org.springframework/org.springframework.beans/3.0.5.RELEASE/org.springframework.beans-3.0.5.RELEASE.jar,\
file:${ivy.cache}/repository/org.springframework/org.springframework.core/3.0.5.RELEASE/org.springframework.core-3.0.5.RELEASE.jar,\
file:${ivy.cache}/repository/org.springframework/org.springframework.context/3.0.5.RELEASE/org.springframework.context-3.0.5.RELEASE.jar,\
- file:${integration.repo.dir}/org.eclipse.virgo.nano/org.eclipse.virgo.nano.core/${org.eclipse.virgo.nano}/org.eclipse.virgo.nano.core-${org.eclipse.virgo.nano}.jar@start,\
- file:${integration.repo.dir}/org.eclipse.virgo.nano/org.eclipse.virgo.nano.deployer.api/${org.eclipse.virgo.nano}/org.eclipse.virgo.nano.deployer.api-${org.eclipse.virgo.nano}.jar,\
- file:${integration.repo.dir}/org.eclipse.virgo.nano/org.eclipse.virgo.nano.deployer.hot/${org.eclipse.virgo.nano}/org.eclipse.virgo.nano.deployer.hot-${org.eclipse.virgo.nano}.jar,\
+ file:${ivy.cache}/repository/org.eclipse.virgo.nano/org.eclipse.virgo.nano.core/${org.eclipse.virgo.nano}/org.eclipse.virgo.nano.core-${org.eclipse.virgo.nano}.jar@start,\
+ file:${ivy.cache}/repository/org.eclipse.virgo.nano/org.eclipse.virgo.nano.deployer.api/${org.eclipse.virgo.nano}/org.eclipse.virgo.nano.deployer.api-${org.eclipse.virgo.nano}.jar,\
+ file:${ivy.cache}/repository/org.eclipse.virgo.nano/org.eclipse.virgo.nano.deployer.hot/${org.eclipse.virgo.nano}/org.eclipse.virgo.nano.deployer.hot-${org.eclipse.virgo.nano}.jar,\
file:../org.eclipse.virgo.kernel.agent.dm/target/classes@start,\
- file:${ivy.cache}/repository/org.eclipse.gemini/org.eclipse.gemini.blueprint.core/1.0.0.RELEASE/org.eclipse.gemini.blueprint.core-1.0.0.RELEASE.jar,\
- file:${ivy.cache}/repository/org.eclipse.gemini/org.eclipse.gemini.blueprint.extender/1.0.0.RELEASE/org.eclipse.gemini.blueprint.extender-1.0.0.RELEASE.jar@start,\
- 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.eclipse.gemini/org.eclipse.gemini.blueprint.core/1.0.2.RELEASE/org.eclipse.gemini.blueprint.core-1.0.2.RELEASE.jar,\
+ file:${ivy.cache}/repository/org.eclipse.gemini/org.eclipse.gemini.blueprint.extender/1.0.2.RELEASE/org.eclipse.gemini.blueprint.extender-1.0.2.RELEASE.jar@start,\
+ file:${ivy.cache}/repository/org.eclipse.gemini/org.eclipse.gemini.blueprint.io/1.0.2.RELEASE/org.eclipse.gemini.blueprint.io-1.0.2.RELEASE.jar,\
file:${ivy.cache}/repository/org.aopalliance/com.springsource.org.aopalliance/1.0.0/com.springsource.org.aopalliance-1.0.0.jar,\
file:../org.eclipse.virgo.kernel.artifact/target/classes@start,\
file:../org.eclipse.virgo.kernel.services/target/classes@start,\
diff --git a/org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/spring256.test.config.properties b/org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/spring256.test.config.properties
index 3af51370..c31073a7 100644
--- a/org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/spring256.test.config.properties
+++ b/org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/spring256.test.config.properties
@@ -6,40 +6,40 @@ launcher.bundles =\
file:${ivy.cache}/repository/org.eclipse.virgo.mirrored/org.slf4j.jul/${org.slf4j.jul}/org.slf4j.jul-${org.slf4j.jul}.jar,\
file:${ivy.cache}/repository/org.eclipse.virgo.mirrored/org.slf4j.jcl/${org.slf4j.jcl}/org.slf4j.jcl-${org.slf4j.jcl}.jar@start,\
file:${ivy.cache}/repository/org.eclipse.virgo.mirrored/com.springsource.org.aspectj.weaver/${org.aspectj}/com.springsource.org.aspectj.weaver-${org.aspectj}.jar@start,\
- file:${integration.repo.dir}/org.eclipse.virgo.medic/org.eclipse.virgo.medic/${org.eclipse.virgo.medic}/org.eclipse.virgo.medic-${org.eclipse.virgo.medic}.jar@start,\
- file:${integration.repo.dir}/org.eclipse.virgo.medic/org.eclipse.virgo.medic.logbackcorefragment/${org.eclipse.virgo.medic}/org.eclipse.virgo.medic.logbackcorefragment-${org.eclipse.virgo.medic}.jar,\
- file:${integration.repo.dir}/org.eclipse.virgo.medic/org.eclipse.virgo.medic.logbackclassicfragment/${org.eclipse.virgo.medic}/org.eclipse.virgo.medic.logbackclassicfragment-${org.eclipse.virgo.medic}.jar,\
+ 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.eclipse.virgo.medic/org.eclipse.virgo.medic.logbackcorefragment/${org.eclipse.virgo.medic}/org.eclipse.virgo.medic.logbackcorefragment-${org.eclipse.virgo.medic}.jar,\
+ file:${ivy.cache}/repository/org.eclipse.virgo.medic/org.eclipse.virgo.medic.logbackclassicfragment/${org.eclipse.virgo.medic}/org.eclipse.virgo.medic.logbackclassicfragment-${org.eclipse.virgo.medic}.jar,\
file:${ivy.cache}/repository/org.eclipse.virgo.mirrored/ch.qos.logback.core/${ch.qos.logback.core}/ch.qos.logback.core-${ch.qos.logback.core}.jar,\
file:${ivy.cache}/repository/org.eclipse.virgo.mirrored/ch.qos.logback.classic/${ch.qos.logback.classic}/ch.qos.logback.classic-${ch.qos.logback.classic}.jar,\
file:${ivy.cache}/repository/org.eclipse.virgo.mirrored/ch.qos.logback.slf4j/${ch.qos.logback.slf4j}/ch.qos.logback.slf4j-${ch.qos.logback.slf4j}.jar,\
file:${ivy.cache}/repository/org.eclipse.virgo.mirrored/org.eclipse.osgi.services/${org.eclipse.osgi.services}/org.eclipse.osgi.services-${org.eclipse.osgi.services}.jar,\
file:${ivy.cache}/repository/org.eclipse.virgo.mirrored/org.eclipse.equinox.cm/${org.eclipse.equinox.cm}/org.eclipse.equinox.cm-${org.eclipse.equinox.cm}.jar@start,\
- file:${integration.repo.dir}/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:${integration.repo.dir}/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:${integration.repo.dir}/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/${org.eclipse.virgo.util}/org.eclipse.virgo.util.osgi.manifest-${org.eclipse.virgo.util}.jar@start,\
+ file:${ivy.cache}/repository/org.eclipse.virgo.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.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/${org.eclipse.virgo.util}/org.eclipse.virgo.util.osgi.manifest-${org.eclipse.virgo.util}.jar@start,\
file:${ivy.cache}/repository/org.eclipse.virgo.mirrored/org.eclipse.equinox.event/${org.eclipse.equinox.event}/org.eclipse.equinox.event-${org.eclipse.equinox.event}.jar@start,\
- file:${integration.repo.dir}/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:${integration.repo.dir}/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:${integration.repo.dir}/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:${integration.repo.dir}/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:${integration.repo.dir}/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:${integration.repo.dir}/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.launcher/${org.eclipse.virgo.util}/org.eclipse.virgo.util.parser.launcher-${org.eclipse.virgo.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.jmx/${org.eclipse.virgo.util}/org.eclipse.virgo.util.jmx-${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.parser.launcher/${org.eclipse.virgo.util}/org.eclipse.virgo.util.parser.launcher-${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:${integration.repo.dir}/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.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.5.RELEASE/org.springframework.aop-3.0.5.RELEASE.jar,\
file:${ivy.cache}/repository/org.springframework/org.springframework.asm/3.0.5.RELEASE/org.springframework.asm-3.0.5.RELEASE.jar,\
file:${ivy.cache}/repository/org.springframework/org.springframework.expression/3.0.5.RELEASE/org.springframework.expression-3.0.5.RELEASE.jar,\
file:${ivy.cache}/repository/org.springframework/org.springframework.beans/3.0.5.RELEASE/org.springframework.beans-3.0.5.RELEASE.jar,\
file:${ivy.cache}/repository/org.springframework/org.springframework.core/3.0.5.RELEASE/org.springframework.core-3.0.5.RELEASE.jar,\
file:${ivy.cache}/repository/org.springframework/org.springframework.context/3.0.5.RELEASE/org.springframework.context-3.0.5.RELEASE.jar,\
- file:${integration.repo.dir}/org.eclipse.virgo.nano/org.eclipse.virgo.nano.core/${org.eclipse.virgo.nano}/org.eclipse.virgo.nano.core-${org.eclipse.virgo.nano}.jar@start,\
- file:${integration.repo.dir}/org.eclipse.virgo.nano/org.eclipse.virgo.nano.deployer.api/${org.eclipse.virgo.nano}/org.eclipse.virgo.nano.deployer.api-${org.eclipse.virgo.nano}.jar,\
- file:${integration.repo.dir}/org.eclipse.virgo.nano/org.eclipse.virgo.nano.deployer.hot/${org.eclipse.virgo.nano}/org.eclipse.virgo.nano.deployer.hot-${org.eclipse.virgo.nano}.jar,\
+ file:${ivy.cache}/repository/org.eclipse.virgo.nano/org.eclipse.virgo.nano.core/${org.eclipse.virgo.nano}/org.eclipse.virgo.nano.core-${org.eclipse.virgo.nano}.jar@start,\
+ file:${ivy.cache}/repository/org.eclipse.virgo.nano/org.eclipse.virgo.nano.deployer.api/${org.eclipse.virgo.nano}/org.eclipse.virgo.nano.deployer.api-${org.eclipse.virgo.nano}.jar,\
+ file:${ivy.cache}/repository/org.eclipse.virgo.nano/org.eclipse.virgo.nano.deployer.hot/${org.eclipse.virgo.nano}/org.eclipse.virgo.nano.deployer.hot-${org.eclipse.virgo.nano}.jar,\
file:../org.eclipse.virgo.kernel.agent.dm/target/classes@start,\
- file:${ivy.cache}/repository/org.eclipse.gemini/org.eclipse.gemini.blueprint.core/1.0.0.RELEASE/org.eclipse.gemini.blueprint.core-1.0.0.RELEASE.jar,\
- file:${ivy.cache}/repository/org.eclipse.gemini/org.eclipse.gemini.blueprint.extender/1.0.0.RELEASE/org.eclipse.gemini.blueprint.extender-1.0.0.RELEASE.jar@start,\
- 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.eclipse.gemini/org.eclipse.gemini.blueprint.core/1.0.2.RELEASE/org.eclipse.gemini.blueprint.core-1.0.2.RELEASE.jar,\
+ file:${ivy.cache}/repository/org.eclipse.gemini/org.eclipse.gemini.blueprint.extender/1.0.2.RELEASE/org.eclipse.gemini.blueprint.extender-1.0.2.RELEASE.jar@start,\
+ file:${ivy.cache}/repository/org.eclipse.gemini/org.eclipse.gemini.blueprint.io/1.0.2.RELEASE/org.eclipse.gemini.blueprint.io-1.0.2.RELEASE.jar,\
file:${ivy.cache}/repository/org.aopalliance/com.springsource.org.aopalliance/1.0.0/com.springsource.org.aopalliance-1.0.0.jar,\
file:../org.eclipse.virgo.kernel.artifact/target/classes@start,\
file:../org.eclipse.virgo.kernel.services/target/classes@start,\
diff --git a/org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/test.config.properties b/org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/test.config.properties
index a0b04fdb..e00337e0 100644
--- a/org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/test.config.properties
+++ b/org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/test.config.properties
@@ -6,40 +6,40 @@ launcher.bundles =\
file:${ivy.cache}/repository/org.eclipse.virgo.mirrored/org.slf4j.jul/${org.slf4j.jul}/org.slf4j.jul-${org.slf4j.jul}.jar,\
file:${ivy.cache}/repository/org.eclipse.virgo.mirrored/org.slf4j.jcl/${org.slf4j.jcl}/org.slf4j.jcl-${org.slf4j.jcl}.jar@start,\
file:${ivy.cache}/repository/org.eclipse.virgo.mirrored/com.springsource.org.aspectj.weaver/${org.aspectj}/com.springsource.org.aspectj.weaver-${org.aspectj}.jar@start,\
- file:${integration.repo.dir}/org.eclipse.virgo.medic/org.eclipse.virgo.medic/${org.eclipse.virgo.medic}/org.eclipse.virgo.medic-${org.eclipse.virgo.medic}.jar@start,\
- file:${integration.repo.dir}/org.eclipse.virgo.medic/org.eclipse.virgo.medic.logbackcorefragment/${org.eclipse.virgo.medic}/org.eclipse.virgo.medic.logbackcorefragment-${org.eclipse.virgo.medic}.jar,\
- file:${integration.repo.dir}/org.eclipse.virgo.medic/org.eclipse.virgo.medic.logbackclassicfragment/${org.eclipse.virgo.medic}/org.eclipse.virgo.medic.logbackclassicfragment-${org.eclipse.virgo.medic}.jar,\
+ 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.eclipse.virgo.medic/org.eclipse.virgo.medic.logbackcorefragment/${org.eclipse.virgo.medic}/org.eclipse.virgo.medic.logbackcorefragment-${org.eclipse.virgo.medic}.jar,\
+ file:${ivy.cache}/repository/org.eclipse.virgo.medic/org.eclipse.virgo.medic.logbackclassicfragment/${org.eclipse.virgo.medic}/org.eclipse.virgo.medic.logbackclassicfragment-${org.eclipse.virgo.medic}.jar,\
file:${ivy.cache}/repository/org.eclipse.virgo.mirrored/ch.qos.logback.core/${ch.qos.logback.core}/ch.qos.logback.core-${ch.qos.logback.core}.jar,\
file:${ivy.cache}/repository/org.eclipse.virgo.mirrored/ch.qos.logback.classic/${ch.qos.logback.classic}/ch.qos.logback.classic-${ch.qos.logback.classic}.jar,\
file:${ivy.cache}/repository/org.eclipse.virgo.mirrored/ch.qos.logback.slf4j/${ch.qos.logback.slf4j}/ch.qos.logback.slf4j-${ch.qos.logback.slf4j}.jar,\
file:${ivy.cache}/repository/org.eclipse.virgo.mirrored/org.eclipse.osgi.services/${org.eclipse.osgi.services}/org.eclipse.osgi.services-${org.eclipse.osgi.services}.jar,\
file:${ivy.cache}/repository/org.eclipse.virgo.mirrored/org.eclipse.equinox.cm/${org.eclipse.equinox.cm}/org.eclipse.equinox.cm-${org.eclipse.equinox.cm}.jar@start,\
- file:${integration.repo.dir}/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:${integration.repo.dir}/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:${integration.repo.dir}/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/${org.eclipse.virgo.util}/org.eclipse.virgo.util.osgi.manifest-${org.eclipse.virgo.util}.jar@start,\
+ file:${ivy.cache}/repository/org.eclipse.virgo.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.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/${org.eclipse.virgo.util}/org.eclipse.virgo.util.osgi.manifest-${org.eclipse.virgo.util}.jar@start,\
file:${ivy.cache}/repository/org.eclipse.virgo.mirrored/org.eclipse.equinox.event/${org.eclipse.equinox.event}/org.eclipse.equinox.event-${org.eclipse.equinox.event}.jar@start,\
- file:${integration.repo.dir}/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:${integration.repo.dir}/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:${integration.repo.dir}/org.eclipse.virgo.util/org.eclipse.virgo.util.jmx/${org.eclipse.virgo.util}/org.eclipse.virgo.util.jmx-${org.eclipse.virgo.util}.jar,\
- file:${integration.repo.dir}/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:${integration.repo.dir}/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:${integration.repo.dir}/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.launcher/${org.eclipse.virgo.util}/org.eclipse.virgo.util.parser.launcher-${org.eclipse.virgo.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.jmx/${org.eclipse.virgo.util}/org.eclipse.virgo.util.jmx-${org.eclipse.virgo.util}.jar,\
+ 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.parser.launcher/${org.eclipse.virgo.util}/org.eclipse.virgo.util.parser.launcher-${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:${integration.repo.dir}/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.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.5.RELEASE/org.springframework.aop-3.0.5.RELEASE.jar,\
file:${ivy.cache}/repository/org.springframework/org.springframework.asm/3.0.5.RELEASE/org.springframework.asm-3.0.5.RELEASE.jar,\
file:${ivy.cache}/repository/org.springframework/org.springframework.expression/3.0.5.RELEASE/org.springframework.expression-3.0.5.RELEASE.jar,\
file:${ivy.cache}/repository/org.springframework/org.springframework.beans/3.0.5.RELEASE/org.springframework.beans-3.0.5.RELEASE.jar,\
file:${ivy.cache}/repository/org.springframework/org.springframework.core/3.0.5.RELEASE/org.springframework.core-3.0.5.RELEASE.jar,\
file:${ivy.cache}/repository/org.springframework/org.springframework.context/3.0.5.RELEASE/org.springframework.context-3.0.5.RELEASE.jar,\
- file:${integration.repo.dir}/org.eclipse.virgo.nano/org.eclipse.virgo.nano.core/${org.eclipse.virgo.nano}/org.eclipse.virgo.nano.core-${org.eclipse.virgo.nano}.jar@start,\
- file:${integration.repo.dir}/org.eclipse.virgo.nano/org.eclipse.virgo.nano.deployer.api/${org.eclipse.virgo.nano}/org.eclipse.virgo.nano.deployer.api-${org.eclipse.virgo.nano}.jar,\
- file:${integration.repo.dir}/org.eclipse.virgo.nano/org.eclipse.virgo.nano.deployer.hot/${org.eclipse.virgo.nano}/org.eclipse.virgo.nano.deployer.hot-${org.eclipse.virgo.nano}.jar,\
+ file:${ivy.cache}/repository/org.eclipse.virgo.nano/org.eclipse.virgo.nano.core/${org.eclipse.virgo.nano}/org.eclipse.virgo.nano.core-${org.eclipse.virgo.nano}.jar@start,\
+ file:${ivy.cache}/repository/org.eclipse.virgo.nano/org.eclipse.virgo.nano.deployer.api/${org.eclipse.virgo.nano}/org.eclipse.virgo.nano.deployer.api-${org.eclipse.virgo.nano}.jar,\
+ file:${ivy.cache}/repository/org.eclipse.virgo.nano/org.eclipse.virgo.nano.deployer.hot/${org.eclipse.virgo.nano}/org.eclipse.virgo.nano.deployer.hot-${org.eclipse.virgo.nano}.jar,\
file:../org.eclipse.virgo.kernel.agent.dm/target/classes@start,\
- file:${ivy.cache}/repository/org.eclipse.gemini/org.eclipse.gemini.blueprint.core/1.0.0.RELEASE/org.eclipse.gemini.blueprint.core-1.0.0.RELEASE.jar,\
- file:${ivy.cache}/repository/org.eclipse.gemini/org.eclipse.gemini.blueprint.extender/1.0.0.RELEASE/org.eclipse.gemini.blueprint.extender-1.0.0.RELEASE.jar@start,\
- 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.eclipse.gemini/org.eclipse.gemini.blueprint.core/1.0.2.RELEASE/org.eclipse.gemini.blueprint.core-1.0.2.RELEASE.jar,\
+ file:${ivy.cache}/repository/org.eclipse.gemini/org.eclipse.gemini.blueprint.extender/1.0.2.RELEASE/org.eclipse.gemini.blueprint.extender-1.0.2.RELEASE.jar@start,\
+ file:${ivy.cache}/repository/org.eclipse.gemini/org.eclipse.gemini.blueprint.io/1.0.2.RELEASE/org.eclipse.gemini.blueprint.io-1.0.2.RELEASE.jar,\
file:${ivy.cache}/repository/org.aopalliance/com.springsource.org.aopalliance/1.0.0/com.springsource.org.aopalliance-1.0.0.jar,\
file:../org.eclipse.virgo.kernel.artifact/target/classes@start,\
file:../org.eclipse.virgo.kernel.services/target/classes@start,\
diff --git a/org.eclipse.virgo.kernel.deployer.test/src/test/resources/config/org.eclipse.virgo.kernel.userregion.properties b/org.eclipse.virgo.kernel.deployer.test/src/test/resources/config/org.eclipse.virgo.kernel.userregion.properties
index 260c56dc..b1c30208 100644
--- a/org.eclipse.virgo.kernel.deployer.test/src/test/resources/config/org.eclipse.virgo.kernel.userregion.properties
+++ b/org.eclipse.virgo.kernel.deployer.test/src/test/resources/config/org.eclipse.virgo.kernel.userregion.properties
@@ -5,9 +5,9 @@ baseBundles =\
file:${ivy.cache}/repository/org.springframework/org.springframework.beans/3.0.5.RELEASE/org.springframework.beans-3.0.5.RELEASE.jar,\
file:${ivy.cache}/repository/org.springframework/org.springframework.core/3.0.5.RELEASE/org.springframework.core-3.0.5.RELEASE.jar,\
file:${ivy.cache}/repository/org.springframework/org.springframework.context/3.0.5.RELEASE/org.springframework.context-3.0.5.RELEASE.jar,\
- file:${ivy.cache}/repository/org.eclipse.gemini/org.eclipse.gemini.blueprint.core/1.0.0.RELEASE/org.eclipse.gemini.blueprint.core-1.0.0.RELEASE.jar,\
- file:${ivy.cache}/repository/org.eclipse.gemini/org.eclipse.gemini.blueprint.extender/1.0.0.RELEASE/org.eclipse.gemini.blueprint.extender-1.0.0.RELEASE.jar@start,\
- 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.eclipse.gemini/org.eclipse.gemini.blueprint.core/1.0.2.RELEASE/org.eclipse.gemini.blueprint.core-1.0.2.RELEASE.jar,\
+ file:${ivy.cache}/repository/org.eclipse.gemini/org.eclipse.gemini.blueprint.extender/1.0.2.RELEASE/org.eclipse.gemini.blueprint.extender-1.0.2.RELEASE.jar@start,\
+ file:${ivy.cache}/repository/org.eclipse.gemini/org.eclipse.gemini.blueprint.io/1.0.2.RELEASE/org.eclipse.gemini.blueprint.io-1.0.2.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.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,\
diff --git a/org.eclipse.virgo.kernel.deployer/.classpath b/org.eclipse.virgo.kernel.deployer/.classpath
index a9383c65..7d7e2347 100644
--- a/org.eclipse.virgo.kernel.deployer/.classpath
+++ b/org.eclipse.virgo.kernel.deployer/.classpath
@@ -24,38 +24,38 @@
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/KERNEL_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-2.3.0.jar" sourcepath="/KERNEL_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-sources-2.3.0.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.aspectj/com.springsource.org.aspectj.runtime/1.6.12.RELEASE/com.springsource.org.aspectj.runtime-1.6.12.RELEASE.jar" sourcepath="/KERNEL_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="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.6.0.D-20120830095303/org.eclipse.virgo.util.common-3.6.0.D-20120830095303.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.5.0.D-20120615065828/org.eclipse.virgo.util.common-sources-3.5.0.D-20120615065828.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.6.0.D-20120830095303/org.eclipse.virgo.util.io-3.6.0.D-20120830095303.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.5.0.D-20120615065828/org.eclipse.virgo.util.io-sources-3.5.0.D-20120615065828.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.math/3.6.0.D-20120830095303/org.eclipse.virgo.util.math-3.6.0.D-20120830095303.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.math/3.5.0.D-20120615065828/org.eclipse.virgo.util.math-sources-3.5.0.D-20120615065828.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.6.0.D-20120830095303/org.eclipse.virgo.util.osgi.manifest-3.6.0.D-20120830095303.jar" sourcepath="/KERNEL_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="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/3.6.0.D-20120830095303/org.eclipse.virgo.util.parser.manifest-3.6.0.D-20120830095303.jar" sourcepath="/KERNEL_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="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.6.0.D-20120903162413/org.eclipse.virgo.util.common-3.6.0.D-20120903162413.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.5.0.D-20120615065828/org.eclipse.virgo.util.common-sources-3.5.0.D-20120615065828.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.6.0.D-20120903162413/org.eclipse.virgo.util.io-3.6.0.D-20120903162413.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.5.0.D-20120615065828/org.eclipse.virgo.util.io-sources-3.5.0.D-20120615065828.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.math/3.6.0.D-20120903162413/org.eclipse.virgo.util.math-3.6.0.D-20120903162413.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.math/3.5.0.D-20120615065828/org.eclipse.virgo.util.math-sources-3.5.0.D-20120615065828.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.6.0.D-20120903162413/org.eclipse.virgo.util.osgi.manifest-3.6.0.D-20120903162413.jar" sourcepath="/KERNEL_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="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/3.6.0.D-20120903162413/org.eclipse.virgo.util.parser.manifest-3.6.0.D-20120903162413.jar" sourcepath="/KERNEL_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="KERNEL_IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi/3.8.0.v20120508-2119/org.eclipse.osgi-3.8.0.v20120508-2119.jar" sourcepath="/KERNEL_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="KERNEL_IVY_CACHE/org.springframework/org.springframework.beans/3.0.5.RELEASE/org.springframework.beans-3.0.5.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework/org.springframework.beans/3.0.5.RELEASE/org.springframework.beans-sources-3.0.5.RELEASE.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework/org.springframework.core/3.0.5.RELEASE/org.springframework.core-3.0.5.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework/org.springframework.core/3.0.5.RELEASE/org.springframework.core-sources-3.0.5.RELEASE.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework/org.springframework.context/3.0.5.RELEASE/org.springframework.context-3.0.5.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework/org.springframework.context/3.0.5.RELEASE/org.springframework.context-sources-3.0.5.RELEASE.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.core/1.0.0.RELEASE/org.eclipse.gemini.blueprint.core-1.0.0.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.core/1.0.0.RELEASE/org.eclipse.gemini.blueprint.core-sources-1.0.0.RELEASE.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.extender/1.0.0.RELEASE/org.eclipse.gemini.blueprint.extender-1.0.0.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.extender/1.0.0.RELEASE/org.eclipse.gemini.blueprint.extender-sources-1.0.0.RELEASE.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.repository/org.eclipse.virgo.repository/3.6.0.D-20120830100334/org.eclipse.virgo.repository-3.6.0.D-20120830100334.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.repository/org.eclipse.virgo.repository/3.5.0.D-20120615071313/org.eclipse.virgo.repository-sources-3.5.0.D-20120615071313.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.core/1.0.2.RELEASE/org.eclipse.gemini.blueprint.core-1.0.2.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.core/1.0.2.RELEASE/org.eclipse.gemini.blueprint.core-sources-1.0.2.RELEASE.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.extender/1.0.2.RELEASE/org.eclipse.gemini.blueprint.extender-1.0.2.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.extender/1.0.2.RELEASE/org.eclipse.gemini.blueprint.extender-sources-1.0.2.RELEASE.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.repository/org.eclipse.virgo.repository/3.6.0.D-20120903163626/org.eclipse.virgo.repository-3.6.0.D-20120903163626.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.repository/org.eclipse.virgo.repository/3.5.0.D-20120615071313/org.eclipse.virgo.repository-sources-3.5.0.D-20120615071313.jar"/>
<classpathentry kind="con" path="org.eclipse.ajdt.core.ASPECTJRT_CONTAINER"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.6.0.D-20120830095745/org.eclipse.virgo.medic-3.6.0.D-20120830095745.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.5.0.D-20120615070622/org.eclipse.virgo.medic-sources-3.5.0.D-20120615070622.jar">
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.6.0.D-20120903162943/org.eclipse.virgo.medic-3.6.0.D-20120903162943.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.5.0.D-20120615070622/org.eclipse.virgo.medic-sources-3.5.0.D-20120615070622.jar">
<attributes>
<attribute name="org.eclipse.ajdt.aspectpath" value="org.eclipse.ajdt.aspectpath"/>
</attributes>
</classpathentry>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.core/3.6.0.D-20120830095745/org.eclipse.virgo.medic.core-3.6.0.D-20120830095745.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.core/3.5.0.D-20120615070622/org.eclipse.virgo.medic.core-sources-3.5.0.D-20120615070622.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.core/3.6.0.D-20120903162943/org.eclipse.virgo.medic.core-3.6.0.D-20120903162943.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.core/3.5.0.D-20120615070622/org.eclipse.virgo.medic.core-sources-3.5.0.D-20120615070622.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.mirrored/org.slf4j.api/1.6.4.v20120130-2120/org.slf4j.api-1.6.4.v20120130-2120.jar" sourcepath="/KERNEL_IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.6.1/com.springsource.slf4j.api-sources-1.6.1.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.slf4j/com.springsource.slf4j.nop/1.6.1/com.springsource.slf4j.nop-1.6.1.jar" sourcepath="/KERNEL_IVY_CACHE/org.slf4j/com.springsource.slf4j.nop/1.6.1/com.springsource.slf4j.nop-sources-1.6.1.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.stubs/3.6.0.D-20120830095553/org.eclipse.virgo.test.stubs-3.6.0.D-20120830095553.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.test.stubs/org.eclipse.virgo.test.stubs/1.0.0.CI-B39/org.eclipse.virgo.test.stubs-sources-1.0.0.CI-B39.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.stubs/3.6.0.D-20120903162719/org.eclipse.virgo.test.stubs-3.6.0.D-20120903162719.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.test.stubs/org.eclipse.virgo.test.stubs/1.0.0.CI-B39/org.eclipse.virgo.test.stubs-sources-1.0.0.CI-B39.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.kernel.osgi"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.kernel.services"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.kernel.artifact"/>
<classpathentry kind="var" path="KERNEL_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="KERNEL_IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.nano.deployer.api/3.6.0.D-20120830095954/org.eclipse.virgo.nano.deployer.api-3.6.0.D-20120830095954.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.nano.deployer.api/3.5.0.D-20120615071853/org.eclipse.virgo.nano.deployer.api-sources-3.5.0.D-20120615071853.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.nano.deployer.hot/3.6.0.D-20120830095954/org.eclipse.virgo.nano.deployer.hot-3.6.0.D-20120830095954.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.nano.core/3.6.0.D-20120830095954/org.eclipse.virgo.nano.core-3.6.0.D-20120830095954.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.nano.deployer.api/3.6.0.D-20120903163206/org.eclipse.virgo.nano.deployer.api-3.6.0.D-20120903163206.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.nano.deployer.api/3.5.0.D-20120615071853/org.eclipse.virgo.nano.deployer.api-sources-3.5.0.D-20120615071853.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.nano.deployer.hot/3.6.0.D-20120903163206/org.eclipse.virgo.nano.deployer.hot-3.6.0.D-20120903163206.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.nano.core/3.6.0.D-20120903163206/org.eclipse.virgo.nano.core-3.6.0.D-20120903163206.jar"/>
<classpathentry kind="var" path="KERNEL_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" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi.services/3.3.0.v20110513/org.eclipse.osgi.services-sources-3.3.0.v20110513.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.kernel.equinox.extensions"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.test/3.6.0.D-20120830095745/org.eclipse.virgo.medic.test-3.6.0.D-20120830095745.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.test/3.5.0.D-20120615070622/org.eclipse.virgo.medic.test-sources-3.5.0.D-20120615070622.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.test/3.6.0.D-20120903162943/org.eclipse.virgo.medic.test-3.6.0.D-20120903162943.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.test/3.5.0.D-20120615070622/org.eclipse.virgo.medic.test-sources-3.5.0.D-20120615070622.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/org.eclipse.virgo.kernel.dmfragment/.classpath b/org.eclipse.virgo.kernel.dmfragment/.classpath
index c8ad56f3..2ea507e2 100644
--- a/org.eclipse.virgo.kernel.dmfragment/.classpath
+++ b/org.eclipse.virgo.kernel.dmfragment/.classpath
@@ -25,12 +25,12 @@
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework/org.springframework.beans/3.0.5.RELEASE/org.springframework.beans-3.0.5.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework/org.springframework.beans/2.5.6/org.springframework.beans-sources-2.5.6.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework/org.springframework.core/3.0.5.RELEASE/org.springframework.core-3.0.5.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework/org.springframework.core/3.0.5.RELEASE/org.springframework.core-sources-3.0.5.RELEASE.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework/org.springframework.aop/3.0.5.RELEASE/org.springframework.aop-3.0.5.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework/org.springframework.aop/2.5.6/org.springframework.aop-2.5.6.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.core/1.0.0.RELEASE/org.eclipse.gemini.blueprint.core-1.0.0.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.core/1.0.0.RELEASE/org.eclipse.gemini.blueprint.core-sources-1.0.0.RELEASE.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.extender/1.0.0.RELEASE/org.eclipse.gemini.blueprint.extender-1.0.0.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.extender/1.0.0.RELEASE/org.eclipse.gemini.blueprint.extender-sources-1.0.0.RELEASE.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.io/1.0.0.RELEASE/org.eclipse.gemini.blueprint.io-1.0.0.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.io/1.0.0.RELEASE/org.eclipse.gemini.blueprint.io-sources-1.0.0.RELEASE.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.core/1.0.2.RELEASE/org.eclipse.gemini.blueprint.core-1.0.2.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.core/1.0.2.RELEASE/org.eclipse.gemini.blueprint.core-sources-1.0.2.RELEASE.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.extender/1.0.2.RELEASE/org.eclipse.gemini.blueprint.extender-1.0.2.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.extender/1.0.2.RELEASE/org.eclipse.gemini.blueprint.extender-sources-1.0.2.RELEASE.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.io/1.0.2.RELEASE/org.eclipse.gemini.blueprint.io-1.0.2.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.io/1.0.2.RELEASE/org.eclipse.gemini.blueprint.io-sources-1.0.2.RELEASE.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi/3.8.0.v20120508-2119/org.eclipse.osgi-3.8.0.v20120508-2119.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.5.0.200809221524/org.eclipse.osgi-3.5.0.200809221524.jar"/>
<classpathentry kind="con" path="org.eclipse.ajdt.core.ASPECTJRT_CONTAINER"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.6.0.D-20120830095745/org.eclipse.virgo.medic-3.6.0.D-20120830095745.jar">
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.6.0.D-20120903162943/org.eclipse.virgo.medic-3.6.0.D-20120903162943.jar">
<attributes>
<attribute name="org.eclipse.ajdt.aspectpath" value="org.eclipse.ajdt.aspectpath"/>
</attributes>
@@ -38,7 +38,7 @@
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.mirrored/org.slf4j.api/1.6.4.v20120130-2120/org.slf4j.api-1.6.4.v20120130-2120.jar" sourcepath="/KERNEL_IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.6.1/com.springsource.slf4j.api-sources-1.6.1.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.kernel.osgi"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.kernel.agent.dm"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.nano.core/3.6.0.D-20120830095954/org.eclipse.virgo.nano.core-3.6.0.D-20120830095954.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.nano.core/3.6.0.D-20120903163206/org.eclipse.virgo.nano.core-3.6.0.D-20120903163206.jar"/>
<classpathentry kind="var" path="KERNEL_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="output" path="target/classes"/>
</classpath>
diff --git a/org.eclipse.virgo.kernel.equinox.extensions/.classpath b/org.eclipse.virgo.kernel.equinox.extensions/.classpath
index c4025aeb..c5448374 100644
--- a/org.eclipse.virgo.kernel.equinox.extensions/.classpath
+++ b/org.eclipse.virgo.kernel.equinox.extensions/.classpath
@@ -24,7 +24,7 @@
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/KERNEL_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi/3.8.0.v20120508-2119/org.eclipse.osgi-3.8.0.v20120508-2119.jar" sourcepath="/KERNEL_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="KERNEL_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-2.3.0.jar" sourcepath="/KERNEL_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-sources-2.3.0.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.stubs/3.6.0.D-20120830095553/org.eclipse.virgo.test.stubs-3.6.0.D-20120830095553.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.test.stubs/org.eclipse.virgo.test.stubs/3.6.0.D-20120711092322/org.eclipse.virgo.test.stubs-sources-3.6.0.D-20120711092322.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.stubs/3.6.0.D-20120903162719/org.eclipse.virgo.test.stubs-3.6.0.D-20120903162719.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.test.stubs/org.eclipse.virgo.test.stubs/3.6.0.D-20120711092322/org.eclipse.virgo.test.stubs-sources-3.6.0.D-20120711092322.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.aspectj/com.springsource.org.aspectj.runtime/1.6.12.RELEASE/com.springsource.org.aspectj.runtime-1.6.12.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.aspectj/com.springsource.org.aspectj.runtime/1.6.12.RELEASE/com.springsource.org.aspectj.runtime-sources-1.6.12.RELEASE.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/org.eclipse.virgo.kernel.kerneldmfragment/.classpath b/org.eclipse.virgo.kernel.kerneldmfragment/.classpath
index c3d1d665..eb0cf14c 100644
--- a/org.eclipse.virgo.kernel.kerneldmfragment/.classpath
+++ b/org.eclipse.virgo.kernel.kerneldmfragment/.classpath
@@ -25,11 +25,11 @@
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework/org.springframework.beans/3.0.5.RELEASE/org.springframework.beans-3.0.5.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework/org.springframework.beans/2.5.6/org.springframework.beans-sources-2.5.6.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework/org.springframework.core/3.0.5.RELEASE/org.springframework.core-3.0.5.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework/org.springframework.core/3.0.5.RELEASE/org.springframework.core-sources-3.0.5.RELEASE.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework/org.springframework.aop/3.0.5.RELEASE/org.springframework.aop-3.0.5.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework/org.springframework.aop/2.5.6/org.springframework.aop-2.5.6.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.core/1.0.0.RELEASE/org.eclipse.gemini.blueprint.core-1.0.0.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.core/1.0.0.RELEASE/org.eclipse.gemini.blueprint.core-sources-1.0.0.RELEASE.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.extender/1.0.0.RELEASE/org.eclipse.gemini.blueprint.extender-1.0.0.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.extender/1.0.0.RELEASE/org.eclipse.gemini.blueprint.extender-sources-1.0.0.RELEASE.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.io/1.0.0.RELEASE/org.eclipse.gemini.blueprint.io-1.0.0.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.io/1.0.0.RELEASE/org.eclipse.gemini.blueprint.io-sources-1.0.0.RELEASE.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.core/1.0.2.RELEASE/org.eclipse.gemini.blueprint.core-1.0.2.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.core/1.0.2.RELEASE/org.eclipse.gemini.blueprint.core-sources-1.0.2.RELEASE.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.extender/1.0.2.RELEASE/org.eclipse.gemini.blueprint.extender-1.0.2.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.extender/1.0.2.RELEASE/org.eclipse.gemini.blueprint.extender-sources-1.0.2.RELEASE.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.io/1.0.2.RELEASE/org.eclipse.gemini.blueprint.io-1.0.2.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.io/1.0.2.RELEASE/org.eclipse.gemini.blueprint.io-sources-1.0.2.RELEASE.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi/3.8.0.v20120508-2119/org.eclipse.osgi-3.8.0.v20120508-2119.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.5.0.200809221524/org.eclipse.osgi-3.5.0.200809221524.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.6.0.D-20120830095745/org.eclipse.virgo.medic-3.6.0.D-20120830095745.jar">
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.6.0.D-20120903162943/org.eclipse.virgo.medic-3.6.0.D-20120903162943.jar">
<attributes>
<attribute name="org.eclipse.ajdt.aspectpath" value="org.eclipse.ajdt.aspectpath"/>
</attributes>
diff --git a/org.eclipse.virgo.kernel.model/.classpath b/org.eclipse.virgo.kernel.model/.classpath
index 390285e3..557d0582 100644
--- a/org.eclipse.virgo.kernel.model/.classpath
+++ b/org.eclipse.virgo.kernel.model/.classpath
@@ -25,24 +25,24 @@
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.mirrored/org.slf4j.api/1.6.4.v20120130-2120/org.slf4j.api-1.6.4.v20120130-2120.jar" sourcepath="/KERNEL_IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.6.1/com.springsource.slf4j.api-sources-1.6.1.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.slf4j/com.springsource.slf4j.nop/1.6.1/com.springsource.slf4j.nop-1.6.1.jar" sourcepath="/KERNEL_IVY_CACHE/org.slf4j/com.springsource.slf4j.nop/1.6.1/com.springsource.slf4j.nop-sources-1.6.1.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/KERNEL_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.6.0.D-20120830095745/org.eclipse.virgo.medic-3.6.0.D-20120830095745.jar" sourcepath="/KERNEL_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="KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.6.0.D-20120903162943/org.eclipse.virgo.medic-3.6.0.D-20120903162943.jar" sourcepath="/KERNEL_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">
<attributes>
<attribute name="org.eclipse.ajdt.aspectpath" value="org.eclipse.ajdt.aspectpath"/>
</attributes>
</classpathentry>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi/3.8.0.v20120508-2119/org.eclipse.osgi-3.8.0.v20120508-2119.jar" sourcepath="/KERNEL_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="KERNEL_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-2.3.0.jar" sourcepath="/KERNEL_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-sources-2.3.0.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.stubs/3.6.0.D-20120830095553/org.eclipse.virgo.test.stubs-3.6.0.D-20120830095553.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.test.stubs/org.eclipse.virgo.test.stubs/3.6.0.D-20120711092322/org.eclipse.virgo.test.stubs-sources-3.6.0.D-20120711092322.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.6.0.D-20120830095303/org.eclipse.virgo.util.osgi-3.6.0.D-20120830095303.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.5.0.D-20120615065828/org.eclipse.virgo.util.osgi-sources-3.5.0.D-20120615065828.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.6.0.D-20120830095303/org.eclipse.virgo.util.common-3.6.0.D-20120830095303.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.5.0.D-20120615065828/org.eclipse.virgo.util.common-sources-3.5.0.D-20120615065828.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.stubs/3.6.0.D-20120903162719/org.eclipse.virgo.test.stubs-3.6.0.D-20120903162719.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.test.stubs/org.eclipse.virgo.test.stubs/3.6.0.D-20120711092322/org.eclipse.virgo.test.stubs-sources-3.6.0.D-20120711092322.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.6.0.D-20120903162413/org.eclipse.virgo.util.osgi-3.6.0.D-20120903162413.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.5.0.D-20120615065828/org.eclipse.virgo.util.osgi-sources-3.5.0.D-20120615065828.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.6.0.D-20120903162413/org.eclipse.virgo.util.common-3.6.0.D-20120903162413.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.5.0.D-20120615065828/org.eclipse.virgo.util.common-sources-3.5.0.D-20120615065828.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.kernel.osgi"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.kernel.artifact"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.kernel.deployer"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.kernel.stubs"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework/org.springframework.context/3.0.5.RELEASE/org.springframework.context-3.0.5.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework/org.springframework.context/3.0.5.RELEASE/org.springframework.context-sources-3.0.5.RELEASE.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.equinox.region/1.1.0.v20120319-1602/org.eclipse.equinox.region-1.1.0.v20120319-1602.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.nano.core/3.6.0.D-20120830095954/org.eclipse.virgo.nano.core-3.6.0.D-20120830095954.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.nano.deployer.api/3.6.0.D-20120830095954/org.eclipse.virgo.nano.deployer.api-3.6.0.D-20120830095954.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.nano.core/3.6.0.D-20120903163206/org.eclipse.virgo.nano.core-3.6.0.D-20120903163206.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.nano.deployer.api/3.6.0.D-20120903163206/org.eclipse.virgo.nano.deployer.api-3.6.0.D-20120903163206.jar"/>
<classpathentry kind="var" path="KERNEL_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" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi.services/3.3.0.v20110513/org.eclipse.osgi.services-sources-3.3.0.v20110513.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/org.eclipse.virgo.kernel.model/src/main/java/org/eclipse/virgo/kernel/model/management/RuntimeArtifactModelObjectNameCreator.java b/org.eclipse.virgo.kernel.model/src/main/java/org/eclipse/virgo/kernel/model/management/RuntimeArtifactModelObjectNameCreator.java
index 5c4dcd63..d42a54d4 100644
--- a/org.eclipse.virgo.kernel.model/src/main/java/org/eclipse/virgo/kernel/model/management/RuntimeArtifactModelObjectNameCreator.java
+++ b/org.eclipse.virgo.kernel.model/src/main/java/org/eclipse/virgo/kernel/model/management/RuntimeArtifactModelObjectNameCreator.java
@@ -30,15 +30,6 @@ import org.osgi.framework.Version;
public interface RuntimeArtifactModelObjectNameCreator {
/**
- * Create an Model {@link ObjectName} based on an input {@link Artifact}. Names generated from equal (
- * {@link AbstractArtifact#equals(Object)}) {@link Artifact}s should be equal as well.
- *
- * @param artifact The artifact to generate an {@link ObjectName} for
- * @return The {@link ObjectName} for the {@link Artifact}
- */
- //ObjectName createModel(Artifact artifact);
-
- /**
* Create an ArtifactModel {@link ObjectName} based on an input {@link Artifact}. Names generated from equal (
* {@link AbstractArtifact#equals(Object)}) {@link Artifact}s should be equal as well.
*
@@ -48,16 +39,6 @@ public interface RuntimeArtifactModelObjectNameCreator {
ObjectName createArtifactModel(Artifact artifact);
/**
- * Creates a Model {@link ObjectName} based on an input type, name, and version.
- *
- * @param type The type of the object to create an @{link ObjectName} for
- * @param name The name of the object to create an @{link ObjectName} for
- * @param version The version of the object to create an @{link ObjectName} for
- * @return An {@link ObjectName} for the runtime artifact represented by this type, name, and version
- */
- //ObjectName createModel(String type, String name, Version version);
-
- /**
* Creates an ArtifactModel {@link ObjectName} based on an input type, name, version, and region.
*
* @param type The type of the object to create an @{link ObjectName} for
diff --git a/org.eclipse.virgo.kernel.model/src/test/java/org/eclipse/virgo/kernel/model/StubCompositeArtifact.java b/org.eclipse.virgo.kernel.model/src/test/java/org/eclipse/virgo/kernel/model/StubCompositeArtifact.java
index 7c0d677e..2c1d64f9 100644
--- a/org.eclipse.virgo.kernel.model/src/test/java/org/eclipse/virgo/kernel/model/StubCompositeArtifact.java
+++ b/org.eclipse.virgo.kernel.model/src/test/java/org/eclipse/virgo/kernel/model/StubCompositeArtifact.java
@@ -15,6 +15,7 @@ import java.util.Map;
import java.util.Set;
import org.eclipse.equinox.region.Region;
+import org.eclipse.virgo.test.stubs.region.StubRegion;
import org.osgi.framework.Version;
public class StubCompositeArtifact implements CompositeArtifact {
@@ -26,7 +27,7 @@ public class StubCompositeArtifact implements CompositeArtifact {
private final Region region;
public StubCompositeArtifact() {
- this("test-type", "test-name", new StubRegion("test-region"));
+ this("test-type", "test-name", new StubRegion("test-region", null));
}
public StubCompositeArtifact(String type, String name, Region region) {
diff --git a/org.eclipse.virgo.kernel.model/src/test/java/org/eclipse/virgo/kernel/model/StubRegion.java b/org.eclipse.virgo.kernel.model/src/test/java/org/eclipse/virgo/kernel/model/StubRegion.java
deleted file mode 100644
index dd8507a8..00000000
--- a/org.eclipse.virgo.kernel.model/src/test/java/org/eclipse/virgo/kernel/model/StubRegion.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- * This file is part of the Eclipse Virgo project.
- *
- * Copyright (c) 2011 copyright_holder
- * 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:
- * cgfrost - initial contribution
- */
-
-package org.eclipse.virgo.kernel.model;
-
-import java.io.InputStream;
-import java.util.Set;
-
-import org.eclipse.equinox.region.Region;
-import org.eclipse.equinox.region.RegionDigraph;
-import org.eclipse.equinox.region.RegionDigraphVisitor;
-import org.eclipse.equinox.region.RegionFilter;
-import org.eclipse.equinox.region.RegionDigraph.FilteredRegion;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleException;
-import org.osgi.framework.Version;
-
-/**
- * StubRegion
- */
-public class StubRegion implements Region {
-
- private final String name;
-
- public StubRegion(String name) {
- this.name = name;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public String getName() {
- return this.name;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void addBundle(Bundle bundle) throws BundleException {
-
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void addBundle(long bundleId) {
-
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public Bundle installBundle(String location, InputStream input) throws BundleException {
- return null;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public Bundle installBundle(String location) throws BundleException {
- return null;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public Set<Long> getBundleIds() {
- return null;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public boolean contains(Bundle bundle) {
- return false;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public boolean contains(long bundleId) {
- return false;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public Bundle getBundle(String symbolicName, Version version) {
- return null;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void connectRegion(Region headRegion, RegionFilter filter) throws BundleException {
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public RegionDigraph getRegionDigraph() {
- return null;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void removeBundle(Bundle bundle) {
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void removeBundle(long bundleId) {
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public Set<FilteredRegion> getEdges() {
- return null;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void visitSubgraph(RegionDigraphVisitor visitor) {
- }
-
- @Override
- public Bundle installBundleAtLocation(String arg0, InputStream arg1)
- throws BundleException {
- return null;
- }
-
-}
diff --git a/org.eclipse.virgo.kernel.model/src/test/java/org/eclipse/virgo/kernel/model/internal/AbztractArtifactTests.java b/org.eclipse.virgo.kernel.model/src/test/java/org/eclipse/virgo/kernel/model/internal/AbztractArtifactTests.java
index e0a47173..43400418 100644
--- a/org.eclipse.virgo.kernel.model/src/test/java/org/eclipse/virgo/kernel/model/internal/AbztractArtifactTests.java
+++ b/org.eclipse.virgo.kernel.model/src/test/java/org/eclipse/virgo/kernel/model/internal/AbztractArtifactTests.java
@@ -22,21 +22,17 @@ import java.util.HashSet;
import java.util.Hashtable;
import java.util.Set;
-import org.junit.Test;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.Version;
-
-
+import org.eclipse.equinox.region.Region;
import org.eclipse.virgo.kernel.model.Artifact;
import org.eclipse.virgo.kernel.model.ArtifactState;
import org.eclipse.virgo.kernel.model.StubCompositeArtifact;
-import org.eclipse.virgo.kernel.model.StubRegion;
-import org.eclipse.virgo.kernel.model.internal.AbstractArtifact;
-import org.eclipse.virgo.kernel.model.internal.DependencyDeterminer;
-import org.eclipse.equinox.region.Region;
import org.eclipse.virgo.nano.serviceability.Assert.FatalAssertionException;
import org.eclipse.virgo.test.stubs.framework.StubBundleContext;
+import org.eclipse.virgo.test.stubs.region.StubRegion;
import org.eclipse.virgo.test.stubs.support.TrueFilter;
+import org.junit.Test;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.Version;
public class AbztractArtifactTests {
@@ -44,7 +40,7 @@ public class AbztractArtifactTests {
private final AbstractArtifact artifact;
- private final StubRegion region = new StubRegion("test-region");
+ private final StubRegion region = new StubRegion("test-region", null);
{
bundleContext = new StubBundleContext();
@@ -134,7 +130,7 @@ public class AbztractArtifactTests {
private static class StubArtifact extends AbstractArtifact {
public StubArtifact(BundleContext bundleContext) {
- super(bundleContext, "test-type", "test-name", Version.emptyVersion, new StubRegion("test-region"));
+ super(bundleContext, "test-type", "test-name", Version.emptyVersion, new StubRegion("test-region", null));
}
public StubArtifact(BundleContext bundleContext, String type, String name, Version version, Region region) {
diff --git a/org.eclipse.virgo.kernel.model/src/test/java/org/eclipse/virgo/kernel/model/internal/NotifyingArtifactRepositoryTests.java b/org.eclipse.virgo.kernel.model/src/test/java/org/eclipse/virgo/kernel/model/internal/NotifyingArtifactRepositoryTests.java
index b1f5875a..88636024 100644
--- a/org.eclipse.virgo.kernel.model/src/test/java/org/eclipse/virgo/kernel/model/internal/NotifyingArtifactRepositoryTests.java
+++ b/org.eclipse.virgo.kernel.model/src/test/java/org/eclipse/virgo/kernel/model/internal/NotifyingArtifactRepositoryTests.java
@@ -22,7 +22,7 @@ import java.util.Set;
import org.eclipse.equinox.region.Region;
import org.eclipse.virgo.kernel.model.Artifact;
import org.eclipse.virgo.kernel.model.StubCompositeArtifact;
-import org.eclipse.virgo.kernel.model.StubRegion;
+import org.eclipse.virgo.test.stubs.region.StubRegion;
import org.junit.Test;
import org.osgi.framework.Version;
@@ -71,8 +71,8 @@ public class NotifyingArtifactRepositoryTests {
@Test
public void getArtifact(){
- Region stubRegion1 = new StubRegion("test-region1");
- Region stubRegion2 = new StubRegion("test-region2");
+ Region stubRegion1 = new StubRegion("test-region1", null);
+ Region stubRegion2 = new StubRegion("test-region2", null);
Artifact stubArtifact = new StubCompositeArtifact("foo", "bar", stubRegion1);
Artifact stubArtifact2 = new StubCompositeArtifact("foo2", "bar2", stubRegion2);
this.artifactRepository.add(stubArtifact);
diff --git a/org.eclipse.virgo.kernel.model/src/test/java/org/eclipse/virgo/kernel/model/internal/bundle/ModelBundleListenerInitializerTests.java b/org.eclipse.virgo.kernel.model/src/test/java/org/eclipse/virgo/kernel/model/internal/bundle/ModelBundleListenerInitializerTests.java
index 9a8baaf4..51480f89 100644
--- a/org.eclipse.virgo.kernel.model/src/test/java/org/eclipse/virgo/kernel/model/internal/bundle/ModelBundleListenerInitializerTests.java
+++ b/org.eclipse.virgo.kernel.model/src/test/java/org/eclipse/virgo/kernel/model/internal/bundle/ModelBundleListenerInitializerTests.java
@@ -21,13 +21,13 @@ import java.io.IOException;
import org.eclipse.equinox.region.RegionDigraph;
import org.eclipse.virgo.kernel.model.StubArtifactRepository;
-import org.eclipse.virgo.kernel.model.StubRegion;
import org.eclipse.virgo.kernel.model.StubSpringContextAccessor;
import org.eclipse.virgo.kernel.model.internal.DependencyDeterminer;
import org.eclipse.virgo.kernel.osgi.framework.PackageAdminUtil;
import org.eclipse.virgo.nano.serviceability.Assert.FatalAssertionException;
import org.eclipse.virgo.test.stubs.framework.StubBundle;
import org.eclipse.virgo.test.stubs.framework.StubBundleContext;
+import org.eclipse.virgo.test.stubs.region.StubRegion;
import org.eclipse.virgo.test.stubs.support.TrueFilter;
import org.junit.Test;
import org.osgi.framework.InvalidSyntaxException;
@@ -37,7 +37,7 @@ public class ModelBundleListenerInitializerTests {
private final StubArtifactRepository artifactRepository = new StubArtifactRepository();
- private final StubRegion region = new StubRegion("test-region");
+ private final StubRegion region = new StubRegion("test-region", null);
private final PackageAdminUtil packageAdminUtil = createMock(PackageAdminUtil.class);
diff --git a/org.eclipse.virgo.kernel.model/src/test/java/org/eclipse/virgo/kernel/model/internal/bundle/ModelBundleListenerTests.java b/org.eclipse.virgo.kernel.model/src/test/java/org/eclipse/virgo/kernel/model/internal/bundle/ModelBundleListenerTests.java
index 670578d3..f5cd0604 100644
--- a/org.eclipse.virgo.kernel.model/src/test/java/org/eclipse/virgo/kernel/model/internal/bundle/ModelBundleListenerTests.java
+++ b/org.eclipse.virgo.kernel.model/src/test/java/org/eclipse/virgo/kernel/model/internal/bundle/ModelBundleListenerTests.java
@@ -19,13 +19,13 @@ import static org.junit.Assert.assertEquals;
import org.eclipse.equinox.region.RegionDigraph;
import org.eclipse.virgo.kernel.model.StubArtifactRepository;
-import org.eclipse.virgo.kernel.model.StubRegion;
import org.eclipse.virgo.kernel.model.StubSpringContextAccessor;
import org.eclipse.virgo.kernel.model.internal.DependencyDeterminer;
import org.eclipse.virgo.kernel.osgi.framework.PackageAdminUtil;
import org.eclipse.virgo.nano.serviceability.Assert.FatalAssertionException;
import org.eclipse.virgo.test.stubs.framework.StubBundle;
import org.eclipse.virgo.test.stubs.framework.StubBundleContext;
+import org.eclipse.virgo.test.stubs.region.StubRegion;
import org.eclipse.virgo.test.stubs.support.TrueFilter;
import org.junit.Test;
import org.osgi.framework.Bundle;
@@ -43,7 +43,7 @@ public class ModelBundleListenerTests {
private final RegionDigraph regionDigraph = createMock(RegionDigraph.class);
- private final StubRegion region = new StubRegion("test-region");
+ private final StubRegion region = new StubRegion("test-region", null);
{
this.bundleContext = new StubBundleContext();
diff --git a/org.eclipse.virgo.kernel.model/src/test/java/org/eclipse/virgo/kernel/model/internal/configurationadmin/ConfgurationArtifactTests.java b/org.eclipse.virgo.kernel.model/src/test/java/org/eclipse/virgo/kernel/model/internal/configurationadmin/ConfgurationArtifactTests.java
index 57541848..8b4d9531 100644
--- a/org.eclipse.virgo.kernel.model/src/test/java/org/eclipse/virgo/kernel/model/internal/configurationadmin/ConfgurationArtifactTests.java
+++ b/org.eclipse.virgo.kernel.model/src/test/java/org/eclipse/virgo/kernel/model/internal/configurationadmin/ConfgurationArtifactTests.java
@@ -16,18 +16,15 @@ import static org.junit.Assert.assertNull;
import java.io.IOException;
-import org.junit.Test;
-import org.osgi.framework.InvalidSyntaxException;
-
-
import org.eclipse.virgo.kernel.model.ArtifactState;
-import org.eclipse.virgo.kernel.model.StubRegion;
import org.eclipse.virgo.kernel.model.internal.DependencyDeterminer;
-import org.eclipse.virgo.kernel.model.internal.configurationadmin.ConfigurationArtifact;
import org.eclipse.virgo.nano.serviceability.Assert.FatalAssertionException;
import org.eclipse.virgo.test.stubs.framework.StubBundleContext;
+import org.eclipse.virgo.test.stubs.region.StubRegion;
import org.eclipse.virgo.test.stubs.service.cm.StubConfigurationAdmin;
import org.eclipse.virgo.test.stubs.support.TrueFilter;
+import org.junit.Test;
+import org.osgi.framework.InvalidSyntaxException;
public class ConfgurationArtifactTests {
@@ -40,7 +37,7 @@ public class ConfgurationArtifactTests {
private final StubConfigurationAdmin configurationAdmin = new StubConfigurationAdmin();
- private final StubRegion region = new StubRegion("test-region");
+ private final StubRegion region = new StubRegion("test-region", null);
private final ConfigurationArtifact artifact = new ConfigurationArtifact(bundleContext, configurationAdmin, "test-pid", region);
diff --git a/org.eclipse.virgo.kernel.model/src/test/java/org/eclipse/virgo/kernel/model/internal/configurationadmin/ModelConfigurationListenerInitializerTests.java b/org.eclipse.virgo.kernel.model/src/test/java/org/eclipse/virgo/kernel/model/internal/configurationadmin/ModelConfigurationListenerInitializerTests.java
index f56b9933..6cb34217 100644
--- a/org.eclipse.virgo.kernel.model/src/test/java/org/eclipse/virgo/kernel/model/internal/configurationadmin/ModelConfigurationListenerInitializerTests.java
+++ b/org.eclipse.virgo.kernel.model/src/test/java/org/eclipse/virgo/kernel/model/internal/configurationadmin/ModelConfigurationListenerInitializerTests.java
@@ -20,11 +20,11 @@ import org.osgi.framework.InvalidSyntaxException;
import org.eclipse.virgo.kernel.model.StubArtifactRepository;
-import org.eclipse.virgo.kernel.model.StubRegion;
import org.eclipse.virgo.kernel.model.internal.DependencyDeterminer;
import org.eclipse.virgo.kernel.model.internal.configurationadmin.ModelConfigurationListenerInitializer;
import org.eclipse.virgo.nano.serviceability.Assert.FatalAssertionException;
import org.eclipse.virgo.test.stubs.framework.StubBundleContext;
+import org.eclipse.virgo.test.stubs.region.StubRegion;
import org.eclipse.virgo.test.stubs.service.cm.StubConfigurationAdmin;
import org.eclipse.virgo.test.stubs.support.TrueFilter;
@@ -38,7 +38,7 @@ public class ModelConfigurationListenerInitializerTests {
this.bundleContext.addFilter(filterString, new TrueFilter(filterString));
}
- private final StubRegion region = new StubRegion("test-region");
+ private final StubRegion region = new StubRegion("test-region", null);
private final StubConfigurationAdmin configurationAdmin = new StubConfigurationAdmin();
diff --git a/org.eclipse.virgo.kernel.model/src/test/java/org/eclipse/virgo/kernel/model/internal/configurationadmin/ModelConfigurationListenerTests.java b/org.eclipse.virgo.kernel.model/src/test/java/org/eclipse/virgo/kernel/model/internal/configurationadmin/ModelConfigurationListenerTests.java
index 7e4f9540..e0f1cc1e 100644
--- a/org.eclipse.virgo.kernel.model/src/test/java/org/eclipse/virgo/kernel/model/internal/configurationadmin/ModelConfigurationListenerTests.java
+++ b/org.eclipse.virgo.kernel.model/src/test/java/org/eclipse/virgo/kernel/model/internal/configurationadmin/ModelConfigurationListenerTests.java
@@ -13,21 +13,18 @@ package org.eclipse.virgo.kernel.model.internal.configurationadmin;
import static org.junit.Assert.assertEquals;
-import org.junit.Test;
-import org.osgi.framework.ServiceReference;
-import org.osgi.service.cm.ConfigurationAdmin;
-import org.osgi.service.cm.ConfigurationEvent;
-
-
import org.eclipse.virgo.kernel.model.StubArtifactRepository;
-import org.eclipse.virgo.kernel.model.StubRegion;
import org.eclipse.virgo.kernel.model.internal.DependencyDeterminer;
-import org.eclipse.virgo.kernel.model.internal.configurationadmin.ModelConfigurationListener;
import org.eclipse.virgo.nano.serviceability.Assert.FatalAssertionException;
import org.eclipse.virgo.test.stubs.framework.StubBundleContext;
import org.eclipse.virgo.test.stubs.framework.StubServiceRegistration;
+import org.eclipse.virgo.test.stubs.region.StubRegion;
import org.eclipse.virgo.test.stubs.service.cm.StubConfigurationAdmin;
import org.eclipse.virgo.test.stubs.support.TrueFilter;
+import org.junit.Test;
+import org.osgi.framework.ServiceReference;
+import org.osgi.service.cm.ConfigurationAdmin;
+import org.osgi.service.cm.ConfigurationEvent;
public class ModelConfigurationListenerTests {
@@ -44,7 +41,7 @@ public class ModelConfigurationListenerTests {
private final StubConfigurationAdmin configurationAdmin = new StubConfigurationAdmin();
- private final StubRegion region = new StubRegion("test-region");
+ private final StubRegion region = new StubRegion("test-region", null);
private final ModelConfigurationListener listener = new ModelConfigurationListener(artifactRepository, bundleContext, configurationAdmin, region);
diff --git a/org.eclipse.virgo.kernel.model/src/test/java/org/eclipse/virgo/kernel/model/internal/deployer/DeployerArtifactTests.java b/org.eclipse.virgo.kernel.model/src/test/java/org/eclipse/virgo/kernel/model/internal/deployer/DeployerArtifactTests.java
index 8f5209ca..7747fe66 100644
--- a/org.eclipse.virgo.kernel.model/src/test/java/org/eclipse/virgo/kernel/model/internal/deployer/DeployerArtifactTests.java
+++ b/org.eclipse.virgo.kernel.model/src/test/java/org/eclipse/virgo/kernel/model/internal/deployer/DeployerArtifactTests.java
@@ -32,7 +32,6 @@ import org.easymock.IAnswer;
import org.eclipse.virgo.kernel.install.artifact.InstallArtifact;
import org.eclipse.virgo.kernel.install.artifact.InstallArtifact.State;
import org.eclipse.virgo.kernel.model.ArtifactState;
-import org.eclipse.virgo.kernel.model.StubRegion;
import org.eclipse.virgo.kernel.model.internal.DependencyDeterminer;
import org.eclipse.virgo.kernel.model.internal.deployer.DeployerArtifact;
@@ -43,6 +42,7 @@ import org.eclipse.virgo.nano.deployer.api.core.DeploymentException;
import org.eclipse.virgo.nano.serviceability.Assert.FatalAssertionException;
import org.eclipse.virgo.kernel.stubs.StubInstallArtifact;
import org.eclipse.virgo.test.stubs.framework.StubBundleContext;
+import org.eclipse.virgo.test.stubs.region.StubRegion;
import org.eclipse.virgo.test.stubs.support.TrueFilter;
public class DeployerArtifactTests {
@@ -53,7 +53,7 @@ public class DeployerArtifactTests {
bundleContext.addFilter(filterString, new TrueFilter(filterString));
}
- private final StubRegion region = new StubRegion("test-region");
+ private final StubRegion region = new StubRegion("test-region", null);
private final DeployerArtifact artifact = new DeployerArtifact(bundleContext, new StubInstallArtifact("bundle"), region);
diff --git a/org.eclipse.virgo.kernel.model/src/test/java/org/eclipse/virgo/kernel/model/internal/deployer/DeployerBundleArtifactTests.java b/org.eclipse.virgo.kernel.model/src/test/java/org/eclipse/virgo/kernel/model/internal/deployer/DeployerBundleArtifactTests.java
index 3a57e8d2..b2ff64e7 100644
--- a/org.eclipse.virgo.kernel.model/src/test/java/org/eclipse/virgo/kernel/model/internal/deployer/DeployerBundleArtifactTests.java
+++ b/org.eclipse.virgo.kernel.model/src/test/java/org/eclipse/virgo/kernel/model/internal/deployer/DeployerBundleArtifactTests.java
@@ -13,20 +13,19 @@ import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-import org.eclipse.virgo.nano.deployer.api.core.DeploymentException;
import org.eclipse.virgo.kernel.install.artifact.BundleInstallArtifact;
-import org.eclipse.virgo.kernel.model.StubRegion;
import org.eclipse.virgo.kernel.model.StubSpringContextAccessor;
import org.eclipse.virgo.kernel.model.internal.DependencyDeterminer;
import org.eclipse.virgo.kernel.model.internal.SpringContextAccessor;
-import org.junit.Test;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.Version;
-
+import org.eclipse.virgo.nano.deployer.api.core.DeploymentException;
import org.eclipse.virgo.nano.serviceability.Assert.FatalAssertionException;
import org.eclipse.virgo.test.stubs.framework.StubBundle;
import org.eclipse.virgo.test.stubs.framework.StubBundleContext;
+import org.eclipse.virgo.test.stubs.region.StubRegion;
import org.eclipse.virgo.test.stubs.support.TrueFilter;
+import org.junit.Test;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.Version;
public class DeployerBundleArtifactTests {
@@ -36,7 +35,7 @@ public class DeployerBundleArtifactTests {
bundleContext.addFilter(filterString, new TrueFilter(filterString));
}
- private final StubRegion region = new StubRegion("test-region");
+ private final StubRegion region = new StubRegion("test-region", null);
private SpringContextAccessor springContextAccessor = new StubSpringContextAccessor();
diff --git a/org.eclipse.virgo.kernel.model/src/test/java/org/eclipse/virgo/kernel/model/internal/deployer/DeployerCompositeArtifactDependencyDeterminerTests.java b/org.eclipse.virgo.kernel.model/src/test/java/org/eclipse/virgo/kernel/model/internal/deployer/DeployerCompositeArtifactDependencyDeterminerTests.java
index 89c956f4..12c9195c 100644
--- a/org.eclipse.virgo.kernel.model/src/test/java/org/eclipse/virgo/kernel/model/internal/deployer/DeployerCompositeArtifactDependencyDeterminerTests.java
+++ b/org.eclipse.virgo.kernel.model/src/test/java/org/eclipse/virgo/kernel/model/internal/deployer/DeployerCompositeArtifactDependencyDeterminerTests.java
@@ -18,12 +18,12 @@ import org.eclipse.virgo.kernel.install.artifact.InstallArtifact;
import org.eclipse.virgo.kernel.model.RuntimeArtifactRepository;
import org.eclipse.virgo.kernel.model.StubArtifactRepository;
import org.eclipse.virgo.kernel.model.StubCompositeArtifact;
-import org.eclipse.virgo.kernel.model.StubRegion;
import org.eclipse.virgo.kernel.model.internal.DependencyDeterminer;
-import org.eclipse.virgo.nano.serviceability.Assert.FatalAssertionException;
import org.eclipse.virgo.kernel.stubs.StubInstallArtifact;
import org.eclipse.virgo.kernel.stubs.StubPlanInstallArtifact;
+import org.eclipse.virgo.nano.serviceability.Assert.FatalAssertionException;
import org.eclipse.virgo.test.stubs.framework.StubBundleContext;
+import org.eclipse.virgo.test.stubs.region.StubRegion;
import org.eclipse.virgo.test.stubs.support.TrueFilter;
import org.eclipse.virgo.util.common.DirectedAcyclicGraph;
import org.eclipse.virgo.util.common.ThreadSafeDirectedAcyclicGraph;
@@ -40,9 +40,9 @@ public class DeployerCompositeArtifactDependencyDeterminerTests {
this.bundleContext.addFilter(filterString, new TrueFilter(filterString));
}
- private final StubRegion region1 = new StubRegion("test-region1");
+ private final StubRegion region1 = new StubRegion("test-region1", null);
- private final StubRegion region2 = new StubRegion("test-region2");
+ private final StubRegion region2 = new StubRegion("test-region2", null);
private final DeployerCompositeArtifactDependencyDeterminer determiner = new DeployerCompositeArtifactDependencyDeterminer(artifactRepository, region1, region2);
diff --git a/org.eclipse.virgo.kernel.model/src/test/java/org/eclipse/virgo/kernel/model/internal/deployer/DeployerCompositeArtifactTests.java b/org.eclipse.virgo.kernel.model/src/test/java/org/eclipse/virgo/kernel/model/internal/deployer/DeployerCompositeArtifactTests.java
index 796d170a..b847633f 100644
--- a/org.eclipse.virgo.kernel.model/src/test/java/org/eclipse/virgo/kernel/model/internal/deployer/DeployerCompositeArtifactTests.java
+++ b/org.eclipse.virgo.kernel.model/src/test/java/org/eclipse/virgo/kernel/model/internal/deployer/DeployerCompositeArtifactTests.java
@@ -16,14 +16,13 @@ import static org.junit.Assert.assertNotNull;
import org.junit.Test;
-
-import org.eclipse.virgo.kernel.model.StubRegion;
import org.eclipse.virgo.kernel.model.internal.DependencyDeterminer;
import org.eclipse.virgo.kernel.model.internal.deployer.DeployerArtifact;
import org.eclipse.virgo.kernel.model.internal.deployer.DeployerCompositeArtifact;
import org.eclipse.virgo.nano.serviceability.Assert.FatalAssertionException;
import org.eclipse.virgo.kernel.stubs.StubPlanInstallArtifact;
import org.eclipse.virgo.test.stubs.framework.StubBundleContext;
+import org.eclipse.virgo.test.stubs.region.StubRegion;
import org.eclipse.virgo.test.stubs.support.TrueFilter;
public class DeployerCompositeArtifactTests {
@@ -34,7 +33,7 @@ public class DeployerCompositeArtifactTests {
bundleContext.addFilter(filterString, new TrueFilter(filterString));
}
- private final StubRegion region = new StubRegion("test-region");
+ private final StubRegion region = new StubRegion("test-region", null);
private final DeployerCompositeArtifact artifact = new DeployerCompositeArtifact(bundleContext, new StubPlanInstallArtifact(), region);
diff --git a/org.eclipse.virgo.kernel.model/src/test/java/org/eclipse/virgo/kernel/model/internal/deployer/ModelInstallArtifactLifecycleListenerInitializerTests.java b/org.eclipse.virgo.kernel.model/src/test/java/org/eclipse/virgo/kernel/model/internal/deployer/ModelInstallArtifactLifecycleListenerInitializerTests.java
index 0e01a38b..56e626c1 100644
--- a/org.eclipse.virgo.kernel.model/src/test/java/org/eclipse/virgo/kernel/model/internal/deployer/ModelInstallArtifactLifecycleListenerInitializerTests.java
+++ b/org.eclipse.virgo.kernel.model/src/test/java/org/eclipse/virgo/kernel/model/internal/deployer/ModelInstallArtifactLifecycleListenerInitializerTests.java
@@ -25,13 +25,13 @@ import org.eclipse.equinox.region.RegionDigraph;
import org.eclipse.virgo.nano.deployer.api.core.DeploymentIdentity;
import org.eclipse.virgo.kernel.deployer.model.RuntimeArtifactModel;
import org.eclipse.virgo.kernel.model.StubArtifactRepository;
-import org.eclipse.virgo.kernel.model.StubRegion;
import org.eclipse.virgo.kernel.model.StubSpringContextAccessor;
import org.eclipse.virgo.kernel.model.internal.DependencyDeterminer;
import org.eclipse.virgo.nano.serviceability.Assert.FatalAssertionException;
import org.eclipse.virgo.kernel.stubs.StubInstallArtifact;
import org.eclipse.virgo.kernel.stubs.StubPlanInstallArtifact;
import org.eclipse.virgo.test.stubs.framework.StubBundleContext;
+import org.eclipse.virgo.test.stubs.region.StubRegion;
import org.eclipse.virgo.test.stubs.support.TrueFilter;
import org.junit.Before;
import org.junit.Test;
@@ -48,7 +48,7 @@ public class ModelInstallArtifactLifecycleListenerInitializerTests {
private final StubSpringContextAccessor springContextAccessor = new StubSpringContextAccessor();
- private final StubRegion region = new StubRegion("test-region");
+ private final StubRegion region = new StubRegion("test-region", null);
private final StubBundleContext bundleContext;
{
diff --git a/org.eclipse.virgo.kernel.model/src/test/java/org/eclipse/virgo/kernel/model/internal/deployer/ModelInstallArtifactLifecycleListenerTests.java b/org.eclipse.virgo.kernel.model/src/test/java/org/eclipse/virgo/kernel/model/internal/deployer/ModelInstallArtifactLifecycleListenerTests.java
index af64f9c5..88b4a686 100644
--- a/org.eclipse.virgo.kernel.model/src/test/java/org/eclipse/virgo/kernel/model/internal/deployer/ModelInstallArtifactLifecycleListenerTests.java
+++ b/org.eclipse.virgo.kernel.model/src/test/java/org/eclipse/virgo/kernel/model/internal/deployer/ModelInstallArtifactLifecycleListenerTests.java
@@ -21,13 +21,13 @@ import org.eclipse.equinox.region.RegionDigraph;
import org.eclipse.virgo.nano.deployer.api.core.DeploymentException;
import org.eclipse.virgo.kernel.install.artifact.InstallArtifact;
import org.eclipse.virgo.kernel.model.StubArtifactRepository;
-import org.eclipse.virgo.kernel.model.StubRegion;
import org.eclipse.virgo.kernel.model.StubSpringContextAccessor;
import org.eclipse.virgo.kernel.model.internal.DependencyDeterminer;
import org.eclipse.virgo.nano.serviceability.Assert.FatalAssertionException;
import org.eclipse.virgo.kernel.stubs.StubInstallArtifact;
import org.eclipse.virgo.kernel.stubs.StubPlanInstallArtifact;
import org.eclipse.virgo.test.stubs.framework.StubBundleContext;
+import org.eclipse.virgo.test.stubs.region.StubRegion;
import org.eclipse.virgo.test.stubs.support.TrueFilter;
import org.junit.Before;
import org.junit.Test;
@@ -40,7 +40,7 @@ public class ModelInstallArtifactLifecycleListenerTests {
private final StubSpringContextAccessor springContextAccessor = new StubSpringContextAccessor();
- private final StubRegion region = new StubRegion("test-region");
+ private final StubRegion region = new StubRegion("test-region", null);
private final StubBundleContext bundleContext;
{
diff --git a/org.eclipse.virgo.kernel.model/src/test/java/org/eclipse/virgo/kernel/model/management/internal/DelegatingManageableArtifactTests.java b/org.eclipse.virgo.kernel.model/src/test/java/org/eclipse/virgo/kernel/model/management/internal/DelegatingManageableArtifactTests.java
index 30174d94..3d132a04 100644
--- a/org.eclipse.virgo.kernel.model/src/test/java/org/eclipse/virgo/kernel/model/management/internal/DelegatingManageableArtifactTests.java
+++ b/org.eclipse.virgo.kernel.model/src/test/java/org/eclipse/virgo/kernel/model/management/internal/DelegatingManageableArtifactTests.java
@@ -29,10 +29,10 @@ import javax.management.ObjectName;
import org.eclipse.virgo.kernel.model.Artifact;
import org.eclipse.virgo.kernel.model.ArtifactState;
import org.eclipse.virgo.kernel.model.StubCompositeArtifact;
-import org.eclipse.virgo.kernel.model.StubRegion;
import org.eclipse.virgo.kernel.model.management.RuntimeArtifactModelObjectNameCreator;
import org.eclipse.virgo.kernel.model.management.internal.DelegatingManageableArtifact;
import org.eclipse.virgo.nano.serviceability.Assert.FatalAssertionException;
+import org.eclipse.virgo.test.stubs.region.StubRegion;
import org.junit.Test;
import org.osgi.framework.Version;
@@ -63,7 +63,7 @@ public class DelegatingManageableArtifactTests {
expect(creator.createArtifactModel(isA(Artifact.class))).andReturn(new ObjectName("domain:key=value3,region=other"));
expect(artifact.getName()).andReturn("test-name");
expect(artifact.getState()).andReturn(ArtifactState.ACTIVE);
- expect(artifact.getRegion()).andReturn(new StubRegion("test-region"));
+ expect(artifact.getRegion()).andReturn(new StubRegion("test-region", null));
expect(artifact.getType()).andReturn("test-type");
expect(artifact.getVersion()).andReturn(Version.emptyVersion);
expect(artifact.getProperties()).andReturn(Collections.<String, String> emptyMap());
@@ -93,7 +93,7 @@ public class DelegatingManageableArtifactTests {
for (int i = 0; i < 3; i++) {
artifacts.add(new StubCompositeArtifact());
}
- artifacts.add(new StubCompositeArtifact("foo", "bar", new StubRegion("global")));
+ artifacts.add(new StubCompositeArtifact("foo", "bar", new StubRegion("global", null)));
return artifacts;
}
}
diff --git a/org.eclipse.virgo.kernel.osgi/.classpath b/org.eclipse.virgo.kernel.osgi/.classpath
index e0b0b02a..515c1f6e 100644
--- a/org.eclipse.virgo.kernel.osgi/.classpath
+++ b/org.eclipse.virgo.kernel.osgi/.classpath
@@ -22,28 +22,28 @@
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.6.0.D-20120830095745/org.eclipse.virgo.medic-3.6.0.D-20120830095745.jar" sourcepath="/KERNEL_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="KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.6.0.D-20120903162943/org.eclipse.virgo.medic-3.6.0.D-20120903162943.jar" sourcepath="/KERNEL_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="KERNEL_IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi/3.8.0.v20120508-2119/org.eclipse.osgi-3.8.0.v20120508-2119.jar" sourcepath="/KERNEL_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="KERNEL_IVY_CACHE/org.eclipse.virgo.mirrored/org.slf4j.api/1.6.4.v20120130-2120/org.slf4j.api-1.6.4.v20120130-2120.jar" sourcepath="/KERNEL_IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.6.1/com.springsource.slf4j.api-sources-1.6.1.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.slf4j/com.springsource.slf4j.nop/1.6.1/com.springsource.slf4j.nop-1.6.1.jar" sourcepath="/KERNEL_IVY_CACHE/org.slf4j/com.springsource.slf4j.nop/1.6.1/com.springsource.slf4j.nop-sources-1.6.1.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.aspectj/com.springsource.org.aspectj.runtime/1.6.12.RELEASE/com.springsource.org.aspectj.runtime-1.6.12.RELEASE.jar" sourcepath="/KERNEL_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="con" path="org.eclipse.ajdt.core.ASPECTJRT_CONTAINER"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.repository/org.eclipse.virgo.repository/3.6.0.D-20120830100334/org.eclipse.virgo.repository-3.6.0.D-20120830100334.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.repository/org.eclipse.virgo.repository/3.5.0.D-20120615071313/org.eclipse.virgo.repository-sources-3.5.0.D-20120615071313.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.6.0.D-20120830095303/org.eclipse.virgo.util.osgi.manifest-3.6.0.D-20120830095303.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.5.0.D-20120615065828/org.eclipse.virgo.util.osgi.manifest-sources-3.5.0.D-20120615065828.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.6.0.D-20120830095303/org.eclipse.virgo.util.common-3.6.0.D-20120830095303.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.5.0.D-20120615065828/org.eclipse.virgo.util.common-sources-3.5.0.D-20120615065828.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.math/3.6.0.D-20120830095303/org.eclipse.virgo.util.math-3.6.0.D-20120830095303.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.math/3.5.0.D-20120615065828/org.eclipse.virgo.util.math-sources-3.5.0.D-20120615065828.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.6.0.D-20120830095303/org.eclipse.virgo.util.io-3.6.0.D-20120830095303.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.6.0.D-20120830095303/org.eclipse.virgo.util.io-sources-3.6.0.D-20120830095303.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/3.6.0.D-20120830095303/org.eclipse.virgo.util.parser.manifest-3.6.0.D-20120830095303.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/3.5.0.D-20120615065828/org.eclipse.virgo.util.parser.manifest-sources-3.5.0.D-20120615065828.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.repository/org.eclipse.virgo.repository/3.6.0.D-20120903163626/org.eclipse.virgo.repository-3.6.0.D-20120903163626.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.repository/org.eclipse.virgo.repository/3.5.0.D-20120615071313/org.eclipse.virgo.repository-sources-3.5.0.D-20120615071313.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.6.0.D-20120903162413/org.eclipse.virgo.util.osgi.manifest-3.6.0.D-20120903162413.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.5.0.D-20120615065828/org.eclipse.virgo.util.osgi.manifest-sources-3.5.0.D-20120615065828.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.6.0.D-20120903162413/org.eclipse.virgo.util.common-3.6.0.D-20120903162413.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.5.0.D-20120615065828/org.eclipse.virgo.util.common-sources-3.5.0.D-20120615065828.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.math/3.6.0.D-20120903162413/org.eclipse.virgo.util.math-3.6.0.D-20120903162413.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.math/3.5.0.D-20120615065828/org.eclipse.virgo.util.math-sources-3.5.0.D-20120615065828.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.6.0.D-20120903162413/org.eclipse.virgo.util.io-3.6.0.D-20120903162413.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.6.0.D-20120903162413/org.eclipse.virgo.util.io-sources-3.6.0.D-20120903162413.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/3.6.0.D-20120903162413/org.eclipse.virgo.util.parser.manifest-3.6.0.D-20120903162413.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/3.5.0.D-20120615065828/org.eclipse.virgo.util.parser.manifest-sources-3.5.0.D-20120615065828.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.kernel.services"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-2.3.0.jar" sourcepath="/KERNEL_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-sources-2.3.0.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.stubs/3.6.0.D-20120830095553/org.eclipse.virgo.test.stubs-3.6.0.D-20120830095553.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.test.stubs/org.eclipse.virgo.test.stubs/3.6.0.D-20120711092322/org.eclipse.virgo.test.stubs-sources-3.6.0.D-20120711092322.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.test/3.6.0.D-20120830095745/org.eclipse.virgo.medic.test-3.6.0.D-20120830095745.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.test/3.5.0.D-20120615070622/org.eclipse.virgo.medic.test-sources-3.5.0.D-20120615070622.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.stubs/3.6.0.D-20120903162719/org.eclipse.virgo.test.stubs-3.6.0.D-20120903162719.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.test.stubs/org.eclipse.virgo.test.stubs/3.6.0.D-20120711092322/org.eclipse.virgo.test.stubs-sources-3.6.0.D-20120711092322.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.test/3.6.0.D-20120903162943/org.eclipse.virgo.medic.test-3.6.0.D-20120903162943.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.test/3.5.0.D-20120615070622/org.eclipse.virgo.medic.test-sources-3.5.0.D-20120615070622.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework/org.springframework.beans/3.0.5.RELEASE/org.springframework.beans-3.0.5.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework/org.springframework.beans/3.0.5.RELEASE/org.springframework.beans-sources-3.0.5.RELEASE.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.kernel.artifact"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.launcher/3.6.0.D-20120830095553/org.eclipse.virgo.test.launcher-3.6.0.D-20120830095553.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.launcher/3.5.0.D-20120615065435/org.eclipse.virgo.test.launcher-sources-3.5.0.D-20120615065435.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.launcher/3.6.0.D-20120903162719/org.eclipse.virgo.test.launcher-3.6.0.D-20120903162719.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.launcher/3.5.0.D-20120615065435/org.eclipse.virgo.test.launcher-sources-3.5.0.D-20120615065435.jar"/>
<classpathentry kind="var" path="KERNEL_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" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi.services/3.3.0.v20110513/org.eclipse.osgi.services-sources-3.3.0.v20110513.jar"/>
<classpathentry kind="var" path="KERNEL_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="KERNEL_IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.equinox.region/1.1.0.v20120319-1602/org.eclipse.equinox.region-1.1.0.v20120319-1602.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.nano.core/3.6.0.D-20120830095954/org.eclipse.virgo.nano.core-3.6.0.D-20120830095954.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.nano.core/3.6.0.D-20120903163206/org.eclipse.virgo.nano.core-3.6.0.D-20120903163206.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/org.eclipse.virgo.kernel.osgicommand/.classpath b/org.eclipse.virgo.kernel.osgicommand/.classpath
index a1ebce4f..8bb082d4 100644
--- a/org.eclipse.virgo.kernel.osgicommand/.classpath
+++ b/org.eclipse.virgo.kernel.osgicommand/.classpath
@@ -10,11 +10,11 @@
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.kernel.services"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.kernel.shell"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi/3.8.0.v20120508-2119/org.eclipse.osgi-3.8.0.v20120508-2119.jar" sourcepath="/KERNEL_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="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.6.0.D-20120830095303/org.eclipse.virgo.util.io-3.6.0.D-20120830095303.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.5.0.D-20120615065828/org.eclipse.virgo.util.osgi-sources-3.5.0.D-20120615065828.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.6.0.D-20120903162413/org.eclipse.virgo.util.io-3.6.0.D-20120903162413.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.5.0.D-20120615065828/org.eclipse.virgo.util.osgi-sources-3.5.0.D-20120615065828.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-2.3.0.jar" sourcepath="/KERNEL_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-sources-2.3.0.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.felix.gogo.runtime/0.8.0.v201108120515/org.apache.felix.gogo.runtime-0.8.0.v201108120515.jar" sourcepath="/KERNEL_IVY_CACHE/org.apache.felix/org.apache.felix.gogo.runtime/0.8.0.v201107131313/org.apache.felix.gogo.runtime-sources-0.8.0.v201107131313.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.felix.gogo.shell/0.8.0.v201110170705/org.apache.felix.gogo.shell-0.8.0.v201110170705.jar" sourcepath="/KERNEL_IVY_CACHE/org.apache.felix/org.apache.felix.gogo.shell/0.8.0.v201107131313/org.apache.felix.gogo.shell-sources-0.8.0.v201107131313.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.felix.gogo.command/0.8.0.v201108120515/org.apache.felix.gogo.command-0.8.0.v201108120515.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.6.0.D-20120830095303/org.eclipse.virgo.util.osgi-3.6.0.D-20120830095303.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.1.0.M01/org.eclipse.virgo.util.osgi-sources-3.1.0.M01.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.6.0.D-20120903162413/org.eclipse.virgo.util.osgi-3.6.0.D-20120903162413.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.1.0.M01/org.eclipse.virgo.util.osgi-sources-3.1.0.M01.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/org.eclipse.virgo.kernel.services/.classpath b/org.eclipse.virgo.kernel.services/.classpath
index ba641fd0..6ea2deb1 100644
--- a/org.eclipse.virgo.kernel.services/.classpath
+++ b/org.eclipse.virgo.kernel.services/.classpath
@@ -24,25 +24,25 @@
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/KERNEL_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-2.3.0.jar" sourcepath="/KERNEL_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-sources-2.3.0.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.aspectj/com.springsource.org.aspectj.runtime/1.6.12.RELEASE/com.springsource.org.aspectj.runtime-1.6.12.RELEASE.jar" sourcepath="/KERNEL_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="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.6.0.D-20120830095303/org.eclipse.virgo.util.common-3.6.0.D-20120830095303.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.5.0.D-20120615065828/org.eclipse.virgo.util.common-sources-3.5.0.D-20120615065828.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.6.0.D-20120830095303/org.eclipse.virgo.util.io-3.6.0.D-20120830095303.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.5.0.D-20120615065828/org.eclipse.virgo.util.io-sources-3.5.0.D-20120615065828.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.6.0.D-20120903162413/org.eclipse.virgo.util.common-3.6.0.D-20120903162413.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.5.0.D-20120615065828/org.eclipse.virgo.util.common-sources-3.5.0.D-20120615065828.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.6.0.D-20120903162413/org.eclipse.virgo.util.io-3.6.0.D-20120903162413.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.5.0.D-20120615065828/org.eclipse.virgo.util.io-sources-3.5.0.D-20120615065828.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi/3.8.0.v20120508-2119/org.eclipse.osgi-3.8.0.v20120508-2119.jar" sourcepath="/KERNEL_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="KERNEL_IVY_CACHE/org.springframework/org.springframework.beans/3.0.5.RELEASE/org.springframework.beans-3.0.5.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework/org.springframework.beans/3.0.5.RELEASE/org.springframework.beans-sources-3.0.5.RELEASE.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework/org.springframework.core/3.0.5.RELEASE/org.springframework.core-3.0.5.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework/org.springframework.core/3.0.5.RELEASE/org.springframework.core-sources-3.0.5.RELEASE.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework/org.springframework.context/3.0.5.RELEASE/org.springframework.context-3.0.5.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework/org.springframework.context/3.0.5.RELEASE/org.springframework.context-sources-3.0.5.RELEASE.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.repository/org.eclipse.virgo.repository/3.6.0.D-20120830100334/org.eclipse.virgo.repository-3.6.0.D-20120830100334.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.repository/org.eclipse.virgo.repository/3.5.0.D-20120615071313/org.eclipse.virgo.repository-sources-3.5.0.D-20120615071313.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.repository/org.eclipse.virgo.repository/3.6.0.D-20120903163626/org.eclipse.virgo.repository-3.6.0.D-20120903163626.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.repository/org.eclipse.virgo.repository/3.5.0.D-20120615071313/org.eclipse.virgo.repository-sources-3.5.0.D-20120615071313.jar"/>
<classpathentry kind="con" path="org.eclipse.ajdt.core.ASPECTJRT_CONTAINER"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.core/3.6.0.D-20120830095745/org.eclipse.virgo.medic.core-3.6.0.D-20120830095745.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.core/1.0.0.CI-B20/org.eclipse.virgo.medic.core-sources-1.0.0.CI-B20.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.core/3.6.0.D-20120903162943/org.eclipse.virgo.medic.core-3.6.0.D-20120903162943.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.core/1.0.0.CI-B20/org.eclipse.virgo.medic.core-sources-1.0.0.CI-B20.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.mirrored/org.slf4j.api/1.6.4.v20120130-2120/org.slf4j.api-1.6.4.v20120130-2120.jar" sourcepath="/KERNEL_IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.6.1/com.springsource.slf4j.api-sources-1.6.1.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.slf4j/com.springsource.slf4j.nop/1.6.1/com.springsource.slf4j.nop-1.6.1.jar" sourcepath="/KERNEL_IVY_CACHE/org.slf4j/com.springsource.slf4j.nop/1.6.1/com.springsource.slf4j.nop-sources-1.6.1.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.stubs/3.6.0.D-20120830095553/org.eclipse.virgo.test.stubs-3.6.0.D-20120830095553.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.test.stubs/org.eclipse.virgo.test.stubs/3.6.0.D-20120711092322/org.eclipse.virgo.test.stubs-sources-3.6.0.D-20120711092322.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.math/3.6.0.D-20120830095303/org.eclipse.virgo.util.math-3.6.0.D-20120830095303.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.math/3.5.0.D-20120615065828/org.eclipse.virgo.util.math-sources-3.5.0.D-20120615065828.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/3.6.0.D-20120830095303/org.eclipse.virgo.util.parser.manifest-3.6.0.D-20120830095303.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/3.5.0.D-20120615065828/org.eclipse.virgo.util.parser.manifest-sources-3.5.0.D-20120615065828.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.core/1.0.0.RELEASE/org.eclipse.gemini.blueprint.core-1.0.0.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.core/1.0.0.RELEASE/org.eclipse.gemini.blueprint.core-sources-1.0.0.RELEASE.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.6.0.D-20120830095745/org.eclipse.virgo.medic-3.6.0.D-20120830095745.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.test/3.5.0.D-20120615070622/org.eclipse.virgo.medic.test-sources-3.5.0.D-20120615070622.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.stubs/3.6.0.D-20120903162719/org.eclipse.virgo.test.stubs-3.6.0.D-20120903162719.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.test.stubs/org.eclipse.virgo.test.stubs/3.6.0.D-20120711092322/org.eclipse.virgo.test.stubs-sources-3.6.0.D-20120711092322.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.math/3.6.0.D-20120903162413/org.eclipse.virgo.util.math-3.6.0.D-20120903162413.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.math/3.5.0.D-20120615065828/org.eclipse.virgo.util.math-sources-3.5.0.D-20120615065828.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/3.6.0.D-20120903162413/org.eclipse.virgo.util.parser.manifest-3.6.0.D-20120903162413.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/3.5.0.D-20120615065828/org.eclipse.virgo.util.parser.manifest-sources-3.5.0.D-20120615065828.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.core/1.0.2.RELEASE/org.eclipse.gemini.blueprint.core-1.0.2.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.core/1.0.2.RELEASE/org.eclipse.gemini.blueprint.core-sources-1.0.2.RELEASE.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.6.0.D-20120903162943/org.eclipse.virgo.medic-3.6.0.D-20120903162943.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.test/3.5.0.D-20120615070622/org.eclipse.virgo.medic.test-sources-3.5.0.D-20120615070622.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.kernel.artifact"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.6.0.D-20120830095303/org.eclipse.virgo.util.osgi.manifest-3.6.0.D-20120830095303.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.nano.core/3.6.0.D-20120830095954/org.eclipse.virgo.nano.core-3.6.0.D-20120830095954.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.test/3.6.0.D-20120830095745/org.eclipse.virgo.medic.test-3.6.0.D-20120830095745.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.test/3.5.0.D-20120615070622/org.eclipse.virgo.medic.test-sources-3.5.0.D-20120615070622.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.6.0.D-20120903162413/org.eclipse.virgo.util.osgi.manifest-3.6.0.D-20120903162413.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.nano.core/3.6.0.D-20120903163206/org.eclipse.virgo.nano.core-3.6.0.D-20120903163206.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.test/3.6.0.D-20120903162943/org.eclipse.virgo.medic.test-3.6.0.D-20120903162943.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.test/3.5.0.D-20120615070622/org.eclipse.virgo.medic.test-sources-3.5.0.D-20120615070622.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/org.eclipse.virgo.kernel.smoketest/.classpath b/org.eclipse.virgo.kernel.smoketest/.classpath
index be256127..62136352 100644
--- a/org.eclipse.virgo.kernel.smoketest/.classpath
+++ b/org.eclipse.virgo.kernel.smoketest/.classpath
@@ -5,6 +5,6 @@
<classpathentry kind="src" path="src/test/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.6.0.D-20120830095303/org.eclipse.virgo.util.io-3.6.0.D-20120830095303.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.5.0.D-20120615065828/org.eclipse.virgo.util.io-sources-3.5.0.D-20120615065828.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.6.0.D-20120903162413/org.eclipse.virgo.util.io-3.6.0.D-20120903162413.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.5.0.D-20120615065828/org.eclipse.virgo.util.io-sources-3.5.0.D-20120615065828.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/org.eclipse.virgo.kernel.stubs/.classpath b/org.eclipse.virgo.kernel.stubs/.classpath
index 20595c4b..f2656506 100644
--- a/org.eclipse.virgo.kernel.stubs/.classpath
+++ b/org.eclipse.virgo.kernel.stubs/.classpath
@@ -23,11 +23,11 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.kernel.deployer"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.1.R37x_v20110808-1106/org.eclipse.osgi-3.7.1.R37x_v20110808-1106.jar" sourcepath="/KERNEL_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="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.6.0.D-20120830095303/org.eclipse.virgo.util.osgi.manifest-3.6.0.D-20120830095303.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.5.0.D-20120615065828/org.eclipse.virgo.util.osgi.manifest-sources-3.5.0.D-20120615065828.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.6.0.D-20120830095303/org.eclipse.virgo.util.common-3.6.0.D-20120830095303.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.5.0.D-20120615065828/org.eclipse.virgo.util.common-sources-3.5.0.D-20120615065828.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.6.0.D-20120903162413/org.eclipse.virgo.util.osgi.manifest-3.6.0.D-20120903162413.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.5.0.D-20120615065828/org.eclipse.virgo.util.osgi.manifest-sources-3.5.0.D-20120615065828.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.6.0.D-20120903162413/org.eclipse.virgo.util.common-3.6.0.D-20120903162413.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.5.0.D-20120615065828/org.eclipse.virgo.util.common-sources-3.5.0.D-20120615065828.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.kernel.artifact"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.kernel.osgi"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.nano.core/3.6.0.D-20120830095954/org.eclipse.virgo.nano.core-3.6.0.D-20120830095954.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.nano.deployer.api/3.6.0.D-20120830095954/org.eclipse.virgo.nano.deployer.api-3.6.0.D-20120830095954.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.nano.core/3.6.0.D-20120903163206/org.eclipse.virgo.nano.core-3.6.0.D-20120903163206.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.nano.deployer.api/3.6.0.D-20120903163206/org.eclipse.virgo.nano.deployer.api-3.6.0.D-20120903163206.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/org.eclipse.virgo.kernel.test/.classpath b/org.eclipse.virgo.kernel.test/.classpath
index c569e288..98211f42 100644
--- a/org.eclipse.virgo.kernel.test/.classpath
+++ b/org.eclipse.virgo.kernel.test/.classpath
@@ -9,19 +9,19 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.kernel.deployer"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.kernel.osgi"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.framework/3.6.0.D-20120820125548/org.eclipse.virgo.test.framework-3.6.0.D-20120820125548.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.framework/3.5.0.D-20120301131734/org.eclipse.virgo.test.framework-sources-3.5.0.D-20120301131734.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.6.0.D-20120820124944/org.eclipse.virgo.util.io-3.6.0.D-20120820124944.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.5.0.D-20120615065828/org.eclipse.virgo.util.io-sources-3.5.0.D-20120615065828.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.6.0.D-20120820124944/org.eclipse.virgo.util.osgi.manifest-3.6.0.D-20120820124944.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.5.0.D-20120615065828/org.eclipse.virgo.util.osgi.manifest-sources-3.5.0.D-20120615065828.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.core/1.0.0.RELEASE/org.eclipse.gemini.blueprint.core-1.0.0.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.core/1.0.0.RELEASE/org.eclipse.gemini.blueprint.core-sources-1.0.0.RELEASE.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.framework/3.6.0.D-20120903162719/org.eclipse.virgo.test.framework-3.6.0.D-20120903162719.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.framework/3.5.0.D-20120301131734/org.eclipse.virgo.test.framework-sources-3.5.0.D-20120301131734.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.6.0.D-20120903162413/org.eclipse.virgo.util.io-3.6.0.D-20120903162413.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.5.0.D-20120615065828/org.eclipse.virgo.util.io-sources-3.5.0.D-20120615065828.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.6.0.D-20120903162413/org.eclipse.virgo.util.osgi.manifest-3.6.0.D-20120903162413.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.5.0.D-20120615065828/org.eclipse.virgo.util.osgi.manifest-sources-3.5.0.D-20120615065828.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.core/1.0.2.RELEASE/org.eclipse.gemini.blueprint.core-1.0.2.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.core/1.0.2.RELEASE/org.eclipse.gemini.blueprint.core-sources-1.0.2.RELEASE.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework/org.springframework.context/3.0.5.RELEASE/org.springframework.context-3.0.5.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework/org.springframework.context/3.0.5.RELEASE/org.springframework.context-sources-3.0.5.RELEASE.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework/org.springframework.core/3.0.5.RELEASE/org.springframework.core-3.0.5.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework/org.springframework.core/3.0.5.RELEASE/org.springframework.core-sources-3.0.5.RELEASE.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.launcher/3.6.0.D-20120820125548/org.eclipse.virgo.test.launcher-3.6.0.D-20120820125548.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.launcher/3.6.0.D-20120903162719/org.eclipse.virgo.test.launcher-3.6.0.D-20120903162719.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework/org.springframework.beans/3.0.5.RELEASE/org.springframework.beans-3.0.5.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework/org.springframework.beans/3.0.5.RELEASE/org.springframework.beans-sources-3.0.5.RELEASE.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/3.6.0.D-20120820124944/org.eclipse.virgo.util.parser.manifest-3.6.0.D-20120820124944.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/3.5.0.D-20120615065828/org.eclipse.virgo.util.parser.manifest-sources-3.5.0.D-20120615065828.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.6.0.D-20120820125756/org.eclipse.virgo.medic-3.6.0.D-20120820125756.jar" sourcepath="/KERNEL_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="KERNEL_IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.equinox.region/1.1.0.v20120319-1602/org.eclipse.equinox.region-1.1.0.v20120319-1602.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.nano.core/3.6.0.D-20120820130036/org.eclipse.virgo.nano.core-3.6.0.D-20120820130036.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.nano.deployer.api/3.6.0.D-20120820130036/org.eclipse.virgo.nano.deployer.api-3.6.0.D-20120820130036.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/3.6.0.D-20120903162413/org.eclipse.virgo.util.parser.manifest-3.6.0.D-20120903162413.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/3.5.0.D-20120615065828/org.eclipse.virgo.util.parser.manifest-sources-3.5.0.D-20120615065828.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.6.0.D-20120903162943/org.eclipse.virgo.medic-3.6.0.D-20120903162943.jar" sourcepath="/KERNEL_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 combineaccessrules="false" kind="src" path="/org.eclipse.virgo.shell.command"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.equinox.region/1.1.0.v20120319-1602/org.eclipse.equinox.region-1.1.0.v20120319-1602.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.nano.core/3.6.0.D-20120903163206/org.eclipse.virgo.nano.core-3.6.0.D-20120903163206.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.nano.deployer.api/3.6.0.D-20120903163206/org.eclipse.virgo.nano.deployer.api-3.6.0.D-20120903163206.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/org.eclipse.virgo.kernel.test/src/test/resources/META-INF/test.config.properties b/org.eclipse.virgo.kernel.test/src/test/resources/META-INF/test.config.properties
index d20bcf62..ee563e08 100644
--- a/org.eclipse.virgo.kernel.test/src/test/resources/META-INF/test.config.properties
+++ b/org.eclipse.virgo.kernel.test/src/test/resources/META-INF/test.config.properties
@@ -4,40 +4,40 @@ launcher.bundles =\
file:${ivy.cache}/repository/org.eclipse.virgo.mirrored/org.slf4j.jul/${org.slf4j.jul}/org.slf4j.jul-${org.slf4j.jul}.jar,\
file:${ivy.cache}/repository/org.eclipse.virgo.mirrored/org.slf4j.jcl/${org.slf4j.jcl}/org.slf4j.jcl-${org.slf4j.jcl}.jar@start,\
file:${ivy.cache}/repository/org.aspectj/com.springsource.org.aspectj.runtime/${org.aspectj}/com.springsource.org.aspectj.runtime-${org.aspectj}.jar@start,\
- file:${integration.repo.dir}/org.eclipse.virgo.medic/org.eclipse.virgo.medic/${org.eclipse.virgo.medic}/org.eclipse.virgo.medic-${org.eclipse.virgo.medic}.jar@start,\
- file:${integration.repo.dir}/org.eclipse.virgo.medic/org.eclipse.virgo.medic.logbackcorefragment/${org.eclipse.virgo.medic}/org.eclipse.virgo.medic.logbackcorefragment-${org.eclipse.virgo.medic}.jar,\
- file:${integration.repo.dir}/org.eclipse.virgo.medic/org.eclipse.virgo.medic.logbackclassicfragment/${org.eclipse.virgo.medic}/org.eclipse.virgo.medic.logbackclassicfragment-${org.eclipse.virgo.medic}.jar,\
+ 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.eclipse.virgo.medic/org.eclipse.virgo.medic.logbackcorefragment/${org.eclipse.virgo.medic}/org.eclipse.virgo.medic.logbackcorefragment-${org.eclipse.virgo.medic}.jar,\
+ file:${ivy.cache}/repository/org.eclipse.virgo.medic/org.eclipse.virgo.medic.logbackclassicfragment/${org.eclipse.virgo.medic}/org.eclipse.virgo.medic.logbackclassicfragment-${org.eclipse.virgo.medic}.jar,\
file:${ivy.cache}/repository/org.eclipse.virgo.mirrored/ch.qos.logback.core/${ch.qos.logback.core}/ch.qos.logback.core-${ch.qos.logback.core}.jar,\
file:${ivy.cache}/repository/org.eclipse.virgo.mirrored/ch.qos.logback.classic/${ch.qos.logback.classic}/ch.qos.logback.classic-${ch.qos.logback.classic}.jar,\
file:${ivy.cache}/repository/org.eclipse.virgo.mirrored/ch.qos.logback.slf4j/${ch.qos.logback.slf4j}/ch.qos.logback.slf4j-${ch.qos.logback.slf4j}.jar,\
file:${ivy.cache}/repository/org.eclipse.virgo.mirrored/org.eclipse.osgi.services/${org.eclipse.osgi.services}/org.eclipse.osgi.services-${org.eclipse.osgi.services}.jar,\
file:${ivy.cache}/repository/org.eclipse.virgo.mirrored/org.eclipse.equinox.cm/${org.eclipse.equinox.cm}/org.eclipse.equinox.cm-${org.eclipse.equinox.cm}.jar@start,\
- file:${integration.repo.dir}/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:${integration.repo.dir}/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:${integration.repo.dir}/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/${org.eclipse.virgo.util}/org.eclipse.virgo.util.osgi.manifest-${org.eclipse.virgo.util}.jar@start,\
+ file:${ivy.cache}/repository/org.eclipse.virgo.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.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/${org.eclipse.virgo.util}/org.eclipse.virgo.util.osgi.manifest-${org.eclipse.virgo.util}.jar@start,\
file:${ivy.cache}/repository/org.eclipse.virgo.mirrored/org.eclipse.equinox.event/${org.eclipse.equinox.event}/org.eclipse.equinox.event-${org.eclipse.equinox.event}.jar@start,\
- file:${integration.repo.dir}/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:${integration.repo.dir}/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:${integration.repo.dir}/org.eclipse.virgo.util/org.eclipse.virgo.util.jmx/${org.eclipse.virgo.util}/org.eclipse.virgo.util.jmx-${org.eclipse.virgo.util}.jar,\
- file:${integration.repo.dir}/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:${integration.repo.dir}/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:${integration.repo.dir}/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.launcher/${org.eclipse.virgo.util}/org.eclipse.virgo.util.parser.launcher-${org.eclipse.virgo.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.jmx/${org.eclipse.virgo.util}/org.eclipse.virgo.util.jmx-${org.eclipse.virgo.util}.jar,\
+ 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.parser.launcher/${org.eclipse.virgo.util}/org.eclipse.virgo.util.parser.launcher-${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:${integration.repo.dir}/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.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.5.RELEASE/org.springframework.aop-3.0.5.RELEASE.jar,\
file:${ivy.cache}/repository/org.springframework/org.springframework.asm/3.0.5.RELEASE/org.springframework.asm-3.0.5.RELEASE.jar,\
file:${ivy.cache}/repository/org.springframework/org.springframework.expression/3.0.5.RELEASE/org.springframework.expression-3.0.5.RELEASE.jar,\
file:${ivy.cache}/repository/org.springframework/org.springframework.beans/3.0.5.RELEASE/org.springframework.beans-3.0.5.RELEASE.jar,\
file:${ivy.cache}/repository/org.springframework/org.springframework.core/3.0.5.RELEASE/org.springframework.core-3.0.5.RELEASE.jar,\
file:${ivy.cache}/repository/org.springframework/org.springframework.context/3.0.5.RELEASE/org.springframework.context-3.0.5.RELEASE.jar,\
- file:${integration.repo.dir}/org.eclipse.virgo.nano/org.eclipse.virgo.nano.core/${org.eclipse.virgo.nano}/org.eclipse.virgo.nano.core-${org.eclipse.virgo.nano}.jar@start,\
- file:${integration.repo.dir}/org.eclipse.virgo.nano/org.eclipse.virgo.nano.deployer.api/${org.eclipse.virgo.nano}/org.eclipse.virgo.nano.deployer.api-${org.eclipse.virgo.nano}.jar,\
- file:${integration.repo.dir}/org.eclipse.virgo.nano/org.eclipse.virgo.nano.deployer.hot/${org.eclipse.virgo.nano}/org.eclipse.virgo.nano.deployer.hot-${org.eclipse.virgo.nano}.jar,\
+ file:${ivy.cache}/repository/org.eclipse.virgo.nano/org.eclipse.virgo.nano.core/${org.eclipse.virgo.nano}/org.eclipse.virgo.nano.core-${org.eclipse.virgo.nano}.jar@start,\
+ file:${ivy.cache}/repository/org.eclipse.virgo.nano/org.eclipse.virgo.nano.deployer.api/${org.eclipse.virgo.nano}/org.eclipse.virgo.nano.deployer.api-${org.eclipse.virgo.nano}.jar,\
+ file:${ivy.cache}/repository/org.eclipse.virgo.nano/org.eclipse.virgo.nano.deployer.hot/${org.eclipse.virgo.nano}/org.eclipse.virgo.nano.deployer.hot-${org.eclipse.virgo.nano}.jar,\
file:../org.eclipse.virgo.kernel.agent.dm/target/classes@start,\
- file:${ivy.cache}/repository/org.eclipse.gemini/org.eclipse.gemini.blueprint.core/1.0.0.RELEASE/org.eclipse.gemini.blueprint.core-1.0.0.RELEASE.jar,\
- file:${ivy.cache}/repository/org.eclipse.gemini/org.eclipse.gemini.blueprint.extender/1.0.0.RELEASE/org.eclipse.gemini.blueprint.extender-1.0.0.RELEASE.jar@start,\
- 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.eclipse.gemini/org.eclipse.gemini.blueprint.core/1.0.2.RELEASE/org.eclipse.gemini.blueprint.core-1.0.2.RELEASE.jar,\
+ file:${ivy.cache}/repository/org.eclipse.gemini/org.eclipse.gemini.blueprint.extender/1.0.2.RELEASE/org.eclipse.gemini.blueprint.extender-1.0.2.RELEASE.jar@start,\
+ file:${ivy.cache}/repository/org.eclipse.gemini/org.eclipse.gemini.blueprint.io/1.0.2.RELEASE/org.eclipse.gemini.blueprint.io-1.0.2.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.ds/${org.eclipse.equinox.ds}/org.eclipse.equinox.ds-${org.eclipse.equinox.ds}.jar@start,\
file:${ivy.cache}/repository/org.eclipse.virgo.mirrored/org.eclipse.equinox.util/${org.eclipse.equinox.util}/org.eclipse.equinox.util-${org.eclipse.equinox.util}.jar@start,\
diff --git a/org.eclipse.virgo.kernel.test/src/test/resources/config/org.eclipse.virgo.kernel.userregion.properties b/org.eclipse.virgo.kernel.test/src/test/resources/config/org.eclipse.virgo.kernel.userregion.properties
index fe8045bc..8f57ef44 100644
--- a/org.eclipse.virgo.kernel.test/src/test/resources/config/org.eclipse.virgo.kernel.userregion.properties
+++ b/org.eclipse.virgo.kernel.test/src/test/resources/config/org.eclipse.virgo.kernel.userregion.properties
@@ -5,9 +5,9 @@ baseBundles =\
file:${ivy.cache}/repository/org.springframework/org.springframework.beans/3.0.5.RELEASE/org.springframework.beans-3.0.5.RELEASE.jar,\
file:${ivy.cache}/repository/org.springframework/org.springframework.core/3.0.5.RELEASE/org.springframework.core-3.0.5.RELEASE.jar,\
file:${ivy.cache}/repository/org.springframework/org.springframework.context/3.0.5.RELEASE/org.springframework.context-3.0.5.RELEASE.jar,\
- file:${ivy.cache}/repository/org.eclipse.gemini/org.eclipse.gemini.blueprint.core/1.0.0.RELEASE/org.eclipse.gemini.blueprint.core-1.0.0.RELEASE.jar,\
- file:${ivy.cache}/repository/org.eclipse.gemini/org.eclipse.gemini.blueprint.extender/1.0.0.RELEASE/org.eclipse.gemini.blueprint.extender-1.0.0.RELEASE.jar@start,\
- 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.eclipse.gemini/org.eclipse.gemini.blueprint.core/1.0.2.RELEASE/org.eclipse.gemini.blueprint.core-1.0.2.RELEASE.jar,\
+ file:${ivy.cache}/repository/org.eclipse.gemini/org.eclipse.gemini.blueprint.extender/1.0.2.RELEASE/org.eclipse.gemini.blueprint.extender-1.0.2.RELEASE.jar@start,\
+ file:${ivy.cache}/repository/org.eclipse.gemini/org.eclipse.gemini.blueprint.io/1.0.2.RELEASE/org.eclipse.gemini.blueprint.io-1.0.2.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.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,\
diff --git a/org.eclipse.virgo.kernel.userregion/.classpath b/org.eclipse.virgo.kernel.userregion/.classpath
index 4b5176e0..892953f5 100644
--- a/org.eclipse.virgo.kernel.userregion/.classpath
+++ b/org.eclipse.virgo.kernel.userregion/.classpath
@@ -22,30 +22,30 @@
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.6.0.D-20120830095745/org.eclipse.virgo.medic-3.6.0.D-20120830095745.jar" sourcepath="/KERNEL_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="KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.6.0.D-20120903162943/org.eclipse.virgo.medic-3.6.0.D-20120903162943.jar" sourcepath="/KERNEL_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="KERNEL_IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi/3.8.0.v20120508-2119/org.eclipse.osgi-3.8.0.v20120508-2119.jar" sourcepath="/KERNEL_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="KERNEL_IVY_CACHE/org.eclipse.virgo.mirrored/org.slf4j.api/1.6.4.v20120130-2120/org.slf4j.api-1.6.4.v20120130-2120.jar" sourcepath="/KERNEL_IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.6.1/com.springsource.slf4j.api-sources-1.6.1.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.slf4j/com.springsource.slf4j.nop/1.6.1/com.springsource.slf4j.nop-1.6.1.jar" sourcepath="/KERNEL_IVY_CACHE/org.slf4j/com.springsource.slf4j.nop/1.6.1/com.springsource.slf4j.nop-sources-1.6.1.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.aspectj/com.springsource.org.aspectj.runtime/1.6.12.RELEASE/com.springsource.org.aspectj.runtime-1.6.12.RELEASE.jar" sourcepath="/KERNEL_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="KERNEL_IVY_CACHE/org.eclipse.virgo.repository/org.eclipse.virgo.repository/3.6.0.D-20120830100334/org.eclipse.virgo.repository-3.6.0.D-20120830100334.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.repository/org.eclipse.virgo.repository/3.5.0.D-20120615071313/org.eclipse.virgo.repository-sources-3.5.0.D-20120615071313.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.6.0.D-20120830095303/org.eclipse.virgo.util.osgi-3.6.0.D-20120830095303.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.5.0.D-20120615065828/org.eclipse.virgo.util.osgi-sources-3.5.0.D-20120615065828.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.6.0.D-20120830095303/org.eclipse.virgo.util.osgi.manifest-3.6.0.D-20120830095303.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.5.0.D-20120615065828/org.eclipse.virgo.util.osgi.manifest-sources-3.5.0.D-20120615065828.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.6.0.D-20120830095303/org.eclipse.virgo.util.common-3.6.0.D-20120830095303.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.5.0.D-20120615065828/org.eclipse.virgo.util.common-sources-3.5.0.D-20120615065828.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.math/3.6.0.D-20120830095303/org.eclipse.virgo.util.math-3.6.0.D-20120830095303.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.math/3.5.0.D-20120615065828/org.eclipse.virgo.util.math-sources-3.5.0.D-20120615065828.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.6.0.D-20120830095303/org.eclipse.virgo.util.io-3.6.0.D-20120830095303.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.5.0.D-20120615065828/org.eclipse.virgo.util.io-sources-3.5.0.D-20120615065828.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/3.6.0.D-20120830095303/org.eclipse.virgo.util.parser.manifest-3.6.0.D-20120830095303.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/3.5.0.D-20120615065828/org.eclipse.virgo.util.parser.manifest-sources-3.5.0.D-20120615065828.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.repository/org.eclipse.virgo.repository/3.6.0.D-20120903163626/org.eclipse.virgo.repository-3.6.0.D-20120903163626.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.repository/org.eclipse.virgo.repository/3.5.0.D-20120615071313/org.eclipse.virgo.repository-sources-3.5.0.D-20120615071313.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.6.0.D-20120903162413/org.eclipse.virgo.util.osgi-3.6.0.D-20120903162413.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.5.0.D-20120615065828/org.eclipse.virgo.util.osgi-sources-3.5.0.D-20120615065828.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.6.0.D-20120903162413/org.eclipse.virgo.util.osgi.manifest-3.6.0.D-20120903162413.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.5.0.D-20120615065828/org.eclipse.virgo.util.osgi.manifest-sources-3.5.0.D-20120615065828.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.6.0.D-20120903162413/org.eclipse.virgo.util.common-3.6.0.D-20120903162413.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.5.0.D-20120615065828/org.eclipse.virgo.util.common-sources-3.5.0.D-20120615065828.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.math/3.6.0.D-20120903162413/org.eclipse.virgo.util.math-3.6.0.D-20120903162413.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.math/3.5.0.D-20120615065828/org.eclipse.virgo.util.math-sources-3.5.0.D-20120615065828.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.6.0.D-20120903162413/org.eclipse.virgo.util.io-3.6.0.D-20120903162413.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.5.0.D-20120615065828/org.eclipse.virgo.util.io-sources-3.5.0.D-20120615065828.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/3.6.0.D-20120903162413/org.eclipse.virgo.util.parser.manifest-3.6.0.D-20120903162413.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/3.5.0.D-20120615065828/org.eclipse.virgo.util.parser.manifest-sources-3.5.0.D-20120615065828.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.kernel.services"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-2.3.0.jar" sourcepath="/KERNEL_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-sources-2.3.0.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.stubs/3.6.0.D-20120830095553/org.eclipse.virgo.test.stubs-3.6.0.D-20120830095553.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.test.stubs/org.eclipse.virgo.test.stubs/1.0.0.CI-B39/org.eclipse.virgo.test.stubs-sources-1.0.0.CI-B39.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.test/3.6.0.D-20120830095745/org.eclipse.virgo.medic.test-3.6.0.D-20120830095745.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.test/3.5.0.D-20120615070622/org.eclipse.virgo.medic.test-sources-3.5.0.D-20120615070622.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.stubs/3.6.0.D-20120903162719/org.eclipse.virgo.test.stubs-3.6.0.D-20120903162719.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.test.stubs/org.eclipse.virgo.test.stubs/1.0.0.CI-B39/org.eclipse.virgo.test.stubs-sources-1.0.0.CI-B39.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.test/3.6.0.D-20120903162943/org.eclipse.virgo.medic.test-3.6.0.D-20120903162943.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.test/3.5.0.D-20120615070622/org.eclipse.virgo.medic.test-sources-3.5.0.D-20120615070622.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.kernel.artifact"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.kernel.osgi"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.kernel.deployer"/>
<classpathentry kind="var" path="KERNEL_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" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi.services/3.3.0.v20110513/org.eclipse.osgi.services-sources-3.3.0.v20110513.jar"/>
<classpathentry kind="var" path="KERNEL_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="KERNEL_IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.equinox.region/1.1.0.v20120319-1602/org.eclipse.equinox.region-1.1.0.v20120319-1602.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.equinox.region/1.1.0.v20120319-1602/org.eclipse.equinox.region.source-1.1.0.v20120319-1602.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.nano.core/3.6.0.D-20120830095954/org.eclipse.virgo.nano.core-3.6.0.D-20120830095954.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.nano.deployer.api/3.6.0.D-20120830095954/org.eclipse.virgo.nano.deployer.api-3.6.0.D-20120830095954.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.nano.core/3.6.0.D-20120903163206/org.eclipse.virgo.nano.core-3.6.0.D-20120903163206.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.nano.deployer.api/3.6.0.D-20120903163206/org.eclipse.virgo.nano.deployer.api-3.6.0.D-20120903163206.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.kernel.equinox.extensions"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/quasi/StandardQuasiBundleTests.java b/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/quasi/StandardQuasiBundleTests.java
index 43806a22..88d96e1f 100644
--- a/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/quasi/StandardQuasiBundleTests.java
+++ b/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/quasi/StandardQuasiBundleTests.java
@@ -18,6 +18,7 @@ import org.eclipse.virgo.kernel.osgi.quasi.QuasiBundle;
import org.eclipse.virgo.kernel.osgi.quasi.QuasiExportPackage;
import org.eclipse.virgo.kernel.osgi.quasi.QuasiImportPackage;
import org.eclipse.virgo.kernel.osgi.quasi.QuasiRequiredBundle;
+import org.eclipse.virgo.test.stubs.region.StubRegionDigraph;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/quasi/StandardQuasiExportPackageTests.java b/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/quasi/StandardQuasiExportPackageTests.java
index ce0a0816..21ffb431 100644
--- a/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/quasi/StandardQuasiExportPackageTests.java
+++ b/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/quasi/StandardQuasiExportPackageTests.java
@@ -18,6 +18,7 @@ import org.eclipse.osgi.service.resolver.BundleDescription;
import org.eclipse.virgo.kernel.osgi.quasi.QuasiBundle;
import org.eclipse.virgo.kernel.osgi.quasi.QuasiExportPackage;
import org.eclipse.virgo.kernel.osgi.quasi.QuasiImportPackage;
+import org.eclipse.virgo.test.stubs.region.StubRegionDigraph;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/quasi/StandardQuasiImportPackageTests.java b/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/quasi/StandardQuasiImportPackageTests.java
index 73dc98af..a50a771c 100644
--- a/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/quasi/StandardQuasiImportPackageTests.java
+++ b/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/quasi/StandardQuasiImportPackageTests.java
@@ -14,6 +14,7 @@ package org.eclipse.virgo.kernel.userregion.internal.quasi;
import org.eclipse.equinox.region.Region;
import org.eclipse.virgo.kernel.osgi.quasi.QuasiBundle;
import org.eclipse.virgo.kernel.osgi.quasi.QuasiImportPackage;
+import org.eclipse.virgo.test.stubs.region.StubRegionDigraph;
import org.eclipse.virgo.util.osgi.manifest.VersionRange;
import org.junit.Assert;
import org.junit.Before;
@@ -26,8 +27,7 @@ public class StandardQuasiImportPackageTests {
private static final String STRING_VERSION_RANGE = "[2,4)";
- private static final org.eclipse.osgi.service.resolver.VersionRange RESOLVER_VERSION_RANGE = new org.eclipse.osgi.service.resolver.VersionRange(
- STRING_VERSION_RANGE);
+ private static final org.eclipse.osgi.service.resolver.VersionRange RESOLVER_VERSION_RANGE = new org.eclipse.osgi.service.resolver.VersionRange(STRING_VERSION_RANGE);
private static final VersionRange VERSION_RANGE = new VersionRange(STRING_VERSION_RANGE);
diff --git a/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/quasi/StandardQuasiRequiredBundleTests.java b/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/quasi/StandardQuasiRequiredBundleTests.java
index 274a7742..cae0a28b 100644
--- a/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/quasi/StandardQuasiRequiredBundleTests.java
+++ b/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/quasi/StandardQuasiRequiredBundleTests.java
@@ -21,6 +21,7 @@ import org.eclipse.virgo.kernel.osgi.quasi.QuasiBundle;
import org.eclipse.virgo.kernel.osgi.quasi.QuasiRequiredBundle;
import org.eclipse.virgo.kernel.userregion.internal.quasi.StandardQuasiBundle;
import org.eclipse.virgo.kernel.userregion.internal.quasi.StandardQuasiRequiredBundle;
+import org.eclipse.virgo.test.stubs.region.StubRegionDigraph;
import org.eclipse.virgo.util.osgi.manifest.VersionRange;
/**
diff --git a/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/quasi/StubRegion.java b/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/quasi/StubRegion.java
deleted file mode 100644
index ab12a957..00000000
--- a/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/quasi/StubRegion.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/**
- * This file is part of the Eclipse Virgo project.
- *
- * Copyright (c) 2011 copyright_holder
- * 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:
- * cgfrost - initial contribution
- */
-package org.eclipse.virgo.kernel.userregion.internal.quasi;
-
-import java.io.InputStream;
-import java.util.Set;
-
-import org.eclipse.equinox.region.Region;
-import org.eclipse.equinox.region.RegionDigraph;
-import org.eclipse.equinox.region.RegionDigraphVisitor;
-import org.eclipse.equinox.region.RegionFilter;
-import org.eclipse.equinox.region.RegionDigraph.FilteredRegion;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleException;
-import org.osgi.framework.Version;
-
-/**
- * StubRegion
- */
-public class StubRegion implements Region {
-
- private final String name;
- private final RegionDigraph regionDigraph;
-
- public StubRegion(String name, RegionDigraph regionDigraph) {
- this.name = name;
- this.regionDigraph = regionDigraph;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public String getName() {
- return this.name;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void addBundle(Bundle bundle) throws BundleException {
-
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void addBundle(long bundleId) {
-
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public Bundle installBundle(String location, InputStream input) throws BundleException {
- return null;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public Bundle installBundle(String location) throws BundleException {
- return null;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public Set<Long> getBundleIds() {
- return null;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public boolean contains(Bundle bundle) {
- return false;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public boolean contains(long bundleId) {
- return false;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public Bundle getBundle(String symbolicName, Version version) {
- return null;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void connectRegion(Region headRegion, RegionFilter filter) throws BundleException {
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public RegionDigraph getRegionDigraph() {
- return this.regionDigraph;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void removeBundle(Bundle bundle) {
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void removeBundle(long bundleId) {
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public Set<FilteredRegion> getEdges() {
- return null;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void visitSubgraph(RegionDigraphVisitor visitor) {
- }
-
- @Override
- public Bundle installBundleAtLocation(String arg0, InputStream arg1) throws BundleException {
- return null;
- }
-
-}
diff --git a/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/quasi/StubRegionDigraph.java b/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/quasi/StubRegionDigraph.java
deleted file mode 100644
index 1492a7c7..00000000
--- a/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/quasi/StubRegionDigraph.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/**
- * This file is part of the Eclipse Virgo project.
- *
- * Copyright (c) 2011 copyright_holder
- * 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:
- * cgfrost - initial contribution
- */
-package org.eclipse.virgo.kernel.userregion.internal.quasi;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.equinox.region.Region;
-import org.eclipse.equinox.region.RegionDigraph;
-import org.eclipse.equinox.region.RegionDigraphPersistence;
-import org.eclipse.equinox.region.RegionDigraphVisitor;
-import org.eclipse.equinox.region.RegionFilter;
-import org.eclipse.equinox.region.RegionFilterBuilder;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleException;
-import org.osgi.framework.hooks.bundle.EventHook;
-import org.osgi.framework.hooks.bundle.FindHook;
-import org.osgi.framework.hooks.resolver.ResolverHookFactory;
-
-public class StubRegionDigraph implements RegionDigraph {
-
- private final Map<String, Region> regions = new HashMap<String, Region>();
- private Region defaultRegion;
-
- @Override
- public Iterator<Region> iterator() {
- return this.regions.values().iterator();
- }
-
- @Override
- public Region createRegion(String regionName) throws BundleException {
- StubRegion stubRegion = new StubRegion(regionName, this);
- this.regions.put(regionName, stubRegion);
- return stubRegion;
- }
-
- @Override
- public RegionFilterBuilder createRegionFilterBuilder() {
- return null;
- }
-
- @Override
- public void removeRegion(Region region) {
- this.regions.remove(region.getName());
- }
-
- @Override
- public Set<Region> getRegions() {
- return Collections.unmodifiableSet(new HashSet<Region>(this.regions.values()));
- }
-
- @Override
- public Region getRegion(String regionName) {
- return this.regions.get(regionName);
- }
-
- @Override
- public Region getRegion(Bundle bundle) {
- return null;
- }
-
- @Override
- public Region getRegion(long bundleId) {
- return null;
- }
-
- @Override
- public void connect(Region tailRegion, RegionFilter filter, Region headRegion) throws BundleException {
-
- }
-
- @Override
- public Set<FilteredRegion> getEdges(Region tailRegion) {
- return null;
- }
-
- @Override
- public void visitSubgraph(Region startingRegion, RegionDigraphVisitor visitor) {
-
- }
-
- @Override
- public RegionDigraphPersistence getRegionDigraphPersistence() {
- return null;
- }
-
- @Override
- public RegionDigraph copy() throws BundleException {
- return null;
- }
-
- @Override
- public void replace(RegionDigraph digraph) throws BundleException {
-
- }
-
- @Override
- public ResolverHookFactory getResolverHookFactory() {
- return null;
- }
-
- @Override
- public EventHook getBundleEventHook() {
- return null;
- }
-
- @Override
- public FindHook getBundleFindHook() {
- return null;
- }
-
- @Override
- public org.osgi.framework.hooks.service.EventHook getServiceEventHook() {
- return null;
- }
-
- @Override
- public org.osgi.framework.hooks.service.FindHook getServiceFindHook() {
- return null;
- }
-
- @Override
- public void setDefaultRegion(Region defaultRegion) {
- this.defaultRegion = defaultRegion;
- }
-
- @Override
- public Region getDefaultRegion() {
- return this.defaultRegion;
- }
-
-}
diff --git a/org.eclipse.virgo.kernel.userregionfactory/.classpath b/org.eclipse.virgo.kernel.userregionfactory/.classpath
index b702aa8c..9e58d9a7 100644
--- a/org.eclipse.virgo.kernel.userregionfactory/.classpath
+++ b/org.eclipse.virgo.kernel.userregionfactory/.classpath
@@ -9,19 +9,19 @@
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi/3.8.0.v20120508-2119/org.eclipse.osgi-3.8.0.v20120508-2119.jar" sourcepath="/KERNEL_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="KERNEL_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-2.3.0.jar" sourcepath="/KERNEL_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-sources-2.3.0.jar"/>
<classpathentry kind="src" path="/org.eclipse.virgo.kernel.osgi"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.6.0.D-20120830095745/org.eclipse.virgo.medic-3.6.0.D-20120830095745.jar" sourcepath="/KERNEL_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="KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.6.0.D-20120903162943/org.eclipse.virgo.medic-3.6.0.D-20120903162943.jar" sourcepath="/KERNEL_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">
<attributes>
<attribute name="org.eclipse.ajdt.aspectpath" value="org.eclipse.ajdt.aspectpath"/>
</attributes>
</classpathentry>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.launcher/3.6.0.D-20120830095553/org.eclipse.virgo.test.launcher-3.6.0.D-20120830095553.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.launcher/2.2.0.D-20101207145732/org.eclipse.virgo.test.launcher-sources-2.2.0.D-20101207145732.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.6.0.D-20120830095303/org.eclipse.virgo.util.osgi-3.6.0.D-20120830095303.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/2.2.0.D-20101207150035/org.eclipse.virgo.util.osgi-sources-2.2.0.D-20101207150035.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.6.0.D-20120830095303/org.eclipse.virgo.util.osgi.manifest-3.6.0.D-20120830095303.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/2.2.0.D-20101207150035/org.eclipse.virgo.util.osgi.manifest-sources-2.2.0.D-20101207150035.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/3.6.0.D-20120830095303/org.eclipse.virgo.util.parser.manifest-3.6.0.D-20120830095303.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/2.2.0.D-20101207150035/org.eclipse.virgo.util.parser.manifest-sources-2.2.0.D-20101207150035.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.launcher/3.6.0.D-20120830095303/org.eclipse.virgo.util.parser.launcher-3.6.0.D-20120830095303.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.launcher/2.2.0.D-20101207150035/org.eclipse.virgo.util.parser.launcher-sources-2.2.0.D-20101207150035.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.stubs/3.6.0.D-20120830095553/org.eclipse.virgo.test.stubs-3.6.0.D-20120830095553.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.launcher/3.6.0.D-20120903162719/org.eclipse.virgo.test.launcher-3.6.0.D-20120903162719.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.launcher/2.2.0.D-20101207145732/org.eclipse.virgo.test.launcher-sources-2.2.0.D-20101207145732.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.6.0.D-20120903162413/org.eclipse.virgo.util.osgi-3.6.0.D-20120903162413.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/2.2.0.D-20101207150035/org.eclipse.virgo.util.osgi-sources-2.2.0.D-20101207150035.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.6.0.D-20120903162413/org.eclipse.virgo.util.osgi.manifest-3.6.0.D-20120903162413.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/2.2.0.D-20101207150035/org.eclipse.virgo.util.osgi.manifest-sources-2.2.0.D-20101207150035.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/3.6.0.D-20120903162413/org.eclipse.virgo.util.parser.manifest-3.6.0.D-20120903162413.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/2.2.0.D-20101207150035/org.eclipse.virgo.util.parser.manifest-sources-2.2.0.D-20101207150035.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.launcher/3.6.0.D-20120903162413/org.eclipse.virgo.util.parser.launcher-3.6.0.D-20120903162413.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.launcher/2.2.0.D-20101207150035/org.eclipse.virgo.util.parser.launcher-sources-2.2.0.D-20101207150035.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.stubs/3.6.0.D-20120903162719/org.eclipse.virgo.test.stubs-3.6.0.D-20120903162719.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.equinox.region/1.1.0.v20120319-1602/org.eclipse.equinox.region-1.1.0.v20120319-1602.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.nano.core/3.6.0.D-20120830095954/org.eclipse.virgo.nano.core-3.6.0.D-20120830095954.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.nano.core/3.6.0.D-20120903163206/org.eclipse.virgo.nano.core-3.6.0.D-20120903163206.jar"/>
<classpathentry kind="var" path="KERNEL_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" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi.services/3.3.0.v20110513/org.eclipse.osgi.services-sources-3.3.0.v20110513.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/org.eclipse.virgo.management.console/ivy.xml b/org.eclipse.virgo.management.console/ivy.xml
index efc70a99..bf6e1b12 100644
--- a/org.eclipse.virgo.management.console/ivy.xml
+++ b/org.eclipse.virgo.management.console/ivy.xml
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?>
-<ivy-module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd" version="1.3">
+<ivy-module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd" version="2.0">
<info organisation="org.eclipse.virgo.management" module="${ant.project.name}"/>
diff --git a/org.eclipse.virgo.shell.command/.classpath b/org.eclipse.virgo.shell.command/.classpath
index a8f7e307..2952a7ad 100644
--- a/org.eclipse.virgo.shell.command/.classpath
+++ b/org.eclipse.virgo.shell.command/.classpath
@@ -25,35 +25,34 @@
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/KERNEL_IVY_CACHE/org.junit/com.springsource.org.junit/4.4.0/com.springsource.org.junit-sources-4.4.0.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-2.3.0.jar" sourcepath="/KERNEL_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-sources-2.3.0.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.aspectj/com.springsource.org.aspectj.runtime/1.6.12.RELEASE/com.springsource.org.aspectj.runtime-1.6.12.RELEASE.jar" sourcepath="/KERNEL_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="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.6.0.D-20120820124944/org.eclipse.virgo.util.common-3.6.0.D-20120820124944.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.5.0.D-20120615065828/org.eclipse.virgo.util.common-sources-3.5.0.D-20120615065828.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.6.0.D-20120903162413/org.eclipse.virgo.util.common-3.6.0.D-20120903162413.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.5.0.D-20120615065828/org.eclipse.virgo.util.common-sources-3.5.0.D-20120615065828.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi/3.8.0.v20120508-2119/org.eclipse.osgi-3.8.0.v20120508-2119.jar" sourcepath="/KERNEL_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="con" path="org.eclipse.ajdt.core.ASPECTJRT_CONTAINER"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.6.0.D-20120820125756/org.eclipse.virgo.medic-3.6.0.D-20120820125756.jar">
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.6.0.D-20120903162943/org.eclipse.virgo.medic-3.6.0.D-20120903162943.jar">
<attributes>
<attribute name="org.eclipse.ajdt.aspectpath" value="org.eclipse.ajdt.aspectpath"/>
</attributes>
</classpathentry>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.test/3.6.0.D-20120820125756/org.eclipse.virgo.medic.test-3.6.0.D-20120820125756.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.core/1.0.0.CI-B20/org.eclipse.virgo.medic.core-sources-1.0.0.CI-B20.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.test/3.6.0.D-20120903162943/org.eclipse.virgo.medic.test-3.6.0.D-20120903162943.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.core/1.0.0.CI-B20/org.eclipse.virgo.medic.core-sources-1.0.0.CI-B20.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.6.1/com.springsource.slf4j.api-1.6.1.jar" sourcepath="/KERNEL_IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.6.1/com.springsource.slf4j.api-sources-1.6.1.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.kernel.osgi"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.stubs/3.6.0.D-20120820125548/org.eclipse.virgo.test.stubs-3.6.0.D-20120820125548.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.stubs/3.6.0.D-20120820125548/org.eclipse.virgo.test.stubs-sources-3.6.0.D-20120820125548.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.stubs/3.6.0.D-20120903162719/org.eclipse.virgo.test.stubs-3.6.0.D-20120903162719.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.stubs/3.6.0.D-20120903162719/org.eclipse.virgo.test.stubs-sources-3.6.0.D-20120903162719.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework/org.springframework.context/3.0.5.RELEASE/org.springframework.context-3.0.5.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework/org.springframework.context/3.0.5.RELEASE/org.springframework.context-sources-3.0.5.RELEASE.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework/org.springframework.beans/3.0.5.RELEASE/org.springframework.beans-3.0.5.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework/org.springframework.beans/3.0.5.RELEASE/org.springframework.beans-sources-3.0.5.RELEASE.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework/org.springframework.core/3.0.5.RELEASE/org.springframework.core-3.0.5.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework/org.springframework.core/3.0.5.RELEASE/org.springframework.core-sources-3.0.5.RELEASE.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.6.0.D-20120820124944/org.eclipse.virgo.util.io-3.6.0.D-20120820124944.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.5.0.D-20120615065828/org.eclipse.virgo.util.io-sources-3.5.0.D-20120615065828.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.core/3.6.0.D-20120820125756/org.eclipse.virgo.medic.core-3.6.0.D-20120820125756.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.test/3.5.0.D-20120615070622/org.eclipse.virgo.medic.test-sources-3.5.0.D-20120615070622.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.6.0.D-20120903162413/org.eclipse.virgo.util.io-3.6.0.D-20120903162413.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.5.0.D-20120615065828/org.eclipse.virgo.util.io-sources-3.5.0.D-20120615065828.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.core/3.6.0.D-20120903162943/org.eclipse.virgo.medic.core-3.6.0.D-20120903162943.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.test/3.5.0.D-20120615070622/org.eclipse.virgo.medic.test-sources-3.5.0.D-20120615070622.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.kernel.deployer"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.repository/org.eclipse.virgo.repository/3.6.0.D-20120820130522/org.eclipse.virgo.repository-3.6.0.D-20120820130522.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.repository/org.eclipse.virgo.repository/3.5.0.D-20120615071313/org.eclipse.virgo.repository-sources-3.5.0.D-20120615071313.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.repository/org.eclipse.virgo.repository/3.6.0.D-20120903163626/org.eclipse.virgo.repository-3.6.0.D-20120903163626.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.repository/org.eclipse.virgo.repository/3.5.0.D-20120615071313/org.eclipse.virgo.repository-sources-3.5.0.D-20120615071313.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.kernel.model"/>
<classpathentry kind="var" path="KERNEL_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="KERNEL_IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.equinox.region/1.1.0.v20120319-1602/org.eclipse.equinox.region-1.1.0.v20120319-1602.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.6.0.D-20120820124944/org.eclipse.virgo.util.osgi.manifest-3.6.0.D-20120820124944.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.6.0.D-20120903162413/org.eclipse.virgo.util.osgi.manifest-3.6.0.D-20120903162413.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.kernel.artifact"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.nano.deployer.api/3.6.0.D-20120820130036/org.eclipse.virgo.nano.deployer.api-3.6.0.D-20120820130036.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.nano.deployer.api/3.6.0.D-20120903163206/org.eclipse.virgo.nano.deployer.api-3.6.0.D-20120903163206.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.mirrored/org.slf4j.jcl/1.6.4.v20120130-2120/org.slf4j.jcl-1.6.4.v20120130-2120.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.kernel.services"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.6.0.D-20120820124944/org.eclipse.virgo.util.osgi-3.6.0.D-20120820124944.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.1.0.M01/org.eclipse.virgo.util.osgi-sources-3.1.0.M01.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.felix.gogo.runtime/0.8.0.v201108120515/org.apache.felix.gogo.runtime-0.8.0.v201108120515.jar" sourcepath="/KERNEL_IVY_CACHE/org.apache.felix/org.apache.felix.gogo.runtime/0.8.0.v201107131313/org.apache.felix.gogo.runtime-sources-0.8.0.v201107131313.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
-
diff --git a/org.eclipse.virgo.shell.command/ivy.xml b/org.eclipse.virgo.shell.command/ivy.xml
index ad167b3c..b0f0a912 100644
--- a/org.eclipse.virgo.shell.command/ivy.xml
+++ b/org.eclipse.virgo.shell.command/ivy.xml
@@ -16,6 +16,7 @@
<!-- RUNTIME -->
<dependency org="org.eclipse.virgo.mirrored" name="org.eclipse.osgi" rev="${org.eclipse.osgi}" conf="compile->runtime"/>
<dependency org="org.eclipse.virgo.mirrored" name="org.eclipse.osgi.services" rev="${org.eclipse.osgi.services}" conf="compile->runtime"/>
+ <dependency org="org.eclipse.virgo.mirrored" name='org.eclipse.equinox.region' rev='${org.eclipse.equinox.region}' conf='compile->compile' />
<dependency org="org.eclipse.virgo.repository" name="org.eclipse.virgo.repository" rev="${org.eclipse.virgo.repository}" conf="compile->compile"/>
<dependency org="org.eclipse.virgo.kernel" name="org.eclipse.virgo.kernel.osgi" rev="latest.integration" conf="compile->compile"/>
<dependency org="org.eclipse.virgo.kernel" name="org.eclipse.virgo.kernel.model" rev="latest.integration" conf="compile->compile"/>
diff --git a/org.eclipse.virgo.shell.command/src/test/java/org/eclipse/virgo/shell/internal/commands/ConfigCommandsTests.java b/org.eclipse.virgo.shell.command/src/test/java/org/eclipse/virgo/shell/internal/commands/ConfigCommandsTests.java
index d5b48122..cb7ec312 100644
--- a/org.eclipse.virgo.shell.command/src/test/java/org/eclipse/virgo/shell/internal/commands/ConfigCommandsTests.java
+++ b/org.eclipse.virgo.shell.command/src/test/java/org/eclipse/virgo/shell/internal/commands/ConfigCommandsTests.java
@@ -24,17 +24,14 @@ import javax.management.MalformedObjectNameException;
import javax.management.NotCompliantMBeanException;
import javax.management.ObjectName;
+import org.eclipse.virgo.kernel.shell.internal.formatting.StubManageableCompositeArtifact;
+import org.eclipse.virgo.test.stubs.region.StubRegionDigraph;
+import org.eclipse.virgo.test.stubs.service.cm.StubConfigurationAdmin;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.osgi.framework.BundleException;
-
-import org.eclipse.virgo.shell.internal.commands.ConfigCommands;
-import org.eclipse.virgo.shell.internal.formatting.StubManageableCompositeArtifact;
-import org.eclipse.virgo.shell.stubs.StubRegionDigraph;
-import org.eclipse.virgo.test.stubs.service.cm.StubConfigurationAdmin;
-
public class ConfigCommandsTests {
private static final StubRegionDigraph REGION_DIGRAPH = new StubRegionDigraph();
diff --git a/org.eclipse.virgo.shell.command/src/test/java/org/eclipse/virgo/shell/internal/commands/StubAbstractCompositeInstallArtifactBasedCommands.java b/org.eclipse.virgo.shell.command/src/test/java/org/eclipse/virgo/shell/internal/commands/StubAbstractCompositeInstallArtifactBasedCommands.java
index 28b1cb46..e0b116e6 100644
--- a/org.eclipse.virgo.shell.command/src/test/java/org/eclipse/virgo/shell/internal/commands/StubAbstractCompositeInstallArtifactBasedCommands.java
+++ b/org.eclipse.virgo.shell.command/src/test/java/org/eclipse/virgo/shell/internal/commands/StubAbstractCompositeInstallArtifactBasedCommands.java
@@ -12,8 +12,7 @@
package org.eclipse.virgo.shell.internal.commands;
import org.eclipse.virgo.kernel.model.management.ManageableCompositeArtifact;
-import org.eclipse.virgo.shell.internal.commands.AbstractInstallArtifactBasedCommands;
-import org.eclipse.virgo.shell.stubs.StubRegionDigraph;
+import org.eclipse.virgo.test.stubs.region.StubRegionDigraph;
import org.osgi.framework.BundleException;
final class StubAbstractCompositeInstallArtifactBasedCommands extends AbstractInstallArtifactBasedCommands<ManageableCompositeArtifact> {
diff --git a/org.eclipse.virgo.shell.command/src/test/java/org/eclipse/virgo/shell/internal/completers/ConfigCompleterTests.java b/org.eclipse.virgo.shell.command/src/test/java/org/eclipse/virgo/shell/internal/completers/ConfigCompleterTests.java
index 1bbe213f..4a2312b4 100644
--- a/org.eclipse.virgo.shell.command/src/test/java/org/eclipse/virgo/shell/internal/completers/ConfigCompleterTests.java
+++ b/org.eclipse.virgo.shell.command/src/test/java/org/eclipse/virgo/shell/internal/completers/ConfigCompleterTests.java
@@ -22,10 +22,9 @@ import javax.management.MalformedObjectNameException;
import javax.management.NotCompliantMBeanException;
import javax.management.ObjectName;
-import org.eclipse.virgo.shell.internal.commands.StubRuntimeArtifactModelObjectNameCreator;
-import org.eclipse.virgo.shell.internal.completers.ConfigCompleter;
-import org.eclipse.virgo.shell.internal.formatting.StubManageableCompositeArtifact;
-import org.eclipse.virgo.shell.stubs.StubRegionDigraph;
+import org.eclipse.virgo.kernel.shell.internal.commands.StubRuntimeArtifactModelObjectNameCreator;
+import org.eclipse.virgo.kernel.shell.internal.formatting.StubManageableCompositeArtifact;
+import org.eclipse.virgo.test.stubs.region.StubRegionDigraph;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
diff --git a/org.eclipse.virgo.shell.command/src/test/java/org/eclipse/virgo/shell/stubs/StubRegion.java b/org.eclipse.virgo.shell.command/src/test/java/org/eclipse/virgo/shell/stubs/StubRegion.java
deleted file mode 100644
index cec34391..00000000
--- a/org.eclipse.virgo.shell.command/src/test/java/org/eclipse/virgo/shell/stubs/StubRegion.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/**
- * This file is part of the Eclipse Virgo project.
- *
- * Copyright (c) 2011 copyright_holder
- * 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:
- * cgfrost - initial contribution
- */
-package org.eclipse.virgo.shell.stubs;
-
-import java.io.InputStream;
-import java.util.Set;
-
-import org.eclipse.equinox.region.Region;
-import org.eclipse.equinox.region.RegionDigraph;
-import org.eclipse.equinox.region.RegionDigraphVisitor;
-import org.eclipse.equinox.region.RegionFilter;
-import org.eclipse.equinox.region.RegionDigraph.FilteredRegion;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleException;
-import org.osgi.framework.Version;
-
-/**
- * StubRegion
- */
-public class StubRegion implements Region {
-
- private final String name;
- private final RegionDigraph regionDigraph;
-
- public StubRegion(String name, RegionDigraph regionDigraph) {
- this.name = name;
- this.regionDigraph = regionDigraph;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public String getName() {
- return this.name;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void addBundle(Bundle bundle) throws BundleException {
-
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void addBundle(long bundleId) {
-
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public Bundle installBundle(String location, InputStream input) throws BundleException {
- return null;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public Bundle installBundle(String location) throws BundleException {
- return null;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public Set<Long> getBundleIds() {
- return null;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public boolean contains(Bundle bundle) {
- return false;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public boolean contains(long bundleId) {
- return false;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public Bundle getBundle(String symbolicName, Version version) {
- return null;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void connectRegion(Region headRegion, RegionFilter filter) throws BundleException {
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public RegionDigraph getRegionDigraph() {
- return this.regionDigraph;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void removeBundle(Bundle bundle) {
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void removeBundle(long bundleId) {
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public Set<FilteredRegion> getEdges() {
- return null;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void visitSubgraph(RegionDigraphVisitor visitor) {
- }
-
- @Override
- public Bundle installBundleAtLocation(String arg0, InputStream arg1) throws BundleException {
- return null;
- }
-
-}
diff --git a/org.eclipse.virgo.shell.command/src/test/java/org/eclipse/virgo/shell/stubs/StubRegionDigraph.java b/org.eclipse.virgo.shell.command/src/test/java/org/eclipse/virgo/shell/stubs/StubRegionDigraph.java
deleted file mode 100644
index 4668fda9..00000000
--- a/org.eclipse.virgo.shell.command/src/test/java/org/eclipse/virgo/shell/stubs/StubRegionDigraph.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/**
- * This file is part of the Eclipse Virgo project.
- *
- * Copyright (c) 2011 copyright_holder
- * 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:
- * cgfrost - initial contribution
- */
-package org.eclipse.virgo.shell.stubs;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.equinox.region.Region;
-import org.eclipse.equinox.region.RegionDigraph;
-import org.eclipse.equinox.region.RegionDigraphPersistence;
-import org.eclipse.equinox.region.RegionDigraphVisitor;
-import org.eclipse.equinox.region.RegionFilter;
-import org.eclipse.equinox.region.RegionFilterBuilder;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleException;
-import org.osgi.framework.hooks.bundle.EventHook;
-import org.osgi.framework.hooks.bundle.FindHook;
-import org.osgi.framework.hooks.resolver.ResolverHookFactory;
-
-public class StubRegionDigraph implements RegionDigraph {
-
- private final Map<String, Region> regions = new HashMap<String, Region>();
- private Region defaultRegion;
-
- @Override
- public Iterator<Region> iterator() {
- return this.regions.values().iterator();
- }
-
- @Override
- public Region createRegion(String regionName) throws BundleException {
- StubRegion stubRegion = new StubRegion(regionName, this);
- this.regions.put(regionName, stubRegion);
- return stubRegion;
- }
-
- @Override
- public RegionFilterBuilder createRegionFilterBuilder() {
- return null;
- }
-
- @Override
- public void removeRegion(Region region) {
- this.regions.remove(region.getName());
- }
-
- @Override
- public Set<Region> getRegions() {
- return Collections.unmodifiableSet(new HashSet<Region>(this.regions.values()));
- }
-
- @Override
- public Region getRegion(String regionName) {
- return this.regions.get(regionName);
- }
-
- @Override
- public Region getRegion(Bundle bundle) {
- return null;
- }
-
- @Override
- public Region getRegion(long bundleId) {
- return null;
- }
-
- @Override
- public void connect(Region tailRegion, RegionFilter filter, Region headRegion) throws BundleException {
-
- }
-
- @Override
- public Set<FilteredRegion> getEdges(Region tailRegion) {
- return null;
- }
-
- @Override
- public void visitSubgraph(Region startingRegion, RegionDigraphVisitor visitor) {
-
- }
-
- @Override
- public RegionDigraphPersistence getRegionDigraphPersistence() {
- return null;
- }
-
- @Override
- public RegionDigraph copy() throws BundleException {
- return null;
- }
-
- @Override
- public void replace(RegionDigraph digraph) throws BundleException {
-
- }
-
- @Override
- public ResolverHookFactory getResolverHookFactory() {
- return null;
- }
-
- @Override
- public EventHook getBundleEventHook() {
- return null;
- }
-
- @Override
- public FindHook getBundleFindHook() {
- return null;
- }
-
- @Override
- public org.osgi.framework.hooks.service.EventHook getServiceEventHook() {
- return null;
- }
-
- @Override
- public org.osgi.framework.hooks.service.FindHook getServiceFindHook() {
- return null;
- }
-
- @Override
- public void setDefaultRegion(Region defaultRegion) {
- this.defaultRegion = defaultRegion;
- }
-
- @Override
- public Region getDefaultRegion() {
- return this.defaultRegion;
- }
-
-}
diff --git a/test-apps/quartz-scheduler/quartz.bundle.a/.classpath b/test-apps/quartz-scheduler/quartz.bundle.a/.classpath
index 9a0f7317..bc37d5d1 100644
--- a/test-apps/quartz-scheduler/quartz.bundle.a/.classpath
+++ b/test-apps/quartz-scheduler/quartz.bundle.a/.classpath
@@ -9,6 +9,6 @@
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework/org.springframework.context/3.0.5.RELEASE/org.springframework.context-3.0.5.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework/org.springframework.context/3.0.5.RELEASE/org.springframework.context-sources-3.0.5.RELEASE.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework/org.springframework.context.support/3.0.5.RELEASE/org.springframework.context.support-3.0.5.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework/org.springframework.context.support/3.0.5.RELEASE/org.springframework.context.support-sources-3.0.5.RELEASE.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework/org.springframework.core/3.0.5.RELEASE/org.springframework.core-3.0.5.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework/org.springframework.core/3.0.5.RELEASE/org.springframework.core-sources-3.0.5.RELEASE.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.core/1.0.0.RELEASE/org.eclipse.gemini.blueprint.core-1.0.0.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.core/1.0.0.RELEASE/org.eclipse.gemini.blueprint.core-sources-1.0.0.RELEASE.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.core/1.0.2.RELEASE/org.eclipse.gemini.blueprint.core-1.0.2.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.core/1.0.2.RELEASE/org.eclipse.gemini.blueprint.core-sources-1.0.2.RELEASE.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/test-apps/quartz-scheduler/quartz.bundle.b/.classpath b/test-apps/quartz-scheduler/quartz.bundle.b/.classpath
index 9a0f7317..bc37d5d1 100644
--- a/test-apps/quartz-scheduler/quartz.bundle.b/.classpath
+++ b/test-apps/quartz-scheduler/quartz.bundle.b/.classpath
@@ -9,6 +9,6 @@
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework/org.springframework.context/3.0.5.RELEASE/org.springframework.context-3.0.5.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework/org.springframework.context/3.0.5.RELEASE/org.springframework.context-sources-3.0.5.RELEASE.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework/org.springframework.context.support/3.0.5.RELEASE/org.springframework.context.support-3.0.5.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework/org.springframework.context.support/3.0.5.RELEASE/org.springframework.context.support-sources-3.0.5.RELEASE.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework/org.springframework.core/3.0.5.RELEASE/org.springframework.core-3.0.5.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework/org.springframework.core/3.0.5.RELEASE/org.springframework.core-sources-3.0.5.RELEASE.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.core/1.0.0.RELEASE/org.eclipse.gemini.blueprint.core-1.0.0.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.core/1.0.0.RELEASE/org.eclipse.gemini.blueprint.core-sources-1.0.0.RELEASE.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.core/1.0.2.RELEASE/org.eclipse.gemini.blueprint.core-1.0.2.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.core/1.0.2.RELEASE/org.eclipse.gemini.blueprint.core-sources-1.0.2.RELEASE.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/test-apps/quartz-scheduler/quartz.bundle.same1/.classpath b/test-apps/quartz-scheduler/quartz.bundle.same1/.classpath
index 9a0f7317..bc37d5d1 100644
--- a/test-apps/quartz-scheduler/quartz.bundle.same1/.classpath
+++ b/test-apps/quartz-scheduler/quartz.bundle.same1/.classpath
@@ -9,6 +9,6 @@
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework/org.springframework.context/3.0.5.RELEASE/org.springframework.context-3.0.5.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework/org.springframework.context/3.0.5.RELEASE/org.springframework.context-sources-3.0.5.RELEASE.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework/org.springframework.context.support/3.0.5.RELEASE/org.springframework.context.support-3.0.5.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework/org.springframework.context.support/3.0.5.RELEASE/org.springframework.context.support-sources-3.0.5.RELEASE.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework/org.springframework.core/3.0.5.RELEASE/org.springframework.core-3.0.5.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework/org.springframework.core/3.0.5.RELEASE/org.springframework.core-sources-3.0.5.RELEASE.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.core/1.0.0.RELEASE/org.eclipse.gemini.blueprint.core-1.0.0.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.core/1.0.0.RELEASE/org.eclipse.gemini.blueprint.core-sources-1.0.0.RELEASE.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.core/1.0.2.RELEASE/org.eclipse.gemini.blueprint.core-1.0.2.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.core/1.0.2.RELEASE/org.eclipse.gemini.blueprint.core-sources-1.0.2.RELEASE.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/test-apps/quartz-scheduler/quartz.bundle.same2/.classpath b/test-apps/quartz-scheduler/quartz.bundle.same2/.classpath
index 9a0f7317..bc37d5d1 100644
--- a/test-apps/quartz-scheduler/quartz.bundle.same2/.classpath
+++ b/test-apps/quartz-scheduler/quartz.bundle.same2/.classpath
@@ -9,6 +9,6 @@
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework/org.springframework.context/3.0.5.RELEASE/org.springframework.context-3.0.5.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework/org.springframework.context/3.0.5.RELEASE/org.springframework.context-sources-3.0.5.RELEASE.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework/org.springframework.context.support/3.0.5.RELEASE/org.springframework.context.support-3.0.5.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework/org.springframework.context.support/3.0.5.RELEASE/org.springframework.context.support-sources-3.0.5.RELEASE.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework/org.springframework.core/3.0.5.RELEASE/org.springframework.core-3.0.5.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework/org.springframework.core/3.0.5.RELEASE/org.springframework.core-sources-3.0.5.RELEASE.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.core/1.0.0.RELEASE/org.eclipse.gemini.blueprint.core-1.0.0.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.core/1.0.0.RELEASE/org.eclipse.gemini.blueprint.core-sources-1.0.0.RELEASE.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.core/1.0.2.RELEASE/org.eclipse.gemini.blueprint.core-1.0.2.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.core/1.0.2.RELEASE/org.eclipse.gemini.blueprint.core-sources-1.0.2.RELEASE.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/virgo-build b/virgo-build
-Subproject f7d22aa0e5a022770c290b892e98941e4a51b9d
+Subproject 4b68d5a489f561dfada9780039dc4b96bfcc848

Back to the top