Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--build.versions1
-rw-r--r--org.eclipse.virgo.kernel.agent.dm/ivy.xml4
-rw-r--r--org.eclipse.virgo.kernel.agent.dm/src/main/java/org/eclipse/virgo/kernel/agent/dm/internal/AgentActivator.java2
-rw-r--r--org.eclipse.virgo.kernel.agent.dm/src/main/java/org/eclipse/virgo/kernel/agent/dm/internal/BlueprintEventPostingOsgiBundleApplicationContextListener.java22
-rw-r--r--org.eclipse.virgo.kernel.agent.dm/src/test/java/com/springsource/kernel/agent/internal/BlueprintEventPostingOsgiBundleApplicationContextListenerTests.java18
-rw-r--r--org.eclipse.virgo.kernel.agent.dm/template.mf2
-rw-r--r--org.eclipse.virgo.kernel.deployer.dm/ivy.xml2
-rw-r--r--org.eclipse.virgo.kernel.deployer.dm/src/main/java/org/eclipse/virgo/kernel/deployer/app/spring/UserRegionModuleContextAccessor.java2
-rw-r--r--org.eclipse.virgo.kernel.deployer.dm/src/test/java/org/eclipse/virgo/kernel/deployer/app/spring/UserRegionModuleContextAccessorTests.java2
-rw-r--r--org.eclipse.virgo.kernel.deployer.dm/template.mf2
-rw-r--r--org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/MANIFEST.MF4
-rw-r--r--org.eclipse.virgo.kernel.deployer/ivy.xml6
-rw-r--r--org.eclipse.virgo.kernel.deployer/src/main/java/org/eclipse/virgo/kernel/install/artifact/internal/SpringConfigServiceModelScanner.java2
-rw-r--r--org.eclipse.virgo.kernel.deployer/src/main/java/org/eclipse/virgo/kernel/module/internal/KernelModuleContextAccessor.java2
-rw-r--r--org.eclipse.virgo.kernel.deployer/src/test/java/org/eclipse/virgo/kernel/install/artifact/internal/SpringConfigServiceModelScannerTests.java2
-rw-r--r--org.eclipse.virgo.kernel.deployer/template.mf2
-rw-r--r--org.eclipse.virgo.kernel.dmfragment/src/main/java/org/eclipse/virgo/kernel/dmfragment/internal/ApplicationContextShutdownBean.java2
-rw-r--r--org.eclipse.virgo.kernel.dmfragment/src/main/java/org/eclipse/virgo/kernel/dmfragment/internal/ContextClassLoaderPostProcessor.java8
-rw-r--r--org.eclipse.virgo.kernel.dmfragment/src/main/java/org/eclipse/virgo/kernel/dmfragment/internal/KernelExtensionConfiguringOsgiPostProcessor.java2
-rw-r--r--org.eclipse.virgo.kernel.dmfragment/src/main/java/org/eclipse/virgo/kernel/dmfragment/internal/KernelLoadTimeWeaver.java2
-rw-r--r--org.eclipse.virgo.kernel.dmfragment/src/main/java/org/eclipse/virgo/kernel/dmfragment/internal/KernelOsgiApplicationContextCreator.java6
-rw-r--r--org.eclipse.virgo.kernel.dmfragment/src/main/java/org/eclipse/virgo/kernel/dmfragment/internal/KernelOsgiContextClassLoaderProvider.java4
-rw-r--r--org.eclipse.virgo.kernel.dmfragment/src/main/java/org/eclipse/virgo/kernel/dmfragment/internal/ServiceProxyRetryDisablingBundleListener.java2
-rw-r--r--org.eclipse.virgo.kernel.dmfragment/template.mf4
-rw-r--r--org.eclipse.virgo.kernel.kerneldmfragment/template.mf2
-rw-r--r--org.eclipse.virgo.kernel.services/ivy.xml2
-rw-r--r--org.eclipse.virgo.kernel.test/ivy.xml2
-rw-r--r--org.eclipse.virgo.kernel.test/src/test/java/org/eclipse/virgo/kernel/dm/test/ModuleBeanFactoryPostProcessorTests.java6
-rw-r--r--org.eclipse.virgo.kernel.test/template.mf2
29 files changed, 60 insertions, 59 deletions
diff --git a/build.versions b/build.versions
index 3f224985..32d2993f 100644
--- a/build.versions
+++ b/build.versions
@@ -15,6 +15,7 @@ org.eclipse.virgo.repository=3.5.0.D-20120301132441
org.eclipse.virgo.util=3.5.0.D-20120301131322
org.slf4j=1.6.1
org.slf4j.spi=1.6.1
+org.eclipse.gemini.blueprint=1.0.0.RELEASE
org.springframework.osgi=1.2.1
org.springframework=3.0.5.RELEASE
com.springsource.org.apache.mina.core=2.0.2
diff --git a/org.eclipse.virgo.kernel.agent.dm/ivy.xml b/org.eclipse.virgo.kernel.agent.dm/ivy.xml
index 7621e786..1dc72b74 100644
--- a/org.eclipse.virgo.kernel.agent.dm/ivy.xml
+++ b/org.eclipse.virgo.kernel.agent.dm/ivy.xml
@@ -31,8 +31,8 @@
<dependency name='org.eclipse.virgo.medic' rev='${org.eclipse.virgo.medic}' org='org.eclipse.virgo.medic' conf='aspects, compile->runtime'/>
<dependency name='org.eclipse.virgo.medic.core' rev='${org.eclipse.virgo.medic}' org='org.eclipse.virgo.medic' conf='runtime->runtime'/>
<dependency name='org.eclipse.virgo.medic.test' rev='${org.eclipse.virgo.medic}' org='org.eclipse.virgo.medic' conf='test->runtime'/>
- <dependency org="org.springframework.osgi" name="org.springframework.osgi.extender" rev="${org.springframework.osgi}" conf="compile->compile"/>
- <dependency org="org.springframework.osgi" name="org.springframework.osgi.core" rev="${org.springframework.osgi}" conf="compile->compile"/>
+ <dependency org="org.eclipse.gemini" name="org.eclipse.gemini.blueprint.extender" rev="${org.eclipse.gemini.blueprint}" conf="compile->compile"/>
+ <dependency org="org.eclipse.gemini" name="org.eclipse.gemini.blueprint.core" rev="${org.eclipse.gemini.blueprint}" conf="compile->compile"/>
<override org="org.springframework" rev="${org.springframework}"/>
<override org="org.eclipse.virgo.util" rev="${org.eclipse.virgo.util}"/>
diff --git a/org.eclipse.virgo.kernel.agent.dm/src/main/java/org/eclipse/virgo/kernel/agent/dm/internal/AgentActivator.java b/org.eclipse.virgo.kernel.agent.dm/src/main/java/org/eclipse/virgo/kernel/agent/dm/internal/AgentActivator.java
index 55bad48c..134b4a97 100644
--- a/org.eclipse.virgo.kernel.agent.dm/src/main/java/org/eclipse/virgo/kernel/agent/dm/internal/AgentActivator.java
+++ b/org.eclipse.virgo.kernel.agent.dm/src/main/java/org/eclipse/virgo/kernel/agent/dm/internal/AgentActivator.java
@@ -23,7 +23,7 @@ import org.osgi.service.component.ComponentContext;
import org.osgi.service.event.EventAdmin;
import org.osgi.service.event.EventConstants;
import org.osgi.service.event.EventHandler;
-import org.springframework.osgi.context.event.OsgiBundleApplicationContextListener;
+import org.eclipse.gemini.blueprint.context.event.OsgiBundleApplicationContextListener;
/**
* ComponentContext activator for the Kernel's Agent bundle
diff --git a/org.eclipse.virgo.kernel.agent.dm/src/main/java/org/eclipse/virgo/kernel/agent/dm/internal/BlueprintEventPostingOsgiBundleApplicationContextListener.java b/org.eclipse.virgo.kernel.agent.dm/src/main/java/org/eclipse/virgo/kernel/agent/dm/internal/BlueprintEventPostingOsgiBundleApplicationContextListener.java
index 20995f63..2a727e8d 100644
--- a/org.eclipse.virgo.kernel.agent.dm/src/main/java/org/eclipse/virgo/kernel/agent/dm/internal/BlueprintEventPostingOsgiBundleApplicationContextListener.java
+++ b/org.eclipse.virgo.kernel.agent.dm/src/main/java/org/eclipse/virgo/kernel/agent/dm/internal/BlueprintEventPostingOsgiBundleApplicationContextListener.java
@@ -25,17 +25,17 @@ import org.osgi.service.event.Event;
import org.osgi.service.event.EventAdmin;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.osgi.context.event.OsgiBundleApplicationContextEvent;
-import org.springframework.osgi.context.event.OsgiBundleApplicationContextListener;
-import org.springframework.osgi.context.event.OsgiBundleContextClosedEvent;
-import org.springframework.osgi.context.event.OsgiBundleContextFailedEvent;
-import org.springframework.osgi.context.event.OsgiBundleContextRefreshedEvent;
-import org.springframework.osgi.extender.event.BootstrappingDependencyEvent;
-import org.springframework.osgi.service.importer.OsgiServiceDependency;
-import org.springframework.osgi.service.importer.event.OsgiServiceDependencyEvent;
-import org.springframework.osgi.service.importer.event.OsgiServiceDependencyWaitEndedEvent;
-import org.springframework.osgi.service.importer.event.OsgiServiceDependencyWaitStartingEvent;
-import org.springframework.osgi.service.importer.event.OsgiServiceDependencyWaitTimedOutEvent;
+import org.eclipse.gemini.blueprint.context.event.OsgiBundleApplicationContextEvent;
+import org.eclipse.gemini.blueprint.context.event.OsgiBundleApplicationContextListener;
+import org.eclipse.gemini.blueprint.context.event.OsgiBundleContextClosedEvent;
+import org.eclipse.gemini.blueprint.context.event.OsgiBundleContextFailedEvent;
+import org.eclipse.gemini.blueprint.context.event.OsgiBundleContextRefreshedEvent;
+import org.eclipse.gemini.blueprint.extender.event.BootstrappingDependencyEvent;
+import org.eclipse.gemini.blueprint.service.importer.OsgiServiceDependency;
+import org.eclipse.gemini.blueprint.service.importer.event.OsgiServiceDependencyEvent;
+import org.eclipse.gemini.blueprint.service.importer.event.OsgiServiceDependencyWaitEndedEvent;
+import org.eclipse.gemini.blueprint.service.importer.event.OsgiServiceDependencyWaitStartingEvent;
+import org.eclipse.gemini.blueprint.service.importer.event.OsgiServiceDependencyWaitTimedOutEvent;
/**
* An {@link OsgiBundleApplicationContextListener} implementation that listens to Spring DM events and sends the
diff --git a/org.eclipse.virgo.kernel.agent.dm/src/test/java/com/springsource/kernel/agent/internal/BlueprintEventPostingOsgiBundleApplicationContextListenerTests.java b/org.eclipse.virgo.kernel.agent.dm/src/test/java/com/springsource/kernel/agent/internal/BlueprintEventPostingOsgiBundleApplicationContextListenerTests.java
index 62374bb0..71486dce 100644
--- a/org.eclipse.virgo.kernel.agent.dm/src/test/java/com/springsource/kernel/agent/internal/BlueprintEventPostingOsgiBundleApplicationContextListenerTests.java
+++ b/org.eclipse.virgo.kernel.agent.dm/src/test/java/com/springsource/kernel/agent/internal/BlueprintEventPostingOsgiBundleApplicationContextListenerTests.java
@@ -22,15 +22,15 @@ import org.osgi.framework.Filter;
import org.osgi.framework.Version;
import org.osgi.service.event.Event;
import org.springframework.context.ApplicationContext;
-import org.springframework.osgi.context.event.OsgiBundleContextClosedEvent;
-import org.springframework.osgi.context.event.OsgiBundleContextFailedEvent;
-import org.springframework.osgi.context.event.OsgiBundleContextRefreshedEvent;
-import org.springframework.osgi.extender.event.BootstrappingDependencyEvent;
-import org.springframework.osgi.service.importer.OsgiServiceDependency;
-import org.springframework.osgi.service.importer.event.OsgiServiceDependencyEvent;
-import org.springframework.osgi.service.importer.event.OsgiServiceDependencyWaitEndedEvent;
-import org.springframework.osgi.service.importer.event.OsgiServiceDependencyWaitStartingEvent;
-import org.springframework.osgi.service.importer.event.OsgiServiceDependencyWaitTimedOutEvent;
+import org.eclipse.gemini.blueprint.context.event.OsgiBundleContextClosedEvent;
+import org.eclipse.gemini.blueprint.context.event.OsgiBundleContextFailedEvent;
+import org.eclipse.gemini.blueprint.context.event.OsgiBundleContextRefreshedEvent;
+import org.eclipse.gemini.blueprint.extender.event.BootstrappingDependencyEvent;
+import org.eclipse.gemini.blueprint.service.importer.OsgiServiceDependency;
+import org.eclipse.gemini.blueprint.service.importer.event.OsgiServiceDependencyEvent;
+import org.eclipse.gemini.blueprint.service.importer.event.OsgiServiceDependencyWaitEndedEvent;
+import org.eclipse.gemini.blueprint.service.importer.event.OsgiServiceDependencyWaitStartingEvent;
+import org.eclipse.gemini.blueprint.service.importer.event.OsgiServiceDependencyWaitTimedOutEvent;
import org.eclipse.virgo.kernel.agent.dm.internal.BlueprintEventPostingOsgiBundleApplicationContextListener;
import org.eclipse.virgo.teststubs.osgi.framework.StubBundle;
diff --git a/org.eclipse.virgo.kernel.agent.dm/template.mf b/org.eclipse.virgo.kernel.agent.dm/template.mf
index e405d54f..867686a6 100644
--- a/org.eclipse.virgo.kernel.agent.dm/template.mf
+++ b/org.eclipse.virgo.kernel.agent.dm/template.mf
@@ -13,7 +13,7 @@ Import-Template:
org.slf4j.*;version="${org.slf4j:[=.=.=, +1)}",
org.eclipse.virgo.medic.*;version="${org.eclipse.virgo.medic:[=.=.=, =.+1)}",
org.springframework.*;version="${org.springframework:[2.5.6, +1)}",
- org.springframework.osgi.*;version="${org.springframework.osgi:[=.=.=, +1)}",
+ org.eclipse.gemini.blueprint.*;version="${org.eclipse.gemini.blueprint:[=.=.=, +1)}",
org.osgi.*;version="0",
org.eclipse.osgi.*;version="0",
org.eclipse.equinox.region.*;version="${org.eclipse.equinox.region:[=.=.=, =.+1)}"
diff --git a/org.eclipse.virgo.kernel.deployer.dm/ivy.xml b/org.eclipse.virgo.kernel.deployer.dm/ivy.xml
index c569e04d..2b688293 100644
--- a/org.eclipse.virgo.kernel.deployer.dm/ivy.xml
+++ b/org.eclipse.virgo.kernel.deployer.dm/ivy.xml
@@ -20,7 +20,7 @@
<dependency org="org.slf4j" name="com.springsource.slf4j.nop" rev="${org.slf4j}" conf="test->runtime"/>
<dependency org="org.springframework" name="org.springframework.beans" rev="${org.springframework}" conf="compile->runtime"/>
- <dependency org="org.springframework.osgi" name="org.springframework.osgi.core" rev="${org.springframework.osgi}" conf="compile->runtime"/>
+ <dependency org="org.eclipse.gemini" name="org.eclipse.gemini.blueprint.core" rev="${org.eclipse.gemini.blueprint}" conf="compile->runtime"/>
<dependency org="org.eclipse.virgo.nano" name="org.eclipse.virgo.kernel.core" rev="${org.eclipse.virgo.nano}" conf="compile->compile"/>
<dependency org="org.eclipse.virgo.kernel" name="org.eclipse.virgo.kernel.deployer" rev="latest.integration" conf="compile->compile"/>
<dependency org="org.eclipse.virgo.medic" name="org.eclipse.virgo.medic" rev="${org.eclipse.virgo.medic}" conf="aspects, compile->runtime"/>
diff --git a/org.eclipse.virgo.kernel.deployer.dm/src/main/java/org/eclipse/virgo/kernel/deployer/app/spring/UserRegionModuleContextAccessor.java b/org.eclipse.virgo.kernel.deployer.dm/src/main/java/org/eclipse/virgo/kernel/deployer/app/spring/UserRegionModuleContextAccessor.java
index 57a5a43b..7f4b4bc3 100644
--- a/org.eclipse.virgo.kernel.deployer.dm/src/main/java/org/eclipse/virgo/kernel/deployer/app/spring/UserRegionModuleContextAccessor.java
+++ b/org.eclipse.virgo.kernel.deployer.dm/src/main/java/org/eclipse/virgo/kernel/deployer/app/spring/UserRegionModuleContextAccessor.java
@@ -23,7 +23,7 @@ import org.osgi.framework.BundleContext;
import org.osgi.framework.InvalidSyntaxException;
import org.osgi.framework.ServiceReference;
import org.springframework.context.ApplicationContext;
-import org.springframework.osgi.context.ConfigurableOsgiBundleApplicationContext;
+import org.eclipse.gemini.blueprint.context.ConfigurableOsgiBundleApplicationContext;
/**
* {@link UserRegionModuleContextAccessor} accesses {@link ModuleContext ModuleContexts} in either the the user region or the kernel, but this class must
diff --git a/org.eclipse.virgo.kernel.deployer.dm/src/test/java/org/eclipse/virgo/kernel/deployer/app/spring/UserRegionModuleContextAccessorTests.java b/org.eclipse.virgo.kernel.deployer.dm/src/test/java/org/eclipse/virgo/kernel/deployer/app/spring/UserRegionModuleContextAccessorTests.java
index 34f41c1b..9586bbd8 100644
--- a/org.eclipse.virgo.kernel.deployer.dm/src/test/java/org/eclipse/virgo/kernel/deployer/app/spring/UserRegionModuleContextAccessorTests.java
+++ b/org.eclipse.virgo.kernel.deployer.dm/src/test/java/org/eclipse/virgo/kernel/deployer/app/spring/UserRegionModuleContextAccessorTests.java
@@ -24,7 +24,7 @@ import org.osgi.framework.Filter;
import org.osgi.framework.ServiceReference;
import org.osgi.framework.Version;
import org.springframework.context.ApplicationContext;
-import org.springframework.osgi.context.ConfigurableOsgiBundleApplicationContext;
+import org.eclipse.gemini.blueprint.context.ConfigurableOsgiBundleApplicationContext;
import static org.easymock.EasyMock.createMock;
import static org.easymock.EasyMock.expect;
diff --git a/org.eclipse.virgo.kernel.deployer.dm/template.mf b/org.eclipse.virgo.kernel.deployer.dm/template.mf
index edf5cf23..74f55004 100644
--- a/org.eclipse.virgo.kernel.deployer.dm/template.mf
+++ b/org.eclipse.virgo.kernel.deployer.dm/template.mf
@@ -10,4 +10,4 @@ Import-Template:
org.aspectj.*;version="${org.aspectj:[=.=.=.=, +1)}",
org.osgi.framework.*;version="0",
org.springframework.*;version="${org.springframework:[2.5.6, +1)}",
- org.springframework.osgi.*;version="${org.springframework.osgi:[=.=.=, +1)}"
+ org.eclipse.gemini.blueprint.*;version="${org.eclipse.gemini.blueprint:[=.=.=, +1)}"
diff --git a/org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/MANIFEST.MF b/org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/MANIFEST.MF
index c568e359..71f70f10 100644
--- a/org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/MANIFEST.MF
+++ b/org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/MANIFEST.MF
@@ -27,7 +27,7 @@ Import-Package: org.eclipse.virgo.kernel.core,
org.osgi.service.framework,
org.osgi.service.packageadmin,
org.springframework.context,
- org.springframework.osgi.context,
- org.springframework.osgi.context.event,
+ org.eclipse.gemini.blueprint.context,
+ org.eclipse.gemini.blueprint.context.event,
org.springframework.util,
org.hsqldb
diff --git a/org.eclipse.virgo.kernel.deployer/ivy.xml b/org.eclipse.virgo.kernel.deployer/ivy.xml
index 1b4d4dd1..e6312447 100644
--- a/org.eclipse.virgo.kernel.deployer/ivy.xml
+++ b/org.eclipse.virgo.kernel.deployer/ivy.xml
@@ -30,9 +30,9 @@
<dependency org="org.eclipse.osgi" name="org.eclipse.osgi.services" rev="${org.eclipse.osgi.services}" conf="compile->runtime"/>
<dependency org="org.eclipse.osgi" name="org.eclipse.equinox.cm" rev="${org.eclipse.equinox.cm}" conf="compile->runtime"/>
- <dependency org="org.springframework.osgi" name="org.springframework.osgi.core" rev="${org.springframework.osgi}" conf="compile->runtime"/>
- <dependency org="org.springframework.osgi" name="org.springframework.osgi.extender" rev="${org.springframework.osgi}" conf="compile->runtime"/>
- <dependency org="org.springframework.osgi" name="org.springframework.osgi.io" rev="${org.springframework.osgi}" conf="compile->runtime"/>
+ <dependency org="org.eclipse.gemini" name="org.eclipse.gemini.blueprint.core" rev="${org.eclipse.gemini.blueprint}" conf="compile->runtime"/>
+ <dependency org="org.eclipse.gemini" name="org.eclipse.gemini.blueprint.extender" rev="${org.eclipse.gemini.blueprint}" conf="compile->runtime"/>
+ <dependency org="org.eclipse.gemini" name="org.eclipse.gemini.blueprint.io" rev="${org.eclipse.gemini.blueprint}" conf="compile->runtime"/>
<dependency org="org.eclipse.virgo.nano" name="org.eclipse.virgo.kernel.core" rev="${org.eclipse.virgo.nano}" conf="aspects->compile"/>
<dependency org="org.eclipse.virgo.nano" name="org.eclipse.virgo.deployer.api" rev="${org.eclipse.virgo.nano}" conf="aspects->compile"/>
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 a2c68366..f922a679 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
@@ -68,7 +68,7 @@ final class SpringConfigServiceModelScanner {
private static final String ELEMENT_SERVICE = "service";
- private static final String BEAN_NAME_PROPERTY = "org.springframework.osgi.bean.name";
+ private static final String BEAN_NAME_PROPERTY = "org.eclipse.gemini.blueprint.bean.name";
private final EventLogger eventLogger;
diff --git a/org.eclipse.virgo.kernel.deployer/src/main/java/org/eclipse/virgo/kernel/module/internal/KernelModuleContextAccessor.java b/org.eclipse.virgo.kernel.deployer/src/main/java/org/eclipse/virgo/kernel/module/internal/KernelModuleContextAccessor.java
index 4975d080..483721ab 100644
--- a/org.eclipse.virgo.kernel.deployer/src/main/java/org/eclipse/virgo/kernel/module/internal/KernelModuleContextAccessor.java
+++ b/org.eclipse.virgo.kernel.deployer/src/main/java/org/eclipse/virgo/kernel/module/internal/KernelModuleContextAccessor.java
@@ -20,7 +20,7 @@ import org.osgi.framework.BundleContext;
import org.osgi.framework.InvalidSyntaxException;
import org.osgi.framework.ServiceReference;
import org.springframework.context.ApplicationContext;
-import org.springframework.osgi.context.ConfigurableOsgiBundleApplicationContext;
+import org.eclipse.gemini.blueprint.context.ConfigurableOsgiBundleApplicationContext;
import org.eclipse.virgo.kernel.module.ModuleContext;
import org.eclipse.virgo.kernel.module.ModuleContextAccessor;
diff --git a/org.eclipse.virgo.kernel.deployer/src/test/java/org/eclipse/virgo/kernel/install/artifact/internal/SpringConfigServiceModelScannerTests.java b/org.eclipse.virgo.kernel.deployer/src/test/java/org/eclipse/virgo/kernel/install/artifact/internal/SpringConfigServiceModelScannerTests.java
index 8bdce80f..639e2626 100644
--- a/org.eclipse.virgo.kernel.deployer/src/test/java/org/eclipse/virgo/kernel/install/artifact/internal/SpringConfigServiceModelScannerTests.java
+++ b/org.eclipse.virgo.kernel.deployer/src/test/java/org/eclipse/virgo/kernel/install/artifact/internal/SpringConfigServiceModelScannerTests.java
@@ -52,7 +52,7 @@ public class SpringConfigServiceModelScannerTests {
assertTrue(repository.scopeHasMatchingService(TEST_SCOPE, Serializable.class.getName(), "(foo=bar)"));
assertTrue(repository.scopeHasMatchingService(TEST_SCOPE, Appendable.class.getName(), null));
assertTrue(repository.scopeHasMatchingService(TEST_SCOPE, Appendable.class.getName(), "(foo=bar)"));
- assertTrue(repository.scopeHasMatchingService(TEST_SCOPE, Appendable.class.getName(), "(org.springframework.osgi.bean.name=service)"));
+ assertTrue(repository.scopeHasMatchingService(TEST_SCOPE, Appendable.class.getName(), "(org.eclipse.gemini.blueprint.bean.name=service)"));
}
private final void run(ScopeServiceRepository repository, String configLocation) throws Exception {
diff --git a/org.eclipse.virgo.kernel.deployer/template.mf b/org.eclipse.virgo.kernel.deployer/template.mf
index 35fb4fda..0431c4ff 100644
--- a/org.eclipse.virgo.kernel.deployer/template.mf
+++ b/org.eclipse.virgo.kernel.deployer/template.mf
@@ -17,7 +17,7 @@ Import-Template:
org.slf4j.*;version="${org.slf4j:[=.=.=, +1)}",
org.aspectj.*;version="${org.aspectj:[=.=.=.=, +1)}",
org.springframework.*;version="${org.springframework:[2.5.6, +1)}",
- org.springframework.osgi.*;version="${org.springframework.osgi:[=.=.=, +1]}",
+ org.eclipse.gemini.blueprint.*;version="${org.eclipse.gemini.blueprint:[=.=.=, +1]}",
org.osgi.framework.*;version="0",
org.eclipse.osgi.*;version="0",
org.osgi.service.*;version="0",
diff --git a/org.eclipse.virgo.kernel.dmfragment/src/main/java/org/eclipse/virgo/kernel/dmfragment/internal/ApplicationContextShutdownBean.java b/org.eclipse.virgo.kernel.dmfragment/src/main/java/org/eclipse/virgo/kernel/dmfragment/internal/ApplicationContextShutdownBean.java
index c9c992e6..432fc17a 100644
--- a/org.eclipse.virgo.kernel.dmfragment/src/main/java/org/eclipse/virgo/kernel/dmfragment/internal/ApplicationContextShutdownBean.java
+++ b/org.eclipse.virgo.kernel.dmfragment/src/main/java/org/eclipse/virgo/kernel/dmfragment/internal/ApplicationContextShutdownBean.java
@@ -19,7 +19,7 @@ import org.springframework.context.ApplicationEvent;
import org.springframework.context.ApplicationListener;
import org.springframework.context.event.ApplicationContextEvent;
import org.springframework.context.event.ContextClosedEvent;
-import org.springframework.osgi.service.importer.support.OsgiServiceProxyFactoryBean;
+import org.eclipse.gemini.blueprint.service.importer.support.OsgiServiceProxyFactoryBean;
/**
* {@link ApplicationContextShutdownBean} manages the shutting down of application contexts in the dm Server. In
diff --git a/org.eclipse.virgo.kernel.dmfragment/src/main/java/org/eclipse/virgo/kernel/dmfragment/internal/ContextClassLoaderPostProcessor.java b/org.eclipse.virgo.kernel.dmfragment/src/main/java/org/eclipse/virgo/kernel/dmfragment/internal/ContextClassLoaderPostProcessor.java
index dcc4f095..7bc97fb0 100644
--- a/org.eclipse.virgo.kernel.dmfragment/src/main/java/org/eclipse/virgo/kernel/dmfragment/internal/ContextClassLoaderPostProcessor.java
+++ b/org.eclipse.virgo.kernel.dmfragment/src/main/java/org/eclipse/virgo/kernel/dmfragment/internal/ContextClassLoaderPostProcessor.java
@@ -19,10 +19,10 @@ import org.osgi.framework.BundleContext;
import org.springframework.beans.MutablePropertyValues;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
-import org.springframework.osgi.extender.OsgiBeanFactoryPostProcessor;
-import org.springframework.osgi.service.importer.support.ImportContextClassLoader;
-import org.springframework.osgi.service.importer.support.OsgiServiceCollectionProxyFactoryBean;
-import org.springframework.osgi.service.importer.support.OsgiServiceProxyFactoryBean;
+import org.eclipse.gemini.blueprint.extender.OsgiBeanFactoryPostProcessor;
+import org.eclipse.gemini.blueprint.service.importer.support.ImportContextClassLoader;
+import org.eclipse.gemini.blueprint.service.importer.support.OsgiServiceCollectionProxyFactoryBean;
+import org.eclipse.gemini.blueprint.service.importer.support.OsgiServiceProxyFactoryBean;
/**
diff --git a/org.eclipse.virgo.kernel.dmfragment/src/main/java/org/eclipse/virgo/kernel/dmfragment/internal/KernelExtensionConfiguringOsgiPostProcessor.java b/org.eclipse.virgo.kernel.dmfragment/src/main/java/org/eclipse/virgo/kernel/dmfragment/internal/KernelExtensionConfiguringOsgiPostProcessor.java
index 0fc7c1db..61b045ac 100644
--- a/org.eclipse.virgo.kernel.dmfragment/src/main/java/org/eclipse/virgo/kernel/dmfragment/internal/KernelExtensionConfiguringOsgiPostProcessor.java
+++ b/org.eclipse.virgo.kernel.dmfragment/src/main/java/org/eclipse/virgo/kernel/dmfragment/internal/KernelExtensionConfiguringOsgiPostProcessor.java
@@ -17,7 +17,7 @@ import java.util.concurrent.CopyOnWriteArrayList;
import org.eclipse.virgo.kernel.dmfragment.ModuleBeanFactoryPostProcessor;
import org.osgi.framework.BundleContext;
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
-import org.springframework.osgi.extender.OsgiBeanFactoryPostProcessor;
+import org.eclipse.gemini.blueprint.extender.OsgiBeanFactoryPostProcessor;
/**
diff --git a/org.eclipse.virgo.kernel.dmfragment/src/main/java/org/eclipse/virgo/kernel/dmfragment/internal/KernelLoadTimeWeaver.java b/org.eclipse.virgo.kernel.dmfragment/src/main/java/org/eclipse/virgo/kernel/dmfragment/internal/KernelLoadTimeWeaver.java
index af0b804d..50c48ee3 100644
--- a/org.eclipse.virgo.kernel.dmfragment/src/main/java/org/eclipse/virgo/kernel/dmfragment/internal/KernelLoadTimeWeaver.java
+++ b/org.eclipse.virgo.kernel.dmfragment/src/main/java/org/eclipse/virgo/kernel/dmfragment/internal/KernelLoadTimeWeaver.java
@@ -18,7 +18,7 @@ import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
import org.springframework.beans.factory.BeanClassLoaderAware;
import org.springframework.instrument.classloading.LoadTimeWeaver;
-import org.springframework.osgi.util.BundleDelegatingClassLoader;
+import org.eclipse.gemini.blueprint.util.BundleDelegatingClassLoader;
import org.eclipse.virgo.kernel.osgi.framework.InstrumentableClassLoader;
import org.eclipse.virgo.kernel.osgi.framework.OsgiFramework;
diff --git a/org.eclipse.virgo.kernel.dmfragment/src/main/java/org/eclipse/virgo/kernel/dmfragment/internal/KernelOsgiApplicationContextCreator.java b/org.eclipse.virgo.kernel.dmfragment/src/main/java/org/eclipse/virgo/kernel/dmfragment/internal/KernelOsgiApplicationContextCreator.java
index da88d44d..1caa8ff0 100644
--- a/org.eclipse.virgo.kernel.dmfragment/src/main/java/org/eclipse/virgo/kernel/dmfragment/internal/KernelOsgiApplicationContextCreator.java
+++ b/org.eclipse.virgo.kernel.dmfragment/src/main/java/org/eclipse/virgo/kernel/dmfragment/internal/KernelOsgiApplicationContextCreator.java
@@ -12,9 +12,9 @@
package org.eclipse.virgo.kernel.dmfragment.internal;
import org.osgi.framework.BundleContext;
-import org.springframework.osgi.context.DelegatedExecutionOsgiBundleApplicationContext;
-import org.springframework.osgi.context.support.OsgiBundleXmlApplicationContext;
-import org.springframework.osgi.extender.support.DefaultOsgiApplicationContextCreator;
+import org.eclipse.gemini.blueprint.context.DelegatedExecutionOsgiBundleApplicationContext;
+import org.eclipse.gemini.blueprint.context.support.OsgiBundleXmlApplicationContext;
+import org.eclipse.gemini.blueprint.extender.support.DefaultOsgiApplicationContextCreator;
/**
* {@link KernelOsgiApplicationContextCreator} creates user region application contexts.
diff --git a/org.eclipse.virgo.kernel.dmfragment/src/main/java/org/eclipse/virgo/kernel/dmfragment/internal/KernelOsgiContextClassLoaderProvider.java b/org.eclipse.virgo.kernel.dmfragment/src/main/java/org/eclipse/virgo/kernel/dmfragment/internal/KernelOsgiContextClassLoaderProvider.java
index 27904924..693375c3 100644
--- a/org.eclipse.virgo.kernel.dmfragment/src/main/java/org/eclipse/virgo/kernel/dmfragment/internal/KernelOsgiContextClassLoaderProvider.java
+++ b/org.eclipse.virgo.kernel.dmfragment/src/main/java/org/eclipse/virgo/kernel/dmfragment/internal/KernelOsgiContextClassLoaderProvider.java
@@ -12,8 +12,8 @@
package org.eclipse.virgo.kernel.dmfragment.internal;
import org.osgi.framework.Bundle;
-import org.springframework.osgi.context.support.ContextClassLoaderProvider;
-import org.springframework.osgi.util.BundleDelegatingClassLoader;
+import org.eclipse.gemini.blueprint.context.support.ContextClassLoaderProvider;
+import org.eclipse.gemini.blueprint.util.BundleDelegatingClassLoader;
/**
* {@link KernelOsgiContextClassLoaderProvider} preserves any existing thread context class loader and uses the bundle
diff --git a/org.eclipse.virgo.kernel.dmfragment/src/main/java/org/eclipse/virgo/kernel/dmfragment/internal/ServiceProxyRetryDisablingBundleListener.java b/org.eclipse.virgo.kernel.dmfragment/src/main/java/org/eclipse/virgo/kernel/dmfragment/internal/ServiceProxyRetryDisablingBundleListener.java
index cafc95f8..da378813 100644
--- a/org.eclipse.virgo.kernel.dmfragment/src/main/java/org/eclipse/virgo/kernel/dmfragment/internal/ServiceProxyRetryDisablingBundleListener.java
+++ b/org.eclipse.virgo.kernel.dmfragment/src/main/java/org/eclipse/virgo/kernel/dmfragment/internal/ServiceProxyRetryDisablingBundleListener.java
@@ -19,7 +19,7 @@ import org.osgi.framework.SynchronousBundleListener;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.ApplicationContext;
-import org.springframework.osgi.service.importer.support.OsgiServiceProxyFactoryBean;
+import org.eclipse.gemini.blueprint.service.importer.support.OsgiServiceProxyFactoryBean;
/**
* A {@link SynchronousBundleListener} that reacts to a {@link BundleEvent#STOPPING STOPPING} event for the system
diff --git a/org.eclipse.virgo.kernel.dmfragment/template.mf b/org.eclipse.virgo.kernel.dmfragment/template.mf
index de7d1732..2dcc6e15 100644
--- a/org.eclipse.virgo.kernel.dmfragment/template.mf
+++ b/org.eclipse.virgo.kernel.dmfragment/template.mf
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Virgo Kernel User Region OSGi Spring DM Fragment
-Fragment-Host: org.springframework.osgi.extender
+Fragment-Host: org.eclipse.gemini.blueprint.extender
Bundle-SymbolicName: org.eclipse.virgo.kernel.dmfragment
Bundle-Version: ${version}
Import-Package:
@@ -16,6 +16,6 @@ Import-Template:
org.osgi.framework.*;version="0",
org.springframework.*;version="${org.springframework:[2.5.6, +1)}"
Excluded-Imports:
- org.springframework.osgi.*
+ org.eclipse.gemini.blueprint.*
Excluded-Exports:
org.eclipse.virgo.kernel.dmfragment.internal.*
diff --git a/org.eclipse.virgo.kernel.kerneldmfragment/template.mf b/org.eclipse.virgo.kernel.kerneldmfragment/template.mf
index b5cc4df3..cadebd28 100644
--- a/org.eclipse.virgo.kernel.kerneldmfragment/template.mf
+++ b/org.eclipse.virgo.kernel.kerneldmfragment/template.mf
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Virgo Kernel OSGi Spring DM Fragment
-Fragment-Host: org.springframework.osgi.extender
+Fragment-Host: org.eclipse.gemini.blueprint.extender
Bundle-SymbolicName: org.eclipse.virgo.kernel.kerneldmfragment
Bundle-Version: ${version}
Import-Package:
diff --git a/org.eclipse.virgo.kernel.services/ivy.xml b/org.eclipse.virgo.kernel.services/ivy.xml
index 8b385b23..d70ddf4b 100644
--- a/org.eclipse.virgo.kernel.services/ivy.xml
+++ b/org.eclipse.virgo.kernel.services/ivy.xml
@@ -35,7 +35,7 @@
<dependency org="org.springframework" name="org.springframework.beans" rev="${org.springframework}" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.context" rev="${org.springframework}" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.core" rev="${org.springframework}" conf="compile->runtime"/>
- <dependency org="org.springframework.osgi" name="org.springframework.osgi.core" rev="${org.springframework.osgi}" conf="compile->compile"/>
+ <dependency org="org.eclipse.gemini" name="org.eclipse.gemini.blueprint.core" rev="${org.eclipse.gemini.blueprint}" conf="compile->compile"/>
<override org="org.springframework" rev="${org.springframework}" />
<override org="org.eclipse.virgo.util" rev="${org.eclipse.virgo.util}"/>
diff --git a/org.eclipse.virgo.kernel.test/ivy.xml b/org.eclipse.virgo.kernel.test/ivy.xml
index 97fcb424..22e8e385 100644
--- a/org.eclipse.virgo.kernel.test/ivy.xml
+++ b/org.eclipse.virgo.kernel.test/ivy.xml
@@ -16,7 +16,7 @@
<!-- build -->
<dependency org="org.eclipse.osgi" name="org.eclipse.equinox.cm" rev="${org.eclipse.equinox.cm}" conf="compile->runtime"/>
- <dependency org="org.springframework.osgi" name="org.springframework.osgi.core" rev="${org.springframework.osgi}" conf="compile->runtime"/>
+ <dependency org="org.eclipse.gemini" name="org.eclipse.gemini.blueprint.core" rev="${org.eclipse.gemini.blueprint}" conf="compile->runtime"/>
<!-- testing -->
<dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit}" conf="test->runtime"/>
diff --git a/org.eclipse.virgo.kernel.test/src/test/java/org/eclipse/virgo/kernel/dm/test/ModuleBeanFactoryPostProcessorTests.java b/org.eclipse.virgo.kernel.test/src/test/java/org/eclipse/virgo/kernel/dm/test/ModuleBeanFactoryPostProcessorTests.java
index 7d1b819b..65bce653 100644
--- a/org.eclipse.virgo.kernel.test/src/test/java/org/eclipse/virgo/kernel/dm/test/ModuleBeanFactoryPostProcessorTests.java
+++ b/org.eclipse.virgo.kernel.test/src/test/java/org/eclipse/virgo/kernel/dm/test/ModuleBeanFactoryPostProcessorTests.java
@@ -25,9 +25,9 @@ import org.osgi.framework.Bundle;
import org.osgi.framework.ServiceReference;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.osgi.context.support.OsgiBundleXmlApplicationContext;
-import org.springframework.osgi.service.importer.support.ImportContextClassLoader;
-import org.springframework.osgi.service.importer.support.OsgiServiceProxyFactoryBean;
+import org.eclipse.gemini.blueprint.context.support.OsgiBundleXmlApplicationContext;
+import org.eclipse.gemini.blueprint.service.importer.support.ImportContextClassLoader;
+import org.eclipse.gemini.blueprint.service.importer.support.OsgiServiceProxyFactoryBean;
import org.eclipse.virgo.kernel.osgi.framework.OsgiFrameworkUtils;
import org.eclipse.virgo.kernel.osgi.framework.OsgiServiceHolder;
diff --git a/org.eclipse.virgo.kernel.test/template.mf b/org.eclipse.virgo.kernel.test/template.mf
index 53e897cd..8648f659 100644
--- a/org.eclipse.virgo.kernel.test/template.mf
+++ b/org.eclipse.virgo.kernel.test/template.mf
@@ -12,7 +12,7 @@ Import-Template:
org.eclipse.osgi.*;version="0",
org.osgi.*;version="0",
org.springframework.*;version="${org.springframework:[2.5.6, +1)}",
- org.springframework.osgi.*;version="${org.springframework.osgi:[=.=.=, +1)}"
+ org.eclipse.gemini.blueprint.*;version="${org.eclipse.gemini.blueprint:[=.=.=, +1)}"
Excluded-Imports: subsystem.installation,
com.springsource,
org.eclipse.virgo.osgi.extensions.*,

Back to the top