servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r731881 - in /servicemix/smx4/kernel/trunk: gshell/gshell-features/src/main/resources/META-INF/spring/ gshell/gshell-log/src/main/resources/META-INF/spring/ management/src/main/resources/META-INF/spring/
Date Tue, 06 Jan 2009 08:57:05 GMT
Author: gnodet
Date: Tue Jan  6 00:57:04 2009
New Revision: 731881

URL: http://svn.apache.org/viewvc?rev=731881&view=rev
Log:
SMX4KNL-147: upgrade to spring-dm 1.2.0-m2

Modified:
    servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/resources/META-INF/spring/gshell-features.xml
    servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/resources/META-INF/spring/gshell-log.xml
    servicemix/smx4/kernel/trunk/management/src/main/resources/META-INF/spring/servicemix-management.xml

Modified: servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/resources/META-INF/spring/gshell-features.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/resources/META-INF/spring/gshell-features.xml?rev=731881&r1=731880&r2=731881&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/resources/META-INF/spring/gshell-features.xml
(original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/resources/META-INF/spring/gshell-features.xml
Tue Jan  6 00:57:04 2009
@@ -19,6 +19,7 @@
 -->
 <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"
@@ -26,6 +27,8 @@
        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/osgi
   http://www.springframework.org/schema/osgi/spring-osgi.xsd
   http://www.springframework.org/schema/osgi-compendium
@@ -74,11 +77,11 @@
 
     <osgi:service ref="featuresService" interface="org.apache.servicemix.kernel.gshell.features.FeaturesService"
/>
 
-    <osgix:property-placeholder persistent-id="org.apache.servicemix.features">
-        <osgix:default-properties>
-            <prop key="featuresRepositories"></prop>
-            <prop key="featuresBoot"></prop>
-        </osgix:default-properties>
-    </osgix:property-placeholder>
+    <osgix:cm-properties id="cmProps" persistent-id="org.apache.servicemix.features">
+        <prop key="featuresRepositories"></prop>
+        <prop key="featuresBoot"></prop>
+    </osgix:cm-properties>
+
+    <ctx:property-placeholder properties-ref="cmProps" />
 
 </beans>
\ No newline at end of file

Modified: servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/resources/META-INF/spring/gshell-log.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/resources/META-INF/spring/gshell-log.xml?rev=731881&r1=731880&r2=731881&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/resources/META-INF/spring/gshell-log.xml
(original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/resources/META-INF/spring/gshell-log.xml
Tue Jan  6 00:57:04 2009
@@ -19,6 +19,7 @@
 -->
 <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"
@@ -26,6 +27,8 @@
        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/osgi
   http://www.springframework.org/schema/osgi/spring-osgi.xsd
   http://www.springframework.org/schema/osgi-compendium
@@ -79,11 +82,11 @@
         </osgi:service-properties>
     </osgi:service>
 
-    <osgix:property-placeholder persistent-id="org.apache.servicemix.log">
-        <osgix:default-properties>
-            <prop key="size">500</prop>
-            <prop key="pattern">%d{ABSOLUTE} | %-5.5p | %-16.16t | %-32.32c{1} | %-32.32C
%4L | %m%n</prop>
-        </osgix:default-properties>
-    </osgix:property-placeholder>
+    <osgix:cm-properties id="cmProps" persistent-id="org.apache.servicemix.log">
+        <prop key="size">500</prop>
+        <prop key="pattern">%d{ABSOLUTE} | %-5.5p | %-16.16t | %-32.32c{1} | %-32.32C
%4L | %m%n</prop>
+    </osgix:cm-properties>
+
+    <ctx:property-placeholder properties-ref="cmProps" />
 
 </beans>
\ No newline at end of file

Modified: servicemix/smx4/kernel/trunk/management/src/main/resources/META-INF/spring/servicemix-management.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/management/src/main/resources/META-INF/spring/servicemix-management.xml?rev=731881&r1=731880&r2=731881&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/management/src/main/resources/META-INF/spring/servicemix-management.xml
(original)
+++ servicemix/smx4/kernel/trunk/management/src/main/resources/META-INF/spring/servicemix-management.xml
Tue Jan  6 00:57:04 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
@@ -90,19 +93,19 @@
         </property>
         <property name="assembler" ref="assembler"/>
     </bean>
-    
+
     <!-- Property place holder -->
-    <osgix:property-placeholder persistent-id="org.apache.servicemix.management">
-        <osgix:default-properties>
-            <prop key="rmiRegistryPort">1099</prop>
-            <prop key="jmxRealm">servicemix</prop>
-            <prop key="serviceUrl">service:jmx:rmi:///jndi/rmi://localhost:1099/jmxrmi</prop>
-            <prop key="daemon">true</prop>
-            <prop key="threaded">true</prop>
-            <prop key="objectName">connector:name=rmi</prop>
-            <prop key="frameworkName">org.osgi:name=Framework</prop>
-        </osgix:default-properties>
-    </osgix:property-placeholder>
+    <osgix:cm-properties id="cmProps" persistent-id="org.apache.servicemix.management">
+        <prop key="rmiRegistryPort">1099</prop>
+        <prop key="jmxRealm">servicemix</prop>
+        <prop key="serviceUrl">service:jmx:rmi:///jndi/rmi://localhost:1099/jmxrmi</prop>
+        <prop key="daemon">true</prop>
+        <prop key="threaded">true</prop>
+        <prop key="objectName">connector:name=rmi</prop>
+        <prop key="frameworkName">org.osgi:name=Framework</prop>
+    </osgix:cm-properties>
+
+    <ctx:property-placeholder properties-ref="cmProps" />
 
 </beans>
 



Mime
View raw message