You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by an...@apache.org on 2007/03/03 10:55:03 UTC
svn commit: r514108 - in
/incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2: ./
binding/src/main/java/org/apache/tuscany/binding/axis2/ itests/
itests/old-style/ itests/simplest/ plugins/java2wsdl/ plugins/wsdl2java/
Author: antelder
Date: Sat Mar 3 01:55:02 2007
New Revision: 514108
URL: http://svn.apache.org/viewvc?view=rev&rev=514108
Log:
Fix Axis2 service name never starts with a slash character so ?wsdl works
Modified:
incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/binding/src/main/java/org/apache/tuscany/binding/axis2/Axis2BindingBuilder.java
incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/binding/src/main/java/org/apache/tuscany/binding/axis2/Axis2ServiceBinding.java
incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/binding/src/main/java/org/apache/tuscany/binding/axis2/TuscanyDispatcher.java
incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/itests/old-style/pom.xml
incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/itests/pom.xml
incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/itests/simplest/pom.xml
incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/plugins/java2wsdl/pom.xml
incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/plugins/wsdl2java/pom.xml
incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/pom.xml
Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/binding/src/main/java/org/apache/tuscany/binding/axis2/Axis2BindingBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/binding/src/main/java/org/apache/tuscany/binding/axis2/Axis2BindingBuilder.java?view=diff&rev=514108&r1=514107&r2=514108
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/binding/src/main/java/org/apache/tuscany/binding/axis2/Axis2BindingBuilder.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/binding/src/main/java/org/apache/tuscany/binding/axis2/Axis2BindingBuilder.java Sat Mar 3 01:55:02 2007
@@ -51,6 +51,7 @@
*
* @version $Rev$ $Date$
*/
+@SuppressWarnings("deprecation")
public class Axis2BindingBuilder extends BindingBuilderExtension<WebServiceBindingDefinition> {
private static final String OM_DATA_BINDING = OMElement.class.getName();
@@ -148,6 +149,9 @@
if (wsBinding.isSpec10Compliant()) {
wsBinding.setActualURI(computeActualURI(wsBinding, BASE_URI, serviceDefinition.getTarget(), serviceDefinition.getName(), parent));
axisServiceName = wsBinding.getActualURI().getPath();
+ if (axisServiceName != null && axisServiceName.length() > 1 && axisServiceName.startsWith("/")) {
+ axisServiceName = axisServiceName.substring(1);
+ }
} else {
axisServiceName = serviceDefinition.getName();
}
Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/binding/src/main/java/org/apache/tuscany/binding/axis2/Axis2ServiceBinding.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/binding/src/main/java/org/apache/tuscany/binding/axis2/Axis2ServiceBinding.java?view=diff&rev=514108&r1=514107&r2=514108
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/binding/src/main/java/org/apache/tuscany/binding/axis2/Axis2ServiceBinding.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/binding/src/main/java/org/apache/tuscany/binding/axis2/Axis2ServiceBinding.java Sat Mar 3 01:55:02 2007
@@ -22,7 +22,6 @@
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
-import java.net.URI;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/binding/src/main/java/org/apache/tuscany/binding/axis2/TuscanyDispatcher.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/binding/src/main/java/org/apache/tuscany/binding/axis2/TuscanyDispatcher.java?view=diff&rev=514108&r1=514107&r2=514108
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/binding/src/main/java/org/apache/tuscany/binding/axis2/TuscanyDispatcher.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/binding/src/main/java/org/apache/tuscany/binding/axis2/TuscanyDispatcher.java Sat Mar 3 01:55:02 2007
@@ -55,6 +55,11 @@
String path = URI.create(toEPR.getAddress()).getPath();
+ // remove the leading slash
+ if (path != null && path.length() > 1 && path.startsWith("/")) {
+ path = path.substring(1);
+ }
+
ConfigurationContext configurationContext = messageContext.getConfigurationContext();
AxisConfiguration registry = configurationContext.getAxisConfiguration();
Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/itests/old-style/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/itests/old-style/pom.xml?view=diff&rev=514108&r1=514107&r2=514108
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/itests/old-style/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/itests/old-style/pom.xml Sat Mar 3 01:55:02 2007
@@ -29,7 +29,7 @@
<artifactId>axis2-itest-old-style</artifactId>
<version>${testing.version}</version>
<packaging>jar</packaging>
- <name>Tuscany Axis2 itest - old style scdl</name>
+ <name>Apache Tuscany Axis2 itests old style scdl</name>
<dependencies>
<dependency>
Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/itests/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/itests/pom.xml?view=diff&rev=514108&r1=514107&r2=514108
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/itests/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/itests/pom.xml Sat Mar 3 01:55:02 2007
@@ -29,7 +29,7 @@
<groupId>org.apache.tuscany.sca.extensions.axis2.itests</groupId>
<artifactId>parent</artifactId>
<packaging>pom</packaging>
- <name>Tuscany itests for the Axis2 extension</name>
+ <name>Apache Tuscany Axis2 itests</name>
<modules>
<module>old-style</module>
Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/itests/simplest/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/itests/simplest/pom.xml?view=diff&rev=514108&r1=514107&r2=514108
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/itests/simplest/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/itests/simplest/pom.xml Sat Mar 3 01:55:02 2007
@@ -29,7 +29,7 @@
<artifactId>axis2-itest-simplest</artifactId>
<version>${testing.version}</version>
<packaging>jar</packaging>
- <name>Tuscany Axis2 itest - simplest binding.ws</name>
+ <name>Apache Tuscany Axis2 itests simplest binding.ws</name>
<dependencies>
<dependency>
Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/plugins/java2wsdl/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/plugins/java2wsdl/pom.xml?view=diff&rev=514108&r1=514107&r2=514108
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/plugins/java2wsdl/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/plugins/java2wsdl/pom.xml Sat Mar 3 01:55:02 2007
@@ -27,7 +27,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>tuscany-plugin-java2wsdl</artifactId>
<packaging>maven-plugin</packaging>
- <name>Apache Tuscany Maven Plugin for Java2WSDL</name>
+ <name>Apache Tuscany Axis2 Maven Plugin for Java2WSDL</name>
<description>Implementation of Java2WSDL Generator</description>
<dependencies>
Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/plugins/wsdl2java/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/plugins/wsdl2java/pom.xml?view=diff&rev=514108&r1=514107&r2=514108
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/plugins/wsdl2java/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/plugins/wsdl2java/pom.xml Sat Mar 3 01:55:02 2007
@@ -27,7 +27,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>tuscany-plugin-wsdl2java</artifactId>
<packaging>maven-plugin</packaging>
- <name>Apache Tuscany Maven Plugin for WSDL2Java</name>
+ <name>Apache Tuscany Axis2 Maven Plugin for WSDL2Java</name>
<description>Implementation of WSDL2Java Generator</description>
<dependencies>
Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/pom.xml?view=diff&rev=514108&r1=514107&r2=514108
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/pom.xml Sat Mar 3 01:55:02 2007
@@ -51,6 +51,7 @@
<module>databinding</module>
<module>tools</module>
<module>plugins</module>
+ <module>itests</module>
<module>samples</module>
</modules>
</profile>
@@ -62,6 +63,7 @@
<module>databinding</module>
<module>tools</module>
<module>plugins</module>
+ <module>itests</module>
<module>samples</module>
</modules>
</profile>
@@ -73,6 +75,7 @@
<module>databinding</module>
<module>tools</module>
<module>plugins</module>
+ <module>itests</module>
<module>samples</module>
</modules>
</profile>
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org