Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlyn Normington2010-11-25 10:37:42 +0000
committerGlyn Normington2010-11-25 10:37:42 +0000
commitf7776d63055d577a607d83a41dc74d8c28c91c20 (patch)
tree0b73b57f922f6e14341562840b8e730f39b74c6f
parent037396a88bdb7740b4115a19aa248e5110ce42cc (diff)
downloadorg.eclipse.virgo.kernel-f7776d63055d577a607d83a41dc74d8c28c91c20.tar.gz
org.eclipse.virgo.kernel-f7776d63055d577a607d83a41dc74d8c28c91c20.tar.xz
org.eclipse.virgo.kernel-f7776d63055d577a607d83a41dc74d8c28c91c20.zip
bug 330236: upgrade to Equinox 3.7
-rw-r--r--build.versions4
-rw-r--r--org.eclipse.virgo.kernel.agent.dm/.classpath2
-rw-r--r--org.eclipse.virgo.kernel.artifact/.classpath2
-rw-r--r--org.eclipse.virgo.kernel.core/.classpath6
-rw-r--r--org.eclipse.virgo.kernel.core/src/main/java/org/eclipse/virgo/kernel/core/internal/CoreBundleActivator.java19
-rw-r--r--org.eclipse.virgo.kernel.core/src/main/java/org/eclipse/virgo/kernel/core/internal/StartupTracker.java9
-rw-r--r--org.eclipse.virgo.kernel.core/src/test/java/org/eclipse/virgo/kernel/core/internal/StartupTrackerTests.java13
-rw-r--r--org.eclipse.virgo.kernel.deployer.dm/.classpath2
-rw-r--r--org.eclipse.virgo.kernel.deployer.test/.classpath2
-rw-r--r--org.eclipse.virgo.kernel.deployer/.classpath2
-rw-r--r--org.eclipse.virgo.kernel.deployer/src/main/java/org/eclipse/virgo/kernel/deployer/core/internal/recovery/RecoveryAgent.java2
-rw-r--r--org.eclipse.virgo.kernel.deployer/src/main/java/org/eclipse/virgo/kernel/install/artifact/ScopeServiceRepository.java2
-rw-r--r--org.eclipse.virgo.kernel.deployer/src/main/java/org/eclipse/virgo/kernel/install/artifact/internal/DelegatingServiceRegistryBackedArtifactIdentityDeterminer.java4
-rw-r--r--org.eclipse.virgo.kernel.deployer/src/main/java/org/eclipse/virgo/kernel/install/artifact/internal/SpringConfigServiceModelScanner.java33
-rw-r--r--org.eclipse.virgo.kernel.deployer/src/main/java/org/eclipse/virgo/kernel/install/artifact/internal/StandardScopeServiceRepository.java14
-rw-r--r--org.eclipse.virgo.kernel.deployer/src/main/java/org/eclipse/virgo/kernel/module/internal/StandardModuleContextEventPublisher.java14
-rw-r--r--org.eclipse.virgo.kernel.deployer/src/test/java/org/eclipse/virgo/kernel/deployer/hot/HotDeployerTests.java15
-rw-r--r--org.eclipse.virgo.kernel.deployer/src/test/java/org/eclipse/virgo/kernel/deployer/management/RecoveryMonitorTests.java4
-rw-r--r--org.eclipse.virgo.kernel.deployer/src/test/java/org/eclipse/virgo/kernel/install/artifact/internal/ScopeServiceRepositoryTests.java12
-rw-r--r--org.eclipse.virgo.kernel.deployer/src/test/java/org/eclipse/virgo/kernel/install/pipeline/stage/transform/TransformationStageTests.java4
-rw-r--r--org.eclipse.virgo.kernel.dmfragment/.classpath2
-rw-r--r--org.eclipse.virgo.kernel.kerneldmfragment/.classpath2
-rw-r--r--org.eclipse.virgo.kernel.model/.classpath2
-rw-r--r--org.eclipse.virgo.kernel.osgi/.classpath6
-rw-r--r--org.eclipse.virgo.kernel.osgi/src/main/java/org/eclipse/virgo/kernel/osgi/framework/OsgiFrameworkUtils.java12
-rw-r--r--org.eclipse.virgo.kernel.osgi/src/main/java/org/eclipse/virgo/kernel/osgi/framework/OsgiServiceHolder.java2
-rw-r--r--org.eclipse.virgo.kernel.osgi/src/main/java/org/eclipse/virgo/kernel/osgi/region/PackageImportWildcardExpander.java8
-rw-r--r--org.eclipse.virgo.kernel.osgi/src/main/java/org/eclipse/virgo/kernel/osgi/region/RegionManager.java16
-rw-r--r--org.eclipse.virgo.kernel.osgi/src/main/java/org/eclipse/virgo/kernel/osgi/region/eventlog/RegionAwareEventLoggerServiceFactory.java7
-rw-r--r--org.eclipse.virgo.kernel.osgicommand/.classpath2
-rw-r--r--org.eclipse.virgo.kernel.services/.classpath2
-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/CommandRegistry.java10
-rw-r--r--org.eclipse.virgo.kernel.shell/src/main/java/org/eclipse/virgo/kernel/shell/internal/ServiceUtils.java4
-rw-r--r--org.eclipse.virgo.kernel.stubs/.classpath2
-rw-r--r--org.eclipse.virgo.kernel.test/.classpath2
-rw-r--r--org.eclipse.virgo.kernel.test/src/test/resources/META-INF/MANIFEST.MF28
-rw-r--r--org.eclipse.virgo.kernel.userregion/.classpath4
-rw-r--r--org.eclipse.virgo.kernel.userregion/src/main/java/org/eclipse/virgo/kernel/userregion/internal/Activator.java7
-rw-r--r--org.eclipse.virgo.kernel.userregion/src/main/java/org/eclipse/virgo/kernel/userregion/internal/InitialArtifactDeployer.java3
-rw-r--r--org.eclipse.virgo.kernel.userregion/src/main/java/org/eclipse/virgo/kernel/userregion/internal/ServiceScopingStrategy.java32
-rw-r--r--org.eclipse.virgo.kernel.userregion/src/main/java/org/eclipse/virgo/kernel/userregion/internal/equinox/EquinoxOsgiFramework.java2
-rw-r--r--org.eclipse.virgo.kernel.userregion/src/main/java/org/eclipse/virgo/kernel/userregion/internal/equinox/StandardPackageAdminUtil.java2
-rw-r--r--org.eclipse.virgo.kernel.userregion/src/main/java/org/eclipse/virgo/kernel/userregion/internal/quasi/DependencyCalculator.java2
-rw-r--r--org.eclipse.virgo.kernel.userregion/src/main/java/org/eclipse/virgo/kernel/userregion/internal/quasi/StandardQuasiFrameworkFactory.java2
-rw-r--r--org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/InitialArtifactDeployerTests.java19
-rw-r--r--org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/quasi/BundleDescriptionComparatorTests.java87
-rw-r--r--org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/quasi/StubBaseDescription.java30
-rw-r--r--org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/quasi/StubBundleDescription.java115
-rw-r--r--org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/quasi/StubExportPackageDescription.java32
-rw-r--r--test-apps/bundle-update/class.load.after.update/but.C/.classpath2
-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
-rw-r--r--test-apps/service-scoping/scoping.service.module.b/.classpath2
56 files changed, 442 insertions, 181 deletions
diff --git a/build.versions b/build.versions
index b311fb1c..ee05a89b 100644
--- a/build.versions
+++ b/build.versions
@@ -1,9 +1,9 @@
# Compile
org.apache.felix.eventadmin=1.0.0
-org.eclipse.osgi.services=3.1.200.v20071203
+org.eclipse.osgi.services=3.3.0.v20101018
org.eclipse.equinox.cm=1.0.200.v20100520
org.aspectj=1.6.6.RELEASE
-org.eclipse.osgi=3.6.1.R36x_v20100806
+org.eclipse.osgi=3.7.0.v20101022
org.eclipse.virgo.medic=2.2.0.D-20101108170256
org.eclipse.virgo.osgi=2.2.0.M01
org.eclipse.virgo.repository=2.2.0.D-20101108170959
diff --git a/org.eclipse.virgo.kernel.agent.dm/.classpath b/org.eclipse.virgo.kernel.agent.dm/.classpath
index 3c9db797..d3f8cf30 100644
--- a/org.eclipse.virgo.kernel.agent.dm/.classpath
+++ b/org.eclipse.virgo.kernel.agent.dm/.classpath
@@ -29,7 +29,7 @@
</classpathentry>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework.osgi/org.springframework.osgi.core/1.2.1/org.springframework.osgi.core-1.2.1.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework.osgi/org.springframework.osgi.core/1.2.1/org.springframework.osgi.core-sources-1.2.1.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework.osgi/org.springframework.osgi.extender/1.2.1/org.springframework.osgi.extender-1.2.1.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework.osgi/org.springframework.osgi.extender/1.2.1/org.springframework.osgi.extender-sources-1.2.1.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.6.1.R36x_v20100806/org.eclipse.osgi-3.6.1.R36x_v20100806.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.6.1.R36x_v20100806/org.eclipse.osgi-sources-3.6.1.R36x_v20100806.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.0.v20101022/org.eclipse.osgi-3.7.0.v20101022.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.0.v20101022/org.eclipse.osgi-sources-3.7.0.v20101022.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.apache.felix/org.apache.felix.eventadmin/1.0.0/org.apache.felix.eventadmin-1.0.0.jar" sourcepath="/KERNEL_IVY_CACHE/org.apache.felix/org.apache.felix.eventadmin/1.0.0/org.apache.felix.eventadmin-sources-1.0.0.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework/org.springframework.context/3.0.0.RELEASE/org.springframework.context-3.0.0.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework/org.springframework.context/3.0.0.RELEASE/org.springframework.context-sources-3.0.0.RELEASE.jar"/>
diff --git a/org.eclipse.virgo.kernel.artifact/.classpath b/org.eclipse.virgo.kernel.artifact/.classpath
index 5f0bddd8..f1bddb3d 100644
--- a/org.eclipse.virgo.kernel.artifact/.classpath
+++ b/org.eclipse.virgo.kernel.artifact/.classpath
@@ -29,7 +29,7 @@
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/2.2.0.D-20101108165433/org.eclipse.virgo.util.common-2.2.0.D-20101108165433.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/2.2.0.D-20101108165433/org.eclipse.virgo.util.common-sources-2.0019103807.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.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.osgi/org.eclipse.osgi/3.6.1.R36x_v20100806/org.eclipse.osgi-3.6.1.R36x_v20100806.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.6.1.R36x_v20100806/org.eclipse.osgi-sources-3.6.1.R36x_v20100806.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.0.v20101022/org.eclipse.osgi-3.7.0.v20101022.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.0.v20101022/org.eclipse.osgi-sources-3.7.0.v20101022.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.aspectj/com.springsource.org.aspectj.runtime/1.6.6.RELEASE/com.springsource.org.aspectj.runtime-1.6.6.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.aspectj/com.springsource.org.aspectj.runtime/1.6.6.RELEASE/com.springsource.org.aspectj.runtime-1.6.6.RELEASE.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/2.2.0.D-20101108170256/org.eclipse.virgo.medic-2.2.0.D-20101108170256.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/2.2.0.D-20101108170256/org.eclipse.virgo.medic.core-2.2.0.D-20101108170256.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.core/2.2.0.D-20101108170256/org.eclipse.virgo.medic.core-sources-2.2.0.D-20101108170256.jar"/>
diff --git a/org.eclipse.virgo.kernel.core/.classpath b/org.eclipse.virgo.kernel.core/.classpath
index 4209d262..c52108f8 100644
--- a/org.eclipse.virgo.kernel.core/.classpath
+++ b/org.eclipse.virgo.kernel.core/.classpath
@@ -22,11 +22,10 @@
</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.osgi/org.eclipse.osgi/3.6.1.R36x_v20100806/org.eclipse.osgi-3.6.1.R36x_v20100806.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.6.1.R36x_v20100806/org.eclipse.osgi-sources-3.6.1.R36x_v20100806.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.0.v20101022/org.eclipse.osgi-3.7.0.v20101022.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.0.v20101022/org.eclipse.osgi-sources-3.7.0.v20101022.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.io/2.2.0.D-20101108165433/org.eclipse.virgo.util.io-2.2.0.D-20101108165433.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/2.2.0.D-20101108165433/org.eclipse.virgo.util.io-sources-2.2.0.D-20101108165433.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.RELEASE/org.springframework.beans-3.0.0.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.RELEASE/org.springframework.beans-sources-3.0.0.RELEASE.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.apache.felix/org.apache.felix.configadmin/1.2.4/org.apache.felix.configadmin-1.2.4.jar" sourcepath="/KERNEL_IVY_CACHE/org.apache.felix/org.apache.felix.configadmin/1.2.4/org.apache.felix.configadmin-sources-1.2.4.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework/org.springframework.core/3.0.0.RELEASE/org.springframework.core-3.0.0.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework/org.springframework.core/3.0.0.RELEASE/org.springframework.core-sources-3.0.0.RELEASE.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/2.2.0.D-20101108170256/org.eclipse.virgo.medic-2.2.0.D-20101108170256.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/2.2.0.D-20101108170256/org.eclipse.virgo.medic-sources-2.2.0.D-20101108170256.jar">
@@ -40,7 +39,8 @@
<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.util/org.eclipse.virgo.util.osgi/2.2.0.D-20101108165433/org.eclipse.virgo.util.osgi-2.2.0.D-20101108165433.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/2.2.0.D-20101108165433/org.eclipse.virgo.util.osgi-sources-2.2.0.D-20101108165433.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/2.2.0.D-20101108165433/org.eclipse.virgo.util.common-2.2.0.D-20101108165433.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/2.2.0.D-20101108165433/org.eclipse.virgo.util.common-sources-2.2.0.D-20101108165433.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.apache.felix/org.apache.felix.eventadmin/1.0.0/org.apache.felix.eventadmin-1.0.0.jar" sourcepath="/KERNEL_IVY_CACHE/org.apache.felix/org.apache.felix.eventadmin/1.0.0/org.apache.felix.eventadmin-sources-1.0.0.jar"/>
+ <classpathentry exported="true" kind="var" path="KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi.services/3.3.0.v20101018/org.eclipse.osgi.services-3.3.0.v20101018.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi.services/3.3.0.v20101018/org.eclipse.osgi.services-sources-3.3.0.v20101018.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.apache.felix/org.apache.felix.eventadmin/1.0.0/org.apache.felix.eventadmin-1.0.0.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi.services/3.3.0.v20101018/org.eclipse.osgi.services-sources-3.3.0.v20101018.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.test/2.2.0.D-20101108170256/org.eclipse.virgo.medic.test-2.2.0.D-20101108170256.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.test/2.2.0.D-20101108170256/org.eclipse.virgo.medic.test-sources-2.2.0.D-20101108170256.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework.osgi/org.springframework.osgi.extender/1.2.1/org.springframework.osgi.extender-1.2.1.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework.osgi/org.springframework.osgi.extender/1.2.1/org.springframework.osgi.extender-sources-1.2.1.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework/org.springframework.context/3.0.0.RELEASE/org.springframework.context-3.0.0.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework/org.springframework.context/3.0.0.RELEASE/org.springframework.context-sources-3.0.0.RELEASE.jar"/>
diff --git a/org.eclipse.virgo.kernel.core/src/main/java/org/eclipse/virgo/kernel/core/internal/CoreBundleActivator.java b/org.eclipse.virgo.kernel.core/src/main/java/org/eclipse/virgo/kernel/core/internal/CoreBundleActivator.java
index 81f13348..f318b36f 100644
--- a/org.eclipse.virgo.kernel.core/src/main/java/org/eclipse/virgo/kernel/core/internal/CoreBundleActivator.java
+++ b/org.eclipse.virgo.kernel.core/src/main/java/org/eclipse/virgo/kernel/core/internal/CoreBundleActivator.java
@@ -14,7 +14,6 @@ package org.eclipse.virgo.kernel.core.internal;
import java.lang.management.ManagementFactory;
import java.util.Dictionary;
import java.util.Hashtable;
-import java.util.Properties;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ThreadFactory;
@@ -27,15 +26,6 @@ import javax.management.MBeanServer;
import javax.management.ObjectInstance;
import javax.management.ObjectName;
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceReference;
-import org.osgi.framework.launch.Framework;
-import org.osgi.service.event.EventConstants;
-import org.osgi.service.event.EventHandler;
-import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
-
-
import org.eclipse.virgo.kernel.config.internal.ConfigurationInitialiser;
import org.eclipse.virgo.kernel.config.internal.KernelConfiguration;
import org.eclipse.virgo.kernel.core.BundleStarter;
@@ -48,6 +38,13 @@ import org.eclipse.virgo.kernel.shim.serviceability.internal.Slf4jTracingService
import org.eclipse.virgo.medic.dump.DumpGenerator;
import org.eclipse.virgo.medic.eventlog.EventLogger;
import org.eclipse.virgo.util.osgi.ServiceRegistrationTracker;
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceReference;
+import org.osgi.framework.launch.Framework;
+import org.osgi.service.event.EventConstants;
+import org.osgi.service.event.EventHandler;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
/**
* {@link BundleActivator} that initialises the core of the Kernel.
@@ -120,7 +117,7 @@ public class CoreBundleActivator implements BundleActivator {
ApplicationContextDependencyMonitor dependencyMonitor = new ApplicationContextDependencyMonitor(scheduledExecutor, eventLogger);
- Properties properties = new Properties();
+ Dictionary<String, String> properties = new Hashtable<String, String>();
properties.put(EventConstants.EVENT_TOPIC, EVENT_TOPIC_BLUEPRINT_CONTAINER);
this.tracker.track(context.registerService(EventHandler.class.getName(), dependencyMonitor, properties));
diff --git a/org.eclipse.virgo.kernel.core/src/main/java/org/eclipse/virgo/kernel/core/internal/StartupTracker.java b/org.eclipse.virgo.kernel.core/src/main/java/org/eclipse/virgo/kernel/core/internal/StartupTracker.java
index 078d9861..b334d17a 100644
--- a/org.eclipse.virgo.kernel.core/src/main/java/org/eclipse/virgo/kernel/core/internal/StartupTracker.java
+++ b/org.eclipse.virgo.kernel.core/src/main/java/org/eclipse/virgo/kernel/core/internal/StartupTracker.java
@@ -13,6 +13,7 @@ package org.eclipse.virgo.kernel.core.internal;
import java.lang.management.ManagementFactory;
import java.util.concurrent.TimeUnit;
+import java.util.Map;
import javax.management.JMException;
import javax.management.MBeanServer;
@@ -179,18 +180,20 @@ final class StartupTracker {
}
}
+ @SuppressWarnings("unchecked")
private EventLogger getEventLoggerService() {
EventLogger eventLogger = null;
- ServiceReference eventLoggerServiceReference = this.context.getServiceReference(EventLogger.class.getName());
+ ServiceReference<EventLogger> eventLoggerServiceReference = (ServiceReference<EventLogger>) this.context.getServiceReference(EventLogger.class.getName());
if (eventLoggerServiceReference != null) {
eventLogger = (EventLogger) this.context.getService(this.serviceReferenceTracker.track(eventLoggerServiceReference));
}
return eventLogger;
}
+ @SuppressWarnings("unchecked")
private EventAdmin getEventAdminService() {
EventAdmin eventAdmin = null;
- ServiceReference eventAdminServiceReference = this.context.getServiceReference(EventAdmin.class.getName());
+ ServiceReference<EventAdmin> eventAdminServiceReference = (ServiceReference<EventAdmin>) this.context.getServiceReference(EventAdmin.class.getName());
if (eventAdminServiceReference != null) {
eventAdmin = (EventAdmin) this.context.getService(this.serviceReferenceTracker.track(eventAdminServiceReference));
}
@@ -246,7 +249,7 @@ final class StartupTracker {
private void postEvent(String topic) {
if (this.eventAdmin != null) {
- this.eventAdmin.postEvent(new Event(topic, null));
+ this.eventAdmin.postEvent(new Event(topic, (Map<String, ?>)null));
}
}
}
diff --git a/org.eclipse.virgo.kernel.core/src/test/java/org/eclipse/virgo/kernel/core/internal/StartupTrackerTests.java b/org.eclipse.virgo.kernel.core/src/test/java/org/eclipse/virgo/kernel/core/internal/StartupTrackerTests.java
index 879cdf8d..b3642c14 100644
--- a/org.eclipse.virgo.kernel.core/src/test/java/org/eclipse/virgo/kernel/core/internal/StartupTrackerTests.java
+++ b/org.eclipse.virgo.kernel.core/src/test/java/org/eclipse/virgo/kernel/core/internal/StartupTrackerTests.java
@@ -20,6 +20,7 @@ import static org.junit.Assert.assertTrue;
import java.lang.management.ManagementFactory;
import java.util.Dictionary;
import java.util.Hashtable;
+import java.util.Map;
import javax.management.MBeanServer;
import javax.management.ObjectName;
@@ -74,11 +75,11 @@ public class StartupTrackerTests {
StartupTracker tracker = new StartupTracker(this.bundleContext, new KernelConfiguration(this.bundleContext), 30, bundleStartTracker, this.shutdown, this.dumpGenerator);
tracker.start();
- assertTrue(this.eventAdmin.awaitPostingOfEvent(new Event("org/eclipse/virgo/kernel/STARTING", null), 10000));
+ assertTrue(this.eventAdmin.awaitPostingOfEvent(new Event("org/eclipse/virgo/kernel/STARTING", (Map<String, ?>)null), 10000));
this.bundle.start();
- assertTrue(this.eventAdmin.awaitPostingOfEvent(new Event("org/eclipse/virgo/kernel/STARTED", null), 10000));
+ assertTrue(this.eventAdmin.awaitPostingOfEvent(new Event("org/eclipse/virgo/kernel/STARTED", (Map<String, ?>)null), 10000));
tracker.stop();
}
@@ -99,8 +100,8 @@ public class StartupTrackerTests {
StartupTracker tracker = new StartupTracker(this.bundleContext, new KernelConfiguration(this.bundleContext), 1, bundleStartTracker, this.shutdown, this.dumpGenerator);
tracker.start();
- assertTrue(this.eventAdmin.awaitPostingOfEvent(new Event("org/eclipse/virgo/kernel/STARTING", null), 10000));
- assertTrue(this.eventAdmin.awaitPostingOfEvent(new Event("org/eclipse/virgo/kernel/START_TIMED_OUT", null), 10000));
+ assertTrue(this.eventAdmin.awaitPostingOfEvent(new Event("org/eclipse/virgo/kernel/STARTING", (Map<String, ?>)null), 10000));
+ assertTrue(this.eventAdmin.awaitPostingOfEvent(new Event("org/eclipse/virgo/kernel/START_TIMED_OUT", (Map<String, ?>)null), 10000));
waitForABit(500);
@@ -140,7 +141,7 @@ public class StartupTrackerTests {
StartupTracker tracker = new StartupTracker(this.bundleContext, new KernelConfiguration(this.bundleContext), 1, bundleStartTracker, this.shutdown, this.dumpGenerator);
tracker.start();
- assertTrue(this.eventAdmin.awaitPostingOfEvent(new Event("org/eclipse/virgo/kernel/STARTING", null), 10000));
+ assertTrue(this.eventAdmin.awaitPostingOfEvent(new Event("org/eclipse/virgo/kernel/STARTING", (Map<String, ?>)null), 10000));
Dictionary<String, Object> properties = new Hashtable<String, Object>();
properties.put("bundle", bundle);
@@ -148,7 +149,7 @@ public class StartupTrackerTests {
bundleStartTracker.handleEvent(new Event("org/osgi/service/blueprint/container/FAILURE", properties));
- assertTrue(this.eventAdmin.awaitPostingOfEvent(new Event("org/eclipse/virgo/kernel/START_FAILED", null), 10000));
+ assertTrue(this.eventAdmin.awaitPostingOfEvent(new Event("org/eclipse/virgo/kernel/START_FAILED", (Map<String, ?>)null), 10000));
waitForABit(500);
diff --git a/org.eclipse.virgo.kernel.deployer.dm/.classpath b/org.eclipse.virgo.kernel.deployer.dm/.classpath
index d8fead7f..2c2907d0 100644
--- a/org.eclipse.virgo.kernel.deployer.dm/.classpath
+++ b/org.eclipse.virgo.kernel.deployer.dm/.classpath
@@ -25,7 +25,7 @@
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework.osgi/org.springframework.osgi.core/1.2.1/org.springframework.osgi.core-1.2.1.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework.osgi/org.springframework.osgi.core/1.2.1/org.springframework.osgi.core-sources-1.2.1.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.RELEASE/org.springframework.beans-3.0.0.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.RELEASE/org.springframework.beans-sources-3.0.0.RELEASE.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework/org.springframework.context/3.0.0.RELEASE/org.springframework.context-3.0.0.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework/org.springframework.context/3.0.0.RELEASE/org.springframework.context-sources-3.0.0.RELEASE.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.6.1.R36x_v20100806/org.eclipse.osgi-3.6.1.R36x_v20100806.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.6.1.R36x_v20100806/org.eclipse.osgi-sources-3.6.1.R36x_v20100806.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.0.v20101022/org.eclipse.osgi-3.7.0.v20101022.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.0.v20101022/org.eclipse.osgi-sources-3.7.0.v20101022.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework/org.springframework.context.support/3.0.0.RELEASE/org.springframework.context.support-3.0.0.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework/org.springframework.context.support/3.0.0.RELEASE/org.springframework.context.support-sources-3.0.0.RELEASE.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework.osgi/org.springframework.osgi.extender/1.2.1/org.springframework.osgi.extender-1.2.1.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework.osgi/org.springframework.osgi.extender/1.2.1/org.springframework.osgi.extender-sources-1.2.1.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework.osgi/org.springframework.osgi.io/1.2.1/org.springframework.osgi.io-1.2.1.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework.osgi/org.springframework.osgi.io/1.2.1/org.springframework.osgi.io-sources-1.2.1.jar"/>
diff --git a/org.eclipse.virgo.kernel.deployer.test/.classpath b/org.eclipse.virgo.kernel.deployer.test/.classpath
index 1ad500e8..6b239c97 100644
--- a/org.eclipse.virgo.kernel.deployer.test/.classpath
+++ b/org.eclipse.virgo.kernel.deployer.test/.classpath
@@ -30,7 +30,7 @@
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework.osgi/org.springframework.osgi.core/1.2.1/org.springframework.osgi.core-1.2.1.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework.osgi/org.springframework.osgi.core/1.2.1/org.springframework.osgi.core-sources-1.2.1.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/2.2.0.D-20101108165433/org.eclipse.virgo.util.io-2.2.0.D-20101108165433.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/2.2.0.D-20101108165433/org.eclipse.virgo.util.io-sources-2.2.0.D-20101108165433.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.math/2.2.0.D-20101108165433/org.eclipse.virgo.util.math-2.2.0.D-20101108165433.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.math/2.2.0.D-20101108165433/org.eclipse.virgo.util.math-sources-2.2.0.D-20101108165433.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.6.1.R36x_v20100806/org.eclipse.osgi-3.6.1.R36x_v20100806.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.6.1.R36x_v20100806/org.eclipse.osgi-sources-3.6.1.R36x_v20100806.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.0.v20101022/org.eclipse.osgi-3.7.0.v20101022.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.0.v20101022/org.eclipse.osgi-sources-3.7.0.v20101022.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/javax.transaction/com.springsource.javax.transaction/1.1.0/com.springsource.javax.transaction-1.1.0.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.repository/org.eclipse.virgo.repository/2.2.0.D-20101108170959/org.eclipse.virgo.repository-2.2.0.D-20101108170959.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.repository/org.eclipse.virgo.repository/2.2.0.D-20101108170959/org.eclipse.virgo.repository-sources-2.2.0.D-20101108170959.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/2.2.0.D-20101108165433/org.eclipse.virgo.util.common-2.2.0.D-20101108165433.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/2.2.0.D-20101108165433/org.eclipse.virgo.util.common-sources-2.2.0.D-20101108165433.jar"/>
diff --git a/org.eclipse.virgo.kernel.deployer/.classpath b/org.eclipse.virgo.kernel.deployer/.classpath
index c8f1caed..2e09fdd9 100644
--- a/org.eclipse.virgo.kernel.deployer/.classpath
+++ b/org.eclipse.virgo.kernel.deployer/.classpath
@@ -30,7 +30,7 @@
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.math/2.2.0.D-20101108165433/org.eclipse.virgo.util.math-2.2.0.D-20101108165433.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.math/2.2.0.D-20101108165433/org.eclipse.virgo.util.math-sources-2.2.0.D-20101108165433.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/2.2.0.D-20101108165433/org.eclipse.virgo.util.osgi-2.2.0.D-20101108165433.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/2.2.0.D-20101108165433/org.eclipse.virgo.util.osgi-sources-2.2.0.D-20101108165433.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/2.2.0.D-20101108165433/org.eclipse.virgo.util.parser.manifest-2.2.0.D-20101108165433.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/2.2.0.D-20101108165433/org.eclipse.virgo.util.parser.manifest-sources-2.2.0.D-20101108165433.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.6.1.R36x_v20100806/org.eclipse.osgi-3.6.1.R36x_v20100806.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.6.1.R36x_v20100806/org.eclipse.osgi-sources-3.6.1.R36x_v20100806.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.0.v20101022/org.eclipse.osgi-3.7.0.v20101022.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.0.v20101022/org.eclipse.osgi-sources-3.7.0.v20101022.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.extensions.equinox/2.2.0.M01/org.eclipse.virgo.osgi.extensions.equinox-2.2.0.M01.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.extensions.equinox/2.2.0.M01/org.eclipse.virgo.osgi.extensions.equinox-sources-2.2.0.M01.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.RELEASE/org.springframework.beans-3.0.0.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.RELEASE/org.springframework.beans-sources-3.0.0.RELEASE.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework/org.springframework.core/3.0.0.RELEASE/org.springframework.core-3.0.0.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework/org.springframework.core/3.0.0.RELEASE/org.springframework.core-sources-3.0.0.RELEASE.jar"/>
diff --git a/org.eclipse.virgo.kernel.deployer/src/main/java/org/eclipse/virgo/kernel/deployer/core/internal/recovery/RecoveryAgent.java b/org.eclipse.virgo.kernel.deployer/src/main/java/org/eclipse/virgo/kernel/deployer/core/internal/recovery/RecoveryAgent.java
index 70710b70..ebc5c641 100644
--- a/org.eclipse.virgo.kernel.deployer/src/main/java/org/eclipse/virgo/kernel/deployer/core/internal/recovery/RecoveryAgent.java
+++ b/org.eclipse.virgo.kernel.deployer/src/main/java/org/eclipse/virgo/kernel/deployer/core/internal/recovery/RecoveryAgent.java
@@ -88,7 +88,7 @@ final class RecoveryAgent implements EventHandler {
private void recoveryComplete() {
this.recoveryState.clear();
- eventAdmin.postEvent(new Event(TOPIC_RECOVERY_COMPLETED, null));
+ eventAdmin.postEvent(new Event(TOPIC_RECOVERY_COMPLETED, (Map<String, ?>)null));
}
private boolean isRecoveryEnabled() {
diff --git a/org.eclipse.virgo.kernel.deployer/src/main/java/org/eclipse/virgo/kernel/install/artifact/ScopeServiceRepository.java b/org.eclipse.virgo.kernel.deployer/src/main/java/org/eclipse/virgo/kernel/install/artifact/ScopeServiceRepository.java
index d43b2f0d..870f678c 100644
--- a/org.eclipse.virgo.kernel.deployer/src/main/java/org/eclipse/virgo/kernel/install/artifact/ScopeServiceRepository.java
+++ b/org.eclipse.virgo.kernel.deployer/src/main/java/org/eclipse/virgo/kernel/install/artifact/ScopeServiceRepository.java
@@ -18,7 +18,7 @@ import org.osgi.framework.InvalidSyntaxException;
public interface ScopeServiceRepository {
- void recordService(String scopeName, String[] types, Dictionary<Object, Object> properties);
+ void recordService(String scopeName, String[] types, Dictionary<String, Object> properties);
boolean scopeHasMatchingService(String scopeName, String type, String filter) throws InvalidSyntaxException;
diff --git a/org.eclipse.virgo.kernel.deployer/src/main/java/org/eclipse/virgo/kernel/install/artifact/internal/DelegatingServiceRegistryBackedArtifactIdentityDeterminer.java b/org.eclipse.virgo.kernel.deployer/src/main/java/org/eclipse/virgo/kernel/install/artifact/internal/DelegatingServiceRegistryBackedArtifactIdentityDeterminer.java
index da77941e..4bf62f4b 100644
--- a/org.eclipse.virgo.kernel.deployer/src/main/java/org/eclipse/virgo/kernel/install/artifact/internal/DelegatingServiceRegistryBackedArtifactIdentityDeterminer.java
+++ b/org.eclipse.virgo.kernel.deployer/src/main/java/org/eclipse/virgo/kernel/install/artifact/internal/DelegatingServiceRegistryBackedArtifactIdentityDeterminer.java
@@ -31,13 +31,13 @@ import org.osgi.util.tracker.ServiceTracker;
*/
public class DelegatingServiceRegistryBackedArtifactIdentityDeterminer implements ArtifactIdentityDeterminer {
- private final ServiceTracker serviceTracker;
+ private final ServiceTracker<ArtifactIdentityDeterminer, ArtifactIdentityDeterminer> serviceTracker;
/**
* @param bundleContext
*/
public DelegatingServiceRegistryBackedArtifactIdentityDeterminer(BundleContext bundleContext) {
- this.serviceTracker = new ServiceTracker(bundleContext, ArtifactIdentityDeterminer.class.getName(), null);
+ this.serviceTracker = new ServiceTracker<ArtifactIdentityDeterminer, ArtifactIdentityDeterminer>(bundleContext, ArtifactIdentityDeterminer.class.getName(), null);
}
public void init() {
diff --git a/org.eclipse.virgo.kernel.deployer/src/main/java/org/eclipse/virgo/kernel/install/artifact/internal/SpringConfigServiceModelScanner.java b/org.eclipse.virgo.kernel.deployer/src/main/java/org/eclipse/virgo/kernel/install/artifact/internal/SpringConfigServiceModelScanner.java
index acd71afe..a2c68366 100644
--- a/org.eclipse.virgo.kernel.deployer/src/main/java/org/eclipse/virgo/kernel/install/artifact/internal/SpringConfigServiceModelScanner.java
+++ b/org.eclipse.virgo.kernel.deployer/src/main/java/org/eclipse/virgo/kernel/install/artifact/internal/SpringConfigServiceModelScanner.java
@@ -13,14 +13,20 @@ package org.eclipse.virgo.kernel.install.artifact.internal;
import java.io.IOException;
import java.io.InputStream;
+import java.util.Dictionary;
import java.util.HashSet;
-import java.util.Properties;
+import java.util.Hashtable;
import java.util.Set;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
+import org.eclipse.virgo.kernel.deployer.core.DeployerLogEvents;
+import org.eclipse.virgo.kernel.deployer.core.DeploymentException;
+import org.eclipse.virgo.kernel.deployer.core.FatalDeploymentException;
+import org.eclipse.virgo.kernel.install.artifact.ScopeServiceRepository;
+import org.eclipse.virgo.medic.eventlog.EventLogger;
import org.osgi.framework.Version;
import org.springframework.util.StringUtils;
import org.w3c.dom.Document;
@@ -30,13 +36,6 @@ import org.w3c.dom.NodeList;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
-
-import org.eclipse.virgo.kernel.deployer.core.DeployerLogEvents;
-import org.eclipse.virgo.kernel.deployer.core.DeploymentException;
-import org.eclipse.virgo.kernel.deployer.core.FatalDeploymentException;
-import org.eclipse.virgo.kernel.install.artifact.ScopeServiceRepository;
-import org.eclipse.virgo.medic.eventlog.EventLogger;
-
/**
* Utility class for parsing Spring config files and populating a {@link StandardScopeServiceRepository}.
*
@@ -103,7 +102,7 @@ final class SpringConfigServiceModelScanner {
private void parseServiceElement(Element elem) {
String[] types = extractInterfaces(elem);
- Properties properties = extractServiceProperties(elem);
+ Dictionary<String, Object> properties = extractServiceProperties(elem);
this.repository.recordService(this.scopeName, types, properties);
}
@@ -139,11 +138,11 @@ final class SpringConfigServiceModelScanner {
return exportedInterfaces.toArray(new String[exportedInterfaces.size()]);
}
- private Properties extractServiceProperties(Element elem) {
+ private Dictionary<String, Object> extractServiceProperties(Element elem) {
NodeList servicePropertiesElems = elem.getElementsByTagNameNS(SPRING_DM_NAMESPACE, ELEMENT_SERVICE_PROPERTIES);
- Properties p = null;
+ Dictionary<String, Object> p = null;
if (servicePropertiesElems.getLength() > 0) {
- p = new Properties();
+ p = new Hashtable<String, Object>();
Node item = servicePropertiesElems.item(0);
readServiceProperties((Element) item, p);
}
@@ -151,25 +150,25 @@ final class SpringConfigServiceModelScanner {
return p;
}
- private Properties addStandardServiceProperties(Element elem, Properties p) {
+ private Dictionary<String, Object> addStandardServiceProperties(Element elem, Dictionary<String, Object> p) {
// The only standard service property in the Spring DM reference manual is "bean name".
String beanName = StringUtils.trimWhitespace(elem.getAttribute(ATTRIBUTE_REF));
if (StringUtils.hasText(beanName)) {
if (p == null) {
- p = new Properties();
+ p = new Hashtable<String, Object>();
}
- p.setProperty(BEAN_NAME_PROPERTY, beanName);
+ p.put(BEAN_NAME_PROPERTY, beanName);
}
return p;
}
- private void readServiceProperties(Element servicePropertiesElement, Properties serviceProperties) {
+ private void readServiceProperties(Element servicePropertiesElement, Dictionary<String, Object> serviceProperties) {
NodeList childNodes = servicePropertiesElement.getChildNodes();
for (int y = 0; y < childNodes.getLength(); y++) {
Node child = childNodes.item(y);
if (isEntryElement(child)) {
Element entry = (Element) child;
- serviceProperties.setProperty(entry.getAttribute(ATTRIBUTE_KEY), entry.getAttribute(ATTRIBUTE_VALUE));
+ serviceProperties.put(entry.getAttribute(ATTRIBUTE_KEY), entry.getAttribute(ATTRIBUTE_VALUE));
}
}
}
diff --git a/org.eclipse.virgo.kernel.deployer/src/main/java/org/eclipse/virgo/kernel/install/artifact/internal/StandardScopeServiceRepository.java b/org.eclipse.virgo.kernel.deployer/src/main/java/org/eclipse/virgo/kernel/install/artifact/internal/StandardScopeServiceRepository.java
index b96c49b3..a0bdf9e1 100644
--- a/org.eclipse.virgo.kernel.deployer/src/main/java/org/eclipse/virgo/kernel/install/artifact/internal/StandardScopeServiceRepository.java
+++ b/org.eclipse.virgo.kernel.deployer/src/main/java/org/eclipse/virgo/kernel/install/artifact/internal/StandardScopeServiceRepository.java
@@ -57,7 +57,7 @@ final class StandardScopeServiceRepository implements ScopeServiceRepository {
/**
* {@inheritDoc}
*/
- public void recordService(String scopeName, String[] types, Dictionary<Object, Object> properties) {
+ public void recordService(String scopeName, String[] types, Dictionary<String, Object> properties) {
if (logger.isDebugEnabled()) {
logger.debug("Adding service to scope '{}' with service types '{}' and properties '{}'", new Object[] { scopeName,
StringUtils.arrayToCommaDelimitedString(types), dictionaryToCommaSeparatedString(properties) });
@@ -65,7 +65,7 @@ final class StandardScopeServiceRepository implements ScopeServiceRepository {
synchronized (this.monitor) {
if (properties == null) {
- properties = new Hashtable<Object, Object>();
+ properties = new Hashtable<String, Object>();
}
setStandardProperties(types, properties);
List<Service> servicesForScope = this.scopeServices.get(scopeName);
@@ -77,10 +77,10 @@ final class StandardScopeServiceRepository implements ScopeServiceRepository {
}
}
- private static String dictionaryToCommaSeparatedString(Dictionary<Object, Object> properties) {
+ private static String dictionaryToCommaSeparatedString(Dictionary<String, Object> properties) {
StringBuffer propsString = new StringBuffer();
if (properties != null) {
- Enumeration<Object> keys = properties.keys();
+ Enumeration<String> keys = properties.keys();
for (int i = 0; keys.hasMoreElements(); i++) {
if (i > 0) {
propsString.append(", ");
@@ -92,7 +92,7 @@ final class StandardScopeServiceRepository implements ScopeServiceRepository {
return propsString.toString();
}
- private void setStandardProperties(String[] types, Dictionary<Object, Object> properties) {
+ private void setStandardProperties(String[] types, Dictionary<String, Object> properties) {
if (properties.get(Constants.OBJECTCLASS) == null) {
properties.put(Constants.OBJECTCLASS, types);
}
@@ -143,9 +143,9 @@ final class StandardScopeServiceRepository implements ScopeServiceRepository {
private final Set<String> types;
- private final Dictionary<Object, Object> properties;
+ private final Dictionary<String, Object> properties;
- public Service(String[] types, Dictionary<Object, Object> properties) {
+ public Service(String[] types, Dictionary<String, Object> properties) {
this.types = Sets.asSet(types);
this.properties = properties;
}
diff --git a/org.eclipse.virgo.kernel.deployer/src/main/java/org/eclipse/virgo/kernel/module/internal/StandardModuleContextEventPublisher.java b/org.eclipse.virgo.kernel.deployer/src/main/java/org/eclipse/virgo/kernel/module/internal/StandardModuleContextEventPublisher.java
index 04c2e249..f8d3a26a 100644
--- a/org.eclipse.virgo.kernel.deployer/src/main/java/org/eclipse/virgo/kernel/module/internal/StandardModuleContextEventPublisher.java
+++ b/org.eclipse.virgo.kernel.deployer/src/main/java/org/eclipse/virgo/kernel/module/internal/StandardModuleContextEventPublisher.java
@@ -45,13 +45,14 @@ final class StandardModuleContextEventPublisher implements ModuleContextEventPub
private final BundleContext bundleContext;
+ @SuppressWarnings("unchecked")
StandardModuleContextEventPublisher(BundleContext bundleContext) {
synchronized (this.monitor) {
this.bundleContext = bundleContext;
try {
- ServiceReference[] allServiceReferences = bundleContext.getAllServiceReferences(ModuleContextEventListener.class.getName(), null);
+ ServiceReference<ModuleContextEventListener>[] allServiceReferences = (ServiceReference<ModuleContextEventListener>[]) bundleContext.getAllServiceReferences(ModuleContextEventListener.class.getName(), null);
if (allServiceReferences != null) {
- for (ServiceReference serviceReference : allServiceReferences) {
+ for (ServiceReference<ModuleContextEventListener> serviceReference : allServiceReferences) {
registerListener(serviceReference);
}
}
@@ -67,7 +68,7 @@ final class StandardModuleContextEventPublisher implements ModuleContextEventPub
*
* @param serviceReference the listener service
*/
- private void registerListener(ServiceReference serviceReference) {
+ private void registerListener(ServiceReference<ModuleContextEventListener> serviceReference) {
synchronized (this.monitor) {
this.listeners.add((ModuleContextEventListener)this.bundleContext.getService(serviceReference));
}
@@ -78,7 +79,7 @@ final class StandardModuleContextEventPublisher implements ModuleContextEventPub
*
* @param serviceReference the listener service
*/
- public void deregisterListener(ServiceReference serviceReference) {
+ public void deregisterListener(ServiceReference<ModuleContextEventListener> serviceReference) {
synchronized (this.monitor) {
this.listeners.remove((ModuleContextEventListener)this.bundleContext.getService(serviceReference));
this.bundleContext.ungetService(serviceReference);
@@ -108,14 +109,15 @@ final class StandardModuleContextEventPublisher implements ModuleContextEventPub
*/
private class ListenerListener implements ServiceListener {
+ @SuppressWarnings("unchecked")
public void serviceChanged(ServiceEvent event) {
synchronized (StandardModuleContextEventPublisher.this.monitor) {
switch (event.getType()) {
case ServiceEvent.REGISTERED:
- registerListener(event.getServiceReference());
+ registerListener((ServiceReference<ModuleContextEventListener>) event.getServiceReference());
break;
case ServiceEvent.UNREGISTERING:
- deregisterListener(event.getServiceReference());
+ deregisterListener((ServiceReference<ModuleContextEventListener>) event.getServiceReference());
break;
default:
break;
diff --git a/org.eclipse.virgo.kernel.deployer/src/test/java/org/eclipse/virgo/kernel/deployer/hot/HotDeployerTests.java b/org.eclipse.virgo.kernel.deployer/src/test/java/org/eclipse/virgo/kernel/deployer/hot/HotDeployerTests.java
index e637ef8f..c655585b 100644
--- a/org.eclipse.virgo.kernel.deployer/src/test/java/org/eclipse/virgo/kernel/deployer/hot/HotDeployerTests.java
+++ b/org.eclipse.virgo.kernel.deployer/src/test/java/org/eclipse/virgo/kernel/deployer/hot/HotDeployerTests.java
@@ -20,19 +20,18 @@ import static org.easymock.EasyMock.verify;
import static org.junit.Assert.assertTrue;
import java.net.URI;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.osgi.service.event.Event;
+import java.util.Map;
import org.eclipse.virgo.kernel.deployer.core.ApplicationDeployer;
+import org.eclipse.virgo.kernel.deployer.core.ApplicationDeployer.DeploymentOptions;
import org.eclipse.virgo.kernel.deployer.core.DeployerConfiguration;
import org.eclipse.virgo.kernel.deployer.core.DeploymentIdentity;
-import org.eclipse.virgo.kernel.deployer.core.ApplicationDeployer.DeploymentOptions;
-import org.eclipse.virgo.kernel.deployer.hot.HotDeployer;
import org.eclipse.virgo.medic.test.eventlog.MockEventLogger;
import org.eclipse.virgo.util.io.PathReference;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.osgi.service.event.Event;
/**
*/
@@ -85,7 +84,7 @@ public class HotDeployerTests {
replay(deployerConfiguration);
HotDeployer deployer = new HotDeployer(deployerConfiguration, this.deployer, new MockEventLogger());
- deployer.handleEvent(new Event("org/eclipse/virgo/kernel/deployer/recovery/COMPLETED", null));
+ deployer.handleEvent(new Event("org/eclipse/virgo/kernel/deployer/recovery/COMPLETED", (Map<String, ?>)null));
try {
// Deployer.start() is asynchronous: sleep long
diff --git a/org.eclipse.virgo.kernel.deployer/src/test/java/org/eclipse/virgo/kernel/deployer/management/RecoveryMonitorTests.java b/org.eclipse.virgo.kernel.deployer/src/test/java/org/eclipse/virgo/kernel/deployer/management/RecoveryMonitorTests.java
index b5e6a33e..9ed9f347 100644
--- a/org.eclipse.virgo.kernel.deployer/src/test/java/org/eclipse/virgo/kernel/deployer/management/RecoveryMonitorTests.java
+++ b/org.eclipse.virgo.kernel.deployer/src/test/java/org/eclipse/virgo/kernel/deployer/management/RecoveryMonitorTests.java
@@ -16,6 +16,7 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import java.lang.management.ManagementFactory;
+import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;
import javax.management.MBeanServer;
@@ -23,7 +24,6 @@ import javax.management.Notification;
import javax.management.NotificationListener;
import javax.management.ObjectName;
-import org.eclipse.virgo.kernel.deployer.management.StandardRecoveryMonitor;
import org.junit.Before;
import org.junit.Test;
import org.osgi.service.event.Event;
@@ -58,7 +58,7 @@ public class RecoveryMonitorTests {
}
}, null, null);
- mbean.handleEvent(new Event("org/eclipse/virgo/kernel/deployer/recovery/COMPLETED", null));
+ mbean.handleEvent(new Event("org/eclipse/virgo/kernel/deployer/recovery/COMPLETED", (Map<String, ?>)null));
assertTrue(queryRecoveryComplete());
assertEquals(1, counter.get());
}
diff --git a/org.eclipse.virgo.kernel.deployer/src/test/java/org/eclipse/virgo/kernel/install/artifact/internal/ScopeServiceRepositoryTests.java b/org.eclipse.virgo.kernel.deployer/src/test/java/org/eclipse/virgo/kernel/install/artifact/internal/ScopeServiceRepositoryTests.java
index b10f5e2b..8a82280a 100644
--- a/org.eclipse.virgo.kernel.deployer/src/test/java/org/eclipse/virgo/kernel/install/artifact/internal/ScopeServiceRepositoryTests.java
+++ b/org.eclipse.virgo.kernel.deployer/src/test/java/org/eclipse/virgo/kernel/install/artifact/internal/ScopeServiceRepositoryTests.java
@@ -15,10 +15,10 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import java.io.Serializable;
-import java.util.Properties;
+import java.util.Dictionary;
+import java.util.Hashtable;
import org.eclipse.virgo.kernel.install.artifact.ScopeServiceRepository;
-import org.eclipse.virgo.kernel.install.artifact.internal.StandardScopeServiceRepository;
import org.junit.Test;
@@ -39,8 +39,8 @@ public class ScopeServiceRepositoryTests {
@Test
public void testServiceWithSingleTypeFiltered() throws Exception {
ScopeServiceRepository repository = new StandardScopeServiceRepository();
- Properties p = new Properties();
- p.setProperty("foo", "bar");
+ Dictionary<String, Object> p = new Hashtable<String, Object>();
+ p.put("foo", "bar");
repository.recordService(TEST_SCOPE, new String[]{String.class.getName()}, p);
assertTrue(repository.scopeHasMatchingService(TEST_SCOPE, String.class.getName(), "(foo=bar)"));
assertFalse(repository.scopeHasMatchingService(TEST_SCOPE, Integer.class.getName(), "(foo=bar)"));
@@ -58,8 +58,8 @@ public class ScopeServiceRepositoryTests {
@Test
public void testServiceWithMultiTypeFilter() throws Exception {
ScopeServiceRepository repository = new StandardScopeServiceRepository();
- Properties p = new Properties();
- p.setProperty("foo", "bar");
+ Dictionary<String, Object> p = new Hashtable<String, Object>();
+ p.put("foo", "bar");
repository.recordService(TEST_SCOPE, new String[]{String.class.getName(), Serializable.class.getName()}, p);
assertTrue(repository.scopeHasMatchingService(TEST_SCOPE, String.class.getName(), "(foo=bar)"));
assertTrue(repository.scopeHasMatchingService(TEST_SCOPE, Serializable.class.getName(), "(foo=bar)"));
diff --git a/org.eclipse.virgo.kernel.deployer/src/test/java/org/eclipse/virgo/kernel/install/pipeline/stage/transform/TransformationStageTests.java b/org.eclipse.virgo.kernel.deployer/src/test/java/org/eclipse/virgo/kernel/install/pipeline/stage/transform/TransformationStageTests.java
index 1168287c..467ac260 100644
--- a/org.eclipse.virgo.kernel.deployer/src/test/java/org/eclipse/virgo/kernel/install/pipeline/stage/transform/TransformationStageTests.java
+++ b/org.eclipse.virgo.kernel.deployer/src/test/java/org/eclipse/virgo/kernel/install/pipeline/stage/transform/TransformationStageTests.java
@@ -84,8 +84,8 @@ public class TransformationStageTests {
this.transformationStage.process(this.installTree, this.installEnvironment);
- ServiceRegistration registration1 = this.bundleContext.registerService(Transformer.class.getName(), this.transformer1, null);
- ServiceRegistration registration2= this.bundleContext.registerService(Transformer.class.getName(), this.transformer2, null);
+ ServiceRegistration<Transformer> registration1 = this.bundleContext.registerService(Transformer.class, this.transformer1, null);
+ ServiceRegistration<Transformer> registration2= this.bundleContext.registerService(Transformer.class, this.transformer2, null);
this.transformationStage.process(this.installTree, this.installEnvironment);
diff --git a/org.eclipse.virgo.kernel.dmfragment/.classpath b/org.eclipse.virgo.kernel.dmfragment/.classpath
index 028d7ed6..d79b6acd 100644
--- a/org.eclipse.virgo.kernel.dmfragment/.classpath
+++ b/org.eclipse.virgo.kernel.dmfragment/.classpath
@@ -28,7 +28,7 @@
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework.osgi/org.springframework.osgi.core/1.2.1/org.springframework.osgi.core-1.2.1.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework.osgi/org.springframework.osgi.core/1.2.1/org.springframework.osgi.core-sources-1.2.1.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework.osgi/org.springframework.osgi.extender/1.2.1/org.springframework.osgi.extender-1.2.1.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework.osgi/org.springframework.osgi.extender/1.2.1/org.springframework.osgi.extender-sources-1.2.1.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework.osgi/org.springframework.osgi.io/1.2.1/org.springframework.osgi.io-1.2.1.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework.osgi/org.springframework.osgi.io/1.2.1/org.springframework.osgi.io-sources-1.2.1.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.6.1.R36x_v20100806/org.eclipse.osgi-3.6.1.R36x_v20100806.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.osgi/org.eclipse.osgi/3.7.0.v20101022/org.eclipse.osgi-3.7.0.v20101022.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/2.2.0.D-20101108170256/org.eclipse.virgo.medic-2.2.0.D-20101108170256.jar">
<attributes>
diff --git a/org.eclipse.virgo.kernel.kerneldmfragment/.classpath b/org.eclipse.virgo.kernel.kerneldmfragment/.classpath
index 6785cdf2..56522584 100644
--- a/org.eclipse.virgo.kernel.kerneldmfragment/.classpath
+++ b/org.eclipse.virgo.kernel.kerneldmfragment/.classpath
@@ -28,7 +28,7 @@
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework.osgi/org.springframework.osgi.core/1.2.1/org.springframework.osgi.core-1.2.1.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework.osgi/org.springframework.osgi.core/1.2.1/org.springframework.osgi.core-sources-1.2.1.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework.osgi/org.springframework.osgi.extender/1.2.1/org.springframework.osgi.extender-1.2.1.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework.osgi/org.springframework.osgi.extender/1.2.1/org.springframework.osgi.extender-sources-1.2.1.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework.osgi/org.springframework.osgi.io/1.2.1/org.springframework.osgi.io-1.2.1.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework.osgi/org.springframework.osgi.io/1.2.1/org.springframework.osgi.io-sources-1.2.1.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.6.1.R36x_v20100806/org.eclipse.osgi-3.6.1.R36x_v20100806.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.osgi/org.eclipse.osgi/3.7.0.v20101022/org.eclipse.osgi-3.7.0.v20101022.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/2.2.0.D-20101108170256/org.eclipse.virgo.medic-2.2.0.D-20101108170256.jar">
<attributes>
<attribute name="org.eclipse.ajdt.aspectpath" value="org.eclipse.ajdt.aspectpath"/>
diff --git a/org.eclipse.virgo.kernel.model/.classpath b/org.eclipse.virgo.kernel.model/.classpath
index 12dd6bc5..526a37bc 100644
--- a/org.eclipse.virgo.kernel.model/.classpath
+++ b/org.eclipse.virgo.kernel.model/.classpath
@@ -30,7 +30,7 @@
<attribute name="org.eclipse.ajdt.aspectpath" value="org.eclipse.ajdt.aspectpath"/>
</attributes>
</classpathentry>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.6.1.R36x_v20100806/org.eclipse.osgi-3.6.1.R36x_v20100806.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.6.1.R36x_v20100806/org.eclipse.osgi-sources-3.6.1.R36x_v20100806.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.0.v20101022/org.eclipse.osgi-3.7.0.v20101022.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.0.v20101022/org.eclipse.osgi-sources-3.7.0.v20101022.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.teststubs/org.eclipse.virgo.teststubs.osgi/2.2.0.M01/org.eclipse.virgo.teststubs.osgi-2.2.0.M01.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.teststubs/org.eclipse.virgo.teststubs.osgi/2.2.0.M01/org.eclipse.virgo.teststubs.osgi-sources-2.2.0.M01.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.apache.felix/org.apache.felix.configadmin/1.2.4/org.apache.felix.configadmin-1.2.4.jar" sourcepath="/KERNEL_IVY_CACHE/org.apache.felix/org.apache.felix.configadmin/1.2.4/org.apache.felix.configadmin-sources-1.2.4.jar"/>
diff --git a/org.eclipse.virgo.kernel.osgi/.classpath b/org.eclipse.virgo.kernel.osgi/.classpath
index 28223ecf..349f22a0 100644
--- a/org.eclipse.virgo.kernel.osgi/.classpath
+++ b/org.eclipse.virgo.kernel.osgi/.classpath
@@ -23,7 +23,7 @@
<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/2.2.0.D-20101108170256/org.eclipse.virgo.medic-2.2.0.D-20101108170256.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.6.1.R36x_v20100806/org.eclipse.osgi-3.6.1.R36x_v20100806.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.6.1.R36x_v20100806/org.eclipse.osgi-sources-3.6.1.R36x_v20100806.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.0.v20101022/org.eclipse.osgi-3.7.0.v20101022.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.0.v20101022/org.eclipse.osgi-sources-3.7.0.v20101022.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.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.6.RELEASE/com.springsource.org.aspectj.runtime-1.6.6.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.aspectj/com.springsource.org.aspectj.runtime/1.6.6.RELEASE/com.springsource.org.aspectj.runtime-1.6.6.RELEASE.jar"/>
@@ -43,7 +43,7 @@
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.RELEASE/org.springframework.beans-3.0.0.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.RELEASE/org.springframework.beans-sources-3.0.0.RELEASE.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.kernel.artifact"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.launcher/2.2.0.M01/org.eclipse.virgo.osgi.launcher-2.2.0.M01.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.launcher/2.2.0.M01/org.eclipse.virgo.osgi.launcher-sources-2.2.0.M01.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.apache.felix/org.apache.felix.eventadmin/1.0.0/org.apache.felix.eventadmin-1.0.0.jar" sourcepath="/KERNEL_IVY_CACHE/org.apache.felix/org.apache.felix.eventadmin/1.0.0/org.apache.felix.eventadmin-sources-1.0.0.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.apache.felix/org.apache.felix.configadmin/1.2.4/org.apache.felix.configadmin-1.2.4.jar" sourcepath="/KERNEL_IVY_CACHE/org.apache.felix/org.apache.felix.configadmin/1.2.4/org.apache.felix.configadmin-sources-1.2.4.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.apache.felix/org.apache.felix.eventadmin/1.0.0/org.apache.felix.eventadmin-1.0.0.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi.services/3.3.0.v20101018/org.eclipse.osgi.services-sources-3.3.0.v20101018.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi.services/3.3.0.v20101018/org.eclipse.osgi.services-3.3.0.v20101018.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi.services/3.3.0.v20101018/org.eclipse.osgi.services-sources-3.3.0.v20101018.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/org.eclipse.virgo.kernel.osgi/src/main/java/org/eclipse/virgo/kernel/osgi/framework/OsgiFrameworkUtils.java b/org.eclipse.virgo.kernel.osgi/src/main/java/org/eclipse/virgo/kernel/osgi/framework/OsgiFrameworkUtils.java
index c8e3a76a..97d60673 100644
--- a/org.eclipse.virgo.kernel.osgi/src/main/java/org/eclipse/virgo/kernel/osgi/framework/OsgiFrameworkUtils.java
+++ b/org.eclipse.virgo.kernel.osgi/src/main/java/org/eclipse/virgo/kernel/osgi/framework/OsgiFrameworkUtils.java
@@ -84,7 +84,7 @@ public final class OsgiFrameworkUtils {
@SuppressWarnings("unchecked")
public static <T> OsgiServiceHolder<T> getService(BundleContext bundleContext, Class<T> clazz) {
- final ServiceReference reference = bundleContext.getServiceReference(clazz.getName());
+ final ServiceReference<T> reference = (ServiceReference<T>) bundleContext.getServiceReference(clazz.getName());
if (reference != null) {
final T service = (T) bundleContext.getService(reference);
return new StandardOsgiServiceHolder<T>(service, reference);
@@ -111,9 +111,9 @@ public final class OsgiFrameworkUtils {
public static <T> List<OsgiServiceHolder<T>> getServices(BundleContext bundleContext, Class<T> serviceType) {
List<OsgiServiceHolder<T>> serviceHolders = new ArrayList<OsgiServiceHolder<T>>();
try {
- ServiceReference[] serviceReferences = bundleContext.getServiceReferences(serviceType.getName(), null);
+ ServiceReference<T>[] serviceReferences = (ServiceReference<T>[]) bundleContext.getServiceReferences(serviceType.getName(), null);
if (serviceReferences != null) {
- for (ServiceReference serviceReference : serviceReferences) {
+ for (ServiceReference<T> serviceReference : serviceReferences) {
T service = (T) bundleContext.getService(serviceReference);
if (service != null) {
serviceHolders.add(new StandardOsgiServiceHolder<T>(service, serviceReference));
@@ -132,9 +132,9 @@ public final class OsgiFrameworkUtils {
private final T service;
- private final ServiceReference serviceReference;
+ private final ServiceReference<T> serviceReference;
- private StandardOsgiServiceHolder(T service, ServiceReference serviceReference) {
+ private StandardOsgiServiceHolder(T service, ServiceReference<T> serviceReference) {
this.service = service;
this.serviceReference = serviceReference;
}
@@ -149,7 +149,7 @@ public final class OsgiFrameworkUtils {
/**
* {@inheritDoc}
*/
- public ServiceReference getServiceReference() {
+ public ServiceReference<T> getServiceReference() {
return this.serviceReference;
}
diff --git a/org.eclipse.virgo.kernel.osgi/src/main/java/org/eclipse/virgo/kernel/osgi/framework/OsgiServiceHolder.java b/org.eclipse.virgo.kernel.osgi/src/main/java/org/eclipse/virgo/kernel/osgi/framework/OsgiServiceHolder.java
index 7c7d8c27..690dd295 100644
--- a/org.eclipse.virgo.kernel.osgi/src/main/java/org/eclipse/virgo/kernel/osgi/framework/OsgiServiceHolder.java
+++ b/org.eclipse.virgo.kernel.osgi/src/main/java/org/eclipse/virgo/kernel/osgi/framework/OsgiServiceHolder.java
@@ -30,5 +30,5 @@ public interface OsgiServiceHolder<T> extends Comparable<OsgiServiceHolder<?>> {
T getService();
- ServiceReference getServiceReference();
+ ServiceReference<T> getServiceReference();
}
diff --git a/org.eclipse.virgo.kernel.osgi/src/main/java/org/eclipse/virgo/kernel/osgi/region/PackageImportWildcardExpander.java b/org.eclipse.virgo.kernel.osgi/src/main/java/org/eclipse/virgo/kernel/osgi/region/PackageImportWildcardExpander.java
index 1467b3fd..0b1e4086 100644
--- a/org.eclipse.virgo.kernel.osgi/src/main/java/org/eclipse/virgo/kernel/osgi/region/PackageImportWildcardExpander.java
+++ b/org.eclipse.virgo.kernel.osgi/src/main/java/org/eclipse/virgo/kernel/osgi/region/PackageImportWildcardExpander.java
@@ -48,8 +48,8 @@ final class PackageImportWildcardExpander {
private static final String wildcard = "*";
static String expandPackageImportsWildcards(String userRegionImportsProperty, BundleContext bundleContext) {
- ServiceReference eventLoggerServiceReference = bundleContext.getServiceReference(EventLogger.class.getName());
- EventLogger eventLogger = (EventLogger) bundleContext.getService(eventLoggerServiceReference);
+ ServiceReference<EventLogger> eventLoggerServiceReference = bundleContext.getServiceReference(EventLogger.class);
+ EventLogger eventLogger = bundleContext.getService(eventLoggerServiceReference);
String[] exportedPackageNames = getExportedPackageNames(bundleContext);
@@ -69,8 +69,8 @@ final class PackageImportWildcardExpander {
}
private static ExportedPackage[] getExportedPackages(BundleContext bundleContext) {
- ServiceReference paServiceReference = bundleContext.getServiceReference(PackageAdmin.class.getName());
- PackageAdmin pa = (PackageAdmin) bundleContext.getService(paServiceReference);
+ ServiceReference<PackageAdmin> paServiceReference = bundleContext.getServiceReference(PackageAdmin.class);
+ PackageAdmin pa = bundleContext.getService(paServiceReference);
ExportedPackage[] exportedPackages = pa.getExportedPackages((Bundle) null);
Assert.notNull(exportedPackages, "Expected at least one exported package");
diff --git a/org.eclipse.virgo.kernel.osgi/src/main/java/org/eclipse/virgo/kernel/osgi/region/RegionManager.java b/org.eclipse.virgo.kernel.osgi/src/main/java/org/eclipse/virgo/kernel/osgi/region/RegionManager.java
index 0b760ef4..8ebef526 100644
--- a/org.eclipse.virgo.kernel.osgi/src/main/java/org/eclipse/virgo/kernel/osgi/region/RegionManager.java
+++ b/org.eclipse.virgo.kernel.osgi/src/main/java/org/eclipse/virgo/kernel/osgi/region/RegionManager.java
@@ -17,9 +17,9 @@ import java.util.ArrayList;
import java.util.Dictionary;
import java.util.Enumeration;
import java.util.HashMap;
+import java.util.Hashtable;
import java.util.List;
import java.util.Map;
-import java.util.Properties;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
@@ -72,7 +72,7 @@ final class RegionManager {
private static final String EVENT_REGION_STARTING = "org/eclipse/virgo/kernel/region/STARTING";
- private static final Object EVENT_PROPERTY_REGION_BUNDLECONTEXT = "region.bundleContext";
+ private static final String EVENT_PROPERTY_REGION_BUNDLECONTEXT = "region.bundleContext";
private final ServiceRegistrationTracker tracker = new ServiceRegistrationTracker();
@@ -84,7 +84,7 @@ final class RegionManager {
private final EventAdmin eventAdmin;
- private final ServiceFactory eventLoggerServiceFactory;
+ private final ServiceFactory<EventLogger> eventLoggerServiceFactory;
private volatile Framework childFramework;
@@ -101,7 +101,7 @@ final class RegionManager {
private String regionInheritedProperties;
public RegionManager(BundleContext bundleContext, CompositeBundleFactory compositeBundleFactory, EventAdmin eventAdmin,
- ServiceFactory eventLoggerServiceFactory, ConfigurationAdmin configAdmin, EventLogger eventLogger, Shutdown shutdown) {
+ ServiceFactory<EventLogger> eventLoggerServiceFactory, ConfigurationAdmin configAdmin, EventLogger eventLogger, Shutdown shutdown) {
this.bundleContext = bundleContext;
this.compositeBundleFactory = compositeBundleFactory;
this.eventAdmin = eventAdmin;
@@ -149,7 +149,7 @@ final class RegionManager {
SurrogateBundle surrogateBundle = compositeBundle.getSurrogateBundle();
BundleContext surrogateBundleContext = surrogateBundle.getBundleContext();
- Properties properties = new Properties();
+ Map<String, Object> properties = new HashMap<String, Object>();
properties.put(EVENT_PROPERTY_REGION_BUNDLECONTEXT, surrogateBundleContext);
this.eventAdmin.sendEvent(new Event(EVENT_REGION_STARTING, properties));
@@ -171,7 +171,7 @@ final class RegionManager {
* @param surrogateBundleContext
*/
private void publishUserRegionsBundleContext(BundleContext surrogateBundleContext) {
- Properties properties = new Properties();
+ Dictionary<String, String> properties = new Hashtable<String, String>();
properties.put("org.eclipse.virgo.kernel.regionContext", "true");
this.bundleContext.registerService(BundleContext.class.getName(), surrogateBundleContext, properties);
}
@@ -332,8 +332,8 @@ final class RegionManager {
}
private void registerRegionService(Region region) {
- Properties props = new Properties();
- props.setProperty("org.eclipse.virgo.kernel.region.name", region.getName());
+ Dictionary<String, String> props = new Hashtable<String, String>();
+ props.put("org.eclipse.virgo.kernel.region.name", region.getName());
this.tracker.track(this.bundleContext.registerService(Region.class.getName(), region, props));
}
diff --git a/org.eclipse.virgo.kernel.osgi/src/main/java/org/eclipse/virgo/kernel/osgi/region/eventlog/RegionAwareEventLoggerServiceFactory.java b/org.eclipse.virgo.kernel.osgi/src/main/java/org/eclipse/virgo/kernel/osgi/region/eventlog/RegionAwareEventLoggerServiceFactory.java
index e2d291d5..6ba08745 100644
--- a/org.eclipse.virgo.kernel.osgi/src/main/java/org/eclipse/virgo/kernel/osgi/region/eventlog/RegionAwareEventLoggerServiceFactory.java
+++ b/org.eclipse.virgo.kernel.osgi/src/main/java/org/eclipse/virgo/kernel/osgi/region/eventlog/RegionAwareEventLoggerServiceFactory.java
@@ -15,6 +15,7 @@ import org.osgi.framework.Bundle;
import org.osgi.framework.ServiceFactory;
import org.osgi.framework.ServiceRegistration;
+import org.eclipse.virgo.medic.eventlog.EventLogger;
import org.eclipse.virgo.medic.eventlog.EventLoggerFactory;
/**
@@ -29,7 +30,7 @@ import org.eclipse.virgo.medic.eventlog.EventLoggerFactory;
* Thread-safe.
*
*/
-final class RegionAwareEventLoggerServiceFactory implements ServiceFactory {
+final class RegionAwareEventLoggerServiceFactory implements ServiceFactory<EventLogger> {
private final EventLoggerFactory eventLoggerFactory;
@@ -43,13 +44,13 @@ final class RegionAwareEventLoggerServiceFactory implements ServiceFactory {
/**
* {@inheritDoc}
*/
- public Object getService(Bundle bundle, ServiceRegistration registration) {
+ public EventLogger getService(Bundle bundle, ServiceRegistration<EventLogger> registration) {
return this.eventLoggerFactory.createEventLogger(bundle);
}
/**
* {@inheritDoc}
*/
- public void ungetService(Bundle bundle, ServiceRegistration registration, Object service) {
+ public void ungetService(Bundle bundle, ServiceRegistration<EventLogger> registration, EventLogger service) {
}
}
diff --git a/org.eclipse.virgo.kernel.osgicommand/.classpath b/org.eclipse.virgo.kernel.osgicommand/.classpath
index 7b801b9c..90f1caac 100644
--- a/org.eclipse.virgo.kernel.osgicommand/.classpath
+++ b/org.eclipse.virgo.kernel.osgicommand/.classpath
@@ -9,7 +9,7 @@
<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.shell"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.6.1.R36x_v20100806/org.eclipse.osgi-3.6.1.R36x_v20100806.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.6.1.R36x_v20100806/org.eclipse.osgi-sources-3.6.1.R36x_v20100806.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.0.v20101022/org.eclipse.osgi-3.7.0.v20101022.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.0.v20101022/org.eclipse.osgi-sources-3.7.0.v20101022.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/2.2.0.D-20101108165433/org.eclipse.virgo.util.osgi-2.2.0.D-20101108165433.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/2.2.0.D-20101108165433/org.eclipse.virgo.util.osgi-sources-2.2.0.D-20101108165433.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="output" path="target/classes"/>
diff --git a/org.eclipse.virgo.kernel.services/.classpath b/org.eclipse.virgo.kernel.services/.classpath
index 5b6ccabb..8526b59e 100644
--- a/org.eclipse.virgo.kernel.services/.classpath
+++ b/org.eclipse.virgo.kernel.services/.classpath
@@ -26,7 +26,7 @@
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.aspectj/com.springsource.org.aspectj.runtime/1.6.6.RELEASE/com.springsource.org.aspectj.runtime-1.6.6.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.aspectj/com.springsource.org.aspectj.runtime/1.6.6.RELEASE/com.springsource.org.aspectj.runtime-1.6.6.RELEASE.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/2.2.0.D-20101108165433/org.eclipse.virgo.util.common-2.2.0.D-20101108165433.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/2.2.0.D-20101108165433/org.eclipse.virgo.util.common-sources-2.2.0.D-20101108165433.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/2.2.0.D-20101108165433/org.eclipse.virgo.util.io-2.2.0.D-20101108165433.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/2.2.0.D-20101108165433/org.eclipse.virgo.util.io-sources-2.2.0.D-20101108165433.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.6.1.R36x_v20100806/org.eclipse.osgi-3.6.1.R36x_v20100806.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.6.1.R36x_v20100806/org.eclipse.osgi-sources-3.6.1.R36x_v20100806.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.0.v20101022/org.eclipse.osgi-3.7.0.v20101022.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.0.v20101022/org.eclipse.osgi-sources-3.7.0.v20101022.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.RELEASE/org.springframework.beans-3.0.0.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.RELEASE/org.springframework.beans-sources-3.0.0.RELEASE.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework/org.springframework.core/3.0.0.RELEASE/org.springframework.core-3.0.0.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework/org.springframework.core/3.0.0.RELEASE/org.springframework.core-sources-3.0.0.RELEASE.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework/org.springframework.context/3.0.0.RELEASE/org.springframework.context-3.0.0.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework/org.springframework.context/3.0.0.RELEASE/org.springframework.context-sources-3.0.0.RELEASE.jar"/>
diff --git a/org.eclipse.virgo.kernel.shell/.classpath b/org.eclipse.virgo.kernel.shell/.classpath
index 30dd9124..9112127f 100644
--- a/org.eclipse.virgo.kernel.shell/.classpath
+++ b/org.eclipse.virgo.kernel.shell/.classpath
@@ -25,7 +25,7 @@
<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.6.RELEASE/com.springsource.org.aspectj.runtime-1.6.6.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.aspectj/com.springsource.org.aspectj.runtime/1.6.6.RELEASE/com.springsource.org.aspectj.runtime-1.6.6.RELEASE.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/2.2.0.D-20101108165433/org.eclipse.virgo.util.common-2.2.0.D-20101108165433.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/2.2.0.D-20101108165433/org.eclipse.virgo.util.common-sources-2.2.0.D-20101108165433.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.6.1.R36x_v20100806/org.eclipse.osgi-3.6.1.R36x_v20100806.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.6.1.R36x_v20100806/org.eclipse.osgi-sources-3.6.1.R36x_v20100806.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.0.v20101022/org.eclipse.osgi-3.7.0.v20101022.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.0.v20101022/org.eclipse.osgi-sources-3.7.0.v20101022.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/2.2.0.D-20101108170256/org.eclipse.virgo.medic-2.2.0.D-20101108170256.jar">
<attributes>
diff --git a/org.eclipse.virgo.kernel.shell/src/main/java/org/eclipse/virgo/kernel/shell/internal/CommandRegistry.java b/org.eclipse.virgo.kernel.shell/src/main/java/org/eclipse/virgo/kernel/shell/internal/CommandRegistry.java
index 532f3179..0890a573 100644
--- a/org.eclipse.virgo.kernel.shell/src/main/java/org/eclipse/virgo/kernel/shell/internal/CommandRegistry.java
+++ b/org.eclipse.virgo.kernel.shell/src/main/java/org/eclipse/virgo/kernel/shell/internal/CommandRegistry.java
@@ -40,7 +40,7 @@ public final class CommandRegistry {
private final List<CommandDescriptor> commandDescriptors = new ArrayList<CommandDescriptor>();
- private final Map<ServiceReference, List<CommandDescriptor>> commandDescriptorsByService = new HashMap<ServiceReference, List<CommandDescriptor>>();
+ private final Map<ServiceReference<?>, List<CommandDescriptor>> commandDescriptorsByService = new HashMap<ServiceReference<?>, List<CommandDescriptor>>();
private final Object monitor = new Object();
@@ -60,9 +60,9 @@ public final class CommandRegistry {
this.bundleContext.addServiceListener(this.commandRegistryServiceListener);
try {
// TODO Limit with a filter
- ServiceReference[] serviceReferences = this.bundleContext.getServiceReferences(null, null);
+ ServiceReference<?>[] serviceReferences = this.bundleContext.getServiceReferences((String)null, null);
if (serviceReferences != null) {
- for (ServiceReference serviceReference : serviceReferences) {
+ for (ServiceReference<?> serviceReference : serviceReferences) {
serviceRegistered(serviceReference);
}
}
@@ -78,7 +78,7 @@ public final class CommandRegistry {
}
- private void serviceRegistered(ServiceReference serviceReference) {
+ private void serviceRegistered(ServiceReference<?> serviceReference) {
Object service = bundleContext.getService(serviceReference);
if (service != null) {
List<CommandDescriptor> commands = commandResolver.resolveCommands(serviceReference, service);
@@ -91,7 +91,7 @@ public final class CommandRegistry {
}
}
- private void serviceUnregistering(ServiceReference serviceReference) {
+ private void serviceUnregistering(ServiceReference<?> serviceReference) {
synchronized (this.monitor) {
List<CommandDescriptor> commandDescriptorsForService = this.commandDescriptorsByService.remove(serviceReference);
this.commandDescriptors.removeAll(commandDescriptorsForService);
diff --git a/org.eclipse.virgo.kernel.shell/src/main/java/org/eclipse/virgo/kernel/shell/internal/ServiceUtils.java b/org.eclipse.virgo.kernel.shell/src/main/java/org/eclipse/virgo/kernel/shell/internal/ServiceUtils.java
index 10894843..23d63a54 100644
--- a/org.eclipse.virgo.kernel.shell/src/main/java/org/eclipse/virgo/kernel/shell/internal/ServiceUtils.java
+++ b/org.eclipse.virgo.kernel.shell/src/main/java/org/eclipse/virgo/kernel/shell/internal/ServiceUtils.java
@@ -34,9 +34,9 @@ public final class ServiceUtils {
public static <T> T getService(BundleContext bundleContext, Class<T> clazz, String requiredProperty, String requiredPropertyValue) {
T result = null;
try {
- ServiceReference[] serviceReferences = bundleContext.getServiceReferences(null, String.format("(%s=*)", requiredProperty));
+ ServiceReference<?>[] serviceReferences = bundleContext.getServiceReferences((String)null, String.format("(%s=*)", requiredProperty));
if (serviceReferences != null) {
- for (ServiceReference serviceReference : serviceReferences) {
+ for (ServiceReference<?> serviceReference : serviceReferences) {
Object offeredPropertyValue = serviceReference.getProperty(requiredProperty);
if (offeredPropertyValue instanceof String) { // String value
String offeredProperty = (String) offeredPropertyValue;
diff --git a/org.eclipse.virgo.kernel.stubs/.classpath b/org.eclipse.virgo.kernel.stubs/.classpath
index bb4ee443..9c2b061d 100644
--- a/org.eclipse.virgo.kernel.stubs/.classpath
+++ b/org.eclipse.virgo.kernel.stubs/.classpath
@@ -22,7 +22,7 @@
</classpathentry>
<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.6.1.R36x_v20100806/org.eclipse.osgi-3.6.1.R36x_v20100806.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.6.1.R36x_v20100806/org.eclipse.osgi-sources-3.6.1.R36x_v20100806.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.0.v20101022/org.eclipse.osgi-3.7.0.v20101022.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.0.v20101022/org.eclipse.osgi-sources-3.7.0.v20101022.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.kernel.core"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/2.2.0.D-20101108165433/org.eclipse.virgo.util.osgi-2.2.0.D-20101108165433.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/2.2.0.D-20101108165433/org.eclipse.virgo.util.osgi-sources-2.2.0.D-20101108165433.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/2.2.0.D-20101108165433/org.eclipse.virgo.util.common-2.2.0.D-20101108165433.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/2.2.0.D-20101108165433/org.eclipse.virgo.util.common-sources-2.2.0.D-20101108165433.jar"/>
diff --git a/org.eclipse.virgo.kernel.test/.classpath b/org.eclipse.virgo.kernel.test/.classpath
index f2f32dfa..4ae2abf8 100644
--- a/org.eclipse.virgo.kernel.test/.classpath
+++ b/org.eclipse.virgo.kernel.test/.classpath
@@ -4,7 +4,7 @@
<classpathentry kind="src" path="src/main/resources"/>
<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
<classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.6.1.R36x_v20100806/org.eclipse.osgi-3.6.1.R36x_v20100806.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.6.1.R36x_v20100806/org.eclipse.osgi-sources-3.6.1.R36x_v20100806.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.0.v20101022/org.eclipse.osgi-3.7.0.v20101022.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.0.v20101022/org.eclipse.osgi-sources-3.7.0.v20101022.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="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.kernel.deployer"/>
diff --git a/org.eclipse.virgo.kernel.test/src/test/resources/META-INF/MANIFEST.MF b/org.eclipse.virgo.kernel.test/src/test/resources/META-INF/MANIFEST.MF
index a1bd2e8a..d5fe266a 100644
--- a/org.eclipse.virgo.kernel.test/src/test/resources/META-INF/MANIFEST.MF
+++ b/org.eclipse.virgo.kernel.test/src/test/resources/META-INF/MANIFEST.MF
@@ -9,26 +9,20 @@ Export-Package: org.eclipse.virgo.kernel.concurrent.test;version="2.2.
elper.test;version="2.2.0";uses:="org.eclipse.virgo.kernel.test,org.j
unit,org.junit.runner",org.eclipse.virgo.kernel.test;version="2.2.0";
uses:="org.eclipse.virgo.kernel.core,org.junit,org.junit.runner"
-Bundle-ClassPath: .,quasi/simpleexporter.jar,quasi/simpleimporter.jar,
- QuickConsumer.jar,SlowService.jar,quasi/simpleexporter.jar,quasi/simp
- leimporter.jar,QuickConsumer.jar,SlowService.jar
Bundle-Version: 2.2.0
Tool: Bundlor 1.0.0.RELEASE
Bundle-Name: Virgo Kernel Test
Bundle-ManifestVersion: 2
+Import-Package: org.eclipse.virgo.kernel.core;version="[2.2.0,3)",org.
+ eclipse.virgo.kernel.deployer.core;version="[2.2.0,3)",org.eclipse.vi
+ rgo.kernel.osgi.framework;version="[2.2.0,3)",org.eclipse.virgo.kerne
+ l.osgi.quasi;version="[2.2.0,3)",org.eclipse.virgo.kernel.osgi.region
+ ;version="[2.2.0,3)",org.eclipse.virgo.util.io;version="[2.2.0,3)",or
+ g.eclipse.virgo.util.osgi.manifest;version="[2.2.0,3)",org.junit;vers
+ ion="[4.7.0,5)",org.junit.runner;version="[4.7.0,5)",org.osgi.framewo
+ rk;version="0",org.springframework.context;version="[2.5.6,3.1)",org.
+ springframework.jmx.export;version="[2.5.6,3.1)",org.springframework.
+ osgi.context.support;version="[1.2.1,2)",org.springframework.osgi.ser
+ vice.importer.support;version="[1.2.1,2)"
Bundle-SymbolicName: org.eclipse.virgo.kernel.test
-Import-Package: javax.management;version="0",org.eclipse.virgo.kernel.
- core;version="[2.2.0,3)",org.eclipse.virgo.kernel.deployer.core;versi
- on="[2.2.0,3)",org.eclipse.virgo.kernel.osgi.framework;version="[2.2.
- 0,3)",org.eclipse.virgo.kernel.osgi.quasi;version="[2.2.0,3)",org.ecl
- ipse.virgo.kernel.osgi.region;version="[2.2.0,3)",org.eclipse.virgo.k
- ernel.osgicommand.helper;version="[2.2.0,3)",org.eclipse.virgo.util.i
- o;version="[2.2.0,3)",org.eclipse.virgo.util.osgi.manifest;version="[
- 2.2.0,3)",org.junit;version="[4.7.0,5)",org.junit.runner;version="[4.
- 7.0,5)",org.osgi.framework;version="0",org.osgi.service.framework;ver
- sion="0",org.osgi.service.packageadmin;version="0",org.springframewor
- k.context;version="[2.5.6,3.1)",org.springframework.jmx.export;versio
- n="[2.5.6,3.1)",org.springframework.osgi.context.support;version="[1.
- 2.1,2)",org.springframework.osgi.service.importer.support;version="[1
- .2.1,2)"
diff --git a/org.eclipse.virgo.kernel.userregion/.classpath b/org.eclipse.virgo.kernel.userregion/.classpath
index f50a6f3c..a3218d20 100644
--- a/org.eclipse.virgo.kernel.userregion/.classpath
+++ b/org.eclipse.virgo.kernel.userregion/.classpath
@@ -23,7 +23,7 @@
<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/2.2.0.D-20101108170256/org.eclipse.virgo.medic-2.2.0.D-20101108170256.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.6.1.R36x_v20100806/org.eclipse.osgi-3.6.1.R36x_v20100806.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.6.1.R36x_v20100806/org.eclipse.osgi-sources-3.6.1.R36x_v20100806.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.0.v20101022/org.eclipse.osgi-3.7.0.v20101022.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.0.v20101022/org.eclipse.osgi-sources-3.7.0.v20101022.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.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.6.RELEASE/com.springsource.org.aspectj.runtime-1.6.6.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.aspectj/com.springsource.org.aspectj.runtime/1.6.6.RELEASE/com.springsource.org.aspectj.runtime-1.6.6.RELEASE.jar"/>
@@ -43,6 +43,6 @@
<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.apache.felix/org.apache.felix.eventadmin/1.0.0/org.apache.felix.eventadmin-1.0.0.jar" sourcepath="/KERNEL_IVY_CACHE/org.apache.felix/org.apache.felix.eventadmin/1.0.0/org.apache.felix.eventadmin-sources-1.0.0.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.apache.felix/org.apache.felix.configadmin/1.2.4/org.apache.felix.configadmin-1.2.4.jar" sourcepath="/KERNEL_IVY_CACHE/org.apache.felix/org.apache.felix.configadmin/1.2.4/org.apache.felix.configadmin-sources-1.2.4.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi.services/3.3.0.v20101018/org.eclipse.osgi.services-3.3.0.v20101018.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi.services/3.3.0.v20101018/org.eclipse.osgi.services-sources-3.3.0.v20101018.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 17f2f8c5..e7a44ddc 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
@@ -14,6 +14,7 @@ package org.eclipse.virgo.kernel.userregion.internal;
import java.io.IOException;
import java.util.Dictionary;
import java.util.HashSet;
+import java.util.Hashtable;
import java.util.Properties;
import java.util.Set;
import java.util.concurrent.TimeUnit;
@@ -116,7 +117,7 @@ public class Activator implements BundleActivator {
scheduleRegistrationOfServiceScopingRegistryHooks(context, eventLogger);
- Properties properties = new Properties();
+ Dictionary<String, Object> properties = new Hashtable<String, Object>();
properties.put(Constants.SERVICE_RANKING, Integer.MIN_VALUE);
this.registrationTracker.track(context.registerService(ModuleContextAccessor.class.getName(), new EmptyModuleContextAccessor(), properties));
@@ -179,7 +180,7 @@ public class Activator implements BundleActivator {
private void scheduleInitialArtifactDeployerCreation(BundleContext context, EventLogger eventLogger) {
KernelStartedAwaiter startedAwaiter = new KernelStartedAwaiter();
- Properties properties = new Properties();
+ Dictionary<String, String> properties = new Hashtable<String, String>();
properties.put(EventConstants.EVENT_TOPIC, "org/eclipse/virgo/kernel/*");
this.registrationTracker.track(context.registerService(EventHandler.class.getName(), startedAwaiter, properties));
@@ -275,7 +276,7 @@ public class Activator implements BundleActivator {
InitialArtifactDeployer initialArtifactDeployer = new InitialArtifactDeployer(this.startAwaiter, deployer,
artifactConfiguration.get(PROPERTY_USER_REGION_ARTIFACTS), artifactConfiguration.get(PROPERTY_USER_REGION_COMMANDLINE_ARTIFACTS),
uriNormaliser, eventAdmin, eventLogger, shutdown);
- Properties properties = new Properties();
+ Dictionary<String, String> properties = new Hashtable<String, String>();
properties.put(EventConstants.EVENT_TOPIC, "org/eclipse/virgo/kernel/*");
this.registrationTracker.track(context.registerService(EventHandler.class.getName(), initialArtifactDeployer, properties));
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 0d088da3..7dda4a26 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
@@ -14,6 +14,7 @@ package org.eclipse.virgo.kernel.userregion.internal;
import java.net.URI;
import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
import org.osgi.service.event.Event;
import org.osgi.service.event.EventAdmin;
@@ -143,7 +144,7 @@ final class InitialArtifactDeployer implements EventHandler {
try {
validateArtifacts();
deployArtifacts();
- eventAdmin.postEvent(new Event(this.completionEventTopic, null));
+ eventAdmin.postEvent(new Event(this.completionEventTopic, (Map<String, ?>)null));
} catch (DeploymentException de) {
eventLogger.log(UserRegionLogEvents.INITIAL_ARTIFACT_DEPLOYMENT_FAILED);
shutdown.shutdown();
diff --git a/org.eclipse.virgo.kernel.userregion/src/main/java/org/eclipse/virgo/kernel/userregion/internal/ServiceScopingStrategy.java b/org.eclipse.virgo.kernel.userregion/src/main/java/org/eclipse/virgo/kernel/userregion/internal/ServiceScopingStrategy.java
index a456d077..295cba14 100644
--- a/org.eclipse.virgo.kernel.userregion/src/main/java/org/eclipse/virgo/kernel/userregion/internal/ServiceScopingStrategy.java
+++ b/org.eclipse.virgo.kernel.userregion/src/main/java/org/eclipse/virgo/kernel/userregion/internal/ServiceScopingStrategy.java
@@ -58,7 +58,7 @@ final class ServiceScopingStrategy {
* reference is in the global scope, the given bundle context is scoped, and there is another service in the scope
* which shadows the given service reference.
*/
- boolean isPotentiallyVisible(ServiceReference serviceReference, BundleContext consumingBundleContext) {
+ boolean isPotentiallyVisible(ServiceReference<?> serviceReference, BundleContext consumingBundleContext) {
boolean matchesScope = true;
Scope serviceScope = getServiceScope(serviceReference);
if (serviceScope != null && !serviceScope.isGlobal()) {
@@ -82,8 +82,7 @@ final class ServiceScopingStrategy {
* Spring DM supports a manifest header which specifies the directory containing application context files. Again
* this is not currently taken into account when the repository is built.
*/
- @SuppressWarnings("unchecked")
- void scopeReferences(Collection references, BundleContext consumingBundleContext, String className, String filter) {
+ void scopeReferences(Collection<ServiceReference<?>> references, BundleContext consumingBundleContext, String className, String filter) {
Bundle consumingBundle = consumingBundleContext.getBundle();
Scope lookupScope = getLookupScope(consumingBundle, className, filter);
Scope consumerScope = getBundleScope(consumingBundle);
@@ -94,7 +93,7 @@ final class ServiceScopingStrategy {
* If some of the service references are in the consumer's scope, restrict the set to just those.
*/
if (lookupScope.isGlobal() && !consumerScope.isGlobal()) {
- Collection scopedReferences = getScopedReferences(references, consumerScope);
+ Collection<ServiceReference<?>> scopedReferences = getScopedReferences(references, consumerScope);
if (!scopedReferences.isEmpty()) {
removeAllExcept(references, scopedReferences);
return;
@@ -103,29 +102,27 @@ final class ServiceScopingStrategy {
restrictServicesToScope(references, lookupScope);
}
- @SuppressWarnings("unchecked")
- private void removeAllExcept(Collection references, Collection scopedReferences) {
+ private void removeAllExcept(Collection<ServiceReference<?>> references, Collection<ServiceReference<?>> scopedReferences) {
/*
* The simple implementation of clearing references and then using addAll to add
* in scopedReferences is no good as the find hook is passed a shrinkable collection
* that does not support add or addAll.
*/
- Iterator iterator = references.iterator();
+ Iterator<ServiceReference<?>> iterator = references.iterator();
while (iterator.hasNext()) {
- ServiceReference ref = (ServiceReference) iterator.next();
+ ServiceReference<?> ref = iterator.next();
if (!scopedReferences.contains(ref)) {
iterator.remove();
}
}
}
- @SuppressWarnings("unchecked")
- private Collection getScopedReferences(Collection references, Scope scope) {
- Collection scopedReferences = new HashSet<ServiceReference>();
+ private Collection<ServiceReference<?>> getScopedReferences(Collection<ServiceReference<?>> references, Scope scope) {
+ Collection<ServiceReference<?>> scopedReferences = new HashSet<ServiceReference<?>>();
logger.debug("References input to getScopedReferences: {}", references.size());
- Iterator iterator = references.iterator();
+ Iterator<ServiceReference<?>> iterator = references.iterator();
while (iterator.hasNext()) {
- ServiceReference ref = (ServiceReference) iterator.next();
+ ServiceReference<?> ref = iterator.next();
Scope serviceScope = getServiceScope(ref);
if (scope.equals(serviceScope)) {
logger.debug("Adding {} ", ref);
@@ -136,12 +133,11 @@ final class ServiceScopingStrategy {
return scopedReferences;
}
- @SuppressWarnings("unchecked")
- private void restrictServicesToScope(Collection references, Scope scope) {
+ private void restrictServicesToScope(Collection<ServiceReference<?>> references, Scope scope) {
logger.debug("Before filtering: {}", references.size());
- Iterator iterator = references.iterator();
+ Iterator<ServiceReference<?>> iterator = references.iterator();
while (iterator.hasNext()) {
- ServiceReference ref = (ServiceReference) iterator.next();
+ ServiceReference<?> ref = (ServiceReference<?>) iterator.next();
Scope serviceScope = getServiceScope(ref);
if (!scope.equals(serviceScope)) {
logger.debug("Removing {} ", ref);
@@ -179,7 +175,7 @@ final class ServiceScopingStrategy {
}
}
- private Scope getServiceScope(ServiceReference ref) {
+ private Scope getServiceScope(ServiceReference<?> ref) {
try {
return this.scopeFactory.getServiceScope(ref);
} catch (IllegalStateException ise) {
diff --git a/org.eclipse.virgo.kernel.userregion/src/main/java/org/eclipse/virgo/kernel/userregion/internal/equinox/EquinoxOsgiFramework.java b/org.eclipse.virgo.kernel.userregion/src/main/java/org/eclipse/virgo/kernel/userregion/internal/equinox/EquinoxOsgiFramework.java
index f295d648..f1625702 100644
--- a/org.eclipse.virgo.kernel.userregion/src/main/java/org/eclipse/virgo/kernel/userregion/internal/equinox/EquinoxOsgiFramework.java
+++ b/org.eclipse.virgo.kernel.userregion/src/main/java/org/eclipse/virgo/kernel/userregion/internal/equinox/EquinoxOsgiFramework.java
@@ -108,7 +108,7 @@ public class EquinoxOsgiFramework extends AbstractOsgiFramework {
*/
public Bundle[] getDirectDependencies(Bundle bundle, boolean includeFragments) {
BundleContext bundleContext = getBundleContext();
- ServiceReference serviceRef = bundleContext.getServiceReference(PlatformAdmin.class.getName());
+ ServiceReference<PlatformAdmin> serviceRef = bundleContext.getServiceReference(PlatformAdmin.class);
try {
PlatformAdmin serverAdmin = (PlatformAdmin) bundleContext.getService(serviceRef);
return EquinoxUtils.getDirectDependencies(bundle, bundleContext, serverAdmin, includeFragments);
diff --git a/org.eclipse.virgo.kernel.userregion/src/main/java/org/eclipse/virgo/kernel/userregion/internal/equinox/StandardPackageAdminUtil.java b/org.eclipse.virgo.kernel.userregion/src/main/java/org/eclipse/virgo/kernel/userregion/internal/equinox/StandardPackageAdminUtil.java
index 217ceb60..0a22db89 100644
--- a/org.eclipse.virgo.kernel.userregion/src/main/java/org/eclipse/virgo/kernel/userregion/internal/equinox/StandardPackageAdminUtil.java
+++ b/org.eclipse.virgo.kernel.userregion/src/main/java/org/eclipse/virgo/kernel/userregion/internal/equinox/StandardPackageAdminUtil.java
@@ -40,6 +40,6 @@ public final class StandardPackageAdminUtil implements PackageAdminUtil {
* {@inheritDoc}
*/
public void synchronouslyRefreshPackages(Bundle[] bundles) {
- ((PackageAdminImpl)this.packageAdmin).refreshPackages(bundles, true);
+ ((PackageAdminImpl)this.packageAdmin).refreshPackages(bundles, true, null);
}
}
diff --git a/org.eclipse.virgo.kernel.userregion/src/main/java/org/eclipse/virgo/kernel/userregion/internal/quasi/DependencyCalculator.java b/org.eclipse.virgo.kernel.userregion/src/main/java/org/eclipse/virgo/kernel/userregion/internal/quasi/DependencyCalculator.java
index 58882ad0..6bd9bc90 100644
--- a/org.eclipse.virgo.kernel.userregion/src/main/java/org/eclipse/virgo/kernel/userregion/internal/quasi/DependencyCalculator.java
+++ b/org.eclipse.virgo.kernel.userregion/src/main/java/org/eclipse/virgo/kernel/userregion/internal/quasi/DependencyCalculator.java
@@ -344,7 +344,7 @@ public final class DependencyCalculator {
}
private BundleDescription createBundleDescription(ArtifactDescriptor artifact, State state) throws BundleException {
- Dictionary<?, ?> manifest = BundleBridge.convertToDictionary(artifact);
+ Dictionary<String, String> manifest = BundleBridge.convertToDictionary(artifact);
try {
URI uri = artifact.getUri();
if ("file".equals(uri.getScheme())) {
diff --git a/org.eclipse.virgo.kernel.userregion/src/main/java/org/eclipse/virgo/kernel/userregion/internal/quasi/StandardQuasiFrameworkFactory.java b/org.eclipse.virgo.kernel.userregion/src/main/java/org/eclipse/virgo/kernel/userregion/internal/quasi/StandardQuasiFrameworkFactory.java
index 634d9ad2..ec910884 100644
--- a/org.eclipse.virgo.kernel.userregion/src/main/java/org/eclipse/virgo/kernel/userregion/internal/quasi/StandardQuasiFrameworkFactory.java
+++ b/org.eclipse.virgo.kernel.userregion/src/main/java/org/eclipse/virgo/kernel/userregion/internal/quasi/StandardQuasiFrameworkFactory.java
@@ -63,7 +63,7 @@ public final class StandardQuasiFrameworkFactory implements QuasiFrameworkFactor
this.platformAdmin = getPlatformAdminService(bundleContext);
this.detective = detective;
this.repository = repository;
- ServiceReference platformAdminServiceReference = bundleContext.getServiceReference(PlatformAdmin.class.getName());
+ ServiceReference<PlatformAdmin> platformAdminServiceReference = bundleContext.getServiceReference(PlatformAdmin.class);
this.stateManager = (StateManager) bundleContext.getService(platformAdminServiceReference);
this.bundleTransformationHandler = bundleTransformationHandler;
}
diff --git a/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/InitialArtifactDeployerTests.java b/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/InitialArtifactDeployerTests.java
index ab9e6854..c4ea92bc 100644
--- a/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/InitialArtifactDeployerTests.java
+++ b/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/InitialArtifactDeployerTests.java
@@ -20,6 +20,7 @@ import static org.easymock.EasyMock.verify;
import java.net.URI;
import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
import org.junit.Test;
import org.osgi.service.event.Event;
@@ -37,7 +38,9 @@ import org.eclipse.virgo.medic.test.eventlog.MockEventLogger;
public class InitialArtifactDeployerTests {
- private ApplicationDeployer deployer = createMock(ApplicationDeployer.class);
+ private static final Map<String, ?> NULL_PROPERTIES = (Map<String, ?>)null;
+
+ private ApplicationDeployer deployer = createMock(ApplicationDeployer.class);
private KernelStartedAwaiter startedAwaiter = new KernelStartedAwaiter();
@@ -52,15 +55,15 @@ public class InitialArtifactDeployerTests {
replay(this.deployer);
InitialArtifactDeployer initialArtifactDeployer = new InitialArtifactDeployer(this.startedAwaiter, this.deployer, "", "", new StubDeployUriNormaliser(), this.eventAdmin, this.eventLogger, this.shutdown);
- this.startedAwaiter.handleEvent(new Event("org/eclipse/virgo/kernel/STARTED", null));
+ this.startedAwaiter.handleEvent(new Event("org/eclipse/virgo/kernel/STARTED", NULL_PROPERTIES));
initialArtifactDeployer.deployArtifacts();
- Event eventSystemArtifactsDeployed = new Event("org/eclipse/virgo/kernel/userregion/systemartifacts/DEPLOYED", null);
+ Event eventSystemArtifactsDeployed = new Event("org/eclipse/virgo/kernel/userregion/systemartifacts/DEPLOYED", NULL_PROPERTIES);
this.eventAdmin.awaitPostingOfEvent(eventSystemArtifactsDeployed);
initialArtifactDeployer.handleEvent(eventSystemArtifactsDeployed);
- this.eventAdmin.awaitPostingOfEvent(new Event("org/eclipse/virgo/kernel/userregion/userartifacts/DEPLOYED", null));
+ this.eventAdmin.awaitPostingOfEvent(new Event("org/eclipse/virgo/kernel/userregion/userartifacts/DEPLOYED", NULL_PROPERTIES));
verify(this.deployer);
}
@@ -74,10 +77,10 @@ public class InitialArtifactDeployerTests {
expect(this.deployer.deploy(URI.create("repository:alpha/bravo/2"), new DeploymentOptions(false, false, true))).andReturn(null);
replay(this.deployer);
- this.startedAwaiter.handleEvent(new Event("org/eclipse/virgo/kernel/STARTED", null));
+ this.startedAwaiter.handleEvent(new Event("org/eclipse/virgo/kernel/STARTED", NULL_PROPERTIES));
initialArtifactDeployer.deployArtifacts();
- Event eventSystemArtifactsDeployed = new Event("org/eclipse/virgo/kernel/userregion/systemartifacts/DEPLOYED", null);
+ Event eventSystemArtifactsDeployed = new Event("org/eclipse/virgo/kernel/userregion/systemartifacts/DEPLOYED", NULL_PROPERTIES);
this.eventAdmin.awaitPostingOfEvent(eventSystemArtifactsDeployed);
verify(this.deployer);
@@ -90,7 +93,7 @@ public class InitialArtifactDeployerTests {
replay(this.deployer);
initialArtifactDeployer.handleEvent(eventSystemArtifactsDeployed);
- this.eventAdmin.awaitPostingOfEvent(new Event("org/eclipse/virgo/kernel/userregion/userartifacts/DEPLOYED", null));
+ this.eventAdmin.awaitPostingOfEvent(new Event("org/eclipse/virgo/kernel/userregion/userartifacts/DEPLOYED", NULL_PROPERTIES));
verify(this.deployer);
}
@@ -105,7 +108,7 @@ public class InitialArtifactDeployerTests {
this.shutdown.shutdown();
replay(this.shutdown);
- this.startedAwaiter.handleEvent(new Event("org/eclipse/virgo/kernel/STARTED", null));
+ this.startedAwaiter.handleEvent(new Event("org/eclipse/virgo/kernel/STARTED", NULL_PROPERTIES));
initialArtifactDeployer.deployArtifacts();
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 ea5f1da6..a562d8c2 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
@@ -15,6 +15,9 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
+import java.util.List;
+import java.util.Map;
+
import org.eclipse.osgi.service.resolver.BundleDescription;
import org.eclipse.osgi.service.resolver.BundleSpecification;
import org.eclipse.osgi.service.resolver.ExportPackageDescription;
@@ -26,7 +29,11 @@ import org.eclipse.osgi.service.resolver.NativeCodeSpecification;
import org.eclipse.osgi.service.resolver.State;
import org.eclipse.virgo.kernel.userregion.internal.quasi.BundleDescriptionComparator;
import org.junit.Test;
+import org.osgi.framework.Bundle;
import org.osgi.framework.Version;
+import org.osgi.framework.wiring.BundleWiring;
+import org.osgi.framework.wiring.Capability;
+import org.osgi.framework.wiring.WiredCapability;
public class BundleDescriptionComparatorTests {
@@ -85,124 +92,204 @@ public class BundleDescriptionComparatorTests {
this.version = version;
}
+ @Override
public boolean attachFragments() {
throw new UnsupportedOperationException();
}
+ @Override
public boolean dynamicFragments() {
throw new UnsupportedOperationException();
}
+ @Override
public long getBundleId() {
throw new UnsupportedOperationException();
}
+ @Override
public State getContainingState() {
throw new UnsupportedOperationException();
}
+ @Override
public BundleDescription[] getDependents() {
throw new UnsupportedOperationException();
}
+ @Override
public String[] getExecutionEnvironments() {
throw new UnsupportedOperationException();
}
+ @Override
public ExportPackageDescription[] getExportPackages() {
throw new UnsupportedOperationException();
}
+ @Override
public BundleDescription[] getFragments() {
throw new UnsupportedOperationException();
}
+ @Override
public GenericDescription[] getGenericCapabilities() {
throw new UnsupportedOperationException();
}
+ @Override
public GenericSpecification[] getGenericRequires() {
throw new UnsupportedOperationException();
}
+ @Override
public HostSpecification getHost() {
throw new UnsupportedOperationException();
}
+ @Override
public ImportPackageSpecification[] getImportPackages() {
throw new UnsupportedOperationException();
}
+ @Override
public String getLocation() {
throw new UnsupportedOperationException();
}
+ @Override
public NativeCodeSpecification getNativeCodeSpecification() {
throw new UnsupportedOperationException();
}
+ @Override
public String getPlatformFilter() {
throw new UnsupportedOperationException();
}
+ @Override
public BundleSpecification[] getRequiredBundles() {
throw new UnsupportedOperationException();
}
+ @Override
public ExportPackageDescription[] getResolvedImports() {
throw new UnsupportedOperationException();
}
+ @Override
public BundleDescription[] getResolvedRequires() {
throw new UnsupportedOperationException();
}
+ @Override
public ExportPackageDescription[] getSelectedExports() {
throw new UnsupportedOperationException();
}
+ @Override
public ExportPackageDescription[] getSubstitutedExports() {
throw new UnsupportedOperationException();
}
+ @Override
public String getSymbolicName() {
return this.symbolicName;
}
+ @Override
public Object getUserObject() {
throw new UnsupportedOperationException();
}
+ @Override
public boolean hasDynamicImports() {
throw new UnsupportedOperationException();
}
+ @Override
public boolean isRemovalPending() {
throw new UnsupportedOperationException();
}
+ @Override
public boolean isResolved() {
throw new UnsupportedOperationException();
}
+ @Override
public boolean isSingleton() {
throw new UnsupportedOperationException();
}
+ @Override
public void setUserObject(Object userObject) {
throw new UnsupportedOperationException();
}
+ @Override
public String getName() {
throw new UnsupportedOperationException();
}
+ @Override
public BundleDescription getSupplier() {
throw new UnsupportedOperationException();
}
+ @Override
public Version getVersion() {
return this.version;
}
+
+ @Override
+ public Map<String, String> getDeclaredDirectives() {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public Map<String, Object> getDeclaredAttributes() {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public WiredCapability getWiredCapability() {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public List<Capability> getDeclaredCapabilities(String namespace) {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public int getTypes() {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public Bundle getBundle() {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public ImportPackageSpecification[] getAddedDynamicImportPackages() {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public GenericDescription[] getSelectedGenericCapabilities() {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public GenericDescription[] getResolvedGenericRequires() {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public BundleWiring getBundleWiring() {
+ throw new UnsupportedOperationException();
+ }
}
}
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 e7a6479b..3a59f2d9 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
@@ -11,9 +11,12 @@
package org.eclipse.virgo.kernel.userregion.internal.quasi;
+import java.util.Map;
+
import org.eclipse.osgi.service.resolver.BaseDescription;
import org.eclipse.osgi.service.resolver.BundleDescription;
import org.osgi.framework.Version;
+import org.osgi.framework.wiring.WiredCapability;
/**
@@ -32,6 +35,7 @@ public class StubBaseDescription implements BaseDescription {
/**
* {@inheritDoc}
*/
+ @Override
public String getName() {
throw new UnsupportedOperationException();
}
@@ -39,6 +43,7 @@ public class StubBaseDescription implements BaseDescription {
/**
* {@inheritDoc}
*/
+ @Override
public BundleDescription getSupplier() {
return this.supplier;
}
@@ -46,6 +51,7 @@ public class StubBaseDescription implements BaseDescription {
/**
* {@inheritDoc}
*/
+ @Override
public Version getVersion() {
throw new UnsupportedOperationException();
}
@@ -54,4 +60,28 @@ public class StubBaseDescription implements BaseDescription {
this.supplier = supplier;
}
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public Map<String, String> getDeclaredDirectives() {
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public Map<String, Object> getDeclaredAttributes() {
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public WiredCapability getWiredCapability() {
+ throw new UnsupportedOperationException();
+ }
+
}
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 a5834a95..a8e69198 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
@@ -13,6 +13,7 @@ package org.eclipse.virgo.kernel.userregion.internal.quasi;
import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
import org.eclipse.osgi.service.resolver.BaseDescription;
import org.eclipse.osgi.service.resolver.BundleDescription;
@@ -25,7 +26,11 @@ import org.eclipse.osgi.service.resolver.ImportPackageSpecification;
import org.eclipse.osgi.service.resolver.NativeCodeSpecification;
import org.eclipse.osgi.service.resolver.State;
import org.eclipse.osgi.service.resolver.VersionRange;
+import org.osgi.framework.Bundle;
import org.osgi.framework.Version;
+import org.osgi.framework.wiring.BundleWiring;
+import org.osgi.framework.wiring.Capability;
+import org.osgi.framework.wiring.WiredCapability;
/**
*/
@@ -61,6 +66,7 @@ public class StubBundleDescription implements BundleDescription {
/**
* {@inheritDoc}
*/
+ @Override
public boolean attachFragments() {
throw new UnsupportedOperationException();
}
@@ -68,6 +74,7 @@ public class StubBundleDescription implements BundleDescription {
/**
* {@inheritDoc}
*/
+ @Override
public boolean dynamicFragments() {
throw new UnsupportedOperationException();
}
@@ -75,6 +82,7 @@ public class StubBundleDescription implements BundleDescription {
/**
* {@inheritDoc}
*/
+ @Override
public long getBundleId() {
return this.bid;
}
@@ -82,6 +90,7 @@ public class StubBundleDescription implements BundleDescription {
/**
* {@inheritDoc}
*/
+ @Override
public State getContainingState() {
throw new UnsupportedOperationException();
}
@@ -89,6 +98,7 @@ public class StubBundleDescription implements BundleDescription {
/**
* {@inheritDoc}
*/
+ @Override
public BundleDescription[] getDependents() {
return this.dependents.toArray(new BundleDescription[this.dependents.size()]);
}
@@ -96,6 +106,7 @@ public class StubBundleDescription implements BundleDescription {
/**
* {@inheritDoc}
*/
+ @Override
public String[] getExecutionEnvironments() {
throw new UnsupportedOperationException();
}
@@ -103,6 +114,7 @@ public class StubBundleDescription implements BundleDescription {
/**
* {@inheritDoc}
*/
+ @Override
public ExportPackageDescription[] getExportPackages() {
return this.epds.toArray(new ExportPackageDescription[this.epds.size()]);
}
@@ -110,6 +122,7 @@ public class StubBundleDescription implements BundleDescription {
/**
* {@inheritDoc}
*/
+ @Override
public BundleDescription[] getFragments() {
return this.fragments.toArray(new BundleDescription[this.fragments.size()]);
}
@@ -117,6 +130,7 @@ public class StubBundleDescription implements BundleDescription {
/**
* {@inheritDoc}
*/
+ @Override
public GenericDescription[] getGenericCapabilities() {
throw new UnsupportedOperationException();
}
@@ -124,6 +138,7 @@ public class StubBundleDescription implements BundleDescription {
/**
* {@inheritDoc}
*/
+ @Override
public GenericSpecification[] getGenericRequires() {
throw new UnsupportedOperationException();
}
@@ -131,6 +146,7 @@ public class StubBundleDescription implements BundleDescription {
/**
* {@inheritDoc}
*/
+ @Override
public HostSpecification getHost() {
return StubBundleDescription.this.hosts == null ? null : new HostSpecification() {
@@ -172,6 +188,7 @@ public class StubBundleDescription implements BundleDescription {
/**
* {@inheritDoc}
*/
+ @Override
public ImportPackageSpecification[] getImportPackages() {
return this.ipss.toArray(new ImportPackageSpecification[this.ipss.size()]);
}
@@ -179,6 +196,7 @@ public class StubBundleDescription implements BundleDescription {
/**
* {@inheritDoc}
*/
+ @Override
public String getLocation() {
throw new UnsupportedOperationException();
}
@@ -186,6 +204,7 @@ public class StubBundleDescription implements BundleDescription {
/**
* {@inheritDoc}
*/
+ @Override
public NativeCodeSpecification getNativeCodeSpecification() {
throw new UnsupportedOperationException();
}
@@ -193,6 +212,7 @@ public class StubBundleDescription implements BundleDescription {
/**
* {@inheritDoc}
*/
+ @Override
public String getPlatformFilter() {
throw new UnsupportedOperationException();
}
@@ -200,6 +220,7 @@ public class StubBundleDescription implements BundleDescription {
/**
* {@inheritDoc}
*/
+ @Override
public BundleSpecification[] getRequiredBundles() {
return this.rbs.toArray(new BundleSpecification[this.rbs.size()]);
}
@@ -207,6 +228,7 @@ public class StubBundleDescription implements BundleDescription {
/**
* {@inheritDoc}
*/
+ @Override
public ExportPackageDescription[] getResolvedImports() {
throw new UnsupportedOperationException();
}
@@ -214,6 +236,7 @@ public class StubBundleDescription implements BundleDescription {
/**
* {@inheritDoc}
*/
+ @Override
public BundleDescription[] getResolvedRequires() {
throw new UnsupportedOperationException();
}
@@ -221,6 +244,7 @@ public class StubBundleDescription implements BundleDescription {
/**
* {@inheritDoc}
*/
+ @Override
public ExportPackageDescription[] getSelectedExports() {
throw new UnsupportedOperationException();
}
@@ -228,6 +252,7 @@ public class StubBundleDescription implements BundleDescription {
/**
* {@inheritDoc}
*/
+ @Override
public ExportPackageDescription[] getSubstitutedExports() {
throw new UnsupportedOperationException();
}
@@ -235,6 +260,7 @@ public class StubBundleDescription implements BundleDescription {
/**
* {@inheritDoc}
*/
+ @Override
public String getSymbolicName() {
return this.bsn;
}
@@ -242,6 +268,7 @@ public class StubBundleDescription implements BundleDescription {
/**
* {@inheritDoc}
*/
+ @Override
public Object getUserObject() {
throw new UnsupportedOperationException();
}
@@ -249,6 +276,7 @@ public class StubBundleDescription implements BundleDescription {
/**
* {@inheritDoc}
*/
+ @Override
public boolean hasDynamicImports() {
throw new UnsupportedOperationException();
}
@@ -256,6 +284,7 @@ public class StubBundleDescription implements BundleDescription {
/**
* {@inheritDoc}
*/
+ @Override
public boolean isRemovalPending() {
throw new UnsupportedOperationException();
}
@@ -263,6 +292,7 @@ public class StubBundleDescription implements BundleDescription {
/**
* {@inheritDoc}
*/
+ @Override
public boolean isResolved() {
return this.resolved;
}
@@ -270,6 +300,7 @@ public class StubBundleDescription implements BundleDescription {
/**
* {@inheritDoc}
*/
+ @Override
public boolean isSingleton() {
throw new UnsupportedOperationException();
}
@@ -277,6 +308,7 @@ public class StubBundleDescription implements BundleDescription {
/**
* {@inheritDoc}
*/
+ @Override
public void setUserObject(Object userObject) {
throw new UnsupportedOperationException();
}
@@ -284,6 +316,7 @@ public class StubBundleDescription implements BundleDescription {
/**
* {@inheritDoc}
*/
+ @Override
public String getName() {
throw new UnsupportedOperationException();
}
@@ -291,6 +324,7 @@ public class StubBundleDescription implements BundleDescription {
/**
* {@inheritDoc}
*/
+ @Override
public BundleDescription getSupplier() {
throw new UnsupportedOperationException();
}
@@ -298,6 +332,7 @@ public class StubBundleDescription implements BundleDescription {
/**
* {@inheritDoc}
*/
+ @Override
public Version getVersion() {
return this.bv;
}
@@ -345,4 +380,84 @@ public class StubBundleDescription implements BundleDescription {
this.dependents.add(d);
}
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public Map<String, String> getDeclaredDirectives() {
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public Map<String, Object> getDeclaredAttributes() {
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public WiredCapability getWiredCapability() {
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public List<Capability> getDeclaredCapabilities(String namespace) {
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public int getTypes() {
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public Bundle getBundle() {
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public ImportPackageSpecification[] getAddedDynamicImportPackages() {
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public GenericDescription[] getSelectedGenericCapabilities() {
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public GenericDescription[] getResolvedGenericRequires() {
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public BundleWiring getBundleWiring() {
+ 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 c09bcaf0..ad31e248 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
@@ -11,9 +11,12 @@
package org.eclipse.virgo.kernel.userregion.internal.quasi;
+import java.util.Map;
+
import org.eclipse.osgi.service.resolver.BundleDescription;
import org.eclipse.osgi.service.resolver.ExportPackageDescription;
import org.osgi.framework.Version;
+import org.osgi.framework.wiring.WiredCapability;
/**
*/
@@ -32,6 +35,7 @@ public class StubExportPackageDescription extends StubParameterised implements E
/**
* {@inheritDoc}
*/
+ @Override
public BundleDescription getExporter() {
return this.exporter;
}
@@ -39,6 +43,7 @@ public class StubExportPackageDescription extends StubParameterised implements E
/**
* {@inheritDoc}
*/
+ @Override
public boolean isRoot() {
throw new UnsupportedOperationException();
}
@@ -46,6 +51,7 @@ public class StubExportPackageDescription extends StubParameterised implements E
/**
* {@inheritDoc}
*/
+ @Override
public String getName() {
return this.name;
}
@@ -53,6 +59,7 @@ public class StubExportPackageDescription extends StubParameterised implements E
/**
* {@inheritDoc}
*/
+ @Override
public BundleDescription getSupplier() {
throw new UnsupportedOperationException();
}
@@ -60,6 +67,7 @@ public class StubExportPackageDescription extends StubParameterised implements E
/**
* {@inheritDoc}
*/
+ @Override
public Version getVersion() {
return this.version;
}
@@ -72,4 +80,28 @@ public class StubExportPackageDescription extends StubParameterised implements E
this.exporter = exporter;
}
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public Map<String, String> getDeclaredDirectives() {
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public Map<String, Object> getDeclaredAttributes() {
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public WiredCapability getWiredCapability() {
+ throw new UnsupportedOperationException();
+ }
+
}
diff --git a/test-apps/bundle-update/class.load.after.update/but.C/.classpath b/test-apps/bundle-update/class.load.after.update/but.C/.classpath
index 86ffd1f9..409591ee 100644
--- a/test-apps/bundle-update/class.load.after.update/but.C/.classpath
+++ b/test-apps/bundle-update/class.load.after.update/but.C/.classpath
@@ -3,6 +3,6 @@
<classpathentry kind="src" path="src/main/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry combineaccessrules="false" kind="src" path="/but.b.after"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.6.1.R36x_v20100806/org.eclipse.osgi-3.6.1.R36x_v20100806.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.6.1.R36x_v20100806/org.eclipse.osgi-sources-3.6.1.R36x_v20100806.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.0.v20101022/org.eclipse.osgi-3.7.0.v20101022.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.0.v20101022/org.eclipse.osgi-sources-3.7.0.v20101022.jar"/>
<classpathentry kind="output" path="target"/>
</classpath>
diff --git a/test-apps/quartz-scheduler/quartz.bundle.a/.classpath b/test-apps/quartz-scheduler/quartz.bundle.a/.classpath
index f11c47e3..765e03b8 100644
--- a/test-apps/quartz-scheduler/quartz.bundle.a/.classpath
+++ b/test-apps/quartz-scheduler/quartz.bundle.a/.classpath
@@ -4,7 +4,7 @@
<classpathentry kind="src" path="src/main/resources"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/com.opensymphony.quartz/com.springsource.org.quartz/1.6.0/com.springsource.org.quartz-1.6.0.jar" sourcepath="/KERNEL_IVY_CACHE/com.opensymphony.quartz/com.springsource.org.quartz/1.6.0/com.springsource.org.quartz-sources-1.6.0.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.6.1.R36x_v20100806/org.eclipse.osgi-3.6.1.R36x_v20100806.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.6.1.R36x_v20100806/org.eclipse.osgi-sources-3.6.1.R36x_v20100806.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.0.v20101022/org.eclipse.osgi-3.7.0.v20101022.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.0.v20101022/org.eclipse.osgi-sources-3.7.0.v20101022.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.RELEASE/org.springframework.beans-3.0.0.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.RELEASE/org.springframework.beans-sources-3.0.0.RELEASE.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework/org.springframework.context/3.0.0.RELEASE/org.springframework.context-3.0.0.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework/org.springframework.context/3.0.0.RELEASE/org.springframework.context-sources-3.0.0.RELEASE.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework/org.springframework.context.support/3.0.0.RELEASE/org.springframework.context.support-3.0.0.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework/org.springframework.context.support/3.0.0.RELEASE/org.springframework.context.support-sources-3.0.0.RELEASE.jar"/>
diff --git a/test-apps/quartz-scheduler/quartz.bundle.b/.classpath b/test-apps/quartz-scheduler/quartz.bundle.b/.classpath
index f11c47e3..765e03b8 100644
--- a/test-apps/quartz-scheduler/quartz.bundle.b/.classpath
+++ b/test-apps/quartz-scheduler/quartz.bundle.b/.classpath
@@ -4,7 +4,7 @@
<classpathentry kind="src" path="src/main/resources"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/com.opensymphony.quartz/com.springsource.org.quartz/1.6.0/com.springsource.org.quartz-1.6.0.jar" sourcepath="/KERNEL_IVY_CACHE/com.opensymphony.quartz/com.springsource.org.quartz/1.6.0/com.springsource.org.quartz-sources-1.6.0.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.6.1.R36x_v20100806/org.eclipse.osgi-3.6.1.R36x_v20100806.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.6.1.R36x_v20100806/org.eclipse.osgi-sources-3.6.1.R36x_v20100806.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.0.v20101022/org.eclipse.osgi-3.7.0.v20101022.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.0.v20101022/org.eclipse.osgi-sources-3.7.0.v20101022.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.RELEASE/org.springframework.beans-3.0.0.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.RELEASE/org.springframework.beans-sources-3.0.0.RELEASE.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework/org.springframework.context/3.0.0.RELEASE/org.springframework.context-3.0.0.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework/org.springframework.context/3.0.0.RELEASE/org.springframework.context-sources-3.0.0.RELEASE.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework/org.springframework.context.support/3.0.0.RELEASE/org.springframework.context.support-3.0.0.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework/org.springframework.context.support/3.0.0.RELEASE/org.springframework.context.support-sources-3.0.0.RELEASE.jar"/>
diff --git a/test-apps/quartz-scheduler/quartz.bundle.same1/.classpath b/test-apps/quartz-scheduler/quartz.bundle.same1/.classpath
index f11c47e3..765e03b8 100644
--- a/test-apps/quartz-scheduler/quartz.bundle.same1/.classpath
+++ b/test-apps/quartz-scheduler/quartz.bundle.same1/.classpath
@@ -4,7 +4,7 @@
<classpathentry kind="src" path="src/main/resources"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/com.opensymphony.quartz/com.springsource.org.quartz/1.6.0/com.springsource.org.quartz-1.6.0.jar" sourcepath="/KERNEL_IVY_CACHE/com.opensymphony.quartz/com.springsource.org.quartz/1.6.0/com.springsource.org.quartz-sources-1.6.0.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.6.1.R36x_v20100806/org.eclipse.osgi-3.6.1.R36x_v20100806.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.6.1.R36x_v20100806/org.eclipse.osgi-sources-3.6.1.R36x_v20100806.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.0.v20101022/org.eclipse.osgi-3.7.0.v20101022.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.0.v20101022/org.eclipse.osgi-sources-3.7.0.v20101022.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.RELEASE/org.springframework.beans-3.0.0.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.RELEASE/org.springframework.beans-sources-3.0.0.RELEASE.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework/org.springframework.context/3.0.0.RELEASE/org.springframework.context-3.0.0.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework/org.springframework.context/3.0.0.RELEASE/org.springframework.context-sources-3.0.0.RELEASE.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework/org.springframework.context.support/3.0.0.RELEASE/org.springframework.context.support-3.0.0.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework/org.springframework.context.support/3.0.0.RELEASE/org.springframework.context.support-sources-3.0.0.RELEASE.jar"/>
diff --git a/test-apps/quartz-scheduler/quartz.bundle.same2/.classpath b/test-apps/quartz-scheduler/quartz.bundle.same2/.classpath
index f11c47e3..765e03b8 100644
--- a/test-apps/quartz-scheduler/quartz.bundle.same2/.classpath
+++ b/test-apps/quartz-scheduler/quartz.bundle.same2/.classpath
@@ -4,7 +4,7 @@
<classpathentry kind="src" path="src/main/resources"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/com.opensymphony.quartz/com.springsource.org.quartz/1.6.0/com.springsource.org.quartz-1.6.0.jar" sourcepath="/KERNEL_IVY_CACHE/com.opensymphony.quartz/com.springsource.org.quartz/1.6.0/com.springsource.org.quartz-sources-1.6.0.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.6.1.R36x_v20100806/org.eclipse.osgi-3.6.1.R36x_v20100806.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.6.1.R36x_v20100806/org.eclipse.osgi-sources-3.6.1.R36x_v20100806.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.0.v20101022/org.eclipse.osgi-3.7.0.v20101022.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.0.v20101022/org.eclipse.osgi-sources-3.7.0.v20101022.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.RELEASE/org.springframework.beans-3.0.0.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.RELEASE/org.springframework.beans-sources-3.0.0.RELEASE.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework/org.springframework.context/3.0.0.RELEASE/org.springframework.context-3.0.0.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework/org.springframework.context/3.0.0.RELEASE/org.springframework.context-sources-3.0.0.RELEASE.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework/org.springframework.context.support/3.0.0.RELEASE/org.springframework.context.support-3.0.0.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework/org.springframework.context.support/3.0.0.RELEASE/org.springframework.context.support-sources-3.0.0.RELEASE.jar"/>
diff --git a/test-apps/service-scoping/scoping.service.module.b/.classpath b/test-apps/service-scoping/scoping.service.module.b/.classpath
index 5972eefb..8af0f39a 100644
--- a/test-apps/service-scoping/scoping.service.module.b/.classpath
+++ b/test-apps/service-scoping/scoping.service.module.b/.classpath
@@ -6,6 +6,6 @@
<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.6.1.R36x_v20100806/org.eclipse.osgi-3.6.1.R36x_v20100806.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.6.1.R36x_v20100806/org.eclipse.osgi-3.6.1.R36x_v20100806.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.0.v20101022/org.eclipse.osgi-3.7.0.v20101022.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.0.v20101022/org.eclipse.osgi-3.7.0.v20101022.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>

Back to the top