Return-Path: Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: (qmail 16594 invoked from network); 23 Sep 2009 19:14:00 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 23 Sep 2009 19:14:00 -0000 Received: (qmail 60424 invoked by uid 500); 23 Sep 2009 19:14:00 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 60376 invoked by uid 500); 23 Sep 2009 19:14:00 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 60367 invoked by uid 99); 23 Sep 2009 19:14:00 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 23 Sep 2009 19:14:00 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 23 Sep 2009 19:13:56 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id ECF6723888DD; Wed, 23 Sep 2009 19:13:34 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: commits@activemq.apache.org From: chirino@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090923191334.ECF6723888DD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 @@ ${pom.groupId} activeio-core - + + ${pom.groupId} + activemq-console + + org.springframework spring @@ -153,7 +157,22 @@ org.codehaus.jettison jettison test - + + + + velocity + velocity + + + net.sf.josql + josql + + + net.sf.josql + gentlyweb-utils + + + 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 @@ geronimo-transaction 2.1 - - - commons-net - commons-net - ${commons-net-version} - + + + + commons-net + commons-net + ${commons-net-version} + + + + velocity + velocity + 1.4 + true + + + net.sf.josql + josql + 1.5 + true + + + net.sf.josql + gentlyweb-utils + 1.5 + true +