Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlyn Normington2012-03-08 04:30:51 -0500
committerGlyn Normington2012-03-08 04:30:51 -0500
commitbfa77841fa57ef7b3bdabcb5a616cd3081c54d3d (patch)
treed0366b7c1b60fa7457396aeb36e26bb9452121e1 /org.eclipse.virgo.kernel.dmfragment
parent63bab51b715dffc0e000d990ccae4250f238658d (diff)
downloadorg.eclipse.virgo.kernel-bfa77841fa57ef7b3bdabcb5a616cd3081c54d3d.tar.gz
org.eclipse.virgo.kernel-bfa77841fa57ef7b3bdabcb5a616cd3081c54d3d.tar.xz
org.eclipse.virgo.kernel-bfa77841fa57ef7b3bdabcb5a616cd3081c54d3d.zip
317943: more basic upgrade changes
Diffstat (limited to 'org.eclipse.virgo.kernel.dmfragment')
-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
2 files changed, 4 insertions, 5 deletions
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-" />

Back to the top