Author: ajith
Date: Sun Nov 6 16:38:00 2005
New Revision: 331169
URL: http://svn.apache.org/viewcvs?rev=331169&view=rev
Log:
1. Corrected a minor error in the ant build file generation
2. Removed some commented code in WSDLPump.java
Modified:
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/MultiLanguageClientEmitter.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/general/xmlbeansAntBuildTemplate.xsl
webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/wsdl4j/WSDLPump.java
Modified:
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/MultiLanguageClientEmitter.java
URL:
http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/MultiLanguageClientEmitter.java?rev=331169&r1=331168&r2=331169&view=diff
==============================================================================
---
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/MultiLanguageClientEmitter.java
(original)
+++
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/MultiLanguageClientEmitter.java
Sun Nov 6 16:38:00 2005
@@ -416,8 +416,10 @@
*/
protected void writeAntBuild(WSDLInterface axisInterface, WSDLBinding
axisBinding) throws Exception {
//Write the service xml in a folder with the
- Document skeletonModel = createDOMDocumentForInterface(
+ Document skeletonModel = createDOMDocumentForAntBuild(
axisInterface, axisBinding);
+ System.out.println("skeletonModel.getDocumentElement() = " +
skeletonModel.getDocumentElement());
+
ClassWriter antBuildWriter = new AntBuildWriter(
this.configuration.getOutputLocation(),
this.configuration.getOutputLanguage());
@@ -767,6 +769,32 @@
return doc;
}
+
+ /**
+ * Creates the DOM tree for the interface creation. Uses the interface
+ * @param wsdlInterface
+ * @param axisBinding
+ */
+ protected Document createDOMDocumentForAntBuild(WSDLInterface
wsdlInterface, WSDLBinding axisBinding) {
+
+ Document doc = getEmptyDocument();
+ Element rootElement = doc.createElement("ant");
+ String localPart =
reformatName(wsdlInterface.getName().getLocalPart(),false);
+ String packageName = configuration.getPackageName();
+ String[] dotSeperatedValues = packageName.split("\\.");
+ addAttribute(doc,
+ "package",
+ dotSeperatedValues[0],
+ rootElement);
+
+ addAttribute(doc,
+ "name",
+ localPart,
+ rootElement);
+ doc.appendChild(rootElement);
+ return doc;
+
+ }
/**
* Creates the DOM tree for the interface creation. Uses the interface
Modified:
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/general/xmlbeansAntBuildTemplate.xsl
URL:
http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/general/xmlbeansAntBuildTemplate.xsl?rev=331169&r1=331168&r2=331169&view=diff
==============================================================================
---
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
Sun Nov 6 16:38:00 2005
@@ -1,6 +1,6 @@
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
<xsl:output method="xml" indent="yes" omit-xml-declaration="yes"/>
- <xsl:template match="/interface">
+ <xsl:template match="/ant">
<xsl:variable name="package"><xsl:value-of
select="@package"/></xsl:variable>
<project basedir="." default="jar.xbeans" >
Modified:
webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/wsdl4j/WSDLPump.java
URL:
http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/wsdl4j/WSDLPump.java?rev=331169&r1=331168&r2=331169&view=diff
==============================================================================
---
webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/wsdl4j/WSDLPump.java
(original)
+++
webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/wsdl4j/WSDLPump.java
Sun Nov 6 16:38:00 2005
@@ -760,7 +760,7 @@
}
-
+
return schemaElement;
}
@@ -777,9 +777,7 @@
if (isWrappable) {
//The schema for this should be already made ! Find the QName from
the list
referenceQName=(QName)resolvedRpcWrappedElementMap.get(outerName.getLocalPart());
-
////////////////////////////////////////////////////////////////////////////////
- //System.out.println("referenceQName = " + referenceQName);
-
////////////////////////////////////////////////////////////////////////////////
+
} else {
//Only one part so copy the QName of the referenced type.
Iterator outputIterator =
