You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by js...@apache.org on 2007/11/23 17:34:42 UTC

svn commit: r597696 - in /activemq/camel/trunk/examples/camel-example-spring: pom.xml src/main/resources/META-INF/spring/camel-context.xml

Author: jstrachan
Date: Fri Nov 23 08:34:41 2007
New Revision: 597696

URL: http://svn.apache.org/viewvc?rev=597696&view=rev
Log:
tidied up the XML and also made the build make an OSGi bundle

Modified:
    activemq/camel/trunk/examples/camel-example-spring/pom.xml
    activemq/camel/trunk/examples/camel-example-spring/src/main/resources/META-INF/spring/camel-context.xml

Modified: activemq/camel/trunk/examples/camel-example-spring/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/examples/camel-example-spring/pom.xml?rev=597696&r1=597695&r2=597696&view=diff
==============================================================================
--- activemq/camel/trunk/examples/camel-example-spring/pom.xml (original)
+++ activemq/camel/trunk/examples/camel-example-spring/pom.xml Fri Nov 23 08:34:41 2007
@@ -29,15 +29,20 @@
   </parent>
 
   <artifactId>camel-example-spring</artifactId>
+  <packaging>bundle</packaging>
   <name>Camel :: Example :: Spring</name>
   <description>An example showing how to work with Camel and Spring</description>
 
+  <properties>
+    <camel.osgi.export.pkg>org.apache.camel.example.spring*</camel.osgi.export.pkg>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-spring</artifactId>
     </dependency>
-    
+
     <dependency>
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-jms</artifactId>
@@ -54,7 +59,7 @@
       <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
-    
+
   </dependencies>
 
   <build>

Modified: activemq/camel/trunk/examples/camel-example-spring/src/main/resources/META-INF/spring/camel-context.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/examples/camel-example-spring/src/main/resources/META-INF/spring/camel-context.xml?rev=597696&r1=597695&r2=597696&view=diff
==============================================================================
--- activemq/camel/trunk/examples/camel-example-spring/src/main/resources/META-INF/spring/camel-context.xml (original)
+++ activemq/camel/trunk/examples/camel-example-spring/src/main/resources/META-INF/spring/camel-context.xml Fri Nov 23 08:34:41 2007
@@ -29,24 +29,25 @@
        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">
 
-  <camelContext id="camel" useJmx="true" mbeanServer="mbeanServer" xmlns="http://activemq.apache.org/camel/schema/spring">
+  <camelContext id="camel" useJmx="true" mbeanServer="mbeanServer"
+                xmlns="http://activemq.apache.org/camel/schema/spring">
     <package>org.apache.camel.example.spring</package>
   </camelContext>
 
   <!-- lets configure the default ActiveMQ broker URL -->
   <bean id="jms" class="org.apache.camel.component.jms.JmsComponent">
     <property name="connectionFactory">
-       <bean class="org.apache.activemq.ActiveMQConnectionFactory">
-         <property name="brokerURL" value="vm://localhost?broker.persistent=false&amp;broker.useJmx=false"/>
-       </bean>
+      <bean class="org.apache.activemq.ActiveMQConnectionFactory">
+        <property name="brokerURL" value="vm://localhost?broker.persistent=false&amp;broker.useJmx=false"/>
+      </bean>
     </property>
   </bean>
 
   <!-- Use JMX -->
   <bean id="agent" class="org.apache.camel.spring.SpringInstrumentationAgent">
-    <property name="camelContext" ref="camel"/>
     <property name="MBeanServer" ref="mbeanServer"/>
   </bean>
+
   <!--
     this bean needs to be eagerly pre-instantiated in order for the exporting to occur;
     this means that it must not be marked as lazily initialized
@@ -58,10 +59,10 @@
     <property name="port" value="1099"/>
   </bean>
   <bean id="serverConnector"
-      class="org.springframework.jmx.support.ConnectorServerFactoryBean" depends-on="registry">
+        class="org.springframework.jmx.support.ConnectorServerFactoryBean" depends-on="registry">
     <property name="objectName" value="connector:name=rmi"/>
-    <property name="serviceUrl" 
-      value="service:jmx:rmi:///jndi/rmi://localhost:1099/jmxrmi"/>
+    <property name="serviceUrl"
+              value="service:jmx:rmi:///jndi/rmi://localhost:1099/jmxrmi"/>
     <property name="threaded" value="true"/>
     <property name="daemon" value="true"/>
   </bean>