Author: davsclaus
Date: Sun Jun 8 21:58:43 2008
New Revision: 664626
URL: http://svn.apache.org/viewvc?rev=664626&view=rev
Log:
CAMEL-472: Added snippet tags in the example code to let the source be included
in the wiki documentation. Added a new profile to start the server using AOP or
not.
Added:
activemq/camel/trunk/examples/camel-example-spring-jms/src/main/resources/META-INF/spring/camel-server-aop.xml
- copied, changed from r664510,
activemq/camel/trunk/examples/camel-example-spring-jms/src/main/resources/META-INF/spring/camel-server.xml
Modified:
activemq/camel/trunk/examples/camel-example-spring-jms/README.txt
activemq/camel/trunk/examples/camel-example-spring-jms/pom.xml
activemq/camel/trunk/examples/camel-example-spring-jms/src/main/java/org/apache/camel/example/client/CamelClient.java
activemq/camel/trunk/examples/camel-example-spring-jms/src/main/java/org/apache/camel/example/client/CamelClientRemoting.java
activemq/camel/trunk/examples/camel-example-spring-jms/src/main/java/org/apache/camel/example/server/AuditTracker.java
activemq/camel/trunk/examples/camel-example-spring-jms/src/main/java/org/apache/camel/example/server/Multiplier.java
activemq/camel/trunk/examples/camel-example-spring-jms/src/main/java/org/apache/camel/example/server/ServerRoutes.java
activemq/camel/trunk/examples/camel-example-spring-jms/src/main/java/org/apache/camel/example/server/Treble.java
activemq/camel/trunk/examples/camel-example-spring-jms/src/main/resources/META-INF/spring/camel-server.xml
activemq/camel/trunk/examples/camel-example-spring-jms/src/main/resources/camel-client-remoting.xml
activemq/camel/trunk/examples/camel-example-spring-jms/src/main/resources/camel-client.xml
Modified: activemq/camel/trunk/examples/camel-example-spring-jms/README.txt
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/examples/camel-example-spring-jms/README.txt?rev=664626&r1=664625&r2=664626&view=diff
==============================================================================
--- activemq/camel/trunk/examples/camel-example-spring-jms/README.txt (original)
+++ activemq/camel/trunk/examples/camel-example-spring-jms/README.txt Sun Jun
8 21:58:43 2008
@@ -9,7 +9,9 @@
The Server is required to be running when you try the clients.
-The Server is also configued with an AOP aspect that does audit trails of the
invocation
+The Server comes in two flavors:
+- Normal that acts as a JMS broker
+- As Normal plus an AOP aspect that does audit trails of the invocation
of the business service and uses Camel for mediation of the storage of the
audit message.
For the latest & greatest documentation on how to use this example please see:
@@ -17,6 +19,7 @@
The example should run if you type
mvn exec:java -PCamelServer
+ mvn exec:java -PCamelServerAOP
mvn exec:java -PCamelClient
mvn exec:java -PCamelClientRemoting
Modified: activemq/camel/trunk/examples/camel-example-spring-jms/pom.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/examples/camel-example-spring-jms/pom.xml?rev=664626&r1=664625&r2=664626&view=diff
==============================================================================
--- activemq/camel/trunk/examples/camel-example-spring-jms/pom.xml (original)
+++ activemq/camel/trunk/examples/camel-example-spring-jms/pom.xml Sun Jun 8
21:58:43 2008
@@ -32,6 +32,7 @@
</description>
<dependencies>
+ <!-- START SNIPPET: e1 -->
<!-- required by both client and server -->
<dependency>
<groupId>org.apache.camel</groupId>
@@ -49,18 +50,22 @@
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-core</artifactId>
</dependency>
+ <!-- END SNIPPET: e1 -->
+ <!-- START SNIPPET: e2 -->
<!-- xbean is required for ActiveMQ broker configuration in the spring
xml file -->
<dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-spring</artifactId>
</dependency>
+ <!-- END SNIPPET: e2 -->
+ <!-- START SNIPPET: e3 -->
<!-- required jars for aspectj AOP support -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
- <version>2.5</version>
+ <version>2.5.4</version>
</dependency>
<dependency>
<groupId>org.aspectj</groupId>
@@ -77,6 +82,7 @@
<artifactId>cglib-nodep</artifactId>
<version>2.1_3</version>
</dependency>
+ <!-- END SNIPPET: e3 -->
<!-- for logging using log4j.properties in src/main/resources -->
<dependency>
@@ -91,12 +97,19 @@
<id>CamelServer</id>
<properties>
<!-- we use Camel spring Main class as the server got all what
it needs to start in the camel-server.xml file -->
- <!-- the argument isn't needed as Camel will default scan in
the META-INF/spring folder for all spring XML files -->
<target.main.class>org.apache.camel.spring.Main</target.main.class>
<target.cmd.args>-a
META-INF/spring/camel-server.xml</target.cmd.args>
</properties>
</profile>
<profile>
+ <id>CamelServerAOP</id>
+ <properties>
+ <!-- we use Camel spring Main class as the server got all what
it needs to start in the camel-server-aop.xml file -->
+
<target.main.class>org.apache.camel.spring.Main</target.main.class>
+ <target.cmd.args>-a
META-INF/spring/camel-server-aop.xml</target.cmd.args>
+ </properties>
+ </profile>
+ <profile>
<id>CamelClient</id>
<properties>
<!-- we start using our own class to control what we do in the
main -->
Modified:
activemq/camel/trunk/examples/camel-example-spring-jms/src/main/java/org/apache/camel/example/client/CamelClient.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/examples/camel-example-spring-jms/src/main/java/org/apache/camel/example/client/CamelClient.java?rev=664626&r1=664625&r2=664626&view=diff
==============================================================================
---
activemq/camel/trunk/examples/camel-example-spring-jms/src/main/java/org/apache/camel/example/client/CamelClient.java
(original)
+++
activemq/camel/trunk/examples/camel-example-spring-jms/src/main/java/org/apache/camel/example/client/CamelClient.java
Sun Jun 8 21:58:43 2008
@@ -29,6 +29,7 @@
*/
public final class CamelClient {
+ // START SNIPPET: e1
public static void main(final String[] args) throws Exception {
System.out.println("Notice this client requires that the CamelServer
is already running!");
@@ -42,5 +43,6 @@
System.exit(0);
}
+ // END SNIPPET: e1
}
Modified:
activemq/camel/trunk/examples/camel-example-spring-jms/src/main/java/org/apache/camel/example/client/CamelClientRemoting.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/examples/camel-example-spring-jms/src/main/java/org/apache/camel/example/client/CamelClientRemoting.java?rev=664626&r1=664625&r2=664626&view=diff
==============================================================================
---
activemq/camel/trunk/examples/camel-example-spring-jms/src/main/java/org/apache/camel/example/client/CamelClientRemoting.java
(original)
+++
activemq/camel/trunk/examples/camel-example-spring-jms/src/main/java/org/apache/camel/example/client/CamelClientRemoting.java
Sun Jun 8 21:58:43 2008
@@ -27,6 +27,7 @@
*/
public final class CamelClientRemoting {
+ // START SNIPPET: e1
public static void main(final String[] args) {
System.out.println("Notice this client requires that the CamelServer
is already running!");
@@ -42,5 +43,6 @@
System.exit(0);
}
+ // END SNIPPET: e1
}
Modified:
activemq/camel/trunk/examples/camel-example-spring-jms/src/main/java/org/apache/camel/example/server/AuditTracker.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/examples/camel-example-spring-jms/src/main/java/org/apache/camel/example/server/AuditTracker.java?rev=664626&r1=664625&r2=664626&view=diff
==============================================================================
---
activemq/camel/trunk/examples/camel-example-spring-jms/src/main/java/org/apache/camel/example/server/AuditTracker.java
(original)
+++
activemq/camel/trunk/examples/camel-example-spring-jms/src/main/java/org/apache/camel/example/server/AuditTracker.java
Sun Jun 8 21:58:43 2008
@@ -22,6 +22,7 @@
import org.aspectj.lang.annotation.Before;
import org.springframework.beans.factory.annotation.Required;
+// START SNIPPET: e1
/**
* For audit tracking of all incoming invocations of our business (Multiplier)
*/
@@ -48,3 +49,4 @@
}
}
+// END SNIPPET: e1
Modified:
activemq/camel/trunk/examples/camel-example-spring-jms/src/main/java/org/apache/camel/example/server/Multiplier.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/examples/camel-example-spring-jms/src/main/java/org/apache/camel/example/server/Multiplier.java?rev=664626&r1=664625&r2=664626&view=diff
==============================================================================
---
activemq/camel/trunk/examples/camel-example-spring-jms/src/main/java/org/apache/camel/example/server/Multiplier.java
(original)
+++
activemq/camel/trunk/examples/camel-example-spring-jms/src/main/java/org/apache/camel/example/server/Multiplier.java
Sun Jun 8 21:58:43 2008
@@ -19,6 +19,7 @@
/**
* @author martin.gilday
*/
+// START SNIPPET: e1
public interface Multiplier {
/**
@@ -30,3 +31,4 @@
int multiply(int originalNumber);
}
+// END SNIPPET: e1
Modified:
activemq/camel/trunk/examples/camel-example-spring-jms/src/main/java/org/apache/camel/example/server/ServerRoutes.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/examples/camel-example-spring-jms/src/main/java/org/apache/camel/example/server/ServerRoutes.java?rev=664626&r1=664625&r2=664626&view=diff
==============================================================================
---
activemq/camel/trunk/examples/camel-example-spring-jms/src/main/java/org/apache/camel/example/server/ServerRoutes.java
(original)
+++
activemq/camel/trunk/examples/camel-example-spring-jms/src/main/java/org/apache/camel/example/server/ServerRoutes.java
Sun Jun 8 21:58:43 2008
@@ -21,6 +21,7 @@
/**
* @author martin.gilday
*/
+// START SNIPPET: e1
public class ServerRoutes extends RouteBuilder {
@Override
@@ -30,3 +31,4 @@
}
}
+// END SNIPPET: e1
Modified:
activemq/camel/trunk/examples/camel-example-spring-jms/src/main/java/org/apache/camel/example/server/Treble.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/examples/camel-example-spring-jms/src/main/java/org/apache/camel/example/server/Treble.java?rev=664626&r1=664625&r2=664626&view=diff
==============================================================================
---
activemq/camel/trunk/examples/camel-example-spring-jms/src/main/java/org/apache/camel/example/server/Treble.java
(original)
+++
activemq/camel/trunk/examples/camel-example-spring-jms/src/main/java/org/apache/camel/example/server/Treble.java
Sun Jun 8 21:58:43 2008
@@ -21,6 +21,7 @@
/**
* @author martin.gilday
*/
+// START SNIPPET: e1
@Service(value = "multiplier")
public class Treble implements Multiplier {
@@ -29,3 +30,4 @@
}
}
+// END SNIPPET: e1
Copied:
activemq/camel/trunk/examples/camel-example-spring-jms/src/main/resources/META-INF/spring/camel-server-aop.xml
(from r664510,
activemq/camel/trunk/examples/camel-example-spring-jms/src/main/resources/META-INF/spring/camel-server.xml)
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/examples/camel-example-spring-jms/src/main/resources/META-INF/spring/camel-server-aop.xml?p2=activemq/camel/trunk/examples/camel-example-spring-jms/src/main/resources/META-INF/spring/camel-server-aop.xml&p1=activemq/camel/trunk/examples/camel-example-spring-jms/src/main/resources/META-INF/spring/camel-server.xml&r1=664510&r2=664626&rev=664626&view=diff
==============================================================================
---
activemq/camel/trunk/examples/camel-example-spring-jms/src/main/resources/META-INF/spring/camel-server.xml
(original)
+++
activemq/camel/trunk/examples/camel-example-spring-jms/src/main/resources/META-INF/spring/camel-server-aop.xml
Sun Jun 8 21:58:43 2008
@@ -16,55 +16,38 @@
limitations under the License.
-->
+<!-- START SNIPPET: e1 -->
<beans xmlns="http://www.springframework.org/schema/beans";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xmlns:context="http://www.springframework.org/schema/context";
xmlns:aop="http://www.springframework.org/schema/aop";
xmlns:camel="http://activemq.apache.org/camel/schema/spring";
- xmlns:broker="http://activemq.apache.org/schema/core";
xsi:schemaLocation="
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
- http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context-2.5.xsd
http://www.springframework.org/schema/aop
http://www.springframework.org/schema/aop/spring-aop-2.5.xsd
- http://activemq.apache.org/camel/schema/spring
http://activemq.apache.org/camel/schema/spring/camel-spring-1.3.0.xsd
- http://activemq.apache.org/schema/core
http://activemq.apache.org/schema/core/activemq-core-5.1.0.xsd";>
+ http://activemq.apache.org/camel/schema/spring
http://activemq.apache.org/camel/schema/spring/camel-spring-1.3.0.xsd";>
+<!-- END SNIPPET: e1 -->
+ <!-- START SNIPPET: e2 -->
+ <!-- import the normal server that is the JMS broker -->
+ <import resource="camel-server.xml"/>
+ <!-- END SNIPPET: e2 -->
+
+ <!-- START SNIPPET: e3 -->
<!-- turn on AspejctJ AOP to weave all @Aspects beans declared in this
spring xml file -->
<aop:aspectj-autoproxy/>
+ <!-- END SNIPPET: e3 -->
- <!-- let Spring do its IoC stuff in this package -->
- <context:component-scan base-package="org.apache.camel.example.server"/>
-
- <!-- declare a camel context that scans for classes that is RouteBuilder
- in the package org.apache.camel.example.server -->
- <camel:camelContext id="camel">
- <camel:package>org.apache.camel.example.server</camel:package>
- </camel:camelContext>
-
- <!-- lets configure the ActiveMQ JMS broker server to listen on TCP 61616
-->
- <broker:broker useJmx="false" persistent="false" brokerName="localhost">
- <broker:transportConnectors>
- <broker:transportConnector name="tcp" uri="tcp://localhost:61616"/>
- </broker:transportConnectors>
- </broker:broker>
-
- <!-- lets configure the Camel JMS consumer to use the ActiveMQ broker
declared above -->
- <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&broker.useJmx=false"/>
- </bean>
- </property>
- </bean>
-
- <!-- to show aspect AOP stuff -->
+ <!-- START SNIPPET: e4 -->
+ <!-- Aspect that tracks all the invocations of the business service -->
<bean id="AuditTracker"
class="org.apache.camel.example.server.AuditTracker">
<!-- define what store to use for audit backup -->
<property name="store" ref="AuditStore"/>
</bean>
+ <!-- END SNIPPET: e4 -->
+ <!-- START SNIPPET: e5 -->
<!-- the audit store endpoint is configued as file based -->
<camel:endpoint id="AuditStore" uri="file://target/store?append=false"/>
+ <!-- END SNIPPET: e5 -->
</beans>
\ No newline at end of file
Modified:
activemq/camel/trunk/examples/camel-example-spring-jms/src/main/resources/META-INF/spring/camel-server.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/examples/camel-example-spring-jms/src/main/resources/META-INF/spring/camel-server.xml?rev=664626&r1=664625&r2=664626&view=diff
==============================================================================
---
activemq/camel/trunk/examples/camel-example-spring-jms/src/main/resources/META-INF/spring/camel-server.xml
(original)
+++
activemq/camel/trunk/examples/camel-example-spring-jms/src/main/resources/META-INF/spring/camel-server.xml
Sun Jun 8 21:58:43 2008
@@ -16,55 +16,51 @@
limitations under the License.
-->
+<!-- START SNIPPET: e1 -->
<beans xmlns="http://www.springframework.org/schema/beans";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:context="http://www.springframework.org/schema/context";
- xmlns:aop="http://www.springframework.org/schema/aop";
xmlns:camel="http://activemq.apache.org/camel/schema/spring";
xmlns:broker="http://activemq.apache.org/schema/core";
xsi:schemaLocation="
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context-2.5.xsd
- http://www.springframework.org/schema/aop
http://www.springframework.org/schema/aop/spring-aop-2.5.xsd
http://activemq.apache.org/camel/schema/spring
http://activemq.apache.org/camel/schema/spring/camel-spring-1.3.0.xsd
http://activemq.apache.org/schema/core
http://activemq.apache.org/schema/core/activemq-core-5.1.0.xsd";>
+<!-- END SNIPPET: e1 -->
- <!-- turn on AspejctJ AOP to weave all @Aspects beans declared in this
spring xml file -->
- <aop:aspectj-autoproxy/>
-
+ <!-- START SNIPPET: e2 -->
<!-- let Spring do its IoC stuff in this package -->
<context:component-scan base-package="org.apache.camel.example.server"/>
+ <!-- END SNIPPET: e2 -->
+ <!-- START SNIPPET: e3 -->
<!-- declare a camel context that scans for classes that is RouteBuilder
in the package org.apache.camel.example.server -->
<camel:camelContext id="camel">
<camel:package>org.apache.camel.example.server</camel:package>
</camel:camelContext>
+ <!-- END SNIPPET: e3 -->
+ <!-- START SNIPPET: e4 -->
<!-- lets configure the ActiveMQ JMS broker server to listen on TCP 61616
-->
<broker:broker useJmx="false" persistent="false" brokerName="localhost">
<broker:transportConnectors>
<broker:transportConnector name="tcp" uri="tcp://localhost:61616"/>
</broker:transportConnectors>
</broker:broker>
+ <!-- END SNIPPET: e4 -->
+ <!-- START SNIPPET: e5 -->
<!-- lets configure the Camel JMS consumer to use the ActiveMQ broker
declared above -->
<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&broker.useJmx=false"/>
+ <!-- use the vm protocol as the JMS broker is running in the
same jvm as Camel -->
+ <property name="brokerURL" value="vm://localhost"/>
</bean>
</property>
</bean>
+ <!-- END SNIPPET: e5 -->
- <!-- to show aspect AOP stuff -->
- <bean id="AuditTracker"
class="org.apache.camel.example.server.AuditTracker">
- <!-- define what store to use for audit backup -->
- <property name="store" ref="AuditStore"/>
- </bean>
-
- <!-- the audit store endpoint is configued as file based -->
- <camel:endpoint id="AuditStore" uri="file://target/store?append=false"/>
-
-</beans>
\ No newline at end of file
+</beans>
Modified:
activemq/camel/trunk/examples/camel-example-spring-jms/src/main/resources/camel-client-remoting.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/examples/camel-example-spring-jms/src/main/resources/camel-client-remoting.xml?rev=664626&r1=664625&r2=664626&view=diff
==============================================================================
---
activemq/camel/trunk/examples/camel-example-spring-jms/src/main/resources/camel-client-remoting.xml
(original)
+++
activemq/camel/trunk/examples/camel-example-spring-jms/src/main/resources/camel-client-remoting.xml
Sun Jun 8 21:58:43 2008
@@ -23,23 +23,14 @@
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
http://activemq.apache.org/camel/schema/spring
http://activemq.apache.org/camel/schema/spring/camel-spring-1.3.0.xsd";>
- <camel:camelContext id="camel"/>
- <camel:template id="camelTemplate"/>
+ <import resource="camel-client.xml"/>
+ <!-- START SNIPPET: e1 -->
<!-- Camel proxy for a given service, in this case the JMS queue -->
<camel:proxy
id="multiplierProxy"
serviceInterface="org.apache.camel.example.server.Multiplier"
- serviceUrl="jms:queue:numbers"
- />
-
- <!-- Camel JMSProducer to be able to send messages to a remote Active MQ
server -->
- <bean id="jms" class="org.apache.camel.component.jms.JmsComponent">
- <property name="connectionFactory">
- <bean class="org.apache.activemq.ActiveMQConnectionFactory">
- <property name="brokerURL" value="tcp://localhost:61616"/>
- </bean>
- </property>
- </bean>
+ serviceUrl="jms:queue:numbers"/>
+ <!-- END SNIPPET: e1 -->
</beans>
\ No newline at end of file
Modified:
activemq/camel/trunk/examples/camel-example-spring-jms/src/main/resources/camel-client.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/examples/camel-example-spring-jms/src/main/resources/camel-client.xml?rev=664626&r1=664625&r2=664626&view=diff
==============================================================================
---
activemq/camel/trunk/examples/camel-example-spring-jms/src/main/resources/camel-client.xml
(original)
+++
activemq/camel/trunk/examples/camel-example-spring-jms/src/main/resources/camel-client.xml
Sun Jun 8 21:58:43 2008
@@ -16,16 +16,21 @@
limitations under the License.
-->
+<!-- START SNIPPET: e1 -->
<beans xmlns="http://www.springframework.org/schema/beans";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:camel="http://activemq.apache.org/camel/schema/spring";
xsi:schemaLocation="
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
http://activemq.apache.org/camel/schema/spring
http://activemq.apache.org/camel/schema/spring/camel-spring-1.3.0.xsd";>
+<!-- END SNIPPET: e1 -->
+ <!-- START SNIPPET: e2 -->
<camel:camelContext id="camel"/>
<camel:template id="camelTemplate"/>
+ <!-- END SNIPPET: e2 -->
+ <!-- START SNIPPET: e3 -->
<!-- Camel JMSProducer to be able to send messages to a remote Active MQ
server -->
<bean id="jms" class="org.apache.camel.component.jms.JmsComponent">
<property name="connectionFactory">
@@ -34,5 +39,6 @@
</bean>
</property>
</bean>
+ <!-- END SNIPPET: e3 -->
</beans>
\ No newline at end of file
