Skip to content
Browse files

- Upgrade to camel 2.10.3 & activemq 5.7

- Fix error in README page (port number 8080 --> 9090 for camel example)
  • Loading branch information...
1 parent a825d6a commit c3e409b899a61d473c2aa905262028b03afd0bdd Charles Moulliard committed Feb 22, 2013
Showing with 61 additions and 175 deletions.
  1. +15 −14 README.md
  2. +1 −6 camel/pom.xml
  3. +0 −21 camel/src/main/resources/META-INF/spring/camel-context.xml
  4. +8 −77 feeder/pom.xml
  5. +27 −43 pom.xml
  6. +10 −14 web/pom.xml
View
29 README.md
@@ -2,46 +2,47 @@
## ActiveMQ
-1) Download ActiveMQ 5.6 snapshot from this location
- http://repo.fusesource.com/nexus/content/repositories/snapshots/org/apache/activemq/apache-activemq/5.6-fuse-SNAPSHOT/
+1) Download ActiveMQ 5.7 from this location
+ http://repo.fusesource.com/nexus/content/repositories/releases/org/apache/activemq/apache-activemq/5.7.0.fuse-71-047/
or Apache Release
- http://repo1.maven.org/maven2/org/apache/activemq/apache-activemq/5.6.0/
+ http://repo1.maven.org/maven2/org/apache/activemq/apache-activemq/5.7.0/
2) start Jetty Web Server
cd websocket-activemq-camel/web
- mvn package jetty:run
+ mvn jetty:run
-3) Start ActiveMQ 5.6 using the config provided in feeder/src/main/config directory
- cd ~/fuse/servers/apache-activemq-5.6/bin
- ./activemq console xbean:file:/Users/chmoulli/Fuse/examples/websocket-activemq-camel/feeder/src/main/config/activemq-websocket.xml
+3) Start ActiveMQ 5.x using the config provided in feeder/src/main/config directory
+ cd ~/fuse/servers/apache-activemq-5.x/bin
+ ./activemq console xbean:file:/Users/chmoulli/Fuse/fuse-by-examples/websocket-activemq-camel/feeder/src/main/config/activemq-websocket.xml
4) Compile and start Feed application
cd websocket-activemq-camel/feed
- mvn package -P run-trader
+ mvn -P run-trader
5) Open your web browser
http://localhost:8080/stocks-activemq.html
and click on connect button
+ Remark : To connect from the web page to the ActiveMQ broker, the login to be used is guest & password is password
## Camel
1) Start Apache Camel Routes (without using wss://)
cd websocket-activemq-camel/camel
- mvn clean camel:run -P NO-SSL
+ mvn camel:run -P NO-SSL
2) Compile and Start Feed application
cd websocket-activemq-camel/feed
- mvn clean package -P run-trader
+ mvn -P run-trader
3) Verify stock and news websockets in your browser
- http://localhost:8080/stocks-camel.html
- http://localhost:8080/news-camel.html
+ http://localhost:9090/stocks-camel.html
+ http://localhost:9090/news-camel.html
and click on connect button
@@ -50,12 +51,12 @@ To test SSL & wss:// protocol, execute the follownig command
1) Start Apache Camel Routes (with wss:// & HTTPS)
cd websocket-activemq-camel/camel
- mvn clean camel:run -P SSL
+ mvn camel:run -P SSL
2) Compile and Start Feed application
cd websocket-activemq-camel/feed
- mvn clean package -P run-trader
+ mvn -P run-trader
3) Verify stock and news websockets in your browser
View
7 camel/pom.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>project</artifactId>
<groupId>com.fusesource.examples.activemq.websocket</groupId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -31,11 +31,6 @@
<packaging>jar</packaging>
<name>FuseSource :: WebSocket :: Camel</name>
- <properties>
- <camel-version>2.10-SNAPSHOT</camel-version>
- <activemq-version>5.5.1</activemq-version>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.camel</groupId>
View
21 camel/src/main/resources/META-INF/spring/camel-context.xml
@@ -37,31 +37,10 @@
</transportConnectors>
</broker>
- <!--
- <bean id="websocket" class="org.apache.camel.component.websocket.WebsocketComponent">
- <property name="port" value="9090"/>
- </bean>
- -->
-
<bean id="activemq" class="org.apache.activemq.camel.component.ActiveMQComponent">
<property name="brokerURL" value="tcp://localhost:61616"/>
</bean>
- <camel:sslContextParameters
- id="sslContextParameters">
- <camel:keyManagers
- keyPassword="changeit">
- <camel:keyStore
- resource="jsse/localhost.ks"
- password="changeit"/>
- </camel:keyManagers>
- <camel:trustManagers>
- <camel:keyStore
- resource="jsse/localhost.ks"
- password="changeit"/>
- </camel:trustManagers>
- </camel:sslContextParameters>
-
<camelContext xmlns="http://camel.apache.org/schema/spring">
<packageScan>
<package>com.fusesource.examples.camel.websocket</package>
View
85 feeder/pom.xml
@@ -5,27 +5,16 @@
<parent>
<groupId>com.fusesource.examples.activemq.websocket</groupId>
<artifactId>project</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>com.fusesource.examples.activemq.websocket</groupId>
<artifactId>trader</artifactId>
<packaging>jar</packaging>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0</version>
<name>FuseSource :: WebSocket :: ActiveMQ :: Trader</name>
- <dependencies>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
- <version>5.5.1</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.6.2</version>
- </dependency>
- </dependencies>
+
<profiles>
<profile>
<id>run-trader</id>
@@ -58,7 +47,7 @@
<plugin>
<groupId>org.apache.activemq.tooling</groupId>
<artifactId>maven-activemq-plugin</artifactId>
- <version>5.6-SNAPSHOT</version>
+ <version>${activemq-version}</version>
<executions>
<execution>
<goals>
@@ -86,12 +75,12 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-optional</artifactId>
- <version>5.6-SNAPSHOT</version>
+ <version>${activemq-version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.6.4</version>
+ <version>${slf4j-version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -101,70 +90,12 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.16</version>
+ <version>${log4j-version}</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
</profile>
</profiles>
-
- <build>
- <plugins>
- <!--
- <plugin>
- <groupId>org.apache.activemq.tooling</groupId>
- <artifactId>maven-activemq-plugin</artifactId>
- <version>5.6-SNAPSHOT</version>
- <executions>
- <execution>
- <goals>
- <goal>run</goal>
- </goals>
- <phase>package</phase>
- </execution>
- </executions>
- <configuration>
- <configUri>xbean:file:${basedir}/src/main/config/activemq-websocket.xml</configUri>
- <fork>false</fork>
- <systemProperties>
- <property>
- <name>org.apache.activemq.default.directory.prefix</name>
- <value>./target/</value>
- </property>
- </systemProperties>
- </configuration>
- <dependencies>
- <dependency>
- <groupId>org.apache.xbean</groupId>
- <artifactId>xbean-spring</artifactId>
- <version>3.5</version>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-optional</artifactId>
- <version>5.6-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.6.4</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.6.4</version>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.16</version>
- </dependency>
- </dependencies>
- </plugin>
- -->
- </plugins>
- </build>
-
- </project>
+</project>
View
70 pom.xml
@@ -4,27 +4,41 @@
<groupId>com.fusesource.examples.activemq.websocket</groupId>
<artifactId>project</artifactId>
<packaging>pom</packaging>
- <version>1.0-SNAPSHOT</version>
- <name>FuseSource :: WebSocket :: ActiveMQ :: Project</name>
+ <version>1.0</version>
+ <name>FuseSource :: WebSocket :: ActiveMQ &amp; Camel Project</name>
+
+ <properties>
+ <camel-version>2.10.3</camel-version>
+ <activemq-version>5.7.0</activemq-version>
+ <slf4j-version>1.6.4</slf4j-version>
+ <log4j-version>1.2.16</log4j-version>
+
+ <jetty-maven-plugin.version>7.5.4.v20111024</jetty-maven-plugin.version>
+ </properties>
+
<modules>
<module>feeder</module>
<module>web</module>
<module>camel</module>
</modules>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-core</artifactId>
+ <version>${activemq-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j-version}</version>
+ </dependency>
+ </dependencies>
+
<repositories>
<repository>
- <id>fuse-snapshot</id>
- <url>http://repo.fusesource.com/nexus/content/groups/public-snapshots/</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- <repository>
<id>fuse-releases</id>
- <url>http://repo.fusesource.com/nexus/content/groups/public/</url>
+ <url>http://repo.fusesource.com/nexus/content/repositories/releases/</url>
<releases>
<enabled>true</enabled>
</releases>
@@ -33,16 +47,6 @@
</snapshots>
</repository>
<repository>
- <id>apache-snapshot</id>
- <url>https://repository.apache.org/content/groups/snapshots/</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- <repository>
<id>central</id>
<url>http://repo1.maven.org/maven2/</url>
<releases>
@@ -55,16 +59,6 @@
</repositories>
<pluginRepositories>
<pluginRepository>
- <id>fuse-snapshot</id>
- <url>http://repo.fusesource.com/nexus/content/groups/public-snapshots/</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </pluginRepository>
- <pluginRepository>
<id>fuse-releases</id>
<url>http://repo.fusesource.com/nexus/content/groups/public/</url>
<releases>
@@ -74,15 +68,5 @@
<enabled>false</enabled>
</snapshots>
</pluginRepository>
- <pluginRepository>
- <id>apache-snapshot</id>
- <url>https://repository.apache.org/content/groups/snapshots/</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </pluginRepository>
</pluginRepositories>
</project>
View
24 web/pom.xml
@@ -1,23 +1,19 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>com.fusesource.examples.activemq.websocket</groupId>
+ <artifactId>project</artifactId>
+ <version>1.0</version>
+ </parent>
+
<groupId>com.fusesource.examples.activemq.websocket</groupId>
<artifactId>web</artifactId>
<packaging>war</packaging>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0</version>
<name>FuseSource :: WebSocket :: ActiveMQ :: Web</name>
- <dependencies>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
- <version>5.5.1</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.6.2</version>
- </dependency>
- </dependencies>
+
<build>
<plugins>
<plugin>
@@ -61,7 +57,7 @@
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
- <version>7.5.4.v20111024</version>
+ <version>${jetty-maven-plugin.version}</version>
<configuration>
<!-- <jettyXml>src/main/etc/jetty.xml</jettyXml> -->
<connectors>

0 comments on commit c3e409b

Please sign in to comment.
Something went wrong with that request. Please try again.