You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by am...@apache.org on 2007/03/28 12:23:29 UTC
svn commit: r523262 - in /webservices/axis2/trunk/java/modules:
codegen/src/org/apache/axis2/wsdl/template/general/ integration/
kernel/src/org/apache/axis2/description/
Author: amilas
Date: Wed Mar 28 03:23:21 2007
New Revision: 523262
URL: http://svn.apache.org/viewvc?view=rev&rev=523262
Log:
change the wsdl11ToAxisServiceBuilder to pick only the specified port in there is a port given
change the name of the generated archive file to Services
Modified:
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/general/adbAntBuildTemplate.xsl
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/general/defaultAntBuildTemplate.xsl
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/general/xmlbeansAntBuildTemplate.xsl
webservices/axis2/trunk/java/modules/integration/maven.xml
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/general/adbAntBuildTemplate.xsl
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/general/adbAntBuildTemplate.xsl?view=diff&rev=523262&r1=523261&r2=523262
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/general/adbAntBuildTemplate.xsl (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/general/adbAntBuildTemplate.xsl Wed Mar 28 03:23:21 2007
@@ -26,9 +26,6 @@
<property name="maven.class.path">
<xsl:attribute name="value"></xsl:attribute>
</property>
- <!--<property name="name">-->
- <!--<xsl:attribute name="value"><xsl:value-of select="@servicename"/></xsl:attribute>-->
- <!--</property>-->
<property name="name">
<xsl:attribute name="value">Services</xsl:attribute>
</property>
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/general/defaultAntBuildTemplate.xsl
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/general/defaultAntBuildTemplate.xsl?view=diff&rev=523262&r1=523261&r2=523262
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/general/defaultAntBuildTemplate.xsl (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/general/defaultAntBuildTemplate.xsl Wed Mar 28 03:23:21 2007
@@ -42,7 +42,7 @@
<xsl:attribute name="value">${project.base.dir}/<xsl:value-of select="$resource"/></xsl:attribute>
</property>
<property name="name">
- <xsl:attribute name="value"><xsl:value-of select="@servicename"/></xsl:attribute>
+ <xsl:attribute name="value">Services</xsl:attribute>
</property>
<property name="jars.ok" value=""></property>
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/general/xmlbeansAntBuildTemplate.xsl
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/general/xmlbeansAntBuildTemplate.xsl?view=diff&rev=523262&r1=523261&r2=523262
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/general/xmlbeansAntBuildTemplate.xsl (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/general/xmlbeansAntBuildTemplate.xsl Wed Mar 28 03:23:21 2007
@@ -28,7 +28,7 @@
<xsl:attribute name="value"></xsl:attribute>
</property>
<property name="name">
- <xsl:attribute name="value"><xsl:value-of select="@servicename"/></xsl:attribute>
+ <xsl:attribute name="value">Services</xsl:attribute>
</property>
<property name="src">
<xsl:attribute name="value">${project.base.dir}/<xsl:value-of select="$src"/></xsl:attribute>
Modified: webservices/axis2/trunk/java/modules/integration/maven.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/maven.xml?view=diff&rev=523262&r1=523261&r2=523262
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/maven.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/maven.xml Wed Mar 28 03:23:21 2007
@@ -66,10 +66,10 @@
target="make.repo"/>
<ant:ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="target/perf"
target="jar.client"/>
- <ant:move file="target/perf/build/lib/PerfPortType-test-client.jar"
+ <ant:move file="target/perf/build/lib/Services-test-client.jar"
tofile="target/perf/build/lib/PerfSoapService-test-client.jar" />
- <ant:move file="target/perf/build/lib/PerfPortType.aar"
+ <ant:move file="target/perf/build/lib/Services.aar"
tofile="target/perf/build/lib/PerfSoapService.aar" />
<ant:path id="samples.wsdl.perf.client.jar"
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java?view=diff&rev=523262&r1=523261&r2=523262
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java Wed Mar 28 03:23:21 2007
@@ -317,25 +317,26 @@
for (Iterator iterator = wsdl4jPorts.values().iterator(); iterator.hasNext();) {
port = (Port) iterator.next();
- // we process the port only if it has the same port type as the selected binding
- currentBinding = wsdl4jDefinition.getBinding(port.getBinding().getQName());
- if (currentBinding.getPortType().getQName().equals(binding.getPortType().getQName())) {
- axisEndpoint = new AxisEndpoint();
- axisEndpoint.setName(port.getName());
+ // if the user has picked a port then we have to process only that port
+ if ((this.portName == null) || (this.portName.equals(port.getName()))) {
+ // we process the port only if it has the same port type as the selected binding
+ currentBinding = wsdl4jDefinition.getBinding(port.getBinding().getQName());
+ if (currentBinding.getPortType().getQName().equals(binding.getPortType().getQName())) {
+ axisEndpoint = new AxisEndpoint();
+ axisEndpoint.setName(port.getName());
- if (axisService.getEndpointName() == null &&
- bindingName.equals(port.getBinding().getQName())) {
- populateEndpoint(axisEndpoint, port, true);
- axisService.setEndpointName(axisEndpoint.getName());
- axisService.setBindingName(axisEndpoint.getBinding().getName().getLocalPart());
+ if (axisService.getEndpointName() == null &&
+ bindingName.equals(port.getBinding().getQName())) {
+ populateEndpoint(axisEndpoint, port, true);
+ axisService.setEndpointName(axisEndpoint.getName());
+ axisService.setBindingName(axisEndpoint.getBinding().getName().getLocalPart());
} else {
- populateEndpoint(axisEndpoint, port, false);
+ populateEndpoint(axisEndpoint, port, false);
+ }
+ axisService.addEndpoint(port.getName(), axisEndpoint);
}
- axisService.addEndpoint(port.getName(), axisEndpoint);
}
-
}
-
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org