Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBorislav Kapukaranov2012-06-27 03:01:36 -0400
committerBorislav Kapukaranov2012-06-27 03:01:36 -0400
commit017118e08c8ed29af81b9fc4a0a10db1684c2d7e (patch)
treed5419f94beea2f09da0e9f01d8f41cde95422b4e
parentc1597a481f704fb6b3cef23e303bbf0bd5ddd8a4 (diff)
downloadorg.eclipse.virgo.kernel-017118e08c8ed29af81b9fc4a0a10db1684c2d7e.tar.gz
org.eclipse.virgo.kernel-017118e08c8ed29af81b9fc4a0a10db1684c2d7e.tar.xz
org.eclipse.virgo.kernel-017118e08c8ed29af81b9fc4a0a10db1684c2d7e.zip
Upgrades to Juno Equinox versions
-rw-r--r--build-kernel/build.xml8
-rw-r--r--build-kernel/configuration/org.eclipse.virgo.kernel.userregion.properties6
-rw-r--r--build-kernel/lib-ivy.xml2
-rw-r--r--build-kernel/plugins-ivy.xml4
-rwxr-xr-xbuild-kernel/publish_resources/features/org.eclipse.virgo.management/feature.xml3
-rw-r--r--build-kernel/repository-ext-ivy.xml2
-rw-r--r--build.properties2
-rw-r--r--build.versions5
-rw-r--r--org.eclipse.virgo.kernel.artifact/ivy.xml2
-rw-r--r--org.eclipse.virgo.kernel.artifact/src/test/java/org/eclipse/virgo/kernel/artifact/bundle/BundleBridgeTests.java2
-rw-r--r--org.eclipse.virgo.kernel.deployer.test/ivy.xml9
-rw-r--r--org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/ConfigurationDeploymentTests.java4
-rw-r--r--org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/DMSPlanDeploymentTests.java2
-rw-r--r--org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/PlanDeploymentTests.java2
-rw-r--r--org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/no.heap.dump.test.config.properties4
-rw-r--r--org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/spring256.test.config.properties4
-rw-r--r--org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/test.config.properties4
-rw-r--r--org.eclipse.virgo.kernel.deployer.test/src/test/resources/config/org.eclipse.virgo.kernel.userregion.properties8
-rw-r--r--org.eclipse.virgo.kernel.deployer/.classpath2
-rw-r--r--org.eclipse.virgo.kernel.deployer/ivy.xml10
-rw-r--r--org.eclipse.virgo.kernel.osgi/src/test/java/org/eclipse/virgo/kernel/osgi/common/VersionTests.java4
-rw-r--r--org.eclipse.virgo.kernel.osgicommand/ivy.xml2
-rw-r--r--org.eclipse.virgo.kernel.shell/.classpath2
-rw-r--r--org.eclipse.virgo.kernel.shell/src/main/java/org/eclipse/virgo/kernel/shell/internal/formatting/ConfigInstallArtifactCommandFormatter.java2
-rw-r--r--org.eclipse.virgo.kernel.test/ivy.xml1
-rw-r--r--org.eclipse.virgo.kernel.test/src/test/resources/META-INF/test.config.properties2
-rw-r--r--org.eclipse.virgo.kernel.test/src/test/resources/config/org.eclipse.virgo.kernel.userregion.properties22
-rw-r--r--org.eclipse.virgo.kernel.userregion/.classpath36
-rw-r--r--org.eclipse.virgo.kernel.userregion/src/main/java/org/eclipse/virgo/kernel/userregion/internal/Activator.java8
-rwxr-xr-xorg.eclipse.virgo.kernel.userregion/src/main/java/org/eclipse/virgo/kernel/userregion/internal/ConsoleConfigurationConvertor.java3
-rw-r--r--org.eclipse.virgo.kernel.userregion/src/main/java/org/eclipse/virgo/kernel/userregion/internal/InitialArtifactDeployer.java14
-rw-r--r--org.eclipse.virgo.kernel.userregion/src/main/java/org/eclipse/virgo/kernel/userregion/internal/UserRegionConfigurationDeployer.java7
-rw-r--r--org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/quasi/BundleDescriptionComparatorTests.java12
-rw-r--r--org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/quasi/StubBaseDescription.java9
-rw-r--r--org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/quasi/StubBundleDescription.java22
-rw-r--r--org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/quasi/StubBundleSpecification.java10
-rw-r--r--org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/quasi/StubExportPackageDescription.java10
-rw-r--r--org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/quasi/StubImportPackageSpecification.java10
-rw-r--r--org.eclipse.virgo.kernel.userregionfactory/.classpath18
-rw-r--r--org.eclipse.virgo.kernel.userregionfactory/src/main/java/org/eclipse/virgo/kernel/userregionfactory/Activator.java12
-rw-r--r--org.eclipse.virgo.management.fragment/ivy.xml2
41 files changed, 192 insertions, 101 deletions
diff --git a/build-kernel/build.xml b/build-kernel/build.xml
index 799e2daa..cb52141d 100644
--- a/build-kernel/build.xml
+++ b/build-kernel/build.xml
@@ -153,16 +153,18 @@
<filter token="KERNEL.VERSION" value="${bundle.version}"/>
<filter token="MEDIC.VERSION" value="${org.eclipse.virgo.medic}"/>
<filter token="REPOSITORY.VERSION" value="${org.eclipse.virgo.repository}"/>
- <filter token="SLF4J.VERSION" value="${org.slf4j}"/>
+ <filter token="SLF4J.VERSION" value="${org.slf4j.api}"/>
<filter token="SPRING.DM.VERSION" value="${org.eclipse.gemini.blueprint}"/>
<filter token="SPRING.VERSION" value="${org.springframework}"/>
<filter token="UTIL.VERSION" value="${org.eclipse.virgo.util}"/>
<filter token="FELIX.GOGO.RUNTIME.VERSION" value="${org.apache.felix.gogo.runtime}"/>
<filter token="FELIX.GOGO.COMMAND.VERSION" value="${org.apache.felix.gogo.command}"/>
<filter token="FELIX.GOGO.SHELL.VERSION" value="${org.apache.felix.gogo.shell}"/>
- <filter token="MINA.CORE.VERSION" value="${com.springsource.org.apache.mina.core}"/>
- <filter token="SSHD.CORE.VERSION" value="${com.springsource.org.apache.sshd.core}"/>
+ <filter token="MINA.CORE.VERSION" value="${org.apache.mina.core}"/>
+ <filter token="SSHD.CORE.VERSION" value="${org.apache.sshd.core}"/>
<filter token="EQUINOX.CONSOLE.VERSION" value="${org.eclipse.equinox.console}"/>
+ <filter token="EQUINOX.CONSOLE.SSH.VERSION" value="${org.eclipse.equinox.console.ssh}"/>
+
</filterset>
</copy>
diff --git a/build-kernel/configuration/org.eclipse.virgo.kernel.userregion.properties b/build-kernel/configuration/org.eclipse.virgo.kernel.userregion.properties
index 6c332af0..9e6c3cd1 100644
--- a/build-kernel/configuration/org.eclipse.virgo.kernel.userregion.properties
+++ b/build-kernel/configuration/org.eclipse.virgo.kernel.userregion.properties
@@ -6,13 +6,13 @@ baseBundles = \
file:plugins/osgi.enterprise_@OSGI.ENTERPRISE.VERSION@.jar,\
file:plugins/org.eclipse.gemini.management_@GEMINI.MANAGEMENT.VERSION@.jar@start,\
file:plugins/org.eclipse.virgo.management.fragment_@KERNEL.VERSION@.jar,\
- file:plugins/com.springsource.org.apache.mina.core_@MINA.CORE.VERSION@.jar@start,\
+ file:plugins/org.apache.mina.core_@MINA.CORE.VERSION@.jar@start,\
file:plugins/org.apache.felix.gogo.command_@FELIX.GOGO.COMMAND.VERSION@.jar@start,\
file:plugins/org.apache.felix.gogo.runtime_@FELIX.GOGO.RUNTIME.VERSION@.jar@start,\
file:plugins/org.apache.felix.gogo.shell_@FELIX.GOGO.SHELL.VERSION@.jar@start,\
file:plugins/org.eclipse.equinox.console_@EQUINOX.CONSOLE.VERSION@.jar@start,\
- file:plugins/org.eclipse.equinox.console.ssh_@EQUINOX.CONSOLE.VERSION@.jar@start,\
- file:plugins/com.springsource.org.apache.sshd.core_@SSHD.CORE.VERSION@.jar@start
+ file:plugins/org.eclipse.equinox.console.ssh_@EQUINOX.CONSOLE.SSH.VERSION@.jar@start,\
+ file:plugins/org.apache.sshd.core_@SSHD.CORE.VERSION@.jar@start
bundleImports = org.eclipse.osgi;bundle-version="0"
diff --git a/build-kernel/lib-ivy.xml b/build-kernel/lib-ivy.xml
index ecc17816..d45ca79f 100644
--- a/build-kernel/lib-ivy.xml
+++ b/build-kernel/lib-ivy.xml
@@ -11,7 +11,7 @@
<dependencies>
<!-- lib -->
<dependency org="org.eclipse.virgo.osgi" name="org.eclipse.virgo.osgi.console" rev="${org.eclipse.virgo.osgi}" conf="lib->runtime"/>
- <dependency org="javax.transaction" name="com.springsource.javax.transaction" rev="${javax.transaction}" conf="lib->runtime"/>
+ <dependency org="org.eclipse.virgo.mirrored" name="javax.transaction" rev="${javax.transaction}" conf="lib->runtime"/>
<exclude org="org.eclipse.osgi" module="org.eclipse.osgi"/>
</dependencies>
diff --git a/build-kernel/plugins-ivy.xml b/build-kernel/plugins-ivy.xml
index 9a655ec1..3c6e985a 100644
--- a/build-kernel/plugins-ivy.xml
+++ b/build-kernel/plugins-ivy.xml
@@ -13,12 +13,12 @@
<dependency org="org.eclipse.virgo.kernel" name="org.eclipse.virgo.kernel.osgicommand" rev="latest.integration" conf="plugins->runtime"/>
<dependency org="org.eclipse.virgo" name="org.eclipse.virgo.management.fragment" rev="latest.integration" conf="plugins->runtime"/>
<dependency org="org.eclipse.virgo.mirrored" name='org.eclipse.equinox.region' rev='${org.eclipse.equinox.region}' conf="plugins->runtime" />
- <dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="${org.aspectj}" conf="plugins->runtime" />
+ <dependency org="org.eclipse.virgo.mirrored" name="com.springsource.org.aspectj.weaver" rev="${org.aspectj}" conf="plugins->runtime" />
<!-- The exclude of Equinox (org="org.eclipse.osgi" module="org.eclipse.osgi") does not work.
This is due to the transitive dependency from org.eclipse.virgo.osgi.equinox on org.eclipse.osgi
See build.xml for a workaround. -->
- <exclude org="org.eclipse.osgi" module="org.eclipse.osgi"/>
+ <exclude org="org.eclipse.osgi"/>
<exclude org="org.aspectj" module="com.springsource.org.aspectj.runtime"/>
<exclude org="org.jboss.logging"/>
<exclude org="org.jboss.util"/>
diff --git a/build-kernel/publish_resources/features/org.eclipse.virgo.management/feature.xml b/build-kernel/publish_resources/features/org.eclipse.virgo.management/feature.xml
index 92e8d74c..08fa8ae6 100755
--- a/build-kernel/publish_resources/features/org.eclipse.virgo.management/feature.xml
+++ b/build-kernel/publish_resources/features/org.eclipse.virgo.management/feature.xml
@@ -39,7 +39,6 @@
download-size="0"
install-size="0"
version="4.2.0.v201108120515"
- unpack="false"
- autostart="false"/>
+ unpack="false"/>
</feature>
diff --git a/build-kernel/repository-ext-ivy.xml b/build-kernel/repository-ext-ivy.xml
index 8eae36ec..eef35729 100644
--- a/build-kernel/repository-ext-ivy.xml
+++ b/build-kernel/repository-ext-ivy.xml
@@ -19,7 +19,7 @@
<!-- The exclude of Equinox (org="org.eclipse.osgi" module="org.eclipse.osgi") does not work.
This is due to the transitive dependency from org.eclipse.virgo.osgi.equinox on org.eclipse.osgi
See build.xml for a workaround. -->
- <exclude org="org.eclipse.osgi" module="org.eclipse.osgi"/>
+ <exclude org="org.eclipse.osgi"/>
<exclude org="org.eclipse.virgo.util" conf="repository-ext"/>
<exclude org="org.eclipse.virgo.osgi" module="org.eclipse.virgo.osgi.extensions.equinox"/>
<exclude org="org.eclipse.virgo.osgi" module="org.eclipse.virgo.osgi.launcher"/>
diff --git a/build.properties b/build.properties
index c86143c4..3332f9dd 100644
--- a/build.properties
+++ b/build.properties
@@ -13,4 +13,4 @@ natural.name=virgo-kernel
project.key=VK
test.vm.args= -Xmx1024M -XX:MaxPermSize=512M -XX:+HeapDumpOnOutOfMemoryError
-#test.vm.args= -Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=y
+#test.vm.args= -Xmx1024M -XX:MaxPermSize=512M -XX:+HeapDumpOnOutOfMemoryError -Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=y
diff --git a/build.versions b/build.versions
index 51182a5e..d655ab43 100644
--- a/build.versions
+++ b/build.versions
@@ -21,6 +21,9 @@ org.eclipse.virgo.util=3.5.0.D-20120626081305
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.springframework.osgi=1.2.1
org.springframework=3.0.5.RELEASE
@@ -35,7 +38,6 @@ org.eclipse.equinox.launcher=1.3.0.v20120308-1358
# Test
org.springframework.old=2.5.6.SEC01
-javax.servlet=3.0.0.v201112011016
commons.dbcp=1.2.2.osgi
commons.pool=1.3.0
org.aopalliance=1.0.0
@@ -46,6 +48,7 @@ javax.el=2.2.0.v201108011116
javax.jms=1.1.0.v201205091237
javax.portlet=2.0.0.v20110525
javax.servlet=3.0.0.v201112011016
+javax.servlet.jsp=2.2.0.v201112011158
javax.transaction=1.1.1.v201105210645
org.easymock=2.3.0
org.eclipse.virgo.test=3.5.0.D-20120626081916
diff --git a/org.eclipse.virgo.kernel.artifact/ivy.xml b/org.eclipse.virgo.kernel.artifact/ivy.xml
index ca1c350a..fcbd3d2c 100644
--- a/org.eclipse.virgo.kernel.artifact/ivy.xml
+++ b/org.eclipse.virgo.kernel.artifact/ivy.xml
@@ -22,7 +22,7 @@
<dependency org="org.easymock" name="com.springsource.org.easymock" rev="${org.easymock}" conf="test->runtime"/>
<dependency org="org.slf4j" name="com.springsource.slf4j.nop" rev="${org.slf4j}" conf="test->runtime"/>
- <dependency org="javax.servlet" name="javax.servlet" rev="${javax.servlet}" conf="test->runtime"/>
+ <dependency org="org.eclipse.virgo.mirrored" name="javax.servlet" rev="${javax.servlet}" conf="test->runtime"/>
<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.dbcp" rev="${commons.dbcp}" conf="test->runtime" />
<dependency org="org.aopalliance" name="com.springsource.org.aopalliance" rev="${org.aopalliance}" conf="test->runtime" />
diff --git a/org.eclipse.virgo.kernel.artifact/src/test/java/org/eclipse/virgo/kernel/artifact/bundle/BundleBridgeTests.java b/org.eclipse.virgo.kernel.artifact/src/test/java/org/eclipse/virgo/kernel/artifact/bundle/BundleBridgeTests.java
index 99f66e89..e8190b8e 100644
--- a/org.eclipse.virgo.kernel.artifact/src/test/java/org/eclipse/virgo/kernel/artifact/bundle/BundleBridgeTests.java
+++ b/org.eclipse.virgo.kernel.artifact/src/test/java/org/eclipse/virgo/kernel/artifact/bundle/BundleBridgeTests.java
@@ -136,7 +136,7 @@ public class BundleBridgeTests {
@Test
public void testBuildDictionary() throws ArtifactGenerationException, IOException {
- File testFile = new File("../ivy-cache/repository/javax.servlet/javax.servlet/3.0.0.v201112011016/javax.servlet-3.0.0.v201112011016.jar");
+ File testFile = new File("../ivy-cache/repository/org.eclipse.virgo.mirrored/javax.servlet/3.0.0.v201112011016/javax.servlet-3.0.0.v201112011016.jar");
ArtifactDescriptor inputArtefact = BUNDLE_BRIDGE.generateArtifactDescriptor(testFile);
diff --git a/org.eclipse.virgo.kernel.deployer.test/ivy.xml b/org.eclipse.virgo.kernel.deployer.test/ivy.xml
index b46d987e..c9d2b8f6 100644
--- a/org.eclipse.virgo.kernel.deployer.test/ivy.xml
+++ b/org.eclipse.virgo.kernel.deployer.test/ivy.xml
@@ -25,13 +25,13 @@
<dependency org="org.eclipse.virgo.kernel" name="org.eclipse.virgo.kernel.model" rev="latest.integration" conf="test->compile"/>
<dependency org="org.eclipse.virgo.kernel" name="org.eclipse.virgo.kernel.osgi" rev="latest.integration" conf="test->compile"/>
<dependency org="org.eclipse.virgo.kernel" name="org.eclipse.virgo.kernel.deployer" rev="latest.integration" conf="test->compile"/>
- <dependency org="javax.jms" name="com.springsource.javax.jms" rev="${javax.jms}" conf="test->runtime"/>
- <dependency org="javax.transaction" name="com.springsource.javax.transaction" rev="${javax.transaction}" conf="test->runtime"/>
- <dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="${org.aspectj}" conf="compile->runtime"/>
+ <dependency org="org.eclipse.virgo.mirrored" name="javax.jms" rev="${javax.jms}" conf="test->runtime"/>
+ <dependency org="org.eclipse.virgo.mirrored" name="javax.transaction" rev="${javax.transaction}" conf="test->runtime"/>
+ <dependency org="org.eclipse.virgo.mirrored" name="com.springsource.org.aspectj.weaver" rev="${org.aspectj}" conf="compile->runtime"/>
<dependency org="org.hsqldb" name="com.springsource.org.hsqldb" rev="${org.hsqldb}" conf="test->runtime"/>
<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.dbcp" rev="${commons.dbcp}" conf="test->runtime"/>
<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.pool" rev="${commons.pool}" conf="test->runtime"/>
- <dependency org="org.apache.felix" name="org.apache.felix.gogo.runtime" rev="${org.apache.felix.gogo.runtime}" conf="test->runtime"/>
+ <dependency org="org.eclipse.virgo.mirrored" name="org.apache.felix.gogo.runtime" rev="${org.apache.felix.gogo.runtime}" conf="test->runtime"/>
<dependency org="org.eclipse.virgo.medic" name="org.eclipse.virgo.medic.core" rev="${org.eclipse.virgo.medic}" conf="test->runtime"/>
<dependency org="org.eclipse.virgo.medic" name="org.eclipse.virgo.medic.logbackcorefragment" rev="${org.eclipse.virgo.medic}" conf="test->runtime"/>
@@ -65,6 +65,7 @@
<!-- Prevent Xerces from being on the classpath to work around Java bug 6723276 during integration testing -->
<exclude org="org.apache.xerces"/>
+ <exclude org="org.eclipse.osgi"/>
<override org="org.eclipse.virgo.mirrored" module="org.eclipse.osgi" rev="${org.eclipse.osgi}"/>
<override org="org.eclipse.virgo.osgi" rev="${org.eclipse.virgo.osgi}"/>
diff --git a/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/ConfigurationDeploymentTests.java b/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/ConfigurationDeploymentTests.java
index 3f49789e..35701773 100644
--- a/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/ConfigurationDeploymentTests.java
+++ b/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/ConfigurationDeploymentTests.java
@@ -179,7 +179,7 @@ public class ConfigurationDeploymentTests extends AbstractDeployerIntegrationTes
Assert.assertTrue(isInDeploymentIdentities(deploymentIdentity));
Configuration configuration = this.configAdmin.getConfiguration("empty", null);
- Dictionary<Object, Object> dictionary = configuration.getProperties();
+ Dictionary<String, Object> dictionary = configuration.getProperties();
Assert.assertEquals(1, dictionary.size());
Assert.assertEquals("empty", dictionary.get("service.pid"));
@@ -213,7 +213,7 @@ public class ConfigurationDeploymentTests extends AbstractDeployerIntegrationTes
}
Configuration configuration = this.configAdmin.getConfiguration("t", null);
- Dictionary<Object, Object> dictionary = configuration.getProperties();
+ Dictionary<String, Object> dictionary = configuration.getProperties();
Assert.assertEquals("t", dictionary.get("service.pid"));
Assert.assertEquals("b", dictionary.get("a"));
}
diff --git a/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/DMSPlanDeploymentTests.java b/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/DMSPlanDeploymentTests.java
index 582d7e47..f14e00c6 100644
--- a/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/DMSPlanDeploymentTests.java
+++ b/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/DMSPlanDeploymentTests.java
@@ -134,7 +134,7 @@ public class DMSPlanDeploymentTests extends AbstractDeployerIntegrationTest {
@SuppressWarnings("unchecked")
private void checkConfigAvailable(String pid, File propertiesFile) throws IOException {
Configuration configuration = this.configAdmin.getConfiguration(pid, null);
- Dictionary<Object, Object> dictionary = configuration.getProperties();
+ Dictionary<String, Object> dictionary = configuration.getProperties();
Properties properties = new Properties();
properties.load(new FileReader(propertiesFile));
diff --git a/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/PlanDeploymentTests.java b/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/PlanDeploymentTests.java
index cad819db..04507e92 100644
--- a/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/PlanDeploymentTests.java
+++ b/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/PlanDeploymentTests.java
@@ -243,7 +243,7 @@ public class PlanDeploymentTests extends AbstractDeployerIntegrationTest {
@SuppressWarnings("unchecked")
private void checkConfigAvailable(String pid, File propertiesFile) throws IOException {
Configuration configuration = this.configAdmin.getConfiguration(pid, null);
- Dictionary<Object, Object> dictionary = configuration.getProperties();
+ Dictionary<String, Object> dictionary = configuration.getProperties();
Properties properties = new Properties();
properties.load(new FileReader(propertiesFile));
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 c448b5e4..bb20b2f6 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
@@ -5,7 +5,7 @@ launcher.bundles =\
file:../ivy-cache/repository/org.eclipse.virgo.mirrored/org.slf4j.api/${org.slf4j.api}/org.slf4j.api-${org.slf4j.api}.jar@start,\
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.weaver/${org.aspectj}/com.springsource.org.aspectj.weaver-${org.aspectj}.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:../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,\
@@ -49,7 +49,7 @@ launcher.bundles =\
file:../org.eclipse.virgo.kernel.userregionfactory/target/classes@start
-org.eclipse.virgo.test.properties.include=file:../build.versions,file:../build.properties,file:../user-ivy.properties
+org.eclipse.virgo.test.properties.include=file:../build.versions,file:../build.properties
#Equinox Configuration
osgi.parentClassloader=ext
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 963a13d5..b8ec61fb 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
@@ -5,7 +5,7 @@ launcher.bundles =\
file:../ivy-cache/repository/org.eclipse.virgo.mirrored/org.slf4j.api/${org.slf4j.api}/org.slf4j.api-${org.slf4j.api}.jar@start,\
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.weaver/${org.aspectj}/com.springsource.org.aspectj.weaver-${org.aspectj}.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:../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,\
@@ -49,7 +49,7 @@ launcher.bundles =\
file:../org.eclipse.virgo.kernel.userregionfactory/target/classes@start
-org.eclipse.virgo.test.properties.include=file:../build.versions,file:../build.properties,file:../user-ivy.properties
+org.eclipse.virgo.test.properties.include=file:../build.versions,file:../build.properties
#Equinox Configuration
osgi.parentClassloader=ext
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 2a677f55..97b07162 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
@@ -5,7 +5,7 @@ launcher.bundles =\
file:../ivy-cache/repository/org.eclipse.virgo.mirrored/org.slf4j.api/${org.slf4j.api}/org.slf4j.api-${org.slf4j.api}.jar@start,\
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.weaver/${org.aspectj}/com.springsource.org.aspectj.weaver-${org.aspectj}.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:../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,\
@@ -49,7 +49,7 @@ launcher.bundles =\
file:../org.eclipse.virgo.kernel.userregionfactory/target/classes@start
-org.eclipse.virgo.test.properties.include=file:../build.versions,file:../build.properties,file:../user-ivy.properties
+org.eclipse.virgo.test.properties.include=file:../build.versions,file:../build.properties
#Equinox Configuration
osgi.parentClassloader=ext
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 f1c69b9f..7cd8b1e2 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
@@ -9,10 +9,10 @@ baseBundles =\
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.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,\
- 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,\
+ file:../ivy-cache/repository/org.eclipse.virgo.mirrored/org.eclipse.equinox.ds/1.4.0.v20120112-1400/org.eclipse.equinox.ds-1.4.0.v20120112-1400.jar@start,\
+ file:../ivy-cache/repository/org.eclipse.virgo.mirrored/org.eclipse.equinox.util/1.0.300.v20111010-1614/org.eclipse.equinox.util-1.0.300.v20111010-1614.jar@start,\
+ file:../ivy-cache/repository/org.eclipse.virgo.mirrored/org.eclipse.osgi.services/3.3.0.v20120307-2102/org.eclipse.osgi.services-3.3.0.v20120307-2102.jar,\
+ file:../ivy-cache/repository/org.eclipse.virgo.mirrored/org.eclipse.equinox.cm/1.0.400.v20120319-2029/org.eclipse.equinox.cm-1.0.400.v20120319-2029.jar,\
file:../org.eclipse.virgo.kernel.agent.dm/target/classes@start,\
file:../org.eclipse.virgo.kernel.deployer.dm/target/classes@start,\
file:../org.eclipse.virgo.kernel.dmfragment/target/classes,\
diff --git a/org.eclipse.virgo.kernel.deployer/.classpath b/org.eclipse.virgo.kernel.deployer/.classpath
index 8f58e27f..7c2256c3 100644
--- a/org.eclipse.virgo.kernel.deployer/.classpath
+++ b/org.eclipse.virgo.kernel.deployer/.classpath
@@ -54,7 +54,7 @@
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.kernel.artifact"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.equinox.event/1.2.100.v20110110/org.eclipse.equinox.event-1.2.100.v20110110.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.deployer.api/3.5.0.D-20120615071853/org.eclipse.virgo.deployer.api-3.5.0.D-20120615071853.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.deployer.api/3.5.0.D-20120615071853/org.eclipse.virgo.deployer.api-sources-3.5.0.D-20120615071853.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.deployer.hot/3.5.0.D-20120615071853/org.eclipse.virgo.deployer.hot-3.5.0.D-20120615071853.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.deployer.hot/3.5.0.D-20120619055148/org.eclipse.virgo.deployer.hot-3.5.0.D-20120619055148.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.kernel.core/3.5.0.D-20120615071853/org.eclipse.virgo.kernel.core-3.5.0.D-20120615071853.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi.services/3.3.0.v20110513/org.eclipse.osgi.services-3.3.0.v20110513.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"/>
diff --git a/org.eclipse.virgo.kernel.deployer/ivy.xml b/org.eclipse.virgo.kernel.deployer/ivy.xml
index 6dbfccc5..bac06446 100644
--- a/org.eclipse.virgo.kernel.deployer/ivy.xml
+++ b/org.eclipse.virgo.kernel.deployer/ivy.xml
@@ -20,7 +20,7 @@
<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.equinox.event" rev="${org.eclipse.equinox.event}" conf="compile->runtime"/>
- <dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="${org.aspectj}" conf="compile->runtime"/>
+ <dependency org="org.eclipse.virgo.mirrored" name="com.springsource.org.aspectj.weaver" rev="${org.aspectj}" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.core" rev="${org.springframework}" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.context" rev="${org.springframework}" conf="compile->runtime"/>
@@ -57,12 +57,12 @@
<dependency name='org.eclipse.virgo.repository' rev='${org.eclipse.virgo.repository}' conf='compile->compile' org='org.eclipse.virgo.repository'/>
<dependency org="org.eclipse.virgo.kernel" name="org.eclipse.virgo.kernel.userregion" rev="latest.integration" conf="compile->compile"/>
-
+
+ <exclude org="org.eclipse.osgi"/>
+
<override org="org.springframework" rev="${org.springframework}"/>
<override org="org.eclipse.virgo.util" rev="${org.eclipse.virgo.util}"/>
-
- <!-- Allow Equinox to be upgraded point-wise before rippling -->
- <override org="org.eclipse.virgo.mirrored" module="org.eclipse.osgi" rev="${org.eclipse.osgi}"/>
+
</dependencies>
diff --git a/org.eclipse.virgo.kernel.osgi/src/test/java/org/eclipse/virgo/kernel/osgi/common/VersionTests.java b/org.eclipse.virgo.kernel.osgi/src/test/java/org/eclipse/virgo/kernel/osgi/common/VersionTests.java
index d496ff89..32a78593 100644
--- a/org.eclipse.virgo.kernel.osgi/src/test/java/org/eclipse/virgo/kernel/osgi/common/VersionTests.java
+++ b/org.eclipse.virgo.kernel.osgi/src/test/java/org/eclipse/virgo/kernel/osgi/common/VersionTests.java
@@ -38,12 +38,12 @@ public class VersionTests {
try {
@SuppressWarnings("unused") Version v2 = new Version(".");
Assert.assertTrue(false);
- } catch (NumberFormatException e) {
+ } catch (IllegalArgumentException e) {
}
try {
@SuppressWarnings("unused") Version v3 = new Version("0-0");
Assert.assertTrue(false);
- } catch (NumberFormatException e) {
+ } catch (IllegalArgumentException e) {
}
try {
diff --git a/org.eclipse.virgo.kernel.osgicommand/ivy.xml b/org.eclipse.virgo.kernel.osgicommand/ivy.xml
index 00e361d4..3f95a37c 100644
--- a/org.eclipse.virgo.kernel.osgicommand/ivy.xml
+++ b/org.eclipse.virgo.kernel.osgicommand/ivy.xml
@@ -17,7 +17,7 @@
<dependency org="org.eclipse.virgo.mirrored" name='org.eclipse.osgi' rev='${org.eclipse.osgi}' 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.shell" rev="latest.integration" conf="compile->compile"/>
- <dependency org="org.apache.felix" name="org.apache.felix.gogo.runtime" rev="${org.apache.felix.gogo.runtime}" conf="compile->compile"/>
+ <dependency org="org.eclipse.virgo.mirrored" name="org.apache.felix.gogo.runtime" rev="${org.apache.felix.gogo.runtime}" conf="compile->compile"/>
<!-- TEST -->
<dependency org="org.slf4j" name="com.springsource.slf4j.nop" rev="${org.slf4j}" conf="test->runtime"/>
<dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit}" conf="test->runtime"/>
diff --git a/org.eclipse.virgo.kernel.shell/.classpath b/org.eclipse.virgo.kernel.shell/.classpath
index d6a797d6..8350bf3f 100644
--- a/org.eclipse.virgo.kernel.shell/.classpath
+++ b/org.eclipse.virgo.kernel.shell/.classpath
@@ -21,7 +21,7 @@
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi.services/3.3.0.v20110513/org.eclipse.osgi.services-3.3.0.v20110513.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"/>
<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"/>
diff --git a/org.eclipse.virgo.kernel.shell/src/main/java/org/eclipse/virgo/kernel/shell/internal/formatting/ConfigInstallArtifactCommandFormatter.java b/org.eclipse.virgo.kernel.shell/src/main/java/org/eclipse/virgo/kernel/shell/internal/formatting/ConfigInstallArtifactCommandFormatter.java
index 33c08f42..6ce39b78 100644
--- a/org.eclipse.virgo.kernel.shell/src/main/java/org/eclipse/virgo/kernel/shell/internal/formatting/ConfigInstallArtifactCommandFormatter.java
+++ b/org.eclipse.virgo.kernel.shell/src/main/java/org/eclipse/virgo/kernel/shell/internal/formatting/ConfigInstallArtifactCommandFormatter.java
@@ -57,7 +57,7 @@ public final class ConfigInstallArtifactCommandFormatter extends AbstractInstall
List<String> lines = new ArrayList<String>();
List<String> propertyKeys = new ArrayList<String>();
- Dictionary<String, String> properties = configuration.getProperties();
+ Dictionary<String, Object> properties = configuration.getProperties();
if (properties != null) {
Enumeration<String> keys = properties.keys();
while (keys.hasMoreElements()) {
diff --git a/org.eclipse.virgo.kernel.test/ivy.xml b/org.eclipse.virgo.kernel.test/ivy.xml
index 9e59bf55..ebe12f27 100644
--- a/org.eclipse.virgo.kernel.test/ivy.xml
+++ b/org.eclipse.virgo.kernel.test/ivy.xml
@@ -63,6 +63,7 @@
<!-- Prevent Xerces from being on the classpath to work around Java bug 6723276 during integration testing -->
<exclude org="org.apache.xerces"/>
+ <exclude org="org.eclipse.osgi"/>
<!-- Allow Equinox to be upgraded point-wise before rippling -->
<override org="org.aspectj" rev="${org.aspectj}" />
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 9440fa75..ba52d09e 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
@@ -49,7 +49,7 @@ launcher.bundles =\
file:../org.eclipse.virgo.kernel.osgi/target/classes@start,\
file:../org.eclipse.virgo.kernel.userregionfactory/target/classes@start
-org.eclipse.virgo.test.properties.include=file:../build.versions,file:../build.properties,file:../user-ivy.properties
+org.eclipse.virgo.test.properties.include=file:../build.versions,file:../build.properties
#Equinox Configuration
osgi.parentClassloader=ext
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 2f960d4e..68d1cbf0 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
@@ -9,22 +9,22 @@ baseBundles =\
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.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,\
- 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,\
+ file:../ivy-cache/repository/org.eclipse.virgo.mirrored/org.eclipse.equinox.ds/1.4.0.v20120112-1400/org.eclipse.equinox.ds-1.4.0.v20120112-1400.jar@start,\
+ file:../ivy-cache/repository/org.eclipse.virgo.mirrored/org.eclipse.equinox.util/1.0.300.v20111010-1614/org.eclipse.equinox.util-1.0.300.v20111010-1614.jar@start,\
+ file:../ivy-cache/repository/org.eclipse.virgo.mirrored/org.eclipse.osgi.services/3.3.0.v20120307-2102/org.eclipse.osgi.services-3.3.0.v20120307-2102.jar,\
+ file:../ivy-cache/repository/org.eclipse.virgo.mirrored/org.eclipse.equinox.cm/1.0.400.v20120319-2029/org.eclipse.equinox.cm-1.0.400.v20120319-2029.jar,\
file:../org.eclipse.virgo.kernel.agent.dm/target/classes@start,\
file:../org.eclipse.virgo.kernel.deployer.dm/target/classes@start,\
file:../org.eclipse.virgo.kernel.dmfragment/target/classes,\
file:../org.eclipse.virgo.kernel.userregion/target/classes@start,\
file:../org.eclipse.virgo.kernel.osgicommand/target/classes@start,\
- file:../ivy-cache/repository/org.eclipse.virgo.mirrored/com.springsource.org.apache.mina.core/${org.apache.sshd.core}/com.springsource.org.apache.mina.core-${org.apache.sshd.core}.jar@start,\
- file:../ivy-cache/repository/org.eclipse.virgo.mirrored/org.apache.felix.gogo.command/${org.apache.felix.gogo.command}/org.apache.felix.gogo.command-${org.apache.felix.gogo.command}.jar@start,\
- file:../ivy-cache/repository/org.eclipse.virgo.mirrored/org.apache.felix.gogo.runtime/${org.apache.felix.gogo.runtime}/org.apache.felix.gogo.runtime-${org.apache.felix.gogo.runtime}.jar@start,\
- file:../ivy-cache/repository/org.eclipse.virgo.mirrored/org.apache.felix.gogo.shell/${org.apache.felix.gogo.shell}/org.apache.felix.gogo.shell-${org.apache.felix.gogo.shell}.jar@start,\
- file:../ivy-cache/repository/org.eclipse.virgo.mirrored/org.eclipse.equinox.console/${org.eclipse.equinox.console}/org.eclipse.equinox.console-${org.eclipse.equinox.console}.jar@start,\
- file:../ivy-cache/repository/org.eclipse.virgo.mirrored/org.eclipse.equinox.console.ssh/${org.eclipse.equinox.console.ssh}/org.eclipse.equinox.console.ssh-${org.eclipse.equinox.console.ssh}.jar@start,\
- file:../ivy-cache/repository/org.eclipse.virgo.mirrored/org.apache.sshd.core/${org.apache.sshd.core}/org.apache.sshd.core-${org.apache.sshd.core}.jar@start
+ file:../ivy-cache/repository/org.eclipse.virgo.mirrored/org.apache.mina.core/2.0.2.v201108120515/org.apache.mina.core-2.0.2.v201108120515.jar@start,\
+ file:../ivy-cache/repository/org.eclipse.virgo.mirrored/org.apache.felix.gogo.command/0.8.0.v201108120515/org.apache.felix.gogo.command-0.8.0.v201108120515.jar@start,\
+ file:../ivy-cache/repository/org.eclipse.virgo.mirrored/org.apache.felix.gogo.runtime/0.8.0.v201108120515/org.apache.felix.gogo.runtime-0.8.0.v201108120515.jar@start,\
+ file:../ivy-cache/repository/org.eclipse.virgo.mirrored/org.apache.felix.gogo.shell/0.8.0.v201110170705/org.apache.felix.gogo.shell-0.8.0.v201110170705.jar@start,\
+ file:../ivy-cache/repository/org.eclipse.virgo.mirrored/org.eclipse.equinox.console/1.0.0.v20120511-0559/org.eclipse.equinox.console-1.0.0.v20120511-0559.jar@start,\
+ file:../ivy-cache/repository/org.eclipse.virgo.mirrored/org.eclipse.equinox.console.ssh/1.0.0.v20120430-1356/org.eclipse.equinox.console.ssh-1.0.0.v20120430-1356.jar@start,\
+ file:../ivy-cache/repository/org.eclipse.virgo.mirrored/org.apache.sshd.core/0.5.0.v201108120515/org.apache.sshd.core-0.5.0.v201108120515.jar@start
bundleImports = org.eclipse.osgi;bundle-version="0"
diff --git a/org.eclipse.virgo.kernel.userregion/.classpath b/org.eclipse.virgo.kernel.userregion/.classpath
index 46f60868..f17538d9 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.5.0.D-20120615070622/org.eclipse.virgo.medic-3.5.0.D-20120615070622.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.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.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 kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.5.0.D-20120619054721/org.eclipse.virgo.medic-3.5.0.D-20120619054721.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.5.0.D-20120615071313/org.eclipse.virgo.repository-3.5.0.D-20120615071313.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.5.0.D-20120615065828/org.eclipse.virgo.util.osgi-3.5.0.D-20120615065828.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.5.0.D-20120615065828/org.eclipse.virgo.util.osgi.manifest-3.5.0.D-20120615065828.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.5.0.D-20120615065828/org.eclipse.virgo.util.common-3.5.0.D-20120615065828.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.5.0.D-20120615065828/org.eclipse.virgo.util.math-3.5.0.D-20120615065828.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.osgi/org.eclipse.virgo.osgi.extensions.equinox/3.5.0.D-20120615065435/org.eclipse.virgo.osgi.extensions.equinox-3.5.0.D-20120615065435.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.extensions.equinox/2.0.0.D-20090913205430/org.eclipse.virgo.osgi.extensions.equinox-sources-2.0.0.D-20090913205430.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.5.0.D-20120615065828/org.eclipse.virgo.util.io-3.5.0.D-20120615065828.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.5.0.D-20120615065828/org.eclipse.virgo.util.parser.manifest-3.5.0.D-20120615065828.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.5.0.D-20120619055014/org.eclipse.virgo.repository-3.5.0.D-20120619055014.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.5.0.D-20120619054214/org.eclipse.virgo.util.osgi-3.5.0.D-20120619054214.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.5.0.D-20120619054214/org.eclipse.virgo.util.osgi.manifest-3.5.0.D-20120619054214.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.5.0.D-20120619054214/org.eclipse.virgo.util.common-3.5.0.D-20120619054214.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.5.0.D-20120619054214/org.eclipse.virgo.util.math-3.5.0.D-20120619054214.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.osgi/org.eclipse.virgo.osgi.extensions.equinox/3.5.0.D-20120619054004/org.eclipse.virgo.osgi.extensions.equinox-3.5.0.D-20120619054004.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.extensions.equinox/2.0.0.D-20090913205430/org.eclipse.virgo.osgi.extensions.equinox-sources-2.0.0.D-20090913205430.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.5.0.D-20120619054214/org.eclipse.virgo.util.io-3.5.0.D-20120619054214.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.5.0.D-20120619054214/org.eclipse.virgo.util.parser.manifest-3.5.0.D-20120619054214.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.teststubs/org.eclipse.virgo.teststubs.osgi/3.5.0.D-20120626080519/org.eclipse.virgo.teststubs.osgi-3.5.0.D-20120626080519.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.teststubs/org.eclipse.virgo.teststubs.osgi/1.0.0.CI-B39/org.eclipse.virgo.teststubs.osgi-sources-1.0.0.CI-B39.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.test/3.5.0.D-20120615070622/org.eclipse.virgo.medic.test-3.5.0.D-20120615070622.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.teststubs/org.eclipse.virgo.teststubs.osgi/3.5.0.D-20120619053815/org.eclipse.virgo.teststubs.osgi-3.5.0.D-20120619053815.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.teststubs/org.eclipse.virgo.teststubs.osgi/1.0.0.CI-B39/org.eclipse.virgo.teststubs.osgi-sources-1.0.0.CI-B39.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.test/3.5.0.D-20120619054721/org.eclipse.virgo.medic.test-3.5.0.D-20120619054721.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.osgi/org.eclipse.osgi.services/3.3.0.v20110513/org.eclipse.osgi.services-3.3.0.v20110513.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.osgi/org.eclipse.equinox.event/1.2.100.v20110110/org.eclipse.equinox.event-1.2.100.v20110110.jar"/>
- <classpathentry kind="var" path="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.nano/org.eclipse.virgo.kernel.core/3.5.0.D-20120615071853/org.eclipse.virgo.kernel.core-3.5.0.D-20120615071853.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.deployer.api/3.5.0.D-20120615071853/org.eclipse.virgo.deployer.api-3.5.0.D-20120615071853.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.kernel.core/3.5.0.D-20120619055148/org.eclipse.virgo.kernel.core-3.5.0.D-20120619055148.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.deployer.api/3.5.0.D-20120619055148/org.eclipse.virgo.deployer.api-3.5.0.D-20120619055148.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/org.eclipse.virgo.kernel.userregion/src/main/java/org/eclipse/virgo/kernel/userregion/internal/Activator.java b/org.eclipse.virgo.kernel.userregion/src/main/java/org/eclipse/virgo/kernel/userregion/internal/Activator.java
index a7717467..2a5c64aa 100644
--- a/org.eclipse.virgo.kernel.userregion/src/main/java/org/eclipse/virgo/kernel/userregion/internal/Activator.java
+++ b/org.eclipse.virgo.kernel.userregion/src/main/java/org/eclipse/virgo/kernel/userregion/internal/Activator.java
@@ -162,7 +162,7 @@ public class Activator implements BundleActivator {
}
}
- private void publishConfigurationFromKernelRegion(Dictionary<?, ?> configurationProperties, Configuration config) throws IOException {
+ private void publishConfigurationFromKernelRegion(Dictionary<String, Object> configurationProperties, Configuration config) throws IOException {
config.update(configurationProperties);
}
@@ -324,7 +324,7 @@ public class Activator implements BundleActivator {
DeployUriNormaliser uriNormaliser = getPotentiallyDelayedService(context, DeployUriNormaliser.class);
ApplicationDeployer deployer = getPotentiallyDelayedService(context, ApplicationDeployer.class);
- Dictionary<String, String> artifactConfiguration = getRegionArtifactConfiguration();
+ Dictionary<String, Object> artifactConfiguration = getRegionArtifactConfiguration();
InitialArtifactDeployer initialArtifactDeployer = new InitialArtifactDeployer(this.startAwaiter, deployer,
artifactConfiguration.get(PROPERTY_USER_REGION_ARTIFACTS), artifactConfiguration.get(PROPERTY_USER_REGION_COMMANDLINE_ARTIFACTS),
@@ -344,11 +344,11 @@ public class Activator implements BundleActivator {
}
@SuppressWarnings("unchecked")
- private Dictionary<String, String> getRegionArtifactConfiguration() {
+ private Dictionary<String, Object> getRegionArtifactConfiguration() {
ConfigurationAdmin configAdmin = OsgiFrameworkUtils.getService(this.context, ConfigurationAdmin.class).getService();
try {
Configuration config = configAdmin.getConfiguration(USER_REGION_CONFIGURATION_PID, null);
- Dictionary<String, String> properties = (Dictionary<String, String>) config.getProperties();
+ Dictionary<String, Object> properties = (Dictionary<String, Object>) config.getProperties();
return properties;
} catch (IOException ioe) {
throw new RuntimeException("Failed to read region artifact configuration", ioe);
diff --git a/org.eclipse.virgo.kernel.userregion/src/main/java/org/eclipse/virgo/kernel/userregion/internal/ConsoleConfigurationConvertor.java b/org.eclipse.virgo.kernel.userregion/src/main/java/org/eclipse/virgo/kernel/userregion/internal/ConsoleConfigurationConvertor.java
index fd3c9335..4238f78c 100755
--- a/org.eclipse.virgo.kernel.userregion/src/main/java/org/eclipse/virgo/kernel/userregion/internal/ConsoleConfigurationConvertor.java
+++ b/org.eclipse.virgo.kernel.userregion/src/main/java/org/eclipse/virgo/kernel/userregion/internal/ConsoleConfigurationConvertor.java
@@ -5,7 +5,6 @@ import java.net.BindException;
import java.net.ServerSocket;
import java.util.Dictionary;
import java.util.Hashtable;
-import java.util.Properties;
import org.eclipse.virgo.kernel.osgi.framework.OsgiFrameworkUtils;
import org.osgi.framework.BundleContext;
@@ -84,7 +83,7 @@ public class ConsoleConfigurationConvertor {
try {
Configuration configuration = this.configAdmin.getConfiguration(pid, null);
- Properties properties = new Properties();
+ Dictionary<String, Object> properties = new Hashtable<String, Object>();
properties.put(HOST, host);
properties.put(PORT, port);
properties.put(ENABLED, enabled);
diff --git a/org.eclipse.virgo.kernel.userregion/src/main/java/org/eclipse/virgo/kernel/userregion/internal/InitialArtifactDeployer.java b/org.eclipse.virgo.kernel.userregion/src/main/java/org/eclipse/virgo/kernel/userregion/internal/InitialArtifactDeployer.java
index 4c02d416..16e0b8cd 100644
--- a/org.eclipse.virgo.kernel.userregion/src/main/java/org/eclipse/virgo/kernel/userregion/internal/InitialArtifactDeployer.java
+++ b/org.eclipse.virgo.kernel.userregion/src/main/java/org/eclipse/virgo/kernel/userregion/internal/InitialArtifactDeployer.java
@@ -69,12 +69,20 @@ final class InitialArtifactDeployer implements EventHandler {
private final KernelStartedAwaiter startAwaiter;
- InitialArtifactDeployer(KernelStartedAwaiter startAwaiter, ApplicationDeployer deployer, String systemArtifactsProperty, String userArtifactsProperty, DeployUriNormaliser uriNormaliser, EventAdmin eventAdmin, EventLogger eventLogger, Shutdown shutdown) {
+ InitialArtifactDeployer(KernelStartedAwaiter startAwaiter, ApplicationDeployer deployer, Object systemArtifactsProperty, Object userArtifactsProperty, DeployUriNormaliser uriNormaliser, EventAdmin eventAdmin, EventLogger eventLogger, Shutdown shutdown) {
this.deployer = deployer;
this.uriNormaliser = uriNormaliser;
this.eventAdmin = eventAdmin;
- this.systemArtifactsProperty = systemArtifactsProperty;
- this.userArtifactsProperty = userArtifactsProperty;
+ if (systemArtifactsProperty != null) {
+ this.systemArtifactsProperty = systemArtifactsProperty.toString();
+ } else {
+ this.systemArtifactsProperty = null;
+ }
+ if (userArtifactsProperty != null) {
+ this.userArtifactsProperty = userArtifactsProperty.toString();
+ } else {
+ this.userArtifactsProperty = null;
+ }
this.eventLogger = eventLogger;
this.shutdown = shutdown;
this.startAwaiter = startAwaiter;
diff --git a/org.eclipse.virgo.kernel.userregion/src/main/java/org/eclipse/virgo/kernel/userregion/internal/UserRegionConfigurationDeployer.java b/org.eclipse.virgo.kernel.userregion/src/main/java/org/eclipse/virgo/kernel/userregion/internal/UserRegionConfigurationDeployer.java
index b819a954..687cb05e 100644
--- a/org.eclipse.virgo.kernel.userregion/src/main/java/org/eclipse/virgo/kernel/userregion/internal/UserRegionConfigurationDeployer.java
+++ b/org.eclipse.virgo.kernel.userregion/src/main/java/org/eclipse/virgo/kernel/userregion/internal/UserRegionConfigurationDeployer.java
@@ -4,6 +4,7 @@ package org.eclipse.virgo.kernel.userregion.internal;
import java.io.IOException;
import java.util.Dictionary;
import java.util.Enumeration;
+import java.util.Hashtable;
import java.util.Properties;
import org.eclipse.virgo.kernel.deployer.config.ConfigurationDeployer;
@@ -36,7 +37,11 @@ public class UserRegionConfigurationDeployer implements ConfigurationDeployer {
public void publishConfiguration(String pid, Properties configurationProperties) throws IOException {
synchronized (monitor) {
Configuration configuration = this.configurationAdmin.getConfiguration(pid, null);
- configuration.update(configurationProperties);
+ Dictionary<String, Object> properties = new Hashtable<String, Object>();
+ for (String prop : configurationProperties.stringPropertyNames()) {
+ properties.put(prop, configurationProperties.get(prop));
+ }
+ configuration.update(properties);
}
}
diff --git a/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/quasi/BundleDescriptionComparatorTests.java b/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/quasi/BundleDescriptionComparatorTests.java
index 299aa087..31d694a9 100644
--- a/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/quasi/BundleDescriptionComparatorTests.java
+++ b/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/quasi/BundleDescriptionComparatorTests.java
@@ -33,6 +33,8 @@ import org.osgi.framework.Version;
import org.osgi.framework.wiring.BundleRequirement;
import org.osgi.framework.wiring.BundleWiring;
import org.osgi.framework.wiring.BundleCapability;
+import org.osgi.resource.Capability;
+import org.osgi.resource.Requirement;
public class BundleDescriptionComparatorTests {
@@ -300,5 +302,15 @@ public class BundleDescriptionComparatorTests {
public BundleWiring getWiring() {
throw new UnsupportedOperationException();
}
+
+ @Override
+ public List<Capability> getCapabilities(String arg0) {
+ return null;
+ }
+
+ @Override
+ public List<Requirement> getRequirements(String arg0) {
+ return null;
+ }
}
}
diff --git a/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/quasi/StubBaseDescription.java b/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/quasi/StubBaseDescription.java
index 0b186229..7d419cd0 100644
--- a/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/quasi/StubBaseDescription.java
+++ b/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/quasi/StubBaseDescription.java
@@ -74,4 +74,13 @@ public class StubBaseDescription implements BaseDescription {
throw new UnsupportedOperationException();
}
+ @Override
+ public Object getUserObject() {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public void setUserObject(Object arg0) {
+ }
+
}
diff --git a/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/quasi/StubBundleDescription.java b/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/quasi/StubBundleDescription.java
index e96e062d..18e01ba5 100644
--- a/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/quasi/StubBundleDescription.java
+++ b/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/quasi/StubBundleDescription.java
@@ -31,6 +31,8 @@ import org.osgi.framework.Version;
import org.osgi.framework.wiring.BundleRequirement;
import org.osgi.framework.wiring.BundleWiring;
import org.osgi.framework.wiring.BundleCapability;
+import org.osgi.resource.Capability;
+import org.osgi.resource.Requirement;
public class StubBundleDescription implements BundleDescription {
@@ -185,6 +187,16 @@ public class StubBundleDescription implements BundleDescription {
throw new UnsupportedOperationException();
}
+ @Override
+ public Object getUserObject() {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public void setUserObject(Object arg0) {
+ throw new UnsupportedOperationException();
+ }
+
};
}
@@ -473,4 +485,14 @@ public class StubBundleDescription implements BundleDescription {
throw new UnsupportedOperationException();
}
+ @Override
+ public List<Capability> getCapabilities(String arg0) {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public List<Requirement> getRequirements(String arg0) {
+ throw new UnsupportedOperationException();
+ }
+
}
diff --git a/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/quasi/StubBundleSpecification.java b/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/quasi/StubBundleSpecification.java
index d8e5c346..cac9ada8 100644
--- a/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/quasi/StubBundleSpecification.java
+++ b/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/quasi/StubBundleSpecification.java
@@ -104,4 +104,14 @@ public class StubBundleSpecification implements BundleSpecification {
throw new UnsupportedOperationException();
}
+ @Override
+ public Object getUserObject() {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public void setUserObject(Object arg0) {
+ throw new UnsupportedOperationException();
+ }
+
}
diff --git a/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/quasi/StubExportPackageDescription.java b/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/quasi/StubExportPackageDescription.java
index 9e869c81..de458d71 100644
--- a/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/quasi/StubExportPackageDescription.java
+++ b/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/quasi/StubExportPackageDescription.java
@@ -102,4 +102,14 @@ public class StubExportPackageDescription extends StubParameterised implements E
throw new UnsupportedOperationException();
}
+ @Override
+ public Object getUserObject() {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public void setUserObject(Object arg0) {
+ throw new UnsupportedOperationException();
+ }
+
}
diff --git a/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/quasi/StubImportPackageSpecification.java b/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/quasi/StubImportPackageSpecification.java
index 75df7e4a..d9efa86c 100644
--- a/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/quasi/StubImportPackageSpecification.java
+++ b/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/quasi/StubImportPackageSpecification.java
@@ -112,4 +112,14 @@ public class StubImportPackageSpecification extends StubParameterised implements
throw new UnsupportedOperationException();
}
+ @Override
+ public Object getUserObject() {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public void setUserObject(Object arg0) {
+ throw new UnsupportedOperationException();
+ }
+
}
diff --git a/org.eclipse.virgo.kernel.userregionfactory/.classpath b/org.eclipse.virgo.kernel.userregionfactory/.classpath
index f9cd7da6..4b914472 100644
--- a/org.eclipse.virgo.kernel.userregionfactory/.classpath
+++ b/org.eclipse.virgo.kernel.userregionfactory/.classpath
@@ -6,21 +6,21 @@
<classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="var" path="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.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.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.5.0.D-20120615070622/org.eclipse.virgo.medic-3.5.0.D-20120615070622.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.5.0.D-20120619054721/org.eclipse.virgo.medic-3.5.0.D-20120619054721.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.osgi/org.eclipse.virgo.osgi.launcher/3.5.0.D-20120615065435/org.eclipse.virgo.osgi.launcher-3.5.0.D-20120615065435.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.launcher/2.2.0.D-20101207145732/org.eclipse.virgo.osgi.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.5.0.D-20120615065828/org.eclipse.virgo.util.osgi-3.5.0.D-20120615065828.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.5.0.D-20120615065828/org.eclipse.virgo.util.osgi.manifest-3.5.0.D-20120615065828.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.5.0.D-20120615065828/org.eclipse.virgo.util.parser.manifest-3.5.0.D-20120615065828.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.osgi/org.eclipse.virgo.osgi.launcher/3.5.0.D-20120619054004/org.eclipse.virgo.osgi.launcher-3.5.0.D-20120619054004.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.launcher/2.2.0.D-20101207145732/org.eclipse.virgo.osgi.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.5.0.D-20120619054214/org.eclipse.virgo.util.osgi-3.5.0.D-20120619054214.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.5.0.D-20120619054214/org.eclipse.virgo.util.osgi.manifest-3.5.0.D-20120619054214.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.5.0.D-20120619054214/org.eclipse.virgo.util.parser.manifest-3.5.0.D-20120619054214.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.teststubs/org.eclipse.virgo.teststubs.osgi/3.5.0.D-20120626080519/org.eclipse.virgo.teststubs.osgi-3.5.0.D-20120626080519.jar"/>
- <classpathentry kind="var" path="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.nano/org.eclipse.virgo.kernel.core/3.5.0.D-20120615071853/org.eclipse.virgo.kernel.core-3.5.0.D-20120615071853.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi.services/3.3.0.v20110513/org.eclipse.osgi.services-3.3.0.v20110513.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.kernel.core/3.5.0.D-20120619055148/org.eclipse.virgo.kernel.core-3.5.0.D-20120619055148.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.userregionfactory/src/main/java/org/eclipse/virgo/kernel/userregionfactory/Activator.java b/org.eclipse.virgo.kernel.userregionfactory/src/main/java/org/eclipse/virgo/kernel/userregionfactory/Activator.java
index 38d07e9e..512aee44 100644
--- a/org.eclipse.virgo.kernel.userregionfactory/src/main/java/org/eclipse/virgo/kernel/userregionfactory/Activator.java
+++ b/org.eclipse.virgo.kernel.userregionfactory/src/main/java/org/eclipse/virgo/kernel/userregionfactory/Activator.java
@@ -135,14 +135,14 @@ public final class Activator {
Configuration config = configAdmin.getConfiguration(USER_REGION_CONFIGURATION_PID, null);
@SuppressWarnings("unchecked")
- Dictionary<String, String> properties = config.getProperties();
+ Dictionary<String, Object> properties = config.getProperties();
if (properties != null) {
- this.regionBundles = properties.get(USER_REGION_BASE_BUNDLES_PROPERTY);
- this.regionPackageImports = properties.get(USER_REGION_PACKAGE_IMPORTS_PROPERTY);
- this.regionServiceImports = properties.get(USER_REGION_SERVICE_IMPORTS_PROPERTY);
- this.regionBundleImports = properties.get(USER_REGION_BUNDLE_IMPORTS_PROPERTY);
- this.regionServiceExports = properties.get(USER_REGION_SERVICE_EXPORTS_PROPERTY);
+ this.regionBundles = properties.get(USER_REGION_BASE_BUNDLES_PROPERTY).toString();
+ this.regionPackageImports = properties.get(USER_REGION_PACKAGE_IMPORTS_PROPERTY).toString();
+ this.regionServiceImports = properties.get(USER_REGION_SERVICE_IMPORTS_PROPERTY).toString();
+ this.regionBundleImports = properties.get(USER_REGION_BUNDLE_IMPORTS_PROPERTY).toString();
+ this.regionServiceExports = properties.get(USER_REGION_SERVICE_EXPORTS_PROPERTY).toString();
} else {
eventLogger.log(UserRegionFactoryLogEvents.USER_REGION_CONFIGURATION_UNAVAILABLE);
shutdown.immediateShutdown();
diff --git a/org.eclipse.virgo.management.fragment/ivy.xml b/org.eclipse.virgo.management.fragment/ivy.xml
index 61cfb01e..8d012ad6 100644
--- a/org.eclipse.virgo.management.fragment/ivy.xml
+++ b/org.eclipse.virgo.management.fragment/ivy.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<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="${project.organisation}" module="${ant.project.name}"/>
+ <info organisation="org.eclipse.virgo" module="${ant.project.name}"/>
<configurations>
<include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/>

Back to the top