servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r963672 - in /servicemix/components/shared-libraries/trunk/servicemix-common/src/main: java/org/apache/servicemix/jbi/ resources/META-INF/ resources/OSGI-INF/ resources/OSGI-INF/blueprint/ resources/OSGI-INF/blueprint/servicemix-common.xml
Date Tue, 13 Jul 2010 10:47:47 GMT
Author: gnodet
Date: Tue Jul 13 10:47:47 2010
New Revision: 963672

URL: http://svn.apache.org/viewvc?rev=963672&view=rev
Log:
Use blueprint instead of spring-dm for internal config

Added:
    servicemix/components/shared-libraries/trunk/servicemix-common/src/main/resources/OSGI-INF/
    servicemix/components/shared-libraries/trunk/servicemix-common/src/main/resources/OSGI-INF/blueprint/
    servicemix/components/shared-libraries/trunk/servicemix-common/src/main/resources/OSGI-INF/blueprint/servicemix-common.xml
      - copied, changed from r963617, servicemix/components/shared-libraries/trunk/servicemix-common/src/main/resources/META-INF/spring/servicemix-common.xml
Removed:
    servicemix/components/shared-libraries/trunk/servicemix-common/src/main/java/org/apache/servicemix/jbi/
    servicemix/components/shared-libraries/trunk/servicemix-common/src/main/resources/META-INF/

Copied: servicemix/components/shared-libraries/trunk/servicemix-common/src/main/resources/OSGI-INF/blueprint/servicemix-common.xml
(from r963617, servicemix/components/shared-libraries/trunk/servicemix-common/src/main/resources/META-INF/spring/servicemix-common.xml)
URL: http://svn.apache.org/viewvc/servicemix/components/shared-libraries/trunk/servicemix-common/src/main/resources/OSGI-INF/blueprint/servicemix-common.xml?p2=servicemix/components/shared-libraries/trunk/servicemix-common/src/main/resources/OSGI-INF/blueprint/servicemix-common.xml&p1=servicemix/components/shared-libraries/trunk/servicemix-common/src/main/resources/META-INF/spring/servicemix-common.xml&r1=963617&r2=963672&rev=963672&view=diff
==============================================================================
--- servicemix/components/shared-libraries/trunk/servicemix-common/src/main/resources/META-INF/spring/servicemix-common.xml
(original)
+++ servicemix/components/shared-libraries/trunk/servicemix-common/src/main/resources/OSGI-INF/blueprint/servicemix-common.xml
Tue Jul 13 10:47:47 2010
@@ -17,31 +17,19 @@
     limitations under the License.
 
 -->
-<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"
-       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
-  http://www.springframework.org/schema/osgi-compendium/spring-osgi-compendium.xsd">
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
+           xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.0.0">
 
   <!-- Configuration Admin PID org.apache.servicemix.jbi -->
-  <osgix:cm-properties id="cmProps" persistent-id="org.apache.servicemix.jbi">
-    <prop key="allowCoreThreadTimeout">true</prop>
-    <prop key="corePoolSize">4</prop>
-    <prop key="keepAliveTime">60000</prop>
-    <prop key="maximumPoolSize">-1</prop>
-    <prop key="queueSize">1024</prop>
-  </osgix:cm-properties>
-
-  <ctx:property-placeholder properties-ref="cmProps"/>
+  <cm:property-placeholder persistent-id="org.apache.servicemix.jbi">
+    <cm:default-properties>
+      <cm:property name="allowCoreThreadTimeout" value="true"/>
+      <cm:property name="corePoolSize" value="4"/>
+      <cm:property name="keepAliveTime" value="60000"/>
+      <cm:property name="maximumPoolSize" value="-1"/>
+      <cm:property name="queueSize" value="1024"/>
+    </cm:default-properties>
+  </cm:property-placeholder>
 
   <!-- Creating the singleton and setting the configuration on it -->
   <bean class="org.apache.servicemix.common.osgi.Configuration" factory-method="getInstance">
@@ -52,4 +40,4 @@
     <property name="queueSize" value="${queueSize}" />
   </bean>
 
-</beans>
+</blueprint>



Mime
View raw message