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 aj...@apache.org on 2006/01/08 11:32:09 UTC
svn commit: r367015 - in /webservices/axis2/trunk/java/modules:
codegen/src/org/apache/axis2/schema/writer/
codegen/src/org/apache/axis2/wsdl/ codegen/src/org/apache/axis2/wsdl/codegen/
codegen/src/org/apache/axis2/wsdl/codegen/emitter/ codegen/src/org...
Author: ajith
Date: Sun Jan 8 02:31:26 2006
New Revision: 367015
URL: http://svn.apache.org/viewcvs?rev=367015&view=rev
Log:
Halfway through the improvements to the codegenerator
1. Moved the commandline processing classes down to the util package (this move might have screwed up the tool classes though. Since tools are not part of the standard build, it'll not be a problem for the build)
2. Updated the InterfaceImplementationTemplate.xsl for a small issue in the generated code
3. Added long commandline options (like "server-side") to be used
Note - Integration tests seem to fail due to the recent change in the generated ant build file !!!
Added:
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/util/CommandLineOption.java (contents, props changed)
- copied, changed from r366988, webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/CommandLineOption.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/util/CommandLineOptionConstants.java (contents, props changed)
- copied, changed from r366988, webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/CommandLineOptionConstants.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/util/CommandLineOptionParser.java (contents, props changed)
- copied, changed from r366988, webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/CommandLineOptionParser.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/util/OptionValidator.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/util/XSLTConstants.java (contents, props changed)
- copied, changed from r366988, webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/XSLTConstants.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/util/XSLTIncludeResolver.java
- copied, changed from r366988, webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/XSLTIncludeResolver.java
Removed:
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/CommandLineOption.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/CommandLineOptionConstants.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/CommandLineOptionParser.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/XSLTConstants.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/XSLTIncludeResolver.java
Modified:
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/schema/writer/JavaBeanWriter.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/WSDL2Code.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/CodeGenConfiguration.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/CodeGenerationEngine.java
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/codegen/extension/SimpleDBExtension.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/XMLBeansExtension.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl
webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/wsdl/WSDL2JavaTest.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OutInAxisOperation.java
webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/ant/AntCodegenTask.java
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/schema/writer/JavaBeanWriter.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/schema/writer/JavaBeanWriter.java?rev=367015&r1=367014&r2=367015&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/schema/writer/JavaBeanWriter.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/schema/writer/JavaBeanWriter.java Sun Jan 8 02:31:26 2006
@@ -136,6 +136,7 @@
try {
QName qName = element.getQName();
+
return process(qName, metainf, typeMap, true);
} catch (Exception e) {
throw new SchemaCompilationException(e);
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/WSDL2Code.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/WSDL2Code.java?rev=367015&r1=367014&r2=367015&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/WSDL2Code.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/WSDL2Code.java Sun Jan 8 02:31:26 2006
@@ -17,8 +17,8 @@
package org.apache.axis2.wsdl;
import org.apache.axis2.wsdl.codegen.CodeGenerationEngine;
-import org.apache.axis2.wsdl.codegen.CommandLineOptionConstants;
-import org.apache.axis2.wsdl.codegen.CommandLineOptionParser;
+import org.apache.axis2.wsdl.util.CommandLineOptionConstants;
+import org.apache.axis2.wsdl.util.CommandLineOptionParser;
import org.apache.axis2.wsdl.i18n.CodegenMessages;
public class WSDL2Code {
@@ -33,7 +33,7 @@
}
private static void printUsage() {
-
+
System.out.println(CodegenMessages.getMessage("wsdl2code.arg1"));
System.out.println(CodegenMessages.getMessage("wsdl2code.arg2"));
System.out.println(CodegenMessages.getMessage("wsdl2code.arg3"));
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/CodeGenConfiguration.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/CodeGenConfiguration.java?rev=367015&r1=367014&r2=367015&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/CodeGenConfiguration.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/CodeGenConfiguration.java Sun Jan 8 02:31:26 2006
@@ -19,7 +19,10 @@
import org.apache.axis2.util.URLProcessor;
import org.apache.axis2.wsdl.databinding.TypeMapper;
import org.apache.axis2.wsdl.i18n.CodegenMessages;
+import org.apache.axis2.wsdl.util.CommandLineOption;
+import org.apache.axis2.wsdl.util.CommandLineOptionConstants;
import org.apache.axis2.wsdl.util.ConfigPropertyFileLoader;
+import org.apache.axis2.wsdl.util.XSLTConstants;
import org.apache.wsdl.WSDLDescription;
import java.io.File;
@@ -30,7 +33,6 @@
public class CodeGenConfiguration implements CommandLineOptionConstants {
private WSDLDescription wom;
- private CommandLineOptionParser parser;
private File outputLocation;
//get the defaults for these from the property file
@@ -194,16 +196,6 @@
/**
- * @param wom
- * @param parser
- */
- public CodeGenConfiguration(WSDLDescription wom,
- CommandLineOptionParser parser) {
- this(wom, parser.getAllOptions());
- this.parser = parser;
- }
-
- /**
* Constructor for the configuration. It populates the values using the options map.
*
* @param wom
@@ -284,22 +276,15 @@
Iterator keyIterator = optionMap.keySet().iterator();
while (keyIterator.hasNext()) {
Object key = keyIterator.next();
- CommandLineOption option = (CommandLineOption)optionMap.get(key);
- if (key.toString().startsWith(EXTRA_OPTIONTYPE_PREFIX)){
+ CommandLineOption option = (CommandLineOption) optionMap.get(key);
+ if (key.toString().startsWith(EXTRA_OPTIONTYPE_PREFIX)) {
//add this to the property map
- configurationProperties.put(key.toString().replaceFirst("E",""),option.getOptionValue());
+ configurationProperties.put(key.toString().replaceFirst(EXTRA_OPTIONTYPE_PREFIX, ""), option.getOptionValue());
}
}
}
-
- /**
- * @return Returns the parser.
- */
- public CommandLineOptionParser getParser() {
- return parser;
- }
/**
* @return Returns the wom.
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/CodeGenerationEngine.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/CodeGenerationEngine.java?rev=367015&r1=367014&r2=367015&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/CodeGenerationEngine.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/CodeGenerationEngine.java Sun Jan 8 02:31:26 2006
@@ -21,7 +21,10 @@
import org.apache.axis2.wsdl.codegen.extension.CodeGenExtension;
import org.apache.axis2.wsdl.databinding.TypeMapper;
import org.apache.axis2.wsdl.i18n.CodegenMessages;
+import org.apache.axis2.wsdl.util.CommandLineOptionConstants;
+import org.apache.axis2.wsdl.util.CommandLineOptionParser;
import org.apache.axis2.wsdl.util.ConfigPropertyFileLoader;
+import org.apache.axis2.wsdl.util.CommandLineOption;
import org.apache.wsdl.WSDLDescription;
import javax.wsdl.WSDLException;
@@ -42,13 +45,16 @@
public CodeGenerationEngine(CommandLineOptionParser parser) throws CodeGenerationException {
WSDLDescription wom;
+ Map allOptions = parser.getAllOptions();
try {
- wom = this.getWOM(parser);
+
+ CommandLineOption option = (CommandLineOption)allOptions.get(CommandLineOptionConstants.WSDL_LOCATION_URI_OPTION);
+ wom = this.getWOM(option.getOptionValue());
} catch (WSDLException e) {
throw new CodeGenerationException(CodegenMessages.getMessage("engine.wsdlParsingException"), e);
}
- configuration = new CodeGenConfiguration(wom, parser);
+ configuration = new CodeGenConfiguration(wom, allOptions);
loadExtensions();
}
@@ -99,9 +105,9 @@
if (configuration.isServerSide()) {
emitter.emitSkeleton();
- }
-
- if(!configuration.isServerSide() || configuration.isWriteTestCase()){
+ }
+
+ if (!configuration.isServerSide() || configuration.isWriteTestCase()) {
emitter.emitStub();
}
@@ -116,9 +122,9 @@
}
- private WSDLDescription getWOM(CommandLineOptionParser parser) throws WSDLException{
- String uri = ((CommandLineOption) parser.getAllOptions().get(
- CommandLineOptionConstants.WSDL_LOCATION_URI_OPTION)).getOptionValue();
+ private WSDLDescription getWOM(String uri) throws WSDLException {
+ //assume that the builder is always WSDL 1.1 - later we'll have to edit this to allow
+ //WSDL ersion to be passed
return WOMBuilderFactory.getBuilder(org.apache.wsdl.WSDLConstants.WSDL_1_1).build(uri)
.getDescription();
}
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=367015&r1=367014&r2=367015&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 Jan 8 02:31:26 2006
@@ -20,8 +20,8 @@
import org.apache.axis2.util.XSLTUtils;
import org.apache.axis2.wsdl.codegen.CodeGenConfiguration;
import org.apache.axis2.wsdl.codegen.CodeGenerationException;
-import org.apache.axis2.wsdl.codegen.XSLTConstants;
-import org.apache.axis2.wsdl.codegen.XSLTIncludeResolver;
+import org.apache.axis2.wsdl.util.XSLTConstants;
+import org.apache.axis2.wsdl.util.XSLTIncludeResolver;
import org.apache.axis2.wsdl.codegen.writer.AntBuildWriter;
import org.apache.axis2.wsdl.codegen.writer.CallbackHandlerWriter;
import org.apache.axis2.wsdl.codegen.writer.ClassWriter;
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/SimpleDBExtension.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/SimpleDBExtension.java?rev=367015&r1=367014&r2=367015&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/SimpleDBExtension.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/SimpleDBExtension.java Sun Jan 8 02:31:26 2006
@@ -19,7 +19,7 @@
import org.apache.axis2.schema.CompilerOptions;
import org.apache.axis2.schema.SchemaCompiler;
import org.apache.axis2.schema.SchemaConstants;
-import org.apache.axis2.wsdl.codegen.XSLTConstants;
+import org.apache.axis2.wsdl.util.XSLTConstants;
import org.apache.axis2.wsdl.databinding.DefaultTypeMapper;
import org.apache.axis2.wsdl.databinding.JavaTypeMapper;
import org.apache.ws.commons.schema.XmlSchema;
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/XMLBeansExtension.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/XMLBeansExtension.java?rev=367015&r1=367014&r2=367015&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/XMLBeansExtension.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/XMLBeansExtension.java Sun Jan 8 02:31:26 2006
@@ -18,7 +18,7 @@
import com.ibm.wsdl.util.xml.DOM2Writer;
import org.apache.axis2.util.URLProcessor;
-import org.apache.axis2.wsdl.codegen.XSLTConstants;
+import org.apache.axis2.wsdl.util.XSLTConstants;
import org.apache.axis2.wsdl.databinding.DefaultTypeMapper;
import org.apache.axis2.wsdl.databinding.JavaTypeMapper;
import org.apache.axis2.wsdl.i18n.CodegenMessages;
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl?rev=367015&r1=367014&r2=367015&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl Sun Jan 8 02:31:26 2006
@@ -127,7 +127,7 @@
<!--todo if the stub was generated with unwrapping, wrap all parameters into a single element-->
// create SOAP envelope with that payload
- org.apache.axis2.soap.SOAPEnvelope env;
+ org.apache.axis2.soap.SOAPEnvelope env = null;
<xsl:variable name="count"><xsl:value-of select="count(input/param[@type!=''])"></xsl:value-of></xsl:variable>
<xsl:choose>
<!-- test the number of input parameters
Copied: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/util/CommandLineOption.java (from r366988, webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/CommandLineOption.java)
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/util/CommandLineOption.java?p2=webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/util/CommandLineOption.java&p1=webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/CommandLineOption.java&r1=366988&r2=367015&rev=367015&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/CommandLineOption.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/util/CommandLineOption.java Sun Jan 8 02:31:26 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.axis2.wsdl.codegen;
+package org.apache.axis2.wsdl.util;
import java.util.ArrayList;
@@ -22,10 +22,9 @@
private String type;
private ArrayList optionValues;
- private boolean invalid = false;
public CommandLineOption(String type, String[] values) {
- updateType(type);
+ setOptionType(type);
ArrayList arrayList = new ArrayList(values.length);
for (int i = 0; i < values.length; i++) {
arrayList.add(values[i]);
@@ -33,7 +32,9 @@
this.optionValues = arrayList;
}
- private void updateType(String type) {
+ private void setOptionType(String type) {
+ //cater for the long options first
+ if (type.startsWith("--")) type = type.replaceFirst("--", "");
if (type.startsWith("-")) type = type.replaceFirst("-", "");
//for options that start with the extra prefix, don't do any change for the
@@ -48,8 +49,7 @@
* @param type
*/
public CommandLineOption(String type, ArrayList values) {
- updateType(type);
- this.validate(this.type);
+ setOptionType(type);
if (null != values) {
this.optionValues = values;
@@ -61,7 +61,7 @@
* @return Returns the type.
* @see <code>CommandLineOptionConstans</code>
*/
- public String getType() {
+ public String getOptionType() {
return type;
}
@@ -76,12 +76,6 @@
return null;
}
- /**
- * @return Returns boolean.
- */
- public boolean isInvalid() {
- return invalid;
- }
/**
@@ -91,25 +85,5 @@
return optionValues;
}
- private void validate(String optionType) {
- if (optionType.startsWith(EXTRA_OPTIONTYPE_PREFIX)){
- invalid = false;
- } else{
- invalid = !((WSDL_LOCATION_URI_OPTION).equalsIgnoreCase(optionType) ||
- (OUTPUT_LOCATION_OPTION).equalsIgnoreCase(optionType) ||
- (SERVER_SIDE_CODE_OPTION).equalsIgnoreCase(optionType) ||
- (CODEGEN_ASYNC_ONLY_OPTION).equalsIgnoreCase(optionType) ||
- (CODEGEN_SYNC_ONLY_OPTION).equalsIgnoreCase(optionType) ||
- (PACKAGE_OPTION).equalsIgnoreCase(optionType) ||
- (GENERATE_SERVICE_DESCRIPTION_OPTION).equalsIgnoreCase(optionType) ||
- (GENERATE_TEST_CASE_OPTION).equalsIgnoreCase(optionType) ||
- (STUB_LANGUAGE_OPTION).equalsIgnoreCase(optionType) ||
- (DATA_BINDING_TYPE_OPTION).equalsIgnoreCase(optionType) ||
- (UNPACK_CLASSES_OPTION).equalsIgnoreCase(optionType) ||
- (GENERATE_ALL_OPTION).equalsIgnoreCase(optionType))
- ;
- }
-
- }
}
Propchange: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/util/CommandLineOption.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/util/CommandLineOptionConstants.java (from r366988, webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/CommandLineOptionConstants.java)
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/util/CommandLineOptionConstants.java?p2=webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/util/CommandLineOptionConstants.java&p1=webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/CommandLineOptionConstants.java&r1=366988&r2=367015&rev=367015&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/CommandLineOptionConstants.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/util/CommandLineOptionConstants.java Sun Jan 8 02:31:26 2006
@@ -14,13 +14,15 @@
* limitations under the License.
*/
-package org.apache.axis2.wsdl.codegen;
+package org.apache.axis2.wsdl.util;
public interface CommandLineOptionConstants {
public static final String SOLE_INPUT = "SOLE_INPUT";
public static final String WSDL_LOCATION_URI_OPTION = "uri";
+
+ //short option constants
public static final String OUTPUT_LOCATION_OPTION = "o";
public static final String SERVER_SIDE_CODE_OPTION = "ss";
public static final String GENERATE_SERVICE_DESCRIPTION_OPTION = "sd";
@@ -32,6 +34,20 @@
public static final String DATA_BINDING_TYPE_OPTION = "d";
public static final String UNPACK_CLASSES_OPTION = "u";
public static final String GENERATE_ALL_OPTION = "g";
+
+ //long option constants
+ public static final String OUTPUT_LOCATION_OPTION_LONG = "output";
+ public static final String SERVER_SIDE_CODE_OPTION_LONG = "server-side";
+ public static final String GENERATE_SERVICE_DESCRIPTION_OPTION_LONG = "service-description";
+ public static final String CODEGEN_ASYNC_ONLY_OPTION_LONG = "async";
+ public static final String CODEGEN_SYNC_ONLY_OPTION_LONG = "sync";
+ public static final String PACKAGE_OPTION_LONG = "package";
+ public static final String STUB_LANGUAGE_OPTION_LONG = "language";
+ public static final String GENERATE_TEST_CASE_OPTION_LONG = "test-case";
+ public static final String DATA_BINDING_TYPE_OPTION_LONG = "databinding-method";
+ public static final String UNPACK_CLASSES_OPTION_LONG = "unpack-classes";
+ public static final String GENERATE_ALL_OPTION_LONG = "generate-all";
+
public static final String INVALID_OPTION = "INVALID_OPTION";
Propchange: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/util/CommandLineOptionConstants.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/util/CommandLineOptionParser.java (from r366988, webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/CommandLineOptionParser.java)
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/util/CommandLineOptionParser.java?p2=webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/util/CommandLineOptionParser.java&p1=webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/CommandLineOptionParser.java&r1=366988&r2=367015&rev=367015&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/CommandLineOptionParser.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/util/CommandLineOptionParser.java Sun Jan 8 02:31:26 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.axis2.wsdl.codegen;
+package org.apache.axis2.wsdl.util;
import java.util.ArrayList;
import java.util.HashMap;
@@ -67,7 +67,7 @@
// new one but old one should be saved
commandLineOption =
new CommandLineOption(optionType, optionBundle);
- commandLineOptions.put(commandLineOption.getType(),
+ commandLineOptions.put(commandLineOption.getOptionType(),
commandLineOption);
state = 1;
optionType = args[i];
@@ -80,7 +80,7 @@
new CommandLineOption(
CommandLineOptionConstants.SOLE_INPUT,
args);
- commandLineOptions.put(commandLineOption.getType(),
+ commandLineOptions.put(commandLineOption.getOptionType(),
commandLineOption);
return commandLineOptions;
@@ -99,7 +99,7 @@
}
commandLineOption = new CommandLineOption(optionType, optionBundle);
- commandLineOptions.put(commandLineOption.getType(), commandLineOption);
+ commandLineOptions.put(commandLineOption.getOptionType(), commandLineOption);
return commandLineOptions;
}
@@ -113,7 +113,7 @@
while (iterator.hasNext()) {
CommandLineOption commandLineOption = ((CommandLineOption) (iterator
.next()));
- if (commandLineOption.isInvalid()) {
+ if (OptionValidator.isInvalid(commandLineOption)) {
faultList.add(commandLineOption);
}
}
Propchange: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/util/CommandLineOptionParser.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/util/OptionValidator.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/util/OptionValidator.java?rev=367015&view=auto
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/util/OptionValidator.java (added)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/util/OptionValidator.java Sun Jan 8 02:31:26 2006
@@ -0,0 +1,62 @@
+package org.apache.axis2.wsdl.util;
+/*
+ * Copyright 2004,2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+class OptionValidator implements CommandLineOptionConstants{
+
+ public static boolean isInvalid(CommandLineOption option) {
+
+ boolean invalid;
+ String optionType = option.getOptionType();
+
+ if (optionType.startsWith(EXTRA_OPTIONTYPE_PREFIX)){
+ invalid = false;
+ } else{
+
+ invalid = !((WSDL_LOCATION_URI_OPTION).equalsIgnoreCase(optionType) ||
+ (OUTPUT_LOCATION_OPTION).equalsIgnoreCase(optionType) ||
+ (SERVER_SIDE_CODE_OPTION).equalsIgnoreCase(optionType) ||
+ (CODEGEN_ASYNC_ONLY_OPTION).equalsIgnoreCase(optionType) ||
+ (CODEGEN_SYNC_ONLY_OPTION).equalsIgnoreCase(optionType) ||
+ (PACKAGE_OPTION).equalsIgnoreCase(optionType) ||
+ (GENERATE_SERVICE_DESCRIPTION_OPTION).equalsIgnoreCase(optionType) ||
+ (GENERATE_TEST_CASE_OPTION).equalsIgnoreCase(optionType) ||
+ (STUB_LANGUAGE_OPTION).equalsIgnoreCase(optionType) ||
+ (DATA_BINDING_TYPE_OPTION).equalsIgnoreCase(optionType) ||
+ (UNPACK_CLASSES_OPTION).equalsIgnoreCase(optionType) ||
+ (GENERATE_ALL_OPTION).equalsIgnoreCase(optionType) ||
+
+ (OUTPUT_LOCATION_OPTION_LONG).equalsIgnoreCase(optionType) ||
+ (SERVER_SIDE_CODE_OPTION_LONG).equalsIgnoreCase(optionType) ||
+ (CODEGEN_ASYNC_ONLY_OPTION_LONG).equalsIgnoreCase(optionType) ||
+ (CODEGEN_SYNC_ONLY_OPTION_LONG).equalsIgnoreCase(optionType) ||
+ (PACKAGE_OPTION_LONG).equalsIgnoreCase(optionType) ||
+ (GENERATE_SERVICE_DESCRIPTION_OPTION_LONG).equalsIgnoreCase(optionType) ||
+ (GENERATE_TEST_CASE_OPTION_LONG).equalsIgnoreCase(optionType) ||
+ (STUB_LANGUAGE_OPTION_LONG).equalsIgnoreCase(optionType) ||
+ (DATA_BINDING_TYPE_OPTION_LONG).equalsIgnoreCase(optionType) ||
+ (UNPACK_CLASSES_OPTION_LONG).equalsIgnoreCase(optionType) ||
+ (GENERATE_ALL_OPTION_LONG).equalsIgnoreCase(optionType)
+ );
+
+ }
+
+ return invalid;
+ }
+
+
+}
Copied: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/util/XSLTConstants.java (from r366988, webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/XSLTConstants.java)
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/util/XSLTConstants.java?p2=webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/util/XSLTConstants.java&p1=webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/XSLTConstants.java&r1=366988&r2=367015&rev=367015&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/XSLTConstants.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/util/XSLTConstants.java Sun Jan 8 02:31:26 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.axis2.wsdl.codegen;
+package org.apache.axis2.wsdl.util;
import javax.xml.namespace.QName;
//todo rename this
Propchange: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/util/XSLTConstants.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/util/XSLTIncludeResolver.java (from r366988, webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/XSLTIncludeResolver.java)
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/util/XSLTIncludeResolver.java?p2=webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/util/XSLTIncludeResolver.java&p1=webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/XSLTIncludeResolver.java&r1=366988&r2=367015&rev=367015&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/XSLTIncludeResolver.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/util/XSLTIncludeResolver.java Sun Jan 8 02:31:26 2006
@@ -1,4 +1,4 @@
-package org.apache.axis2.wsdl.codegen;
+package org.apache.axis2.wsdl.util;
import org.apache.axis2.wsdl.i18n.CodegenMessages;
import org.apache.axis2.wsdl.util.ConfigPropertyFileLoader;
Modified: webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/wsdl/WSDL2JavaTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/wsdl/WSDL2JavaTest.java?rev=367015&r1=367014&r2=367015&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/wsdl/WSDL2JavaTest.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/wsdl/WSDL2JavaTest.java Sun Jan 8 02:31:26 2006
@@ -19,9 +19,9 @@
import junit.framework.TestCase;
import org.apache.axis2.wsdl.codegen.CodeGenerationEngine;
import org.apache.axis2.wsdl.codegen.CodeGenerationException;
-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.CommandLineOption;
+import org.apache.axis2.wsdl.util.CommandLineOptionConstants;
+import org.apache.axis2.wsdl.util.CommandLineOptionParser;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.Target;
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OutInAxisOperation.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OutInAxisOperation.java?rev=367015&r1=367014&r2=367015&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OutInAxisOperation.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OutInAxisOperation.java Sun Jan 8 02:31:26 2006
@@ -315,6 +315,7 @@
MessageContext responseMessageContext = new MessageContext();
responseMessageContext.setTransportIn(msgctx.getTransportIn());
responseMessageContext.setTransportOut(msgctx.getTransportOut());
+
// This is a hack - Needs to change
responseMessageContext.setOptions(options);
Modified: webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/ant/AntCodegenTask.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/ant/AntCodegenTask.java?rev=367015&r1=367014&r2=367015&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/ant/AntCodegenTask.java (original)
+++ webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/ant/AntCodegenTask.java Sun Jan 8 02:31:26 2006
@@ -18,9 +18,9 @@
import org.apache.axis2.util.URLProcessor;
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.CommandLineOption;
+import org.apache.axis2.wsdl.util.CommandLineOptionConstants;
+import org.apache.axis2.wsdl.util.CommandLineOptionParser;
import org.apache.axis2.wsdl.util.ConfigPropertyFileLoader;
import org.apache.tools.ant.AntClassLoader;
import org.apache.tools.ant.BuildException;