continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From och...@apache.org
Subject svn commit: r1153008 - in /continuum/trunk: ./ continuum-distributed/continuum-distributed-master/continuum-distributed-master-client/ continuum-distributed/continuum-distributed-master/continuum-distributed-master-client/src/main/java/org/apache/conti...
Date Tue, 02 Aug 2011 03:10:22 GMT
Author: oching
Date: Tue Aug  2 03:10:21 2011
New Revision: 1153008

URL: http://svn.apache.org/viewvc?rev=1153008&view=rev
Log:
[CONTINUUM-2641] upgraded apache xmlrpc to 3.1.2 and atlassian xmlrpc binder to 0.11 to get
multi-threading fix in apache xmlrpc 3.1.1+

Modified:
    continuum/trunk/continuum-distributed/continuum-distributed-master/continuum-distributed-master-client/pom.xml
    continuum/trunk/continuum-distributed/continuum-distributed-master/continuum-distributed-master-client/src/main/java/org/apache/continuum/distributed/transport/master/MasterBuildAgentTransportClient.java
    continuum/trunk/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-client/pom.xml
    continuum/trunk/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-client/src/main/java/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportClient.java
    continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-client/src/main/java/org/apache/maven/continuum/xmlrpc/client/SampleClient.java
    continuum/trunk/pom.xml

Modified: continuum/trunk/continuum-distributed/continuum-distributed-master/continuum-distributed-master-client/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-distributed/continuum-distributed-master/continuum-distributed-master-client/pom.xml?rev=1153008&r1=1153007&r2=1153008&view=diff
==============================================================================
--- continuum/trunk/continuum-distributed/continuum-distributed-master/continuum-distributed-master-client/pom.xml
(original)
+++ continuum/trunk/continuum-distributed/continuum-distributed-master/continuum-distributed-master-client/pom.xml
Tue Aug  2 03:10:21 2011
@@ -42,6 +42,10 @@ under the License.
       <artifactId>atlassian-xmlrpc-binder</artifactId>
     </dependency>
     <dependency>
+      <groupId>com.atlassian.xmlrpc</groupId>
+      <artifactId>atlassian-xmlrpc-binder-client-apache</artifactId>
+    </dependency>
+    <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
     </dependency>

Modified: continuum/trunk/continuum-distributed/continuum-distributed-master/continuum-distributed-master-client/src/main/java/org/apache/continuum/distributed/transport/master/MasterBuildAgentTransportClient.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-distributed/continuum-distributed-master/continuum-distributed-master-client/src/main/java/org/apache/continuum/distributed/transport/master/MasterBuildAgentTransportClient.java?rev=1153008&r1=1153007&r2=1153008&view=diff
==============================================================================
--- continuum/trunk/continuum-distributed/continuum-distributed-master/continuum-distributed-master-client/src/main/java/org/apache/continuum/distributed/transport/master/MasterBuildAgentTransportClient.java
(original)
+++ continuum/trunk/continuum-distributed/continuum-distributed-master/continuum-distributed-master-client/src/main/java/org/apache/continuum/distributed/transport/master/MasterBuildAgentTransportClient.java
Tue Aug  2 03:10:21 2011
@@ -19,14 +19,14 @@ package org.apache.continuum.distributed
  * under the License.
  */
 
-import com.atlassian.xmlrpc.AuthenticationInfo;
+import com.atlassian.xmlrpc.ApacheBinder;
 import com.atlassian.xmlrpc.Binder;
 import com.atlassian.xmlrpc.BindingException;
-import com.atlassian.xmlrpc.DefaultBinder;
 
 import java.net.URL;
 import java.util.Map;
 
+import com.atlassian.xmlrpc.ConnectionInfo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -53,22 +53,25 @@ public class MasterBuildAgentTransportCl
     public MasterBuildAgentTransportClient( URL serviceUrl, String login, String password
)
         throws Exception
     {
-        Binder binder = new DefaultBinder();
-        AuthenticationInfo authnInfo = new AuthenticationInfo( login, password );
+        Binder binder = new ApacheBinder();
+        
+        ConnectionInfo connectionInfo = new ConnectionInfo();
+        connectionInfo.setUsername( login );
+        connectionInfo.setPassword( password );
 
         this.masterServerUrl = serviceUrl.toString();
 
         try
         {
-            master = binder.bind( MasterBuildAgentTransportService.class, serviceUrl, authnInfo
);
+            master = binder.bind( MasterBuildAgentTransportService.class, serviceUrl, connectionInfo
);
         }
         catch ( BindingException e )
         {
             log.error( "Can't bind service interface " + MasterBuildAgentTransportService.class.getName()
+ " to " +
-                serviceUrl.toExternalForm() + " using " + authnInfo.getUsername() + ", "
+ authnInfo.getPassword(), e );
+                serviceUrl.toExternalForm() + " using " + connectionInfo.getUsername() +
", " + connectionInfo.getPassword(), e );
             throw new Exception(
                 "Can't bind service interface " + MasterBuildAgentTransportService.class.getName()
+ " to " +
-                    serviceUrl.toExternalForm() + " using " + authnInfo.getUsername() + ",
" + authnInfo.getPassword(),
+                    serviceUrl.toExternalForm() + " using " + connectionInfo.getUsername()
+ ", " + connectionInfo.getPassword(),
                 e );
         }
     }

Modified: continuum/trunk/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-client/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-client/pom.xml?rev=1153008&r1=1153007&r2=1153008&view=diff
==============================================================================
--- continuum/trunk/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-client/pom.xml
(original)
+++ continuum/trunk/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-client/pom.xml
Tue Aug  2 03:10:21 2011
@@ -37,6 +37,10 @@ under the License.
       <artifactId>atlassian-xmlrpc-binder</artifactId>
     </dependency>
     <dependency>
+      <groupId>com.atlassian.xmlrpc</groupId>
+      <artifactId>atlassian-xmlrpc-binder-client-apache</artifactId>
+    </dependency>
+    <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
     </dependency> 

Modified: continuum/trunk/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-client/src/main/java/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportClient.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-client/src/main/java/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportClient.java?rev=1153008&r1=1153007&r2=1153008&view=diff
==============================================================================
--- continuum/trunk/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-client/src/main/java/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportClient.java
(original)
+++ continuum/trunk/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-client/src/main/java/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportClient.java
Tue Aug  2 03:10:21 2011
@@ -19,16 +19,16 @@ package org.apache.continuum.distributed
  * under the License.
  */
 
-import com.atlassian.xmlrpc.AuthenticationInfo;
+import com.atlassian.xmlrpc.ApacheBinder;
 import com.atlassian.xmlrpc.Binder;
 import com.atlassian.xmlrpc.BindingException;
-import com.atlassian.xmlrpc.DefaultBinder;
 
 import java.net.URL;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 
+import com.atlassian.xmlrpc.ConnectionInfo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -53,22 +53,25 @@ public class SlaveBuildAgentTransportCli
     public SlaveBuildAgentTransportClient( URL serviceUrl, String login, String password
)
         throws Exception
     {
-        Binder binder = new DefaultBinder();
-        AuthenticationInfo authnInfo = new AuthenticationInfo( login, password );
+        Binder binder = new ApacheBinder();
+
+        ConnectionInfo connectionInfo = new ConnectionInfo();
+        connectionInfo.setUsername( login );
+        connectionInfo.setPassword( password );
 
         buildAgentUrl = serviceUrl.toString();
 
         try
         {
-            slave = binder.bind( SlaveBuildAgentTransportService.class, serviceUrl, authnInfo
);
+            slave = binder.bind( SlaveBuildAgentTransportService.class, serviceUrl, connectionInfo
);
         }
         catch ( BindingException e )
         {
             log.error( "Can't bind service interface " + SlaveBuildAgentTransportService.class.getName()
+ " to " +
-                serviceUrl.toExternalForm() + " using " + authnInfo.getUsername() + ", "
+ authnInfo.getPassword(), e );
+                serviceUrl.toExternalForm() + " using " + connectionInfo.getUsername() +
", " + connectionInfo.getPassword(), e );
             throw new Exception(
                 "Can't bind service interface " + SlaveBuildAgentTransportService.class.getName()
+ " to " +
-                    serviceUrl.toExternalForm() + " using " + authnInfo.getUsername() + ",
" + authnInfo.getPassword(),
+                    serviceUrl.toExternalForm() + " using " + connectionInfo.getUsername()
+ ", " + connectionInfo.getPassword(),
                 e );
         }
     }

Modified: continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-client/src/main/java/org/apache/maven/continuum/xmlrpc/client/SampleClient.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-client/src/main/java/org/apache/maven/continuum/xmlrpc/client/SampleClient.java?rev=1153008&r1=1153007&r2=1153008&view=diff
==============================================================================
--- continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-client/src/main/java/org/apache/maven/continuum/xmlrpc/client/SampleClient.java
(original)
+++ continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-client/src/main/java/org/apache/maven/continuum/xmlrpc/client/SampleClient.java
Tue Aug  2 03:10:21 2011
@@ -55,7 +55,7 @@ public class SampleClient
         client = new ContinuumXmlRpcClient( new URL( args[0] ), args[1], args[2] );
 
         /*
-        // Test for [CONTINUUM-2641]:
+        // Test for [CONTINUUM-2641]: (test with distributed builds with multiple build agents
or parallel builds with > 1 build queue)
         // make sure to set the projectIds to the actual projectIds of your projects added
in Continuum
         int projectIds[] = new int[] { 2, 3, 4, 5, 6 };
 

Modified: continuum/trunk/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/pom.xml?rev=1153008&r1=1153007&r2=1153008&view=diff
==============================================================================
--- continuum/trunk/pom.xml (original)
+++ continuum/trunk/pom.xml Tue Aug  2 03:10:21 2011
@@ -717,6 +717,17 @@ under the License.
         </exclusions>
       </dependency>
       <dependency>
+        <groupId>com.atlassian.xmlrpc</groupId>
+        <artifactId>atlassian-xmlrpc-binder-client-apache</artifactId>
+        <version>${atlassian.xmlrpc.binder.version}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+      <dependency>
         <groupId>org.apache.continuum</groupId>
         <artifactId>continuum-plexus-application</artifactId>
         <version>${project.version}</version>
@@ -1730,7 +1741,7 @@ under the License.
     <redback.version>1.3-M2-SNAPSHOT</redback.version>
     <archiva.version>1.2.1</archiva.version>
     <slf4jVersion>1.5.8</slf4jVersion>
-    <xmlrpc.version>3.1</xmlrpc.version>
-    <atlassian.xmlrpc.binder.version>0.8.2</atlassian.xmlrpc.binder.version>
+    <xmlrpc.version>3.1.2</xmlrpc.version>
+    <atlassian.xmlrpc.binder.version>0.11</atlassian.xmlrpc.binder.version>
   </properties>
 </project>



Mime
View raw message