geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xuhaih...@apache.org
Subject svn commit: r922113 - in /geronimo/server/branches/2.1/repository/org/apache/activemq: ./ activemq-core/4.1.2-G20090207/ activemq-core/4.1.2-G20100308/
Date Fri, 12 Mar 2010 01:49:33 GMT
Author: xuhaihong
Date: Fri Mar 12 01:49:33 2010
New Revision: 922113

URL: http://svn.apache.org/viewvc?rev=922113&view=rev
Log:
GERONIMO-5179 Create a new customized ActiveMQ 4.1.2 build for Geronimo 2.1.5

Added:
    geronimo/server/branches/2.1/repository/org/apache/activemq/4.1.2-G20100308.README.TXT
      - copied, changed from r917404, geronimo/server/branches/2.1/repository/org/apache/activemq/4.1.2-G20090207.README.TXT
    geronimo/server/branches/2.1/repository/org/apache/activemq/AMQ-2346.patch
    geronimo/server/branches/2.1/repository/org/apache/activemq/activemq-core/4.1.2-G20100308/
    geronimo/server/branches/2.1/repository/org/apache/activemq/activemq-core/4.1.2-G20100308/activemq-core-4.1.2-G20100308.jar
  (with props)
    geronimo/server/branches/2.1/repository/org/apache/activemq/activemq-core/4.1.2-G20100308/activemq-core-4.1.2-G20100308.jar.md5
    geronimo/server/branches/2.1/repository/org/apache/activemq/activemq-core/4.1.2-G20100308/activemq-core-4.1.2-G20100308.jar.sha1
    geronimo/server/branches/2.1/repository/org/apache/activemq/unitcasesfix.patch
Removed:
    geronimo/server/branches/2.1/repository/org/apache/activemq/4.1.2-G20090207.README.TXT
    geronimo/server/branches/2.1/repository/org/apache/activemq/activemq-core/4.1.2-G20090207/

Copied: geronimo/server/branches/2.1/repository/org/apache/activemq/4.1.2-G20100308.README.TXT
(from r917404, geronimo/server/branches/2.1/repository/org/apache/activemq/4.1.2-G20090207.README.TXT)
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/repository/org/apache/activemq/4.1.2-G20100308.README.TXT?p2=geronimo/server/branches/2.1/repository/org/apache/activemq/4.1.2-G20100308.README.TXT&p1=geronimo/server/branches/2.1/repository/org/apache/activemq/4.1.2-G20090207.README.TXT&r1=917404&r2=922113&rev=922113&view=diff
==============================================================================
--- geronimo/server/branches/2.1/repository/org/apache/activemq/4.1.2-G20090207.README.TXT
(original)
+++ geronimo/server/branches/2.1/repository/org/apache/activemq/4.1.2-G20100308.README.TXT
Fri Mar 12 01:49:33 2010
@@ -24,6 +24,8 @@ cd activemq-4.1.2
 patch -p0 -u < AMQ1272-stomp-auth-v412.patch
 patch -p0 -u < AMQ-2094.patch
 patch -p0 -u < build.patch
+patch -p0 -u < AMQ-2346.patch
+patch -p0 -u < unitcasesfix.patch
 Answer 'y' to any prompts of "Reversed (or previously applied) patch detected!  Assume -R?
[n]"
 
 
@@ -39,13 +41,13 @@ Notes:
 Copy patched activemq-core jar to appropriate filename
 ------------------------------------------------------
   cd activemq-4.1.2
-  cp activemq-core/target/activemq-core-4.1.2.jar <geronimo-root>/repository/org/apache/activemq/activemq-core/4.1.2-G20090207/activemq-core-4.1.2-G20090207.jar
+  cp activemq-core/target/activemq-core-4.1.2.jar <geronimo-root>/repository/org/apache/activemq/activemq-core/4.1.2-G20100308/activemq-core-4.1.2-G20100308.jar
 
 Optional steps:
 ---------------
-  cd <geronimo-root>/repository/org/apache/activemq/activemq-core/4.1.2-G20090207
-  md5sum activemq-core-4.1.2-G20090207.jar > activemq-core-4.1.2-G20090207.jar.md5
-  sha1sum activemq-core-4.1.2-G20090207.jar > activemq-core-4.1.2-G20090207.jar.sha1
+  cd <geronimo-root>/repository/org/apache/activemq/activemq-core/4.1.2-G20100308
+  md5sum activemq-core-4.1.2-G20100308.jar > activemq-core-4.1.2-G20100308.jar.md5
+  sha1sum activemq-core-4.1.2-G20100308.jar > activemq-core-4.1.2-G20100308.jar.sha1
 
 
 How the patch (AMQ1272-stomp-auth-v412.patch) was created:

Added: geronimo/server/branches/2.1/repository/org/apache/activemq/AMQ-2346.patch
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/repository/org/apache/activemq/AMQ-2346.patch?rev=922113&view=auto
==============================================================================
--- geronimo/server/branches/2.1/repository/org/apache/activemq/AMQ-2346.patch (added)
+++ geronimo/server/branches/2.1/repository/org/apache/activemq/AMQ-2346.patch Fri Mar 12
01:49:33 2010
@@ -0,0 +1,13 @@
+Index: activemq-core/src/main/java/org/apache/activemq/ActiveMQConnection.java
+===================================================================
+--- activemq-core/src/main/java/org/apache/activemq/ActiveMQConnection.java	(revision 920319)
++++ activemq-core/src/main/java/org/apache/activemq/ActiveMQConnection.java	(working copy)
+@@ -1325,7 +1325,7 @@
+ 
+         if(isConnectionInfoSentToBroker){
+             if(!transportFailed.get() && !closing.get()){
+-                asyncSendPacket(info.createRemoveCommand());
++                syncSendPacket(info.createRemoveCommand());
+             }
+             isConnectionInfoSentToBroker=false;
+         }        

Added: geronimo/server/branches/2.1/repository/org/apache/activemq/activemq-core/4.1.2-G20100308/activemq-core-4.1.2-G20100308.jar
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/repository/org/apache/activemq/activemq-core/4.1.2-G20100308/activemq-core-4.1.2-G20100308.jar?rev=922113&view=auto
==============================================================================
Binary file - no diff available.

Propchange: geronimo/server/branches/2.1/repository/org/apache/activemq/activemq-core/4.1.2-G20100308/activemq-core-4.1.2-G20100308.jar
------------------------------------------------------------------------------
    svn:mime-type = application/java-archive

Added: geronimo/server/branches/2.1/repository/org/apache/activemq/activemq-core/4.1.2-G20100308/activemq-core-4.1.2-G20100308.jar.md5
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/repository/org/apache/activemq/activemq-core/4.1.2-G20100308/activemq-core-4.1.2-G20100308.jar.md5?rev=922113&view=auto
==============================================================================
--- geronimo/server/branches/2.1/repository/org/apache/activemq/activemq-core/4.1.2-G20100308/activemq-core-4.1.2-G20100308.jar.md5
(added)
+++ geronimo/server/branches/2.1/repository/org/apache/activemq/activemq-core/4.1.2-G20100308/activemq-core-4.1.2-G20100308.jar.md5
Fri Mar 12 01:49:33 2010
@@ -0,0 +1 @@
+3acb63450bd94940e4d379bbf0c41fa5  activemq-core-4.1.2-G20100308.jar

Added: geronimo/server/branches/2.1/repository/org/apache/activemq/activemq-core/4.1.2-G20100308/activemq-core-4.1.2-G20100308.jar.sha1
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/repository/org/apache/activemq/activemq-core/4.1.2-G20100308/activemq-core-4.1.2-G20100308.jar.sha1?rev=922113&view=auto
==============================================================================
--- geronimo/server/branches/2.1/repository/org/apache/activemq/activemq-core/4.1.2-G20100308/activemq-core-4.1.2-G20100308.jar.sha1
(added)
+++ geronimo/server/branches/2.1/repository/org/apache/activemq/activemq-core/4.1.2-G20100308/activemq-core-4.1.2-G20100308.jar.sha1
Fri Mar 12 01:49:33 2010
@@ -0,0 +1 @@
+3caee1ab2259a3714dcb3bae1e04e2c246ca7e6a  activemq-core-4.1.2-G20100308.jar

Added: geronimo/server/branches/2.1/repository/org/apache/activemq/unitcasesfix.patch
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/repository/org/apache/activemq/unitcasesfix.patch?rev=922113&view=auto
==============================================================================
--- geronimo/server/branches/2.1/repository/org/apache/activemq/unitcasesfix.patch (added)
+++ geronimo/server/branches/2.1/repository/org/apache/activemq/unitcasesfix.patch Fri Mar
12 01:49:33 2010
@@ -0,0 +1,13 @@
+Index: activemq-core/src/test/resources/spring-embedded-xbean.xml
+===================================================================
+--- activemq-core/src/test/resources/spring-embedded-xbean.xml	(revision 920319)
++++ activemq-core/src/test/resources/spring-embedded-xbean.xml	(working copy)
+@@ -22,7 +22,7 @@
+   xmlns:amq="http://activemq.org/config/1.0"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd

+-  http://activemq.org/config/1.0 http://activemq.apache.org/snapshot-schema/activemq-core-4.1-SNAPSHOT.xsd">
++  http://activemq.org/config/1.0 file:./target/xbean/activemq.xsd">
+   
+   <!--  lets create an embedded ActiveMQ Broker -->
+   <amq:broker useJmx="false" persistent="false">



Mime
View raw message