diff options
| author | Maria Odea B. Ching <oching@apache.org> | 2011-08-02 02:35:47 +0000 |
|---|---|---|
| committer | Maria Odea B. Ching <oching@apache.org> | 2011-08-02 02:35:47 +0000 |
| commit | 8391b7c4d759e533e9482935fd66b0214504b8b4 (patch) | |
| tree | 975e8585133d00bc04a8ed5b3c09f2f28dacb1b4 /archiva-modules | |
| parent | 1e8ff1265f039b0c3dd9946848539023009b6c46 (diff) | |
| download | archiva-8391b7c4d759e533e9482935fd66b0214504b8b4.tar.gz archiva-8391b7c4d759e533e9482935fd66b0214504b8b4.zip | |
[MRM-1484] Upgrade Atlassian XMLRPC binder to 0.11 to get fix for multi-threading issue in Aapache XMLRPC 3.1.1+
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1153002 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-modules')
2 files changed, 15 insertions, 8 deletions
diff --git a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/pom.xml b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/pom.xml index b020b60bf..b9a812c79 100644 --- a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/pom.xml +++ b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/pom.xml @@ -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> diff --git a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/src/main/java/org/apache/archiva/web/xmlrpc/client/SampleClient.java b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/src/main/java/org/apache/archiva/web/xmlrpc/client/SampleClient.java index a85382bca..0158883be 100644 --- a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/src/main/java/org/apache/archiva/web/xmlrpc/client/SampleClient.java +++ b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/src/main/java/org/apache/archiva/web/xmlrpc/client/SampleClient.java @@ -22,10 +22,10 @@ package org.apache.archiva.web.xmlrpc.client; 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() ); |