svn commit: r901500 - /servicemix/archetypes/trunk/servicemix-osgi-camel-archetype/src/main/resources/archetype-resources/src/main/resources/META-INF/spring/camel-context.xml

[ffang]

Author: ffang
Date: Thu Jan 21 02:25:43 2010
New Revision: 901500

URL: http://svn.apache.org/viewvc?rev=901500&view=rev
Log:
[SMX4-463]servicemix-osgi-camel-archetype doesn't work anymore

Modified:
    
servicemix/archetypes/trunk/servicemix-osgi-camel-archetype/src/main/resources/archetype-resources/src/main/resources/META-INF/spring/camel-context.xml

Modified: 
servicemix/archetypes/trunk/servicemix-osgi-camel-archetype/src/main/resources/archetype-resources/src/main/resources/META-INF/spring/camel-context.xml
URL: 
http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-osgi-camel-archetype/src/main/resources/archetype-resources/src/main/resources/META-INF/spring/camel-context.xml?rev=901500&r1=901499&r2=901500&view=diff
==============================================================================
--- 
servicemix/archetypes/trunk/servicemix-osgi-camel-archetype/src/main/resources/archetype-resources/src/main/resources/META-INF/spring/camel-context.xml
 (original)
+++ 
servicemix/archetypes/trunk/servicemix-osgi-camel-archetype/src/main/resources/archetype-resources/src/main/resources/META-INF/spring/camel-context.xml
 Thu Jan 21 02:25:43 2010
@@ -18,15 +18,18 @@
 
 <beans xmlns="http://www.springframework.org/schema/beans";
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-       xmlns:osgi="http://activemq.apache.org/camel/schema/osgi";
+       xmlns:osgi="http://camel.apache.org/schema/osgi";
        xmlns:osgix="http://www.springframework.org/schema/osgi-compendium";
+       xmlns:ctx="http://www.springframework.org/schema/context";
        xsi:schemaLocation="
        http://www.springframework.org/schema/beans 
http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-       http://activemq.apache.org/camel/schema/spring 
http://activemq.apache.org/camel/schema/spring/camel-spring.xsd
-       http://activemq.apache.org/camel/schema/osgi 
http://activemq.apache.org/camel/schema/osgi/camel-osgi.xsd
-       http://www.springframework.org/schema/osgi-compendium 
http://www.springframework.org/schema/osgi-compendium/spring-osgi-compendium.xsd";>
+       http://camel.apache.org/schema/spring 
http://camel.apache.org/schema/spring/camel-spring.xsd
+       http://camel.apache.org/schema/osgi 
http://camel.apache.org/schema/osgi/camel-osgi.xsd
+       http://www.springframework.org/schema/osgi-compendium 
http://www.springframework.org/schema/osgi-compendium/spring-osgi-compendium.xsd
+       http://www.springframework.org/schema/context 
http://www.springframework.org/schema/context/spring-context.xsd
+">
 
-  <osgi:camelContext xmlns="http://activemq.apache.org/camel/schema/spring";>
+  <osgi:camelContext xmlns="http://camel.apache.org/schema/spring";>
     <route>
       <from uri="timer://myTimer?fixedRate=true&amp;period=2000"/>
       <bean ref="myTransform" method="transform"/>
@@ -38,10 +41,10 @@
     <property name="prefix" value="${prefix}"/>
   </bean>
 
-  <osgix:property-placeholder persistent-id="${packageName}">
-        <osgix:default-properties>
-            <prop key="prefix">MyTransform</prop>
-        </osgix:default-properties>
-    </osgix:property-placeholder>
+  <osgix:cm-properties id="preProps" persistent-id="${packageName}">
+      <prop key="prefix">MyTransform</prop>
+  </osgix:cm-properties>
+
+  <ctx:property-placeholder properties-ref="preProps" />
 
 </beans>