Diff
Modified: trunk/assembly/project.xml (735 => 736)
--- trunk/assembly/project.xml 2005-11-03 14:07:29 UTC (rev 735)
+++ trunk/assembly/project.xml 2005-11-03 14:57:38 UTC (rev 736)
@@ -65,7 +65,7 @@
</dependency>
<dependency>
- <groupId>xbean</groupId>
+ <groupId>org.xbean</groupId>
<artifactId>xbean-spring</artifactId>
<version>${xbean_version}</version>
<properties>
Modified: trunk/assembly/src/release/conf/jndi.properties (735 => 736)
--- trunk/assembly/src/release/conf/jndi.properties 2005-11-03 14:07:29 UTC (rev 735)
+++ trunk/assembly/src/release/conf/jndi.properties 2005-11-03 14:57:38 UTC (rev 736)
@@ -1 +1 @@
-java.naming.factory.initial = org.servicemix.jbi.jndi.SpringInitialContextFactory
+java.naming.factory.initial = org.xbean.spring.jndi.SpringInitialContextFactory
Modified: trunk/assembly/src/release/conf/jndi.xml (735 => 736)
--- trunk/assembly/src/release/conf/jndi.xml 2005-11-03 14:07:29 UTC (rev 735)
+++ trunk/assembly/src/release/conf/jndi.xml 2005-11-03 14:57:38 UTC (rev 736)
@@ -2,7 +2,7 @@
<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
<!-- START SNIPPET: jndi -->
<beans>
- <bean id="jndi" class="org.servicemix.jbi.jndi.DefaultContext" singleton="true">
+ <bean id="jndi" class="org.xbean.spring.jndi.DefaultContext" singleton="true">
<property name="entries">
<map>
<entry key="jdbc/pxe__pm">
@@ -13,11 +13,18 @@
</bean>
</entry>
- <entry key="javax.transaction.TransactionManager">
- <bean class="org.jencks.factory.TransactionManagerFactoryBean"/>
- </entry>
+ <entry key="javax.transaction.TransactionManager" value-ref="transactionManager" />
</map>
</property>
</bean>
+
+ <bean id="extendedTransactionManager" class="org.jencks.factory.TransactionManagerFactoryBean"/>
+ <bean id="transactionContextManager" class="org.jencks.factory.TransactionContextManagerFactoryBean">
+ <property name="transactionManager" ref="extendedTransactionManager"/>
+ </bean>
+ <bean id="transactionManager" class="org.jencks.factory.GeronimoTransactionManagerFactoryBean">
+ <property name="transactionContextManager" ref="transactionContextManager"/>
+ </bean>
+
</beans>
<!-- END SNIPPET: jndi -->
Modified: trunk/assembly/src/release/examples/bpel/servicemix.xml (735 => 736)
--- trunk/assembly/src/release/examples/bpel/servicemix.xml 2005-11-03 14:07:29 UTC (rev 735)
+++ trunk/assembly/src/release/examples/bpel/servicemix.xml 2005-11-03 14:57:38 UTC (rev 736)
@@ -50,7 +50,7 @@
<!-- JNDI configurration -->
<bean id="jndi"
- class="org.servicemix.jbi.jndi.SpringInitialContextFactory"
+ class="org.xbean.spring.jndi.SpringInitialContextFactory"
factory-method="makeInitialContext" singleton="true">
<property name="entries">
<map>
@@ -63,10 +63,7 @@
</bean>
</entry>
- <entry key="javax.transaction.TransactionManager">
- <bean
- class="org.jencks.factory.TransactionManagerFactoryBean" />
- </entry>
+ <entry key="javax.transaction.TransactionManager" value-ref="transactionManager" />
</map>
</property>
</bean>
Modified: trunk/components/base/project.xml (735 => 736)
--- trunk/components/base/project.xml 2005-11-03 14:07:29 UTC (rev 735)
+++ trunk/components/base/project.xml 2005-11-03 14:57:38 UTC (rev 736)
@@ -328,7 +328,7 @@
<!-- for custom XML parsing -->
<dependency>
- <groupId>xbean</groupId>
+ <groupId>org.xbean</groupId>
<artifactId>xbean-spring</artifactId>
<version>${xbean_version}</version>
<url>http://www.xbean.org</url>
@@ -337,13 +337,13 @@
</properties>
</dependency>
<dependency>
- <groupId>xbean</groupId>
+ <groupId>org.xbean</groupId>
<artifactId>xbean-server</artifactId>
<version>${xbean_version}</version>
<url>http://www.xbean.org</url>
</dependency>
<dependency>
- <groupId>xbean</groupId>
+ <groupId>org.xbean</groupId>
<artifactId>xbean-kernel</artifactId>
<version>${xbean_version}</version>
<url>http://www.xbean.org</url>
Modified: trunk/components/jaxws/project.xml (735 => 736)
--- trunk/components/jaxws/project.xml 2005-11-03 14:07:29 UTC (rev 735)
+++ trunk/components/jaxws/project.xml 2005-11-03 14:57:38 UTC (rev 736)
@@ -141,7 +141,7 @@
</dependency>
<dependency>
- <groupId>xbean</groupId>
+ <groupId>org.xbean</groupId>
<artifactId>xbean-spring</artifactId>
<version>2.0-SNAPSHOT</version>
<url>http://www.xbean.org</url>
@@ -150,13 +150,13 @@
</properties>
</dependency>
<dependency>
- <groupId>xbean</groupId>
+ <groupId>org.xbean</groupId>
<artifactId>xbean-server</artifactId>
<version>2.0-SNAPSHOT</version>
<url>http://www.xbean.org</url>
</dependency>
<dependency>
- <groupId>xbean</groupId>
+ <groupId>org.xbean</groupId>
<artifactId>xbean-kernel</artifactId>
<version>2.0-SNAPSHOT</version>
<url>http://www.xbean.org</url>
Modified: trunk/components/xfire/project.xml (735 => 736)
--- trunk/components/xfire/project.xml 2005-11-03 14:07:29 UTC (rev 735)
+++ trunk/components/xfire/project.xml 2005-11-03 14:57:38 UTC (rev 736)
@@ -118,19 +118,19 @@
</dependency>
<dependency>
- <groupId>xbean</groupId>
+ <groupId>org.xbean</groupId>
<artifactId>xbean-spring</artifactId>
<version>${xbean_version}</version>
<url>http://www.xbean.org</url>
</dependency>
<dependency>
- <groupId>xbean</groupId>
+ <groupId>org.xbean</groupId>
<artifactId>xbean-server</artifactId>
<version>${xbean_version}</version>
<url>http://www.xbean.org</url>
</dependency>
<dependency>
- <groupId>xbean</groupId>
+ <groupId>org.xbean</groupId>
<artifactId>xbean-kernel</artifactId>
<version>${xbean_version}</version>
<url>http://www.xbean.org</url>
Modified: trunk/core/project.xml (735 => 736)
--- trunk/core/project.xml 2005-11-03 14:07:29 UTC (rev 735)
+++ trunk/core/project.xml 2005-11-03 14:57:38 UTC (rev 736)
@@ -303,7 +303,7 @@
<!-- for custom XML parsing -->
<dependency>
- <groupId>xbean</groupId>
+ <groupId>org.xbean</groupId>
<artifactId>xbean-spring</artifactId>
<version>${xbean_version}</version>
<url>http://www.xbean.org</url>
Modified: trunk/tooling/example-client-logger/project.xml (735 => 736)
--- trunk/tooling/example-client-logger/project.xml 2005-11-03 14:07:29 UTC (rev 735)
+++ trunk/tooling/example-client-logger/project.xml 2005-11-03 14:57:38 UTC (rev 736)
@@ -3,7 +3,7 @@
<pomVersion>2</pomVersion>
<name>ServiceMix Client Logger Example</name>
<id>example-client-logger</id>
- <currentVersion>1.0</currentVersion>
+ <currentVersion>2.0</currentVersion>
<package>org.servicemix.demo</package>
<shortDescription>
This is an example of a simple logging component written using
@@ -26,7 +26,7 @@
<dependencies>
<dependency>
<id>servicemix</id>
- <version>1.0</version>
+ <version>2.0-SNAPSHOT</version>
<type>jar</type>
<url>http://www.servicemix.org</url>
</dependency>
@@ -49,7 +49,7 @@
<dependency>
<groupId>servicemix</groupId>
<artifactId>servicemix-client</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<properties>
<jbi.bundle>true</jbi.bundle>
</properties>
Modified: trunk/tooling/servicemix-client/project.xml (735 => 736)
--- trunk/tooling/servicemix-client/project.xml 2005-11-03 14:07:29 UTC (rev 735)
+++ trunk/tooling/servicemix-client/project.xml 2005-11-03 14:57:38 UTC (rev 736)
@@ -45,6 +45,21 @@
<version>1.3</version>
</dependency>
<dependency>
+ <groupId>org.xbean</groupId>
+ <artifactId>xbean-spring</artifactId>
+ <version>${xbean_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.xbean</groupId>
+ <artifactId>xbean-kernel</artifactId>
+ <version>${xbean_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.xbean</groupId>
+ <artifactId>xbean-server</artifactId>
+ <version>${xbean_version}</version>
+ </dependency>
+ <dependency>
<groupId>mx4j</groupId>
<artifactId>mx4j-jmx</artifactId>
<version>${mx4j_version}</version>
@@ -60,6 +75,16 @@
<artifactId>spring</artifactId>
<version>${spring_version}</version>
</dependency>
+ <dependency>
+ <groupId>backport-util-concurrent</groupId>
+ <artifactId>backport-util-concurrent</artifactId>
+ <version>${backport_util_concurrent_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <version>${easymock_version}</version>
+ </dependency>
</dependencies>
<build>
<sourceDirectory>src/main/java</sourceDirectory>
Modified: trunk/tooling/servicemix-web/project.xml (735 => 736)
--- trunk/tooling/servicemix-web/project.xml 2005-11-03 14:07:29 UTC (rev 735)
+++ trunk/tooling/servicemix-web/project.xml 2005-11-03 14:57:38 UTC (rev 736)
@@ -99,7 +99,7 @@
</properties>
</dependency>
<dependency>
- <groupId>xbean</groupId>
+ <groupId>org.xbean</groupId>
<artifactId>xbean-spring</artifactId>
<version>${xbean_version}</version>
<url>http://www.xbean.org</url>
