Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--build-kernel/build.xml2
-rw-r--r--build-kernel/repository-ext-ivy.xml6
-rw-r--r--org.eclipse.virgo.kernel.dmfragment/src/main/java/org/eclipse/virgo/kernel/dmfragment/internal/ContextClassLoaderPostProcessor.java7
-rw-r--r--org.eclipse.virgo.kernel.dmfragment/src/main/resources/META-INF/spring/extender/kernel-dmfragment-context.xml2
-rw-r--r--org.eclipse.virgo.kernel.test/src/test/java/org/eclipse/virgo/kernel/dm/test/ModuleBeanFactoryPostProcessorTests.java17
-rw-r--r--org.eclipse.virgo.kernel.test/src/test/resources/post-processors/inbuilt/META-INF/MANIFEST.MF4
6 files changed, 19 insertions, 19 deletions
diff --git a/build-kernel/build.xml b/build-kernel/build.xml
index ea3082ad..5a31206b 100644
--- a/build-kernel/build.xml
+++ b/build-kernel/build.xml
@@ -150,7 +150,7 @@
<filter token="MEDIC.VERSION" value="${org.eclipse.virgo.medic}"/>
<filter token="REPOSITORY.VERSION" value="${org.eclipse.virgo.repository}"/>
<filter token="SLF4J.VERSION" value="${org.slf4j}"/>
- <filter token="SPRING.DM.VERSION" value="${org.springframework.osgi}"/>
+ <filter token="SPRING.DM.VERSION" value="${org.eclipse.gemini.blueprint}"/>
<filter token="SPRING.VERSION" value="${org.springframework}"/>
<filter token="UTIL.VERSION" value="${org.eclipse.virgo.util}"/>
<filter token="FELIX.GOGO.RUNTIME.VERSION" value="${org.apache.felix.gogo.runtime}"/>
diff --git a/build-kernel/repository-ext-ivy.xml b/build-kernel/repository-ext-ivy.xml
index e36ec212..c91605a7 100644
--- a/build-kernel/repository-ext-ivy.xml
+++ b/build-kernel/repository-ext-ivy.xml
@@ -9,9 +9,9 @@
</configurations>
<dependencies>
- <dependency org="org.springframework.osgi" name="org.springframework.osgi.core" rev="${org.springframework.osgi}" conf="repository-ext->runtime"/>
- <dependency org="org.springframework.osgi" name="org.springframework.osgi.extender" rev="${org.springframework.osgi}" conf="repository-ext->runtime"/>
- <dependency org="org.springframework.osgi" name="org.springframework.osgi.io" rev="${org.springframework.osgi}" conf="repository-ext->runtime"/>
+ <dependency org="org.eclipse.gemini" name="org.eclipse.gemini.blueprint.core" rev="${org.eclipse.gemini.blueprint}" conf="repository-ext->runtime"/>
+ <dependency org="org.eclipse.gemini" name="org.eclipse.gemini.blueprint.extender" rev="${org.eclipse.gemini.blueprint}" conf="repository-ext->runtime"/>
+ <dependency org="org.eclipse.gemini" name="org.eclipse.gemini.blueprint.io" rev="${org.eclipse.gemini.blueprint}" conf="repository-ext->runtime"/>
<dependency org="org.eclipse.osgi" name="org.eclipse.equinox.ds" rev="${org.eclipse.equinox.ds}" conf="repository-ext->runtime"/>
<dependency org="org.eclipse.osgi" name="org.eclipse.equinox.util" rev="${org.eclipse.equinox.util}" conf="repository-ext->runtime"/>
<dependency org="org.eclipse.osgi" name="org.eclipse.osgi.services" rev="${org.eclipse.osgi.services}" conf="repository-ext->runtime"/>
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 7bc97fb0..6f280bea 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
@@ -20,7 +20,7 @@ import org.springframework.beans.MutablePropertyValues;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
import org.eclipse.gemini.blueprint.extender.OsgiBeanFactoryPostProcessor;
-import org.eclipse.gemini.blueprint.service.importer.support.ImportContextClassLoader;
+import org.eclipse.gemini.blueprint.service.importer.support.ImportContextClassLoaderEnum;
import org.eclipse.gemini.blueprint.service.importer.support.OsgiServiceCollectionProxyFactoryBean;
import org.eclipse.gemini.blueprint.service.importer.support.OsgiServiceProxyFactoryBean;
@@ -36,21 +36,20 @@ import org.eclipse.gemini.blueprint.service.importer.support.OsgiServiceProxyFac
*/
final class ContextClassLoaderPostProcessor implements ModuleBeanFactoryPostProcessor {
- private static final String PROPERTY_CONTEXT_CLASS_LOADER = "contextClassLoader";
+ private static final String PROPERTY_CONTEXT_CLASS_LOADER = "importContextClassLoader";
private static final Set<String> IMPORTER_CLASS_NAMES = createImportClassNames();
/**
* {@inheritDoc}
*/
- @SuppressWarnings("deprecation")
public void postProcess(BundleContext bundleContext, ConfigurableListableBeanFactory beanFactory) {
String[] beanDefinitionNames = beanFactory.getBeanDefinitionNames();
for (String name : beanDefinitionNames) {
BeanDefinition beanDefinition = beanFactory.getBeanDefinition(name);
if (isServiceImportDefinition(beanDefinition)) {
MutablePropertyValues propertyValues = beanDefinition.getPropertyValues();
- propertyValues.addPropertyValue(PROPERTY_CONTEXT_CLASS_LOADER, ImportContextClassLoader.UNMANAGED.getLabel());
+ propertyValues.addPropertyValue(PROPERTY_CONTEXT_CLASS_LOADER, ImportContextClassLoaderEnum.UNMANAGED);
}
}
}
diff --git a/org.eclipse.virgo.kernel.dmfragment/src/main/resources/META-INF/spring/extender/kernel-dmfragment-context.xml b/org.eclipse.virgo.kernel.dmfragment/src/main/resources/META-INF/spring/extender/kernel-dmfragment-context.xml
index 090fb809..1f2473fe 100644
--- a/org.eclipse.virgo.kernel.dmfragment/src/main/resources/META-INF/spring/extender/kernel-dmfragment-context.xml
+++ b/org.eclipse.virgo.kernel.dmfragment/src/main/resources/META-INF/spring/extender/kernel-dmfragment-context.xml
@@ -22,7 +22,7 @@
</constructor-arg>
</bean>
- <osgi:service ref="serverExtensionConfigurer" interface="org.springframework.osgi.extender.OsgiBeanFactoryPostProcessor" />
+ <osgi:service ref="serverExtensionConfigurer" interface="org.eclipse.gemini.blueprint.extender.OsgiBeanFactoryPostProcessor" />
<bean id="taskExecutor" class="org.eclipse.virgo.kernel.agent.dm.ContextPropagatingTaskExecutor">
<constructor-arg value="region-dm-" />
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 65bce653..dabee43d 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
@@ -17,7 +17,14 @@ import static org.junit.Assert.assertTrue;
import java.io.File;
+import org.eclipse.gemini.blueprint.context.support.OsgiBundleXmlApplicationContext;
+import org.eclipse.gemini.blueprint.service.importer.support.ImportContextClassLoaderEnum;
+import org.eclipse.gemini.blueprint.service.importer.support.OsgiServiceProxyFactoryBean;
import org.eclipse.virgo.kernel.core.BundleStarter;
+import org.eclipse.virgo.kernel.osgi.framework.OsgiFrameworkUtils;
+import org.eclipse.virgo.kernel.osgi.framework.OsgiServiceHolder;
+import org.eclipse.virgo.kernel.test.AbstractKernelIntegrationTest;
+import org.eclipse.virgo.kernel.test.TestSignal;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -25,14 +32,6 @@ import org.osgi.framework.Bundle;
import org.osgi.framework.ServiceReference;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ConfigurableApplicationContext;
-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;
-import org.eclipse.virgo.kernel.test.AbstractKernelIntegrationTest;
-import org.eclipse.virgo.kernel.test.TestSignal;
public class ModuleBeanFactoryPostProcessorTests extends AbstractKernelIntegrationTest {
@@ -74,6 +73,6 @@ public class ModuleBeanFactoryPostProcessorTests extends AbstractKernelIntegrati
OsgiServiceProxyFactoryBean referenceBean = (OsgiServiceProxyFactoryBean) applicationContext.getBean("&reference");
assertNotNull(referenceBean);
- assertEquals(ImportContextClassLoader.UNMANAGED, referenceBean.getContextClassLoader());
+ assertEquals(ImportContextClassLoaderEnum.UNMANAGED, referenceBean.getImportContextClassLoader());
}
}
diff --git a/org.eclipse.virgo.kernel.test/src/test/resources/post-processors/inbuilt/META-INF/MANIFEST.MF b/org.eclipse.virgo.kernel.test/src/test/resources/post-processors/inbuilt/META-INF/MANIFEST.MF
index 1e348db9..a36fcef9 100644
--- a/org.eclipse.virgo.kernel.test/src/test/resources/post-processors/inbuilt/META-INF/MANIFEST.MF
+++ b/org.eclipse.virgo.kernel.test/src/test/resources/post-processors/inbuilt/META-INF/MANIFEST.MF
@@ -1,4 +1,6 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.virgo.kernel.dmfragment.test.inbuilt
-Import-Package: org.eclipse.virgo.kernel.osgi.framework
+Import-Package: org.eclipse.virgo.kernel.osgi.framework,
+ org.springframework.context.weaving
+

Back to the top