activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r818213 - in /activemq/branches/activemq-5.3: ./ activemq-optional/ activemq-optional/src/main/java/org/apache/activemq/store/ activemq-optional/src/main/java/org/apache/activemq/store/amq/ activemq-optional/src/main/java/org/apache/activem...
Date Wed, 23 Sep 2009 19:13:34 GMT
Author: chirino
Date: Wed Sep 23 19:13:33 2009
New Revision: 818213

URL: http://svn.apache.org/viewvc?rev=818213&view=rev
Log:
merging http://svn.apache.org/viewvc?view=rev&revision=818209


Added:
    activemq/branches/activemq-5.3/activemq-optional/src/main/java/org/apache/activemq/store/
      - copied from r818209, activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/store/
    activemq/branches/activemq-5.3/activemq-optional/src/main/java/org/apache/activemq/store/amq/
      - copied from r818209, activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/store/amq/
    activemq/branches/activemq-5.3/activemq-optional/src/main/java/org/apache/activemq/store/amq/AMQJournalTool.java
      - copied unchanged from r818209, activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/store/amq/AMQJournalTool.java
    activemq/branches/activemq-5.3/activemq-optional/src/main/java/org/apache/activemq/store/amq/AMQJournalToolCommand.java
      - copied unchanged from r818209, activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/store/amq/AMQJournalToolCommand.java
    activemq/branches/activemq-5.3/activemq-optional/src/main/java/org/apache/activemq/store/amq/CommandLineSupport.java
      - copied unchanged from r818209, activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/store/amq/CommandLineSupport.java
    activemq/branches/activemq-5.3/activemq-optional/src/main/java/org/apache/activemq/store/amq/CustomResourceLoader.java
      - copied unchanged from r818209, activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/store/amq/CustomResourceLoader.java
    activemq/branches/activemq-5.3/activemq-optional/src/main/java/org/apache/activemq/store/amq/Entry.java
      - copied unchanged from r818209, activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/store/amq/Entry.java
    activemq/branches/activemq-5.3/activemq-optional/src/main/java/org/apache/activemq/store/amq/MessageBodyFormatter.java
      - copied unchanged from r818209, activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/store/amq/MessageBodyFormatter.java
    activemq/branches/activemq-5.3/activemq-optional/src/main/java/org/apache/activemq/store/amq/reader/
      - copied from r818209, activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/store/amq/reader/
    activemq/branches/activemq-5.3/activemq-optional/src/main/java/org/apache/activemq/store/amq/reader/AMQIterator.java
      - copied unchanged from r818209, activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/store/amq/reader/AMQIterator.java
    activemq/branches/activemq-5.3/activemq-optional/src/main/java/org/apache/activemq/store/amq/reader/AMQReader.java
      - copied unchanged from r818209, activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/store/amq/reader/AMQReader.java
    activemq/branches/activemq-5.3/activemq-optional/src/main/java/org/apache/activemq/store/amq/reader/MessageLocation.java
      - copied unchanged from r818209, activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/store/amq/reader/MessageLocation.java
    activemq/branches/activemq-5.3/activemq-optional/src/main/java/org/apache/activemq/transport/discovery/
      - copied from r818209, activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/discovery/
    activemq/branches/activemq-5.3/activemq-optional/src/main/java/org/apache/activemq/transport/discovery/http/
      - copied from r818209, activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/discovery/http/
    activemq/branches/activemq-5.3/activemq-optional/src/main/java/org/apache/activemq/transport/discovery/http/DiscoveryRegistryServlet.java
      - copied unchanged from r818209, activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/discovery/http/DiscoveryRegistryServlet.java
    activemq/branches/activemq-5.3/activemq-optional/src/main/java/org/apache/activemq/transport/discovery/http/EmbeddedJettyServer.java
      - copied unchanged from r818209, activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/discovery/http/EmbeddedJettyServer.java
    activemq/branches/activemq-5.3/activemq-optional/src/main/java/org/apache/activemq/transport/discovery/http/HTTPDiscoveryAgent.java
      - copied unchanged from r818209, activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/discovery/http/HTTPDiscoveryAgent.java
    activemq/branches/activemq-5.3/activemq-optional/src/main/java/org/apache/activemq/transport/discovery/http/HTTPDiscoveryAgentFactory.java
      - copied unchanged from r818209, activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/discovery/http/HTTPDiscoveryAgentFactory.java
    activemq/branches/activemq-5.3/activemq-optional/src/main/resources/META-INF/services/org/apache/activemq/transport/discoveryagent/
      - copied from r818209, activemq/trunk/activemq-optional/src/main/resources/META-INF/services/org/apache/activemq/transport/discoveryagent/
    activemq/branches/activemq-5.3/activemq-optional/src/main/resources/META-INF/services/org/apache/activemq/transport/discoveryagent/http
      - copied unchanged from r818209, activemq/trunk/activemq-optional/src/main/resources/META-INF/services/org/apache/activemq/transport/discoveryagent/http
    activemq/branches/activemq-5.3/activemq-optional/src/main/resources/org/
      - copied from r818209, activemq/trunk/activemq-optional/src/main/resources/org/
    activemq/branches/activemq-5.3/activemq-optional/src/main/resources/org/apache/
      - copied from r818209, activemq/trunk/activemq-optional/src/main/resources/org/apache/
    activemq/branches/activemq-5.3/activemq-optional/src/main/resources/org/apache/activemq/
      - copied from r818209, activemq/trunk/activemq-optional/src/main/resources/org/apache/activemq/
    activemq/branches/activemq-5.3/activemq-optional/src/main/resources/org/apache/activemq/store/
      - copied from r818209, activemq/trunk/activemq-optional/src/main/resources/org/apache/activemq/store/
    activemq/branches/activemq-5.3/activemq-optional/src/main/resources/org/apache/activemq/store/amq/
      - copied from r818209, activemq/trunk/activemq-optional/src/main/resources/org/apache/activemq/store/amq/
    activemq/branches/activemq-5.3/activemq-optional/src/main/resources/org/apache/activemq/store/amq/help.txt
      - copied unchanged from r818209, activemq/trunk/activemq-optional/src/main/resources/org/apache/activemq/store/amq/help.txt
    activemq/branches/activemq-5.3/activemq-optional/src/test/java/org/apache/activemq/store/
      - copied from r818209, activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/store/
    activemq/branches/activemq-5.3/activemq-optional/src/test/java/org/apache/activemq/store/amq/
      - copied from r818209, activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/store/amq/
    activemq/branches/activemq-5.3/activemq-optional/src/test/java/org/apache/activemq/store/amq/reader/
      - copied from r818209, activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/store/amq/reader/
    activemq/branches/activemq-5.3/activemq-optional/src/test/java/org/apache/activemq/store/amq/reader/AMQReaderTest.java
      - copied unchanged from r818209, activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/store/amq/reader/AMQReaderTest.java
    activemq/branches/activemq-5.3/activemq-optional/src/test/resources/org/apache/activemq/store/
      - copied from r818209, activemq/trunk/activemq-optional/src/test/resources/org/apache/activemq/store/
    activemq/branches/activemq-5.3/activemq-optional/src/test/resources/org/apache/activemq/store/amq/
      - copied from r818209, activemq/trunk/activemq-optional/src/test/resources/org/apache/activemq/store/amq/
    activemq/branches/activemq-5.3/activemq-optional/src/test/resources/org/apache/activemq/store/amq/reader/
      - copied from r818209, activemq/trunk/activemq-optional/src/test/resources/org/apache/activemq/store/amq/reader/
    activemq/branches/activemq-5.3/activemq-optional/src/test/resources/org/apache/activemq/store/amq/reader/data/
      - copied from r818209, activemq/trunk/activemq-optional/src/test/resources/org/apache/activemq/store/amq/reader/data/
    activemq/branches/activemq-5.3/activemq-optional/src/test/resources/org/apache/activemq/store/amq/reader/data/data-1
      - copied unchanged from r818209, activemq/trunk/activemq-optional/src/test/resources/org/apache/activemq/store/amq/reader/data/data-1
    activemq/branches/activemq-5.3/activemq-optional/src/test/resources/org/apache/activemq/store/amq/reader/data/data-2
      - copied unchanged from r818209, activemq/trunk/activemq-optional/src/test/resources/org/apache/activemq/store/amq/reader/data/data-2
    activemq/branches/activemq-5.3/activemq-optional/src/test/resources/org/apache/activemq/store/amq/reader/data/data-3
      - copied unchanged from r818209, activemq/trunk/activemq-optional/src/test/resources/org/apache/activemq/store/amq/reader/data/data-3
    activemq/branches/activemq-5.3/activemq-optional/src/test/resources/org/apache/activemq/store/amq/reader/data/data-4
      - copied unchanged from r818209, activemq/trunk/activemq-optional/src/test/resources/org/apache/activemq/store/amq/reader/data/data-4
    activemq/branches/activemq-5.3/activemq-optional/src/test/resources/org/apache/activemq/store/amq/reader/data/data-5
      - copied unchanged from r818209, activemq/trunk/activemq-optional/src/test/resources/org/apache/activemq/store/amq/reader/data/data-5
    activemq/branches/activemq-5.3/activemq-optional/src/test/resources/org/apache/activemq/store/amq/reader/data/data-6
      - copied unchanged from r818209, activemq/trunk/activemq-optional/src/test/resources/org/apache/activemq/store/amq/reader/data/data-6
    activemq/branches/activemq-5.3/activemq-optional/src/test/resources/org/apache/activemq/store/amq/reader/data/data-7
      - copied unchanged from r818209, activemq/trunk/activemq-optional/src/test/resources/org/apache/activemq/store/amq/reader/data/data-7
    activemq/branches/activemq-5.3/activemq-optional/src/test/resources/org/apache/activemq/store/amq/reader/data/data-8
      - copied unchanged from r818209, activemq/trunk/activemq-optional/src/test/resources/org/apache/activemq/store/amq/reader/data/data-8
    activemq/branches/activemq-5.3/activemq-optional/src/test/resources/org/apache/activemq/store/amq/reader/data/data-9
      - copied unchanged from r818209, activemq/trunk/activemq-optional/src/test/resources/org/apache/activemq/store/amq/reader/data/data-9
Modified:
    activemq/branches/activemq-5.3/   (props changed)
    activemq/branches/activemq-5.3/activemq-optional/pom.xml
    activemq/branches/activemq-5.3/pom.xml

Propchange: activemq/branches/activemq-5.3/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 23 19:13:33 2009
@@ -1 +1 @@
-/activemq/trunk:816278-816279,816298,818138,818155
+/activemq/trunk:816278-816279,816298,818138,818155,818209,818211

Modified: activemq/branches/activemq-5.3/activemq-optional/pom.xml
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/activemq-optional/pom.xml?rev=818213&r1=818212&r2=818213&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/activemq-optional/pom.xml (original)
+++ activemq/branches/activemq-5.3/activemq-optional/pom.xml Wed Sep 23 19:13:33 2009
@@ -44,7 +44,11 @@
       <groupId>${pom.groupId}</groupId>
       <artifactId>activeio-core</artifactId>
     </dependency>    
-    
+    <dependency>
+      <groupId>${pom.groupId}</groupId>
+      <artifactId>activemq-console</artifactId>
+    </dependency>
+        
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring</artifactId>
@@ -153,7 +157,22 @@
       <groupId>org.codehaus.jettison</groupId>
       <artifactId>jettison</artifactId>
       <scope>test</scope>
-    </dependency>       
+    </dependency>  
+    
+    <dependency>
+      <groupId>velocity</groupId>
+      <artifactId>velocity</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>net.sf.josql</groupId>
+      <artifactId>josql</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>net.sf.josql</groupId>
+      <artifactId>gentlyweb-utils</artifactId>
+    </dependency>
+    
+         
   </dependencies>
 
   <build>

Modified: activemq/branches/activemq-5.3/pom.xml
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/pom.xml?rev=818213&r1=818212&r2=818213&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/pom.xml (original)
+++ activemq/branches/activemq-5.3/pom.xml Wed Sep 23 19:13:33 2009
@@ -892,12 +892,32 @@
         <artifactId>geronimo-transaction</artifactId>
         <version>2.1</version>
       </dependency>
-    <!-- FTP support for BlobMessages -->
-	<dependency>
-	    <groupId>commons-net</groupId>
-	    <artifactId>commons-net</artifactId>
-	    <version>${commons-net-version}</version>
-	</dependency>
+      
+      <!-- FTP support for BlobMessages -->
+    	<dependency>
+    	    <groupId>commons-net</groupId>
+    	    <artifactId>commons-net</artifactId>
+    	    <version>${commons-net-version}</version>
+    	</dependency>
+
+      <dependency>
+        <groupId>velocity</groupId>
+        <artifactId>velocity</artifactId>
+        <version>1.4</version>
+        <optional>true</optional>
+      </dependency>
+      <dependency>
+        <groupId>net.sf.josql</groupId>
+        <artifactId>josql</artifactId>
+        <version>1.5</version>
+        <optional>true</optional>
+      </dependency>
+      <dependency>
+        <groupId>net.sf.josql</groupId>
+        <artifactId>gentlyweb-utils</artifactId>
+        <version>1.5</version>
+        <optional>true</optional>
+      </dependency>
 
     </dependencies>
   </dependencyManagement>



Mime
View raw message