You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by di...@apache.org on 2007/07/06 18:51:47 UTC
svn commit: r553951 - in /webservices/axis2/trunk/java/modules:
codegen/src/org/apache/axis2/wsdl/codegen/emitter/
codegen/src/org/apache/axis2/wsdl/template/general/ samples/quickstartadb/
Author: dims
Date: Fri Jul 6 09:51:46 2007
New Revision: 553951
URL: http://svn.apache.org/viewvc?view=rev&rev=553951
Log:
Fix regression, if there is a single service, use that in the name of the generated aar
Modified:
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java
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/jaxmeAntBuildTemplate.xsl
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/general/jibxAntBuildTemplate.xsl
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/general/xmlbeansAntBuildTemplate.xsl
webservices/axis2/trunk/java/modules/samples/quickstartadb/README.txt
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java?view=diff&rev=553951&r1=553950&r2=553951
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java Fri Jul 6 09:51:46 2007
@@ -581,6 +581,12 @@
addAttribute(doc, "src", codeGenConfiguration.getSourceLocation(), rootElement);
addAttribute(doc, "resource", codeGenConfiguration.getResourceLocation(), rootElement);
+ if (codeGenConfiguration.getAxisServices().size() > 1){
+ addAttribute(doc, "artifactname", "Services", rootElement);
+ } else {
+ addAttribute(doc, "artifactname", this.axisService.getName() , rootElement);
+ }
+
if (!codeGenConfiguration.isWriteTestCase()) {
addAttribute(doc, "testOmit", "true", rootElement);
}
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=553951&r1=553950&r2=553951
==============================================================================
--- 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 Fri Jul 6 09:51:46 2007
@@ -45,7 +45,7 @@
<xsl:attribute name="value"></xsl:attribute>
</property>
<property name="name">
- <xsl:attribute name="value">Services</xsl:attribute>
+ <xsl:attribute name="value"><xsl:value-of select="@artifactname"/></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/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=553951&r1=553950&r2=553951
==============================================================================
--- 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 Fri Jul 6 09:51:46 2007
@@ -60,7 +60,7 @@
<xsl:attribute name="value">${project.base.dir}/<xsl:value-of select="$resource"/></xsl:attribute>
</property>
<property name="name">
- <xsl:attribute name="value">Services</xsl:attribute>
+ <xsl:attribute name="value"><xsl:value-of select="@artifactname"/></xsl:attribute>
</property>
<property name="jars.ok" value=""></property>
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/general/jaxmeAntBuildTemplate.xsl
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/general/jaxmeAntBuildTemplate.xsl?view=diff&rev=553951&r1=553950&r2=553951
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/general/jaxmeAntBuildTemplate.xsl (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/general/jaxmeAntBuildTemplate.xsl Fri Jul 6 09:51:46 2007
@@ -45,7 +45,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"><xsl:value-of select="@artifactname"/></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/codegen/src/org/apache/axis2/wsdl/template/general/jibxAntBuildTemplate.xsl
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/general/jibxAntBuildTemplate.xsl?view=diff&rev=553951&r1=553950&r2=553951
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/general/jibxAntBuildTemplate.xsl (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/general/jibxAntBuildTemplate.xsl Fri Jul 6 09:51:46 2007
@@ -45,7 +45,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"><xsl:value-of select="@artifactname"/></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/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=553951&r1=553950&r2=553951
==============================================================================
--- 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 Fri Jul 6 09:51:46 2007
@@ -46,7 +46,7 @@
<xsl:attribute name="value"></xsl:attribute>
</property>
<property name="name">
- <xsl:attribute name="value">Services</xsl:attribute>
+ <xsl:attribute name="value"><xsl:value-of select="@artifactname"/></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/samples/quickstartadb/README.txt
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/samples/quickstartadb/README.txt?view=diff&rev=553951&r1=553950&r2=553951
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/quickstartadb/README.txt (original)
+++ webservices/axis2/trunk/java/modules/samples/quickstartadb/README.txt Fri Jul 6 09:51:46 2007
@@ -21,7 +21,7 @@
Type "ant generate.service" from Axis2_HOME/samples/quickstartadb
directory and then deploy the
-Axis2_HOME/samples/quickstartadb/build/service/build/lib/Services.aar
+Axis2_HOME/samples/quickstartadb/build/service/build/lib/StockQuoteService.aar
Running the Client
==================
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org