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 he...@apache.org on 2005/07/04 08:54:09 UTC
svn commit: r209025 - in /webservices/axis/trunk/java/modules: samples/
tool/src/org/apache/axis2/tool/ant/ wsdl/src/org/apache/axis2/wsdl/codegen/
wsdl/src/org/apache/axis2/wsdl/codegen/emitter/
Author: hemapani
Date: Sun Jul 3 23:54:07 2005
New Revision: 209025
URL: http://svn.apache.org/viewcvs?rev=209025&view=rev
Log:
check in the ant task updates
Modified:
webservices/axis/trunk/java/modules/samples/maven.xml
webservices/axis/trunk/java/modules/samples/project.xml
webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/ant/AntCodegenTask.java
webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/CodeGenerationEngine.java
webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/CommandLineOptionParser.java
webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/emitter/MultiLanguageClientEmitter.java
Modified: webservices/axis/trunk/java/modules/samples/maven.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/maven.xml?rev=209025&r1=209024&r2=209025&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/maven.xml (original)
+++ webservices/axis/trunk/java/modules/samples/maven.xml Sun Jul 3 23:54:07 2005
@@ -43,7 +43,7 @@
<postGoal name="test:test">
<attainGoal name="create-samples"/>
- <!-- <attainGoal name="doInterop-test"/> -->
+ <!-- <attainGoal name="doInterop-test"/> -->
</postGoal>
<goal name="create-samples">
@@ -267,9 +267,22 @@
<j:set var="work.dir" value="${interop3.dir}/work"/>
<j:set var="calss.dir" value="${interop3.dir}/classes"/>
<j:set var="wsdl.dir" value="test-resources/wsdl"/>
-
- <wsdl2java WSDLFileName="test-resources/wsdl/compound2.wsdl" output="${work.dir}"/>
- <copy file="${wsdl.dir}/Client.java" todir="${work.dir}" overwrite="true" />
+
+ <mkdir dir="${interop3.dir}"/>
+ <mkdir dir="${work.dir}"/>
+ <mkdir dir="${calss.dir}"/>
+
+ <wsdl2java WSDLFileName="test-resources/wsdl/compound2.wsdl" output="${work.dir}"/>
+ <!--
+ <java classname="org.apache.axis2.wsdl.WSDL2Java">
+ <classpath refid="maven.dependency.classpath"/>
+ <arg value="-uri"/>
+ <arg file="${wsdl.dir}/compound2.wsdl"/>
+ <arg value="-o"/>
+ <arg file="${work.dir}"/>
+ </java>
+ -->
+ <copy file="${wsdl.dir}/InteropClient2.java" todir="${work.dir}" overwrite="true" />
<copy file="${wsdl.dir}/echoEmployeeDatabindingSupporter.java" todir="${work.dir}/org/soapinterop/databinding" overwrite="true" />
<move todir="${classes.dir}/schema">
Modified: webservices/axis/trunk/java/modules/samples/project.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/project.xml?rev=209025&r1=209024&r2=209025&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/project.xml (original)
+++ webservices/axis/trunk/java/modules/samples/project.xml Sun Jul 3 23:54:07 2005
@@ -123,6 +123,16 @@
<module>true</module>
</properties>
</dependency>
+ <dependency>
+ <groupId>xmlbeans</groupId>
+ <artifactId>xbean</artifactId>
+ <version>2.0.0-beta1</version>
+ <type>jar</type>
+ <properties>
+ <module>true</module>
+ </properties>
+ </dependency>
+
</dependencies>
<!-- build information for the project -->
Modified: webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/ant/AntCodegenTask.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/ant/AntCodegenTask.java?rev=209025&r1=209024&r2=209025&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/ant/AntCodegenTask.java (original)
+++ webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/ant/AntCodegenTask.java Sun Jul 3 23:54:07 2005
@@ -2,8 +2,12 @@
import java.io.File;
import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.FileWriter;
import java.io.IOException;
import java.io.InputStream;
+import java.io.PrintStream;
import java.util.HashMap;
import java.util.Map;
@@ -15,6 +19,7 @@
import org.apache.axis2.wsdl.codegen.CodeGenerationEngine;
import org.apache.axis2.wsdl.codegen.CommandLineOption;
import org.apache.axis2.wsdl.codegen.CommandLineOptionConstants;
+import org.apache.axis2.wsdl.codegen.CommandLineOptionParser;
import org.apache.axis2.wsdl.util.URLProcessor;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Task;
@@ -131,12 +136,10 @@
public void execute() throws BuildException {
try {
- WSDLDescription wom = this.getWOM(WSDLFileName);
- Map optionsMap = fillOptionMap();
- CodeGenConfiguration codegenConfig = new CodeGenConfiguration(wom,
- optionsMap);
- new CodeGenerationEngine(codegenConfig).generate();
- } catch (Exception e) {
+
+ CommandLineOptionParser parser = new CommandLineOptionParser(this.fillOptionMap());
+ new CodeGenerationEngine(parser).generate();
+ } catch (Throwable e) {
throw new BuildException(e);
}
@@ -176,6 +179,13 @@
public void setGenerateServerXml(boolean generateServerXml) {
this.generateServerXml = generateServerXml;
+ }
+
+ public static void main(String[] args){
+ AntCodegenTask task = new AntCodegenTask();
+ task.setWSDLFileName("modules/samples/test-resources/wsdl/compound2.wsdl");
+ task.setOutput("temp");
+ task.execute();
}
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/CodeGenerationEngine.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/CodeGenerationEngine.java?rev=209025&r1=209024&r2=209025&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/CodeGenerationEngine.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/CodeGenerationEngine.java Sun Jul 3 23:54:07 2005
@@ -44,14 +44,7 @@
private List moduleEndpoints = new ArrayList();
private CodeGenConfiguration configuration;
-
-
- public CodeGenerationEngine(CodeGenConfiguration config){
- this.configuration = config;
- AxisBindingBuilder axisBindingBuilder = new AxisBindingBuilder();
- axisBindingBuilder.init(this.configuration);
- axisBindingBuilder.engage();
- }
+
public CodeGenerationEngine(CommandLineOptionParser parser) throws CodeGenerationException{
WSDLDescription wom ;
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/CommandLineOptionParser.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/CommandLineOptionParser.java?rev=209025&r1=209024&r2=209025&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/CommandLineOptionParser.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/CommandLineOptionParser.java Sun Jul 3 23:54:07 2005
@@ -26,6 +26,9 @@
private Map commandLineOptions;
+ public CommandLineOptionParser(Map commandLineOptions){
+ this.commandLineOptions = commandLineOptions;
+ }
public CommandLineOptionParser(String[] args) {
this.commandLineOptions = this.parse(args);
@@ -110,5 +113,7 @@
return faultList;
}
+
+
}
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/emitter/MultiLanguageClientEmitter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/emitter/MultiLanguageClientEmitter.java?rev=209025&r1=209024&r2=209025&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/emitter/MultiLanguageClientEmitter.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/emitter/MultiLanguageClientEmitter.java Sun Jul 3 23:54:07 2005
@@ -416,8 +416,9 @@
private Element getInputParamElement(XmlDocument doc, WSDLOperation operation) {
//todo this should go in a loop
Element param = doc.createElement("param");
- addAttribute(doc,"name",this.mapper.getParameterName(operation.getInputMessage().getElement()),param);
- String typeMapping = this.mapper.getTypeMapping(operation.getInputMessage().getElement());
+ MessageReference inputMessage = operation.getInputMessage();
+ addAttribute(doc,"name",this.mapper.getParameterName(inputMessage.getElement()),param);
+ String typeMapping = this.mapper.getTypeMapping(inputMessage.getElement());
String typeMappingStr =typeMapping==null?"":typeMapping;
addAttribute(doc,"type",typeMappingStr,param);
return param;