Author: oching
Date: Tue Aug 2 02:35:47 2011
New Revision: 1153002
URL: http://svn.apache.org/viewvc?rev=1153002&view=rev
Log:
[MRM-1484] Upgrade Atlassian XMLRPC binder to 0.11 to get fix for
multi-threading issue in Aapache XMLRPC 3.1.1+
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/pom.xml
archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/src/main/java/org/apache/archiva/web/xmlrpc/client/SampleClient.java
archiva/trunk/pom.xml
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/pom.xml?rev=1153002&r1=1153001&r2=1153002&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/pom.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/pom.xml
Tue Aug 2 02:35:47 2011
@@ -41,6 +41,10 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>com.atlassian.xmlrpc</groupId>
+ <artifactId>atlassian-xmlrpc-binder-client-apache</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<!-- Exec plugin doesn't use runtime scope - odd -->
@@ -75,7 +79,7 @@
</plugins>
</build>
<properties>
- <archiva.url>http://127.0.0.1:8080/archiva/</archiva.url>
+ <archiva.url>http://127.0.0.1:8080/archiva</archiva.url>
<username>admin</username>
</properties>
</project>
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/src/main/java/org/apache/archiva/web/xmlrpc/client/SampleClient.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/src/main/java/org/apache/archiva/web/xmlrpc/client/SampleClient.java?rev=1153002&r1=1153001&r2=1153002&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/src/main/java/org/apache/archiva/web/xmlrpc/client/SampleClient.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/src/main/java/org/apache/archiva/web/xmlrpc/client/SampleClient.java
Tue Aug 2 02:35:47 2011
@@ -22,10 +22,10 @@ package org.apache.archiva.web.xmlrpc.cl
import java.net.URL;
import java.util.List;
-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 com.atlassian.xmlrpc.ConnectionInfo;
import org.apache.archiva.web.xmlrpc.api.AdministrationService;
import org.apache.archiva.web.xmlrpc.api.PingService;
import org.apache.archiva.web.xmlrpc.api.beans.ManagedRepository;
@@ -49,13 +49,16 @@ public class SampleClient
{
public static void main( String[] args )
{
- Binder binder = new DefaultBinder();
-
+
+ Binder binder = new ApacheBinder();
+ ConnectionInfo info = new ConnectionInfo();
+ info.setUsername( args[1] );
+ info.setPassword( args[2] );
+
try
{
- AuthenticationInfo authnInfo = new AuthenticationInfo( args[1],
args[2] );
- AdministrationService adminService = binder.bind(
AdministrationService.class, new URL( args[0] ), authnInfo );
- PingService pingService = binder.bind( PingService.class, new URL(
args[0] ), authnInfo );
+ AdministrationService adminService = binder.bind(
AdministrationService.class, new URL( args[0] ), info );
+ PingService pingService = binder.bind( PingService.class, new URL(
args[0] ), info );
System.out.println( "Ping : " + pingService.ping() );
Modified: archiva/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/pom.xml?rev=1153002&r1=1153001&r2=1153002&view=diff
==============================================================================
--- archiva/trunk/pom.xml (original)
+++ archiva/trunk/pom.xml Tue Aug 2 02:35:47 2011
@@ -69,7 +69,7 @@
<redback.version>1.3-SNAPSHOT</redback.version>
<jetty.version>6.1.19</jetty.version>
<slf4j.version>1.6.1</slf4j.version>
- <binder.version>0.9</binder.version>
+ <binder.version>0.11</binder.version>
<spring.version>3.0.5.RELEASE</spring.version>
<jackrabbit.version>2.3-SNAPSHOT</jackrabbit.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -982,6 +982,17 @@
<version>${binder.version}</version>
</dependency>
<dependency>
+ <groupId>com.atlassian.xmlrpc</groupId>
+ <artifactId>atlassian-xmlrpc-binder-client-apache</artifactId>
+ <version>${binder.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
<groupId>commons-validator</groupId>
<artifactId>commons-validator</artifactId>
<version>1.3.1</version>
