You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by js...@apache.org on 2007/06/29 20:58:11 UTC
svn commit: r552002 - in /incubator/servicemix/branches/servicemix-3.1: ./
common/servicemix-common/src/main/java/org/apache/servicemix/common/xbean/
Author: jstrachan
Date: Fri Jun 29 11:58:10 2007
New Revision: 552002
URL: http://svn.apache.org/viewvc?view=rev&rev=552002
Log:
Backported changes from trunk to better support Camel ServiceUnits
Modified:
incubator/servicemix/branches/servicemix-3.1/common/servicemix-common/src/main/java/org/apache/servicemix/common/xbean/AbstractXBeanDeployer.java
incubator/servicemix/branches/servicemix-3.1/common/servicemix-common/src/main/java/org/apache/servicemix/common/xbean/SimpleBeanFactory.java
incubator/servicemix/branches/servicemix-3.1/pom.xml
Modified: incubator/servicemix/branches/servicemix-3.1/common/servicemix-common/src/main/java/org/apache/servicemix/common/xbean/AbstractXBeanDeployer.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/common/servicemix-common/src/main/java/org/apache/servicemix/common/xbean/AbstractXBeanDeployer.java?view=diff&rev=552002&r1=552001&r2=552002
==============================================================================
--- incubator/servicemix/branches/servicemix-3.1/common/servicemix-common/src/main/java/org/apache/servicemix/common/xbean/AbstractXBeanDeployer.java (original)
+++ incubator/servicemix/branches/servicemix-3.1/common/servicemix-common/src/main/java/org/apache/servicemix/common/xbean/AbstractXBeanDeployer.java Fri Jun 29 11:58:10 2007
@@ -70,7 +70,7 @@
// Load configuration
Thread.currentThread().setContextClassLoader(component.getClass().getClassLoader());
- SpringLoader springLoader = new SpringLoader();
+ SpringLoader springLoader = createSpringLoader();
springLoader.setKernel(kernel);
springLoader.setBaseDir(new File(serviceUnitRootPath));
springLoader.setXmlPreprocessors(getXmlPreProcessors(serviceUnitRootPath));
@@ -110,7 +110,14 @@
Thread.currentThread().setContextClassLoader(getClass().getClassLoader());
}
}
-
+
+ /**
+ * A factory method to allow derived classes to create alternative spring loaders
+ */
+ protected SpringLoader createSpringLoader() {
+ return new SpringLoader();
+ }
+
protected List getServices(Kernel kernel) throws DeploymentException {
return kernel.getServices(Endpoint.class);
}
Modified: incubator/servicemix/branches/servicemix-3.1/common/servicemix-common/src/main/java/org/apache/servicemix/common/xbean/SimpleBeanFactory.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/common/servicemix-common/src/main/java/org/apache/servicemix/common/xbean/SimpleBeanFactory.java?view=diff&rev=552002&r1=552001&r2=552002
==============================================================================
--- incubator/servicemix/branches/servicemix-3.1/common/servicemix-common/src/main/java/org/apache/servicemix/common/xbean/SimpleBeanFactory.java (original)
+++ incubator/servicemix/branches/servicemix-3.1/common/servicemix-common/src/main/java/org/apache/servicemix/common/xbean/SimpleBeanFactory.java Fri Jun 29 11:58:10 2007
@@ -82,4 +82,8 @@
}
return targetType.isAssignableFrom(beans.get(name).getClass());
}
+ public boolean isPrototype(String name) {
+ return false;
+ }
+
}
Modified: incubator/servicemix/branches/servicemix-3.1/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/pom.xml?view=diff&rev=552002&r1=552001&r2=552002
==============================================================================
--- incubator/servicemix/branches/servicemix-3.1/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-3.1/pom.xml Fri Jun 29 11:58:10 2007
@@ -195,8 +195,8 @@
<xfire-jsr181-api-version>1.0-M1</xfire-jsr181-api-version>
<xfire-version>1.2.5</xfire-version>
<mavenAssemblyPluginVersion>2.1</mavenAssemblyPluginVersion>
- <xbean-version>2.8</xbean-version>
- <spring-version>2.0.1</spring-version>
+ <xbean-version>3.0.1</xbean-version>
+ <spring-version>2.0.5</spring-version>
<activemq-version>4.1.1</activemq-version>
<activeio-version>3.0.0-incubator</activeio-version>
<backport-util-concurrent-version>2.2</backport-util-concurrent-version>