You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ch...@apache.org on 2009/05/30 00:46:59 UTC
svn commit: r780132 - in /activemq/sandbox/activemq-flow: ./ activemq-bio/
activemq-broker/
activemq-broker/src/main/java/org/apache/activemq/broker/stomp/
activemq-broker/src/test/java/org/apache/activemq/broker/openwire/stomp/
activemq-dispatcher/ ac...
Author: chirino
Date: Fri May 29 22:46:58 2009
New Revision: 780132
URL: http://svn.apache.org/viewvc?rev=780132&view=rev
Log:
starting to refactor the source code around to fit the module structure.
Added:
activemq/sandbox/activemq-flow/activemq-protocol/src/main/java/org/
activemq/sandbox/activemq-flow/activemq-protocol/src/main/java/org/apache/
activemq/sandbox/activemq-flow/activemq-protocol/src/main/java/org/apache/activemq/
activemq/sandbox/activemq-flow/activemq-stomp/src/main/java/org/
activemq/sandbox/activemq-flow/activemq-stomp/src/main/java/org/apache/
activemq/sandbox/activemq-flow/activemq-stomp/src/main/java/org/apache/activemq/
activemq/sandbox/activemq-flow/activemq-stomp/src/main/java/org/apache/activemq/broker/
activemq/sandbox/activemq-flow/activemq-stomp/src/main/java/org/apache/activemq/broker/stomp/
- copied from r780081, activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/stomp/
activemq/sandbox/activemq-flow/activemq-stomp/src/test/java/org/
activemq/sandbox/activemq-flow/activemq-stomp/src/test/java/org/apache/
activemq/sandbox/activemq-flow/activemq-stomp/src/test/java/org/apache/activemq/
activemq/sandbox/activemq-flow/activemq-stomp/src/test/java/org/apache/activemq/broker/
activemq/sandbox/activemq-flow/activemq-stomp/src/test/java/org/apache/activemq/broker/openwire/
activemq/sandbox/activemq-flow/activemq-stomp/src/test/java/org/apache/activemq/broker/openwire/stomp/
- copied from r780081, activemq/sandbox/activemq-flow/activemq-broker/src/test/java/org/apache/activemq/broker/openwire/stomp/
Removed:
activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/stomp/
activemq/sandbox/activemq-flow/activemq-broker/src/test/java/org/apache/activemq/broker/openwire/stomp/
Modified:
activemq/sandbox/activemq-flow/activemq-bio/pom.xml
activemq/sandbox/activemq-flow/activemq-broker/pom.xml
activemq/sandbox/activemq-flow/activemq-dispatcher/pom.xml
activemq/sandbox/activemq-flow/activemq-flow/pom.xml
activemq/sandbox/activemq-flow/activemq-kaha/pom.xml
activemq/sandbox/activemq-flow/activemq-openwire/pom.xml
activemq/sandbox/activemq-flow/activemq-protocol/pom.xml
activemq/sandbox/activemq-flow/activemq-stomp/pom.xml
activemq/sandbox/activemq-flow/activemq-store/pom.xml
activemq/sandbox/activemq-flow/activemq-transport/pom.xml
activemq/sandbox/activemq-flow/activemq-util/pom.xml
activemq/sandbox/activemq-flow/pom.xml
Modified: activemq/sandbox/activemq-flow/activemq-bio/pom.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-bio/pom.xml?rev=780132&r1=780131&r2=780132&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-bio/pom.xml (original)
+++ activemq/sandbox/activemq-flow/activemq-bio/pom.xml Fri May 29 22:46:58 2009
@@ -32,26 +32,13 @@
<name>ActiveMQ :: BIO</name>
<dependencies>
-
+
<dependency>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
- <version>5.3-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
+ <artifactId>activemq-transport</artifactId>
</dependency>
-
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <scope>test</scope>
- </dependency>
-
-<!-- In case we want to look at mina..
+
+ <!-- In case we want to look at mina..
<dependency>
<groupId>org.apache.mina</groupId>
<artifactId>mina-core</artifactId>
@@ -67,48 +54,18 @@
</dependency>
-->
- </dependencies>
-
- <build>
- <plugins>
-
- <!-- Generate a test jar for the test cases in this package -->
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.activemq.protobuf</groupId>
- <artifactId>activemq-protobuf</artifactId>
- <configuration>
- <type>alt</type>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>compile</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
+ <!-- Testing Dependencies -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <scope>test</scope>
+ </dependency>
- </plugins>
- </build>
+ </dependencies>
</project>
Modified: activemq/sandbox/activemq-flow/activemq-broker/pom.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/pom.xml?rev=780132&r1=780131&r2=780132&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/pom.xml (original)
+++ activemq/sandbox/activemq-flow/activemq-broker/pom.xml Fri May 29 22:46:58 2009
@@ -35,44 +35,48 @@
<dependency>
<groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-util</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-dispatcher</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-flow</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-protocol</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-transport</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-store</artifactId>
+ </dependency>
+
+ <!-- TODO: remove this dependency -->
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
<artifactId>activemq-core</artifactId>
<version>5.3-SNAPSHOT</version>
</dependency>
-
- <dependency>
- <groupId>com.thoughtworks.xstream</groupId>
- <artifactId>xstream</artifactId>
- <optional>true</optional>
- </dependency>
-
+
+ <!-- Testing Dependencies -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<scope>test</scope>
</dependency>
-<!-- In case we want to look at mina..
- <dependency>
- <groupId>org.apache.mina</groupId>
- <artifactId>mina-core</artifactId>
- <version>2.0.0-M4</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jcl</artifactId>
- </dependency>
--->
-
</dependencies>
<build>
Modified: activemq/sandbox/activemq-flow/activemq-dispatcher/pom.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-dispatcher/pom.xml?rev=780132&r1=780131&r2=780132&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-dispatcher/pom.xml (original)
+++ activemq/sandbox/activemq-flow/activemq-dispatcher/pom.xml Fri May 29 22:46:58 2009
@@ -32,40 +32,23 @@
<name>ActiveMQ :: Dispatcher</name>
<dependencies>
-
+
<dependency>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
- <version>5.3-SNAPSHOT</version>
+ <artifactId>activemq-util</artifactId>
</dependency>
-
+
+ <!-- Testing Dependencies -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<scope>test</scope>
</dependency>
-
-<!-- In case we want to look at mina..
- <dependency>
- <groupId>org.apache.mina</groupId>
- <artifactId>mina-core</artifactId>
- <version>2.0.0-M4</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jcl</artifactId>
- </dependency>
--->
</dependencies>
@@ -84,30 +67,6 @@
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.activemq.protobuf</groupId>
- <artifactId>activemq-protobuf</artifactId>
- <configuration>
- <type>alt</type>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>compile</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
-
</plugins>
</build>
Modified: activemq/sandbox/activemq-flow/activemq-flow/pom.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-flow/pom.xml?rev=780132&r1=780131&r2=780132&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-flow/pom.xml (original)
+++ activemq/sandbox/activemq-flow/activemq-flow/pom.xml Fri May 29 22:46:58 2009
@@ -32,47 +32,26 @@
<name>ActiveMQ :: Flow</name>
<dependencies>
-
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
- <version>5.3-SNAPSHOT</version>
- </dependency>
+ <!-- Testing Dependencies -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<scope>test</scope>
</dependency>
-
-<!-- In case we want to look at mina..
- <dependency>
- <groupId>org.apache.mina</groupId>
- <artifactId>mina-core</artifactId>
- <version>2.0.0-M4</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jcl</artifactId>
- </dependency>
--->
-
+
</dependencies>
<build>
<plugins>
<!-- Generate a test jar for the test cases in this package -->
+ <!--
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<executions>
@@ -83,30 +62,7 @@
</execution>
</executions>
</plugin>
-
- <plugin>
- <groupId>org.apache.activemq.protobuf</groupId>
- <artifactId>activemq-protobuf</artifactId>
- <configuration>
- <type>alt</type>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>compile</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
+ -->
</plugins>
</build>
Modified: activemq/sandbox/activemq-flow/activemq-kaha/pom.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-kaha/pom.xml?rev=780132&r1=780131&r2=780132&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-kaha/pom.xml (original)
+++ activemq/sandbox/activemq-flow/activemq-kaha/pom.xml Fri May 29 22:46:58 2009
@@ -32,58 +32,29 @@
<name>ActiveMQ :: Kaha</name>
<dependencies>
-
+
<dependency>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
- <version>5.3-SNAPSHOT</version>
+ <artifactId>activemq-store</artifactId>
</dependency>
-
+
+ <!-- Testing Dependencies -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<scope>test</scope>
</dependency>
-
-<!-- In case we want to look at mina..
- <dependency>
- <groupId>org.apache.mina</groupId>
- <artifactId>mina-core</artifactId>
- <version>2.0.0-M4</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jcl</artifactId>
- </dependency>
--->
</dependencies>
<build>
<plugins>
- <!-- Generate a test jar for the test cases in this package -->
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
<plugin>
<groupId>org.apache.activemq.protobuf</groupId>
<artifactId>activemq-protobuf</artifactId>
@@ -99,15 +70,6 @@
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
-
</plugins>
</build>
Modified: activemq/sandbox/activemq-flow/activemq-openwire/pom.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-openwire/pom.xml?rev=780132&r1=780131&r2=780132&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-openwire/pom.xml (original)
+++ activemq/sandbox/activemq-flow/activemq-openwire/pom.xml Fri May 29 22:46:58 2009
@@ -32,83 +32,24 @@
<name>ActiveMQ :: Openwire</name>
<dependencies>
-
+
<dependency>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
- <version>5.3-SNAPSHOT</version>
- </dependency>
-
+ <artifactId>activemq-protocol</artifactId>
+ </dependency>
+
+ <!-- Testing Dependencies -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<scope>test</scope>
</dependency>
-<!-- In case we want to look at mina..
- <dependency>
- <groupId>org.apache.mina</groupId>
- <artifactId>mina-core</artifactId>
- <version>2.0.0-M4</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jcl</artifactId>
- </dependency>
--->
-
</dependencies>
- <build>
- <plugins>
-
- <!-- Generate a test jar for the test cases in this package -->
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.activemq.protobuf</groupId>
- <artifactId>activemq-protobuf</artifactId>
- <configuration>
- <type>alt</type>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>compile</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
-
- </plugins>
- </build>
-
</project>
Modified: activemq/sandbox/activemq-flow/activemq-protocol/pom.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-protocol/pom.xml?rev=780132&r1=780131&r2=780132&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-protocol/pom.xml (original)
+++ activemq/sandbox/activemq-flow/activemq-protocol/pom.xml Fri May 29 22:46:58 2009
@@ -32,41 +32,32 @@
<name>ActiveMQ :: Protocol</name>
<dependencies>
-
+
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-util</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-dispatcher</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
- <version>5.3-SNAPSHOT</version>
- </dependency>
+ <artifactId>activemq-flow</artifactId>
+ </dependency>
+ <!-- Testing Dependencies -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<scope>test</scope>
</dependency>
-<!-- In case we want to look at mina..
- <dependency>
- <groupId>org.apache.mina</groupId>
- <artifactId>mina-core</artifactId>
- <version>2.0.0-M4</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jcl</artifactId>
- </dependency>
--->
-
</dependencies>
<build>
@@ -84,30 +75,6 @@
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.activemq.protobuf</groupId>
- <artifactId>activemq-protobuf</artifactId>
- <configuration>
- <type>alt</type>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>compile</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
-
</plugins>
</build>
Modified: activemq/sandbox/activemq-flow/activemq-stomp/pom.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-stomp/pom.xml?rev=780132&r1=780131&r2=780132&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-stomp/pom.xml (original)
+++ activemq/sandbox/activemq-flow/activemq-stomp/pom.xml Fri May 29 22:46:58 2009
@@ -32,7 +32,8 @@
<name>ActiveMQ :: Stomp</name>
<dependencies>
-
+
+ <!-- TODO: remove this dependency -->
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-core</artifactId>
@@ -40,81 +41,28 @@
</dependency>
<dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-protocol</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
<optional>true</optional>
</dependency>
+ <!-- Testing Dependencies -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<scope>test</scope>
</dependency>
-
-<!-- In case we want to look at mina..
- <dependency>
- <groupId>org.apache.mina</groupId>
- <artifactId>mina-core</artifactId>
- <version>2.0.0-M4</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jcl</artifactId>
- </dependency>
--->
-
- </dependencies>
-
- <build>
- <plugins>
- <!-- Generate a test jar for the test cases in this package -->
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.activemq.protobuf</groupId>
- <artifactId>activemq-protobuf</artifactId>
- <configuration>
- <type>alt</type>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>compile</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
-
- </plugins>
- </build>
+ </dependencies>
</project>
Modified: activemq/sandbox/activemq-flow/activemq-store/pom.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-store/pom.xml?rev=780132&r1=780131&r2=780132&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-store/pom.xml (original)
+++ activemq/sandbox/activemq-flow/activemq-store/pom.xml Fri May 29 22:46:58 2009
@@ -32,41 +32,32 @@
<name>ActiveMQ :: Store</name>
<dependencies>
-
+
<dependency>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
- <version>5.3-SNAPSHOT</version>
- </dependency>
-
+ <artifactId>activemq-util</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-dispatcher</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-flow</artifactId>
+ </dependency>
+
+ <!-- Testing Dependencies -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<scope>test</scope>
</dependency>
-<!-- In case we want to look at mina..
- <dependency>
- <groupId>org.apache.mina</groupId>
- <artifactId>mina-core</artifactId>
- <version>2.0.0-M4</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jcl</artifactId>
- </dependency>
--->
-
</dependencies>
<build>
@@ -84,30 +75,6 @@
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.activemq.protobuf</groupId>
- <artifactId>activemq-protobuf</artifactId>
- <configuration>
- <type>alt</type>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>compile</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
-
</plugins>
</build>
Modified: activemq/sandbox/activemq-flow/activemq-transport/pom.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-transport/pom.xml?rev=780132&r1=780131&r2=780132&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-transport/pom.xml (original)
+++ activemq/sandbox/activemq-flow/activemq-transport/pom.xml Fri May 29 22:46:58 2009
@@ -32,41 +32,32 @@
<name>ActiveMQ :: Transport</name>
<dependencies>
-
+
<dependency>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
- <version>5.3-SNAPSHOT</version>
- </dependency>
-
+ <artifactId>activemq-util</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-dispatcher</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-flow</artifactId>
+ </dependency>
+
+ <!-- Testing Dependencies -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<scope>test</scope>
</dependency>
-<!-- In case we want to look at mina..
- <dependency>
- <groupId>org.apache.mina</groupId>
- <artifactId>mina-core</artifactId>
- <version>2.0.0-M4</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jcl</artifactId>
- </dependency>
--->
-
</dependencies>
<build>
@@ -84,30 +75,6 @@
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.activemq.protobuf</groupId>
- <artifactId>activemq-protobuf</artifactId>
- <configuration>
- <type>alt</type>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>compile</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
-
</plugins>
</build>
Modified: activemq/sandbox/activemq-flow/activemq-util/pom.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-util/pom.xml?rev=780132&r1=780131&r2=780132&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-util/pom.xml (original)
+++ activemq/sandbox/activemq-flow/activemq-util/pom.xml Fri May 29 22:46:58 2009
@@ -32,13 +32,8 @@
<name>ActiveMQ :: Util</name>
<dependencies>
-
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
- <version>5.3-SNAPSHOT</version>
- </dependency>
-
+
+ <!-- Testing Dependencies -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -50,65 +45,7 @@
<artifactId>log4j</artifactId>
<scope>test</scope>
</dependency>
-
-<!-- In case we want to look at mina..
- <dependency>
- <groupId>org.apache.mina</groupId>
- <artifactId>mina-core</artifactId>
- <version>2.0.0-M4</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jcl</artifactId>
- </dependency>
--->
-
+
</dependencies>
- <build>
- <plugins>
-
- <!-- Generate a test jar for the test cases in this package -->
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.activemq.protobuf</groupId>
- <artifactId>activemq-protobuf</artifactId>
- <configuration>
- <type>alt</type>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>compile</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
-
- </plugins>
- </build>
-
</project>
Modified: activemq/sandbox/activemq-flow/pom.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/pom.xml?rev=780132&r1=780131&r2=780132&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/pom.xml (original)
+++ activemq/sandbox/activemq-flow/pom.xml Fri May 29 22:46:58 2009
@@ -30,7 +30,7 @@
<name>ActiveMQ POM</name>
<properties>
- <activemq-version>5.3-SNAPSHOT</activemq-version>
+ <activemq-version>6.0-SNAPSHOT</activemq-version>
<siteId>activemq-${activemq-version}</siteId>
<projectName>Apache ActiveMQ</projectName>
<!-- base url for site deployment. See distribution management for full url. Override this in settings.xml for staging -->
@@ -158,6 +158,61 @@
<artifactId>activemq-all</artifactId>
<version>${activemq-version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-bio</artifactId>
+ <version>${activemq-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-broker</artifactId>
+ <version>${activemq-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-dispatcher</artifactId>
+ <version>${activemq-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-flow</artifactId>
+ <version>${activemq-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-kaha</artifactId>
+ <version>${activemq-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-openwire</artifactId>
+ <version>${activemq-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-protocol</artifactId>
+ <version>${activemq-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-stomp</artifactId>
+ <version>${activemq-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-store</artifactId>
+ <version>${activemq-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-transport</artifactId>
+ <version>${activemq-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-util</artifactId>
+ <version>${activemq-version}</version>
+ </dependency>
<!-- =============================== -->
<!-- Required dependencies -->