You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@servicemix.apache.org by ff...@apache.org on 2009/01/19 11:14:04 UTC

svn commit: r735642 - /servicemix/smx4/features/trunk/transaction/transaction/src/main/resources/META-INF/spring/servicemix-tx.xml

Author: ffang
Date: Mon Jan 19 02:14:03 2009
New Revision: 735642

URL: http://svn.apache.org/viewvc?rev=735642&view=rev
Log:
[SMX4-191]also change servicemix-tx.xml based on the new syntax in osgi spring 1.2.0-m2

Modified:
    servicemix/smx4/features/trunk/transaction/transaction/src/main/resources/META-INF/spring/servicemix-tx.xml

Modified: servicemix/smx4/features/trunk/transaction/transaction/src/main/resources/META-INF/spring/servicemix-tx.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/transaction/transaction/src/main/resources/META-INF/spring/servicemix-tx.xml?rev=735642&r1=735641&r2=735642&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/transaction/transaction/src/main/resources/META-INF/spring/servicemix-tx.xml (original)
+++ servicemix/smx4/features/trunk/transaction/transaction/src/main/resources/META-INF/spring/servicemix-tx.xml Mon Jan 19 02:14:03 2009
@@ -19,12 +19,15 @@
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:ctx="http://www.springframework.org/schema/context"
        xmlns:osgi="http://www.springframework.org/schema/osgi"
        xmlns:osgix="http://www.springframework.org/schema/osgi-compendium"
        xmlns:util="http://www.springframework.org/schema/util"
        xsi:schemaLocation="
   http://www.springframework.org/schema/beans
   http://www.springframework.org/schema/beans/spring-beans.xsd
+  http://www.springframework.org/schema/context
+  http://www.springframework.org/schema/context/spring-context.xsd
   http://www.springframework.org/schema/util
   http://www.springframework.org/schema/util/spring-util.xsd
   http://www.springframework.org/schema/osgi
@@ -46,11 +49,11 @@
         </osgi:interfaces>
     </osgi:service>
 
-    <osgix:property-placeholder persistent-id="org.apache.servicemix.transaction">
-        <osgix:default-properties>
-            <prop key="defaultTransactionTimeoutSeconds">600</prop>
-            <prop key="transactionLogDir">${servicemix.base}/data/txlog/</prop>
-        </osgix:default-properties>
-    </osgix:property-placeholder>
+    <osgix:cm-properties id="txProps" persistent-id="org.apache.servicemix.transaction">
+        <prop key="defaultTransactionTimeoutSeconds">600</prop>
+        <prop key="transactionLogDir">${servicemix.base}/data/txlog/</prop>
+    </osgix:cm-properties>
+ 
+    <ctx:property-placeholder properties-ref="txProps" />
 
-</beans>
\ No newline at end of file
+</beans>