diff options
Diffstat (limited to 'sca-java-2.x/trunk/modules/binding-ws-runtime-axis2')
3 files changed, 15 insertions, 14 deletions
diff --git a/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/META-INF/MANIFEST.MF b/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/META-INF/MANIFEST.MF index 2ad383d9f7..a2c1fe03ea 100644 --- a/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/META-INF/MANIFEST.MF +++ b/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/META-INF/MANIFEST.MF @@ -87,6 +87,7 @@ Import-Package: javax.activation;resolution:=optional, org.apache.axiom.om,
org.apache.axiom.om.impl.builder,
org.apache.axiom.om.util,
+ org.apache.axiom.util.base64,
org.apache.axiom.soap,
org.apache.axis2,
org.apache.axis2.addressing,
diff --git a/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/pom.xml b/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/pom.xml index d09fa8a124..25bbea3a77 100644 --- a/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/pom.xml +++ b/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/pom.xml @@ -51,7 +51,7 @@ <dependency> <groupId>org.apache.axis2</groupId> <artifactId>axis2-kernel</artifactId> - <version>1.5.1</version> + <version>1.5.3</version> <exclusions> <exclusion> <groupId>xerces</groupId> @@ -75,7 +75,7 @@ <dependency> <groupId>org.apache.axis2</groupId> <artifactId>axis2-java2wsdl</artifactId> - <version>1.5.1</version> + <version>1.5.3</version> <exclusions> <exclusion> <groupId>org.apache.ant</groupId> @@ -95,7 +95,7 @@ <dependency> <groupId>org.apache.axis2</groupId> <artifactId>axis2-codegen</artifactId> - <version>1.5.1</version> + <version>1.5.3</version> <scope>runtime</scope> <exclusions> <exclusion> @@ -112,26 +112,26 @@ <dependency> <groupId>org.apache.axis2</groupId> <artifactId>axis2-mtompolicy</artifactId> - <version>1.5.1</version> + <version>1.5.3</version> </dependency> <dependency> <groupId>org.apache.axis2</groupId> <artifactId>mex</artifactId> - <version>1.5.1</version> + <version>1.5.3</version> <classifier>impl</classifier> </dependency> <dependency> <groupId>org.apache.axis2</groupId> <artifactId>axis2-transport-http</artifactId> - <version>1.5.1</version> + <version>1.5.3</version> </dependency> <dependency> <groupId>org.apache.axis2</groupId> <artifactId>axis2-transport-local</artifactId> - <version>1.5.1</version> + <version>1.5.3</version> </dependency> <dependency> @@ -143,19 +143,19 @@ <dependency> <groupId>org.apache.ws.commons.axiom</groupId> <artifactId>axiom-api</artifactId> - <version>1.2.8</version> + <version>1.2.10</version> </dependency> <dependency> <groupId>org.apache.ws.commons.axiom</groupId> <artifactId>axiom-impl</artifactId> - <version>1.2.8</version> + <version>1.2.10</version> </dependency> <dependency> <groupId>org.apache.ws.commons.axiom</groupId> <artifactId>axiom-dom</artifactId> - <version>1.2.8</version> + <version>1.2.10</version> </dependency> <dependency> @@ -179,13 +179,13 @@ <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpcore</artifactId> - <version>4.0.1</version> + <version>4.1</version> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpcore-nio</artifactId> - <version>4.0.1</version> + <version>4.1</version> </dependency> <dependency> diff --git a/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/basic/BasicAuthenticationServicePolicyInterceptor.java b/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/basic/BasicAuthenticationServicePolicyInterceptor.java index 3d73410ae9..5365754fb3 100644 --- a/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/basic/BasicAuthenticationServicePolicyInterceptor.java +++ b/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/basic/BasicAuthenticationServicePolicyInterceptor.java @@ -24,8 +24,8 @@ import java.util.Map; import javax.security.auth.Subject; import javax.xml.namespace.QName; +import org.apache.axiom.util.base64.Base64Utils; import org.apache.axis2.context.MessageContext; -import org.apache.axis2.util.Base64; import org.apache.tuscany.sca.invocation.Invoker; import org.apache.tuscany.sca.invocation.Message; import org.apache.tuscany.sca.invocation.Phase; @@ -86,7 +86,7 @@ public class BasicAuthenticationServicePolicyInterceptor implements PhasedInterc basicAuthString = basicAuthString.trim(); if (basicAuthString.startsWith("Basic ")) { - decodedBasicAuthString = new String(Base64.decode(basicAuthString.substring(6))); + decodedBasicAuthString = new String(Base64Utils.decode(basicAuthString.substring(6))); } int collonIndex = decodedBasicAuthString.indexOf(':'); |