geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r742256 - in /geronimo/server/branches/2.1: ./ repository/org/apache/activemq/ repository/org/apache/activemq/activemq-core/4.1.2-G20090207/ repository/org/apache/activemq/activemq-core/4.1.2-G647819/
Date Mon, 09 Feb 2009 04:48:00 GMT
Author: gawor
Date: Mon Feb  9 04:47:59 2009
New Revision: 742256

URL: http://svn.apache.org/viewvc?rev=742256&view=rev
Log:
regenerated custom build of activemq-core.jar with additional AMQ-2094 fix (GERONIMO-4404)

Added:
    geronimo/server/branches/2.1/repository/org/apache/activemq/4.1.2-G20090207.README.TXT
      - copied, changed from r741736, geronimo/server/branches/2.1/repository/org/apache/activemq/4.1.2-G647819.README.TXT
    geronimo/server/branches/2.1/repository/org/apache/activemq/AMQ-2094.patch
    geronimo/server/branches/2.1/repository/org/apache/activemq/activemq-core/4.1.2-G20090207/
    geronimo/server/branches/2.1/repository/org/apache/activemq/activemq-core/4.1.2-G20090207/activemq-core-4.1.2-G20090207.jar
  (with props)
    geronimo/server/branches/2.1/repository/org/apache/activemq/activemq-core/4.1.2-G20090207/activemq-core-4.1.2-G20090207.jar.md5
    geronimo/server/branches/2.1/repository/org/apache/activemq/activemq-core/4.1.2-G20090207/activemq-core-4.1.2-G20090207.jar.sha1
    geronimo/server/branches/2.1/repository/org/apache/activemq/build.patch
Removed:
    geronimo/server/branches/2.1/repository/org/apache/activemq/4.1.2-G647819.README.TXT
    geronimo/server/branches/2.1/repository/org/apache/activemq/activemq-core/4.1.2-G647819/
Modified:
    geronimo/server/branches/2.1/pom.xml

Modified: geronimo/server/branches/2.1/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/pom.xml?rev=742256&r1=742255&r2=742256&view=diff
==============================================================================
--- geronimo/server/branches/2.1/pom.xml (original)
+++ geronimo/server/branches/2.1/pom.xml Mon Feb  9 04:47:59 2009
@@ -656,7 +656,7 @@
             <dependency>
                 <groupId>org.apache.activemq</groupId>
                 <artifactId>activemq-core</artifactId>
-                <version>4.1.2-G647819</version>
+                <version>4.1.2-G20090207</version>
             </dependency>
 
             <dependency>

Copied: geronimo/server/branches/2.1/repository/org/apache/activemq/4.1.2-G20090207.README.TXT
(from r741736, geronimo/server/branches/2.1/repository/org/apache/activemq/4.1.2-G647819.README.TXT)
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/repository/org/apache/activemq/4.1.2-G20090207.README.TXT?p2=geronimo/server/branches/2.1/repository/org/apache/activemq/4.1.2-G20090207.README.TXT&p1=geronimo/server/branches/2.1/repository/org/apache/activemq/4.1.2-G647819.README.TXT&r1=741736&r2=742256&rev=742256&view=diff
==============================================================================
--- geronimo/server/branches/2.1/repository/org/apache/activemq/4.1.2-G647819.README.TXT (original)
+++ geronimo/server/branches/2.1/repository/org/apache/activemq/4.1.2-G20090207.README.TXT
Mon Feb  9 04:47:59 2009
@@ -1,8 +1,8 @@
 Private Build of ActiveMQ for Geronimo.   
 
-How to build ActiveMQ 4.1.2 with AMQ-1272 security patch:
----------------------------------------------------------
-Checkout the ActiveMQ 4.1 branch
+How to build ActiveMQ 4.1.2-G20090207:
+--------------------------------------
+Checkout the ActiveMQ 4.1.2 tag
   svn co https://svn.apache.org/repos/asf/activemq/tags/activemq-4.1.2 activemq-4.1.2
   
 svn info for ActiveMQ image:
@@ -18,10 +18,12 @@
 Last Changed Date: 2008-04-10 18:03:51 -0400 (Thu, 10 Apr 2008)
 
 
-Apply the security patch
+Apply the patches
 ---------------------------------
 cd activemq-4.1.2
 patch -p0 -u < AMQ1272-stomp-auth-v412.patch
+patch -p0 -u < AMQ-2094.patch
+patch -p0 -u < build.patch
 Answer 'y' to any prompts of "Reversed (or previously applied) patch detected!  Assume -R?
[n]"
 
 
@@ -37,13 +39,13 @@
 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-G647819/activemq-core-4.1.2-G647819.jar
+  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
 
 Optional steps:
 ---------------
-  cd <geronimo-root>/repository/org/apache/activemq/activemq-core/4.1.2-G647819
-  md5sum activemq-core-4.1.2-G647819.jar > activemq-core-4.1.2-G647819.jar.md5
-  sha1sum activemq-core-4.1.2-G647819.jar > activemq-core-4.1.2-G647819.jar.sha1
+  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
 
 
 How the patch (AMQ1272-stomp-auth-v412.patch) was created:

Added: geronimo/server/branches/2.1/repository/org/apache/activemq/AMQ-2094.patch
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/repository/org/apache/activemq/AMQ-2094.patch?rev=742256&view=auto
==============================================================================
--- geronimo/server/branches/2.1/repository/org/apache/activemq/AMQ-2094.patch (added)
+++ geronimo/server/branches/2.1/repository/org/apache/activemq/AMQ-2094.patch Mon Feb  9
04:47:59 2009
@@ -0,0 +1,18 @@
+Index: activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpTransportServer.java
+===================================================================
+--- activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpTransportServer.java
(revision 741739)
++++ activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpTransportServer.java
(working copy)
+@@ -76,12 +76,7 @@
+         InetAddress addr = InetAddress.getByName(host);
+ 
+         try {
+-            if (host.trim().equals("localhost") || addr.equals(InetAddress.getLocalHost()))
{
+-                this.serverSocket = serverSocketFactory.createServerSocket(bind.getPort(),
backlog);
+-            }
+-            else {
+-                this.serverSocket = serverSocketFactory.createServerSocket(bind.getPort(),
backlog, addr);
+-            }
++            this.serverSocket = serverSocketFactory.createServerSocket(bind.getPort(), backlog,
addr);
+             this.serverSocket.setSoTimeout(2000);
+         }
+         catch (IOException e) {

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

Propchange: geronimo/server/branches/2.1/repository/org/apache/activemq/activemq-core/4.1.2-G20090207/activemq-core-4.1.2-G20090207.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: geronimo/server/branches/2.1/repository/org/apache/activemq/activemq-core/4.1.2-G20090207/activemq-core-4.1.2-G20090207.jar.md5
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/repository/org/apache/activemq/activemq-core/4.1.2-G20090207/activemq-core-4.1.2-G20090207.jar.md5?rev=742256&view=auto
==============================================================================
--- geronimo/server/branches/2.1/repository/org/apache/activemq/activemq-core/4.1.2-G20090207/activemq-core-4.1.2-G20090207.jar.md5
(added)
+++ geronimo/server/branches/2.1/repository/org/apache/activemq/activemq-core/4.1.2-G20090207/activemq-core-4.1.2-G20090207.jar.md5
Mon Feb  9 04:47:59 2009
@@ -0,0 +1 @@
+388ccd815c8f8d4b914da7d10c746b0d  activemq-core-4.1.2-G20090207.jar

Added: geronimo/server/branches/2.1/repository/org/apache/activemq/activemq-core/4.1.2-G20090207/activemq-core-4.1.2-G20090207.jar.sha1
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/repository/org/apache/activemq/activemq-core/4.1.2-G20090207/activemq-core-4.1.2-G20090207.jar.sha1?rev=742256&view=auto
==============================================================================
--- geronimo/server/branches/2.1/repository/org/apache/activemq/activemq-core/4.1.2-G20090207/activemq-core-4.1.2-G20090207.jar.sha1
(added)
+++ geronimo/server/branches/2.1/repository/org/apache/activemq/activemq-core/4.1.2-G20090207/activemq-core-4.1.2-G20090207.jar.sha1
Mon Feb  9 04:47:59 2009
@@ -0,0 +1 @@
+b7ffb5be69c5d39e1206a74da8c0af3eebccac4f  activemq-core-4.1.2-G20090207.jar

Added: geronimo/server/branches/2.1/repository/org/apache/activemq/build.patch
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/repository/org/apache/activemq/build.patch?rev=742256&view=auto
==============================================================================
--- geronimo/server/branches/2.1/repository/org/apache/activemq/build.patch (added)
+++ geronimo/server/branches/2.1/repository/org/apache/activemq/build.patch Mon Feb  9 04:47:59
2009
@@ -0,0 +1,36 @@
+Index: pom.xml
+===================================================================
+--- pom.xml	(revision 742003)
++++ pom.xml	(working copy)
+@@ -877,8 +877,8 @@
+         <groupId>org.apache.maven.plugins</groupId>
+         <artifactId>maven-compiler-plugin</artifactId>
+         <configuration>
+-          <source>1.4</source>
+-          <target>1.4</target>
++          <source>1.5</source>
++          <target>1.5</target>
+         </configuration>
+       </plugin>
+       <plugin>
+@@ -1170,7 +1170,7 @@
+     <xmlbeans-version>2.0.0-beta1</xmlbeans-version>
+     <xmlpull-version>1.1.3.4d_b4_min</xmlpull-version>
+     <xstream-version>1.1.2</xstream-version>
+-    <xbean-version>3.0</xbean-version>
++    <xbean-version>3.0.1</xbean-version>
+     <dist-repo-url>scpexe://minotaur.apache.org/www/people.apache.org/repo/m2-ibiblio-rsync-repository</dist-repo-url>
+     <!--<m1-dist-repo-url>scpexe://minotaur.apache.org/www/people.apache.org/repo/m1-snapshot-repository</m1-dist-repo-url>-->
+     <site-repo-url>scpexe://people.apache.org/www/activemq.apache.org/maven/</site-repo-url>
+Index: activemq-core/pom.xml
+===================================================================
+--- activemq-core/pom.xml	(revision 742003)
++++ activemq-core/pom.xml	(working copy)
+@@ -260,6 +260,7 @@
+             <exclude>**/TopicClusterTest.*</exclude>
+             <exclude>**/MultiBrokersMultiClientsTest.*</exclude>
+             <exclude>**/TwoMulticastDiscoveryBrokerTopicSendReceiveTest.*</exclude>
++            <exclude>**/ReconnectTest.*</exclude>
+           </excludes>
+         </configuration>
+       </plugin>



Mime
View raw message