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 pr...@apache.org on 2007/07/28 00:08:13 UTC
svn commit: r560403 [1/3] - in /webservices/axis2/branches/java/jaxws21: ./
modules/adb-codegen/src/org/apache/axis2/schema/
modules/adb/src/org/apache/axis2/databinding/typemapping/
modules/codegen/src/org/apache/axis2/wsdl/ modules/codegen/src/org/ap...
Author: pradine
Date: Fri Jul 27 15:08:09 2007
New Revision: 560403
URL: http://svn.apache.org/viewvc?view=rev&rev=560403
Log:
Sync with trunk to revision 560115.
Added:
webservices/axis2/branches/java/jaxws21/build.xml
- copied unchanged from r560115, webservices/axis2/trunk/java/build.xml
webservices/axis2/branches/java/jaxws21/modules/metadata/test/org/apache/axis2/jaxws/description/impl/DescriptionFactoryImplTests.java
- copied unchanged from r560115, webservices/axis2/trunk/java/modules/metadata/test/org/apache/axis2/jaxws/description/impl/DescriptionFactoryImplTests.java
webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/plugin/resources/
- copied from r560115, webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/plugin/resources/
webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/plugin/resources/service.xsd
- copied unchanged from r560115, webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/plugin/resources/service.xsd
webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/ideaplugin/bean/ClassFileFilter.java
- copied unchanged from r560115, webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/src/main/java/org/apache/ideaplugin/bean/ClassFileFilter.java
webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/ideaplugin/bean/ParameterObj.java
- copied unchanged from r560115, webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/src/main/java/org/apache/ideaplugin/bean/ParameterObj.java
webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/ideaplugin/bean/ValidateXMLFile.java
- copied unchanged from r560115, webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/src/main/java/org/apache/ideaplugin/bean/ValidateXMLFile.java
webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/ideaplugin/bean/XmlFileFilter.java
- copied unchanged from r560115, webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/src/main/java/org/apache/ideaplugin/bean/XmlFileFilter.java
webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/ideaplugin/frames/ClassFileLocationPage.java
- copied unchanged from r560115, webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/src/main/java/org/apache/ideaplugin/frames/ClassFileLocationPage.java
webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/ideaplugin/frames/LibraryAddingPage.java
- copied unchanged from r560115, webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/src/main/java/org/apache/ideaplugin/frames/LibraryAddingPage.java
webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/ideaplugin/frames/ParameterDialog.java
- copied unchanged from r560115, webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/src/main/java/org/apache/ideaplugin/frames/ParameterDialog.java
webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/ideaplugin/frames/ServiceArchiveOutputLocationPage.java
- copied unchanged from r560115, webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/src/main/java/org/apache/ideaplugin/frames/ServiceArchiveOutputLocationPage.java
webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/ideaplugin/frames/ServiceXMLEditPage.java
- copied unchanged from r560115, webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/src/main/java/org/apache/ideaplugin/frames/ServiceXMLEditPage.java
webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/ideaplugin/frames/ServiceXMLFileSelectionPage.java
- copied unchanged from r560115, webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/src/main/java/org/apache/ideaplugin/frames/ServiceXMLFileSelectionPage.java
webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/ideaplugin/frames/ServiceXMLGenerationPage.java
- copied unchanged from r560115, webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/src/main/java/org/apache/ideaplugin/frames/ServiceXMLGenerationPage.java
webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/ideaplugin/frames/WSDLFileSelectionPage.java
- copied unchanged from r560115, webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/src/main/java/org/apache/ideaplugin/frames/WSDLFileSelectionPage.java
Removed:
webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/util/Java2WSDLOptionsValidator.java
webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/CodegenPlugin.java
webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/CodegenPluginAction.java
webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/ideaplugin/ModuleDialog.java
webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/ideaplugin/ParameterDialog.java
webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/ideaplugin/bean/ObjectKeeper.java
webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/ideaplugin/frames/Axi2PluginPage.java
webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/ideaplugin/frames/BottomPanel.java
webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/ideaplugin/frames/ClassSelctionPage.java
webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/ideaplugin/frames/DescriptorFile.java
webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/ideaplugin/frames/FirstFrame.java
webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/ideaplugin/frames/ImagePanel.java
webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/ideaplugin/frames/LogoPage.java
webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/ideaplugin/frames/OutPage.java
webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/ideaplugin/frames/ResourceChooser.java
webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/ideaplugin/frames/SelectPanel.java
webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/ideaplugin/frames/ServiceArciveFrame.java
webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/ideaplugin/frames/XMLSelectionPage.java
Modified:
webservices/axis2/branches/java/jaxws21/modules/adb-codegen/src/org/apache/axis2/schema/CompilerOptions.java
webservices/axis2/branches/java/jaxws21/modules/adb-codegen/src/org/apache/axis2/schema/ExtensionUtility.java
webservices/axis2/branches/java/jaxws21/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java
webservices/axis2/branches/java/jaxws21/modules/adb-codegen/src/org/apache/axis2/schema/SchemaConstants.java
webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/databinding/typemapping/SimpleTypeMapper.java
webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/WSDL2Code.java
webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/CodeGenConfiguration.java
webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/CodegenConfigLoader.java
webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/XMLBeansExtension.java
webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/i18n/resource.properties
webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/util/WSDL2JavaOptionsValidator.java
webservices/axis2/branches/java/jaxws21/modules/fastinfoset/pom.xml
webservices/axis2/branches/java/jaxws21/modules/fastinfoset/src/org/apache/axis2/fastinfoset/FastInfosetBuilder.java
webservices/axis2/branches/java/jaxws21/modules/fastinfoset/src/org/apache/axis2/fastinfoset/FastInfosetMessageFormatter.java
webservices/axis2/branches/java/jaxws21/modules/fastinfoset/src/org/apache/axis2/fastinfoset/FastInfosetPOXBuilder.java
webservices/axis2/branches/java/jaxws21/modules/fastinfoset/src/org/apache/axis2/fastinfoset/FastInfosetPOXMessageFormatter.java
webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMFaultReportTest.java
webservices/axis2/branches/java/jaxws21/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDL.java
webservices/axis2/branches/java/jaxws21/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLTask.java
webservices/axis2/branches/java/jaxws21/modules/java2wsdl/src/org/apache/ws/java2wsdl/utils/Java2WSDLOptionsValidator.java
webservices/axis2/branches/java/jaxws21/modules/jibx/src/org/apache/axis2/jibx/JiBXDataSource.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/description/AxisService.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/description/OutInAxisOperation.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/description/java2wsdl/Java2WSDLConstants.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/engine/DispatchPhase.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/transport/TransportUtils.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/transport/http/HTTPSender.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/transport/http/HTTPTransportUtils.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/transport/http/HTTPWorker.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/transport/http/server/AxisHttpService.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/util/CommandLineOptionConstants.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/util/MessageContextBuilder.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/util/XMLPrettyPrinter.java
webservices/axis2/branches/java/jaxws21/modules/metadata/src/org/apache/axis2/jaxws/description/impl/DescriptionFactoryImpl.java
webservices/axis2/branches/java/jaxws21/modules/metadata/src/org/apache/axis2/jaxws/description/impl/EndpointInterfaceDescriptionImpl.java
webservices/axis2/branches/java/jaxws21/modules/metadata/src/org/apache/axis2/jaxws/description/impl/ServiceDescriptionImpl.java
webservices/axis2/branches/java/jaxws21/modules/parent/pom.xml
webservices/axis2/branches/java/jaxws21/modules/tool/axis2-ant-plugin/src/main/java/org/apache/axis2/tool/ant/AntCodegenTask.java
webservices/axis2/branches/java/jaxws21/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/CodeGenWizard.java
webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/bean/SrcCompiler.java
webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/bean/WsdlgenBean.java
webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/component/WizardPanel.java
webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/ChooserPanel.java
webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/FirstPanel.java
webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/ProgressBarPanel.java
webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/SecondPanel.java
webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/WSDL2JavaOutputPanel.java
webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/WSDLFileFilter.java
webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/java2wsdl/MiddlePanel.java
webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/java2wsdl/OptionPanel.java
webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/java2wsdl/OutputPanel.java
webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/wizardframe/CodegenFrame.java
webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/wizardframe/WizardFrame.java
webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/ideaplugin/bean/ArchiveBean.java
webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/ideaplugin/bean/ServiceObj.java
webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/ideaplugin/plugin/Axis2IdeaPlugin.java
webservices/axis2/branches/java/jaxws21/modules/tool/axis2-java2wsdl-maven-plugin/src/main/java/org/apache/axis2/maven2/java2wsdl/Java2WSDLMojo.java
webservices/axis2/branches/java/jaxws21/modules/tool/axis2-wsdl2code-maven-plugin/src/main/java/org/apache/axis2/maven2/wsdl2code/WSDL2CodeMojo.java
webservices/axis2/branches/java/jaxws21/modules/xmlbeans/src/org/apache/axis2/xmlbeans/CodeGenerationUtility.java
webservices/axis2/branches/java/jaxws21/xdocs/articles.xml
webservices/axis2/branches/java/jaxws21/xdocs/index.xml
webservices/axis2/branches/java/jaxws21/xdocs/maven-help.xml
webservices/axis2/branches/java/jaxws21/xdocs/overview.xml
Modified: webservices/axis2/branches/java/jaxws21/modules/adb-codegen/src/org/apache/axis2/schema/CompilerOptions.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/adb-codegen/src/org/apache/axis2/schema/CompilerOptions.java?view=diff&rev=560403&r1=560402&r2=560403
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/adb-codegen/src/org/apache/axis2/schema/CompilerOptions.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/adb-codegen/src/org/apache/axis2/schema/CompilerOptions.java Fri Jul 27 15:08:09 2007
@@ -45,6 +45,8 @@
private String packageName = null;
private boolean generateAll = false;
+ private boolean offStrictValidation = false;
+
/**
* Package for the mapper
*/
@@ -184,4 +186,14 @@
public void setSuppressPrefixesMode(boolean suppressPrefixesMode) {
this.suppressPrefixesMode = suppressPrefixesMode;
}
+
+ public boolean isOffStrictValidation() {
+ return offStrictValidation;
+ }
+
+ public void setOffStrictValidation(boolean offStrictValidation) {
+ this.offStrictValidation = offStrictValidation;
+ }
+
+
}
Modified: webservices/axis2/branches/java/jaxws21/modules/adb-codegen/src/org/apache/axis2/schema/ExtensionUtility.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/adb-codegen/src/org/apache/axis2/schema/ExtensionUtility.java?view=diff&rev=560403&r1=560402&r2=560403
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/adb-codegen/src/org/apache/axis2/schema/ExtensionUtility.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/adb-codegen/src/org/apache/axis2/schema/ExtensionUtility.java Fri Jul 27 15:08:09 2007
@@ -580,6 +580,10 @@
}
+ if (propertyMap.containsKey(SchemaConstants.SchemaCompilerArguments.OFF_STRICT_VALIDATION)){
+ options.setOffStrictValidation(true);
+ }
+
//set helper mode
//this becomes effective only if the classes are unpacked
if (!options.isWrapClasses()) {
Modified: webservices/axis2/branches/java/jaxws21/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java?view=diff&rev=560403&r1=560402&r2=560403
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java Fri Jul 27 15:08:09 2007
@@ -2091,7 +2091,12 @@
//register the occurence counts
metainfHolder.addMaxOccurs(referencedQName, elt.getMaxOccurs());
- metainfHolder.addMinOccurs(referencedQName, elt.getMinOccurs());
+ // if the strict validation off then we consider all elements have minOccurs zero on it
+ if (this.options.isOffStrictValidation()){
+ metainfHolder.addMinOccurs(referencedQName, 0);
+ } else {
+ metainfHolder.addMinOccurs(referencedQName, elt.getMinOccurs());
+ }
//we need the order to be preserved. So record the order also
if (order) {
//record the order in the metainf holder
Modified: webservices/axis2/branches/java/jaxws21/modules/adb-codegen/src/org/apache/axis2/schema/SchemaConstants.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/adb-codegen/src/org/apache/axis2/schema/SchemaConstants.java?view=diff&rev=560403&r1=560402&r2=560403
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/adb-codegen/src/org/apache/axis2/schema/SchemaConstants.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/adb-codegen/src/org/apache/axis2/schema/SchemaConstants.java Fri Jul 27 15:08:09 2007
@@ -110,6 +110,7 @@
public static final String PACKAGE = "p";
public static final String MAPPER_PACKAGE = "mp";
public static final String HELPER_MODE = "h";
+ public static final String OFF_STRICT_VALIDATION = "osv";
}
Modified: webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/databinding/typemapping/SimpleTypeMapper.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/databinding/typemapping/SimpleTypeMapper.java?view=diff&rev=560403&r1=560402&r2=560403
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/databinding/typemapping/SimpleTypeMapper.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/databinding/typemapping/SimpleTypeMapper.java Fri Jul 27 15:08:09 2007
@@ -301,7 +301,7 @@
}
public static Object makeDate(String source) {
- return ConverterUtil.convertToDate(source);
+ return ConverterUtil.convertToDateTime(source).getTime();
}
}
Modified: webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/WSDL2Code.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/WSDL2Code.java?view=diff&rev=560403&r1=560402&r2=560403
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/WSDL2Code.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/WSDL2Code.java Fri Jul 27 15:08:09 2007
@@ -38,33 +38,11 @@
private static void printUsage() {
+ System.out.println(CodegenMessages.getMessage("wsdl2code.arg"));
System.out.println(CodegenMessages.getMessage("wsdl2code.arg1"));
- System.out.println(CodegenMessages.getMessage("wsdl2code.arg2"));
- System.out.println(CodegenMessages.getMessage("wsdl2code.arg3"));
- System.out.println(CodegenMessages.getMessage("wsdl2code.arg4"));
- System.out.println(CodegenMessages.getMessage("wsdl2code.arg5"));
- System.out.println(CodegenMessages.getMessage("wsdl2code.arg6"));
- System.out.println(CodegenMessages.getMessage("wsdl2code.arg7"));
- System.out.println(CodegenMessages.getMessage("wsdl2code.arg8"));
- System.out.println(CodegenMessages.getMessage("wsdl2code.arg9"));
- System.out.println(CodegenMessages.getMessage("wsdl2code.arg10"));
- System.out.println(CodegenMessages.getMessage("wsdl2code.arg11"));
- System.out.println(CodegenMessages.getMessage("wsdl2code.arg12"));
- System.out.println(CodegenMessages.getMessage("wsdl2code.arg13"));
- System.out.println(CodegenMessages.getMessage("wsdl2code.arg14"));
- System.out.println(CodegenMessages.getMessage("wsdl2code.arg15"));
- System.out.println(CodegenMessages.getMessage("wsdl2code.arg16"));
- System.out.println(CodegenMessages.getMessage("wsdl2code.arg17"));
- System.out.println(CodegenMessages.getMessage("wsdl2code.arg18"));
- System.out.println(CodegenMessages.getMessage("wsdl2code.arg19"));
- System.out.println(CodegenMessages.getMessage("wsdl2code.arg20"));
- System.out.println(CodegenMessages.getMessage("wsdl2code.arg21"));
- System.out.println(CodegenMessages.getMessage("wsdl2code.arg22"));
- System.out.println(CodegenMessages.getMessage("wsdl2code.arg23"));
- System.out.println(CodegenMessages.getMessage("wsdl2code.arg24"));
- System.out.println(CodegenMessages.getMessage("wsdl2code.arg24"));
- System.out.println(CodegenMessages.getMessage("wsdl2code.arg24"));
-
+ for (int i = 2; i <= 34; i++) {
+ System.out.println(" " + CodegenMessages.getMessage("wsdl2code.arg" + i));
+ }
System.exit(0);
}
Modified: webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/CodeGenConfiguration.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/CodeGenConfiguration.java?view=diff&rev=560403&r1=560402&r2=560403
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/CodeGenConfiguration.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/CodeGenConfiguration.java Fri Jul 27 15:08:09 2007
@@ -90,6 +90,7 @@
* Returns the xsdconfig file to use for XMLBeans data binding.
*
* @return Full path and name of XMLBeans xsdconfig file to use
+ * @deprecated
*/
public String getXsdConfigFile() {
return xsdConfigFile;
@@ -99,6 +100,7 @@
* Sets the xsdconfig file to use for XMLBeans data binding.
*
* @param xsdConfigFile Full path and name of XMLBeans xsdconfig file to use
+ * @deprecated
*/
public void setXsdConfigFile(String xsdConfigFile) {
this.xsdConfigFile = xsdConfigFile;
Modified: webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/CodegenConfigLoader.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/CodegenConfigLoader.java?view=diff&rev=560403&r1=560402&r2=560403
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/CodegenConfigLoader.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/CodegenConfigLoader.java Fri Jul 27 15:08:09 2007
@@ -21,6 +21,7 @@
import org.apache.axis2.util.CommandLineOption;
import org.apache.axis2.util.CommandLineOptionConstants;
import org.apache.axis2.wsdl.i18n.CodegenMessages;
+import org.apache.axis2.wsdl.codegen.extension.XMLBeansExtension;
import java.io.File;
import java.io.FileInputStream;
@@ -249,11 +250,12 @@
config.setSuppressPrefixesMode(true);
}
- commandLineOption = loadOption(WSDL2JavaConstants.XSDCONFIG_OPTION,
- WSDL2JavaConstants.XSDCONFIG_OPTION_LONG,
+ commandLineOption = loadOption(XMLBeansExtension.XSDCONFIG_OPTION,
+ XMLBeansExtension.XSDCONFIG_OPTION_LONG,
optionMap);
if (commandLineOption != null) {
- config.setXsdConfigFile(commandLineOption.getOptionValue());
+ config.getProperties().put(XMLBeansExtension.XSDCONFIG_OPTION,
+ commandLineOption.getOptionValue());
}
// setting the overrid and all ports options
Modified: webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/XMLBeansExtension.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/XMLBeansExtension.java?view=diff&rev=560403&r1=560402&r2=560403
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/XMLBeansExtension.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/XMLBeansExtension.java Fri Jul 27 15:08:09 2007
@@ -40,6 +40,9 @@
/** Name of "extra" option used to supply package name for xsb files. */
public static final String TYPESYSTEMNAME_OPTION = "typesystemname";
public static final String SCHEMA_FOLDER = "schemas";
+ public static final String XSDCONFIG_OPTION = "xc";
+ public static final String XSDCONFIG_OPTION_LONG = "xsdconfig";
+
public static String MAPPINGS = "mappings";
public static String MAPPING = "mapping";
Modified: webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/i18n/resource.properties
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/i18n/resource.properties?view=diff&rev=560403&r1=560402&r2=560403
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/i18n/resource.properties (original)
+++ webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/i18n/resource.properties Fri Jul 27 15:08:09 2007
@@ -33,33 +33,41 @@
# will serve as a base for other translators.
#
################## WSDL2Code ######################################
-wsdl2code.arg1=Usage: WSDL2Java -uri <url or path> : A url or path to a WSDL
-wsdl2code.arg2=\t -o <path> Specify a directory path for the generated code.
-wsdl2code.arg3=\t -a Generate async style code only (Default: off).
-wsdl2code.arg4=\t -s Generate sync style code only (Default: off). Takes precedence over -a.
-wsdl2code.arg5=\t -p <pkg1> Specify a custom package name for the generated code.
-wsdl2code.arg6=\t -l <language> Valid languages are java and c (Default: java).
-wsdl2code.arg7=\t -t Generate a test case for the generated code.
-wsdl2code.arg8=\t -ss Generate server side code (i.e. skeletons) (Default: off).
-wsdl2code.arg9=\t -sd Generate service descriptor (i.e. services.xml). (Default: off). Valid with -ss.
-wsdl2code.arg10=\t -d <databinding> Valid databinding(s) are adb, xmlbeans, jibx, jaxme and jaxbri (Default: adb).
-wsdl2code.arg11=\t -g Generates all the classes. Valid only with -ss.
-wsdl2code.arg12=\t -pn <port_name> Choose a specific port when there are multiple ports in the wsdl.
-wsdl2code.arg13=\t -sn <service_name> Choose a specific service when there are multiple services in the wsdl.
-wsdl2code.arg14=\t -u Unpacks the databinding classes
-wsdl2code.arg15=\t -r <path> Specify a repository against which code is generated.
-wsdl2code.arg16=\t -ns2p ns1=pkg1,ns2=pkg2 Specify a custom package name for each namespace specified in the wsdl's schema.
-wsdl2code.arg17=\t -ssi Generate an interface for the service implementation (Default: off).
-wsdl2code.arg18=\t -wv WSDL Version. Valid Options : 2, 2.0, 1.1
-wsdl2code.arg19=\t -S Specify a directory path for generated source
-wsdl2code.arg20=\t -R Specify a directory path for generated resources
-wsdl2code.arg21=\t -em Specify an external mapping file
-wsdl2code.arg22=\t -f Flattens the generated files
-wsdl2code.arg23=\t -uw Switch on un-wrapping.
-wsdl2code.arg24=\t -xsdconfig <path to file> Use XMLBeans .xsdconfig file. Valid only with -d xmlbeans.
-wsdl2code.arg25=\t -ap <all-ports> generate code for all ports
-wsdl2code.arg26=\t -or <over-ride> override the existing classes
-#wsdl2code.arg19=\t -b Generate Axis 1.x backword compatible code.
+wsdl2code.arg=Usage: WSDL2Java [options] -uri <url or path> : A url or path to a WSDL
+wsdl2code.arg1=\nwhere [options] include:
+wsdl2code.arg2= -o <path> Specify a directory path for the generated code.
+wsdl2code.arg3= -a Generate async style code only (Default: off).
+wsdl2code.arg4= -s Generate sync style code only (Default: off). Takes precedence over -a.
+wsdl2code.arg5= -p <pkg1> Specify a custom package name for the generated code.
+wsdl2code.arg6= -l <language> Valid languages are java and c (Default: java).
+wsdl2code.arg7= -t Generate a test case for the generated code.
+wsdl2code.arg8= -ss Generate server side code (i.e. skeletons) (Default: off).
+wsdl2code.arg9= -sd Generate service descriptor (i.e. services.xml). (Default: off). Valid with -ss.
+wsdl2code.arg10= -d <databinding> Valid databinding(s) are adb, xmlbeans, jibx, jaxme and jaxbri (Default: adb).
+wsdl2code.arg11= -g Generates all the classes. Valid only with -ss.
+wsdl2code.arg12= -pn <port_name> Choose a specific port when there are multiple ports in the wsdl.
+wsdl2code.arg13= -sn <service_name> Choose a specific service when there are multiple services in the wsdl.
+wsdl2code.arg14= -u Unpacks the databinding classes
+wsdl2code.arg15= -r <path> Specify a repository against which code is generated.
+wsdl2code.arg16= -ns2p ns1=pkg1,ns2=pkg2 Specify a custom package name for each namespace specified in the wsdl's schema.
+wsdl2code.arg17= -ssi Generate an interface for the service implementation (Default: off).
+wsdl2code.arg18= -wv <version> WSDL Version. Valid Options : 2, 2.0, 1.1
+wsdl2code.arg19= -S Specify a directory path for generated source
+wsdl2code.arg20= -R Specify a directory path for generated resources
+wsdl2code.arg21= -em Specify an external mapping file
+wsdl2code.arg22= -f Flattens the generated files
+wsdl2code.arg23= -uw Switch on un-wrapping.
+wsdl2code.arg24= -xsdconfig <file path> Use XMLBeans .xsdconfig file. Valid only with -d xmlbeans.
+wsdl2code.arg25= -ap Generate code for all ports
+wsdl2code.arg26= -or Overwrite the existing classes
+wsdl2code.arg27= -b Generate Axis 1.x backword compatible code.
+wsdl2code.arg28= -sp Suppress namespace prefixes (Optimzation that reduces size of soap request/response)
+wsdl2code.arg29= -E<key> <value> Extra configuration options specific to certain databindings. Examples:
+wsdl2code.arg30= \t\t\t -Ebindingfile <path> (for jibx) - specify the file path for the binding file
+wsdl2code.arg31= \t\t\t -Etypesystemname <my_type_system_name> (for xmlbeans) - override the randomly generated type system name
+wsdl2code.arg32= --noBuildXML Don't generate the build.xml in the output directory
+wsdl2code.arg33= --noWSDL Don't generate WSDL's in the resources directory
+wsdl2code.arg34= --noMessageReceiver Don't generate a MessageReceiver in the generated sources
################## prop file loader #################################
propfileload.frameworkMismatch=Number of frameworks and extension names do not match!
Modified: webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/util/WSDL2JavaOptionsValidator.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/util/WSDL2JavaOptionsValidator.java?view=diff&rev=560403&r1=560402&r2=560403
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/util/WSDL2JavaOptionsValidator.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/util/WSDL2JavaOptionsValidator.java Fri Jul 27 15:08:09 2007
@@ -21,6 +21,7 @@
import org.apache.axis2.util.CommandLineOption;
import org.apache.axis2.util.CommandLineOptionConstants;
import org.apache.axis2.util.OptionsValidator;
+import org.apache.axis2.wsdl.codegen.extension.XMLBeansExtension;
public class WSDL2JavaOptionsValidator implements CommandLineOptionConstants, OptionsValidator {
@@ -32,116 +33,65 @@
if (optionType.startsWith(WSDL2JavaConstants.EXTRA_OPTIONTYPE_PREFIX)) {
invalid = false;
} else {
- invalid =
- !((WSDL2JavaConstants.WSDL_LOCATION_URI_OPTION).equalsIgnoreCase(optionType) ||
- (WSDL2JavaConstants.OUTPUT_LOCATION_OPTION)
- .equalsIgnoreCase(optionType) ||
- (WSDL2JavaConstants.SERVER_SIDE_CODE_OPTION)
- .equalsIgnoreCase(optionType) ||
- (WSDL2JavaConstants.CODEGEN_ASYNC_ONLY_OPTION)
- .equalsIgnoreCase(optionType) ||
- (WSDL2JavaConstants.CODEGEN_SYNC_ONLY_OPTION)
- .equalsIgnoreCase(optionType) ||
- (WSDL2JavaConstants.PACKAGE_OPTION).equalsIgnoreCase(optionType) ||
- (WSDL2JavaConstants.GENERATE_SERVICE_DESCRIPTION_OPTION)
- .equalsIgnoreCase(optionType) ||
- (WSDL2JavaConstants.GENERATE_TEST_CASE_OPTION)
- .equalsIgnoreCase(optionType) ||
- (WSDL2JavaConstants.STUB_LANGUAGE_OPTION)
- .equalsIgnoreCase(optionType) ||
- (WSDL2JavaConstants.DATA_BINDING_TYPE_OPTION)
- .equalsIgnoreCase(optionType) ||
- (WSDL2JavaConstants.UNPACK_CLASSES_OPTION)
- .equalsIgnoreCase(optionType) ||
- (WSDL2JavaConstants.GENERATE_ALL_OPTION).equalsIgnoreCase(optionType) ||
- (WSDL2JavaConstants.PORT_NAME_OPTION).equalsIgnoreCase(optionType) ||
- (WSDL2JavaConstants.SERVICE_NAME_OPTION).equalsIgnoreCase(optionType) ||
- (WSDL2JavaConstants.REPOSITORY_PATH_OPTION)
- .equalsIgnoreCase(optionType) ||
- (WSDL2JavaConstants.NAME_SPACE_TO_PACKAGE_OPTION)
- .equalsIgnoreCase(optionType) ||
- (WSDL2JavaConstants.SERVER_SIDE_INTERFACE_OPTION)
- .equalsIgnoreCase(optionType) ||
- (WSDL2JavaConstants.EXTERNAL_MAPPING_OPTION)
- .equalsIgnoreCase(optionType) ||
- (WSDL2JavaConstants.WSDL_VERSION_OPTION).equalsIgnoreCase(optionType) ||
- (WSDL2JavaConstants.FLATTEN_FILES_OPTION)
- .equalsIgnoreCase(optionType) ||
- (WSDL2JavaConstants.UNWRAP_PARAMETERS).equalsIgnoreCase(optionType) ||
- (WSDL2JavaConstants.BACKWORD_COMPATIBILITY_OPTION)
- .equalsIgnoreCase(optionType) ||
- (WSDL2JavaConstants.SUPPRESS_PREFIXES_OPTION)
- .equalsIgnoreCase(optionType) ||
- (WSDL2JavaConstants.SOURCE_FOLDER_NAME_OPTION)
- .equalsIgnoreCase(optionType) ||
- (WSDL2JavaConstants.RESOURCE_FOLDER_OPTION)
- .equalsIgnoreCase(optionType) ||
- (WSDL2JavaConstants.XSDCONFIG_OPTION).equalsIgnoreCase(optionType) ||
-
- (WSDL2JavaConstants.OUTPUT_LOCATION_OPTION_LONG)
- .equalsIgnoreCase(optionType) ||
- (WSDL2JavaConstants.SERVER_SIDE_CODE_OPTION_LONG)
- .equalsIgnoreCase(optionType) ||
- (WSDL2JavaConstants.CODEGEN_ASYNC_ONLY_OPTION_LONG)
- .equalsIgnoreCase(optionType) ||
- (WSDL2JavaConstants.CODEGEN_SYNC_ONLY_OPTION_LONG)
- .equalsIgnoreCase(optionType) ||
- (WSDL2JavaConstants.PACKAGE_OPTION_LONG).equalsIgnoreCase(optionType) ||
- (WSDL2JavaConstants.GENERATE_SERVICE_DESCRIPTION_OPTION_LONG)
- .equalsIgnoreCase(optionType) ||
- (WSDL2JavaConstants.GENERATE_TEST_CASE_OPTION_LONG)
- .equalsIgnoreCase(optionType) ||
- (WSDL2JavaConstants.STUB_LANGUAGE_OPTION_LONG)
- .equalsIgnoreCase(optionType) ||
- (WSDL2JavaConstants.DATA_BINDING_TYPE_OPTION_LONG)
- .equalsIgnoreCase(optionType) ||
- (WSDL2JavaConstants.UNPACK_CLASSES_OPTION_LONG)
- .equalsIgnoreCase(optionType) ||
- (WSDL2JavaConstants.PORT_NAME_OPTION_LONG)
- .equalsIgnoreCase(optionType) ||
- (WSDL2JavaConstants.SERVICE_NAME_OPTION_LONG)
- .equalsIgnoreCase(optionType) ||
- (WSDL2JavaConstants.GENERATE_ALL_OPTION_LONG)
- .equalsIgnoreCase(optionType) ||
- (WSDL2JavaConstants.NAME_SPACE_TO_PACKAGE_OPTION_LONG)
- .equalsIgnoreCase(optionType) ||
- (WSDL2JavaConstants.SERVER_SIDE_INTERFACE_OPTION_LONG)
- .equalsIgnoreCase(optionType) ||
- (WSDL2JavaConstants.EXTERNAL_MAPPING_OPTION_LONG)
- .equalsIgnoreCase(optionType) ||
- (WSDL2JavaConstants.WSDL_VERSION_OPTION_LONG)
- .equalsIgnoreCase(optionType) ||
- (WSDL2JavaConstants.FLATTEN_FILES_OPTION_LONG)
- .equalsIgnoreCase(optionType) ||
- (WSDL2JavaConstants.UNWRAP_PARAMETERS_LONG)
- .equalsIgnoreCase(optionType) ||
- (WSDL2JavaConstants.REPOSITORY_PATH_OPTION_LONG)
- .equalsIgnoreCase(optionType) ||
- (WSDL2JavaConstants.SOURCE_FOLDER_NAME_OPTION_LONG)
- .equalsIgnoreCase(optionType) ||
- (WSDL2JavaConstants.RESOURCE_FOLDER_OPTION_LONG)
- .equalsIgnoreCase(optionType) ||
- (WSDL2JavaConstants.BACKWORD_COMPATIBILITY_OPTION_LONG)
- .equalsIgnoreCase(optionType) ||
- (WSDL2JavaConstants.SUPPRESS_PREFIXES_OPTION_LONG)
- .equalsIgnoreCase(optionType) ||
- (WSDL2JavaConstants.XSDCONFIG_OPTION_LONG)
- .equalsIgnoreCase(optionType) ||
- (WSDL2JavaConstants.NO_MESSAGE_RECEIVER_OPTION_LONG)
- .equalsIgnoreCase(optionType) ||
- (WSDL2JavaConstants.NO_WSDLS_OPTION_LONG)
- .equalsIgnoreCase(optionType) ||
- (WSDL2JavaConstants.NO_BUILD_XML_OPTION_LONG)
- .equalsIgnoreCase(optionType) ||
- (WSDL2JavaConstants.All_PORTS_OPTION)
- .equalsIgnoreCase(optionType) ||
- (WSDL2JavaConstants.All_PORTS_OPTION_LONG)
- .equalsIgnoreCase(optionType) ||
- (WSDL2JavaConstants.OVERRIDE_OPTION)
- .equalsIgnoreCase(optionType) ||
- (WSDL2JavaConstants.OVERRIDE_OPTION_LONG)
- .equalsIgnoreCase(optionType)
- );
+ invalid = !(WSDL2JavaConstants.All_PORTS_OPTION.equalsIgnoreCase(optionType) ||
+ WSDL2JavaConstants.All_PORTS_OPTION_LONG.equalsIgnoreCase(optionType) ||
+ WSDL2JavaConstants.BACKWORD_COMPATIBILITY_OPTION.equalsIgnoreCase(optionType) ||
+ WSDL2JavaConstants.BACKWORD_COMPATIBILITY_OPTION_LONG.equalsIgnoreCase(optionType) ||
+ WSDL2JavaConstants.CODEGEN_ASYNC_ONLY_OPTION.equalsIgnoreCase(optionType) ||
+ WSDL2JavaConstants.CODEGEN_ASYNC_ONLY_OPTION_LONG.equalsIgnoreCase(optionType) ||
+ WSDL2JavaConstants.CODEGEN_SYNC_ONLY_OPTION.equalsIgnoreCase(optionType) ||
+ WSDL2JavaConstants.CODEGEN_SYNC_ONLY_OPTION_LONG.equalsIgnoreCase(optionType) ||
+ WSDL2JavaConstants.DATA_BINDING_TYPE_OPTION.equalsIgnoreCase(optionType) ||
+ WSDL2JavaConstants.DATA_BINDING_TYPE_OPTION_LONG.equalsIgnoreCase(optionType) ||
+ WSDL2JavaConstants.EXTERNAL_MAPPING_OPTION.equalsIgnoreCase(optionType) ||
+ WSDL2JavaConstants.EXTERNAL_MAPPING_OPTION_LONG.equalsIgnoreCase(optionType) ||
+ WSDL2JavaConstants.FLATTEN_FILES_OPTION.equalsIgnoreCase(optionType) ||
+ WSDL2JavaConstants.FLATTEN_FILES_OPTION_LONG.equalsIgnoreCase(optionType) ||
+ WSDL2JavaConstants.GENERATE_ALL_OPTION.equalsIgnoreCase(optionType) ||
+ WSDL2JavaConstants.GENERATE_ALL_OPTION_LONG.equalsIgnoreCase(optionType) ||
+ WSDL2JavaConstants.GENERATE_SERVICE_DESCRIPTION_OPTION.equalsIgnoreCase(optionType) ||
+ WSDL2JavaConstants.GENERATE_SERVICE_DESCRIPTION_OPTION_LONG.equalsIgnoreCase(optionType) ||
+ WSDL2JavaConstants.GENERATE_TEST_CASE_OPTION.equalsIgnoreCase(optionType) ||
+ WSDL2JavaConstants.GENERATE_TEST_CASE_OPTION_LONG.equalsIgnoreCase(optionType) ||
+ WSDL2JavaConstants.NAME_SPACE_TO_PACKAGE_OPTION.equalsIgnoreCase(optionType) ||
+ WSDL2JavaConstants.NAME_SPACE_TO_PACKAGE_OPTION_LONG.equalsIgnoreCase(optionType) ||
+ WSDL2JavaConstants.NO_BUILD_XML_OPTION_LONG.equalsIgnoreCase(optionType) ||
+ WSDL2JavaConstants.NO_MESSAGE_RECEIVER_OPTION_LONG.equalsIgnoreCase(optionType) ||
+ WSDL2JavaConstants.NO_WSDLS_OPTION_LONG.equalsIgnoreCase(optionType) ||
+ WSDL2JavaConstants.OUTPUT_LOCATION_OPTION.equalsIgnoreCase(optionType) ||
+ WSDL2JavaConstants.OUTPUT_LOCATION_OPTION_LONG.equalsIgnoreCase(optionType) ||
+ WSDL2JavaConstants.OVERRIDE_OPTION.equalsIgnoreCase(optionType) ||
+ WSDL2JavaConstants.OVERRIDE_OPTION_LONG.equalsIgnoreCase(optionType) ||
+ WSDL2JavaConstants.PACKAGE_OPTION.equalsIgnoreCase(optionType) ||
+ WSDL2JavaConstants.PACKAGE_OPTION_LONG.equalsIgnoreCase(optionType) ||
+ WSDL2JavaConstants.PORT_NAME_OPTION.equalsIgnoreCase(optionType) ||
+ WSDL2JavaConstants.PORT_NAME_OPTION_LONG.equalsIgnoreCase(optionType) ||
+ WSDL2JavaConstants.REPOSITORY_PATH_OPTION.equalsIgnoreCase(optionType) ||
+ WSDL2JavaConstants.REPOSITORY_PATH_OPTION_LONG.equalsIgnoreCase(optionType) ||
+ WSDL2JavaConstants.RESOURCE_FOLDER_OPTION.equalsIgnoreCase(optionType) ||
+ WSDL2JavaConstants.RESOURCE_FOLDER_OPTION_LONG.equalsIgnoreCase(optionType) ||
+ WSDL2JavaConstants.SERVER_SIDE_CODE_OPTION.equalsIgnoreCase(optionType) ||
+ WSDL2JavaConstants.SERVER_SIDE_CODE_OPTION_LONG.equalsIgnoreCase(optionType) ||
+ WSDL2JavaConstants.SERVER_SIDE_INTERFACE_OPTION.equalsIgnoreCase(optionType) ||
+ WSDL2JavaConstants.SERVER_SIDE_INTERFACE_OPTION_LONG.equalsIgnoreCase(optionType) ||
+ WSDL2JavaConstants.SERVICE_NAME_OPTION.equalsIgnoreCase(optionType) ||
+ WSDL2JavaConstants.SERVICE_NAME_OPTION_LONG.equalsIgnoreCase(optionType) ||
+ WSDL2JavaConstants.SOURCE_FOLDER_NAME_OPTION.equalsIgnoreCase(optionType) ||
+ WSDL2JavaConstants.SOURCE_FOLDER_NAME_OPTION_LONG.equalsIgnoreCase(optionType) ||
+ WSDL2JavaConstants.STUB_LANGUAGE_OPTION.equalsIgnoreCase(optionType) ||
+ WSDL2JavaConstants.STUB_LANGUAGE_OPTION_LONG.equalsIgnoreCase(optionType) ||
+ WSDL2JavaConstants.SUPPRESS_PREFIXES_OPTION.equalsIgnoreCase(optionType) ||
+ WSDL2JavaConstants.SUPPRESS_PREFIXES_OPTION_LONG.equalsIgnoreCase(optionType) ||
+ WSDL2JavaConstants.UNPACK_CLASSES_OPTION.equalsIgnoreCase(optionType) ||
+ WSDL2JavaConstants.UNPACK_CLASSES_OPTION_LONG.equalsIgnoreCase(optionType) ||
+ WSDL2JavaConstants.UNWRAP_PARAMETERS.equalsIgnoreCase(optionType) ||
+ WSDL2JavaConstants.UNWRAP_PARAMETERS_LONG.equalsIgnoreCase(optionType) ||
+ WSDL2JavaConstants.WSDL_LOCATION_URI_OPTION.equalsIgnoreCase(optionType) ||
+ WSDL2JavaConstants.WSDL_VERSION_OPTION.equalsIgnoreCase(optionType) ||
+ WSDL2JavaConstants.WSDL_VERSION_OPTION_LONG.equalsIgnoreCase(optionType) ||
+ XMLBeansExtension.XSDCONFIG_OPTION.equalsIgnoreCase(optionType) ||
+ XMLBeansExtension.XSDCONFIG_OPTION_LONG.equalsIgnoreCase(optionType)
+ );
}
Modified: webservices/axis2/branches/java/jaxws21/modules/fastinfoset/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/fastinfoset/pom.xml?view=diff&rev=560403&r1=560402&r2=560403
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/fastinfoset/pom.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/fastinfoset/pom.xml Fri Jul 27 15:08:09 2007
@@ -52,10 +52,6 @@
<artifactId>commons-logging</artifactId>
</dependency>
<dependency>
- <groupId>${stax.impl.groupid}</groupId>
- <artifactId>${stax.impl.artifactid}</artifactId>
- </dependency>
- <dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
</dependency>
@@ -103,6 +99,26 @@
<artifactId>neethi</artifactId>
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>java14</id>
+ <activation>
+ <jdk>1.4</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>com.sun.xml.fastinfoset</groupId>
+ <artifactId>FastInfoset</artifactId>
+ <version>1.1.8</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.2</version>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
<build>
<sourceDirectory>src</sourceDirectory>
<testSourceDirectory>test</testSourceDirectory>
Modified: webservices/axis2/branches/java/jaxws21/modules/fastinfoset/src/org/apache/axis2/fastinfoset/FastInfosetBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/fastinfoset/src/org/apache/axis2/fastinfoset/FastInfosetBuilder.java?view=diff&rev=560403&r1=560402&r2=560403
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/fastinfoset/src/org/apache/axis2/fastinfoset/FastInfosetBuilder.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/fastinfoset/src/org/apache/axis2/fastinfoset/FastInfosetBuilder.java Fri Jul 27 15:08:09 2007
@@ -58,10 +58,10 @@
if (logger.isDebugEnabled()) {
logger.debug("Processing a Document with the content type: " + contentType);
}
+ //Create a instance of the StAX Parser which can handle the fast infoset stream
XMLStreamReader streamReader = new StAXDocumentParser(inputStream);
- //OMXMLParserWrapper builder = new StAXOMBuilder(streamReader);
StAXBuilder builder = new StAXSOAPModelBuilder(streamReader);
- //TODO Check whether we need to perform any validations here...
+
return builder.getDocumentElement();
}
}
Modified: webservices/axis2/branches/java/jaxws21/modules/fastinfoset/src/org/apache/axis2/fastinfoset/FastInfosetMessageFormatter.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/fastinfoset/src/org/apache/axis2/fastinfoset/FastInfosetMessageFormatter.java?view=diff&rev=560403&r1=560402&r2=560403
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/fastinfoset/src/org/apache/axis2/fastinfoset/FastInfosetMessageFormatter.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/fastinfoset/src/org/apache/axis2/fastinfoset/FastInfosetMessageFormatter.java Fri Jul 27 15:08:09 2007
@@ -48,7 +48,7 @@
private Log logger = LogFactory.getLog(FastInfosetMessageFormatter.class);
/**
- * Plain Fast Infoset message formatter doesn't need to handle SOAP. Hence do nothing.
+ * Fast Infoset message formatter doesn't need to handle SOAP. Hence do nothing.
*
* @see org.apache.axis2.transport.MessageFormatter#formatSOAPAction(org.apache.axis2.context.MessageContext, org.apache.axiom.om.OMOutputFormat, java.lang.String)
*/
@@ -65,16 +65,14 @@
*/
public byte[] getBytes(MessageContext messageContext, OMOutputFormat format)
throws AxisFault {
-// OMElement element = messageContext.getEnvelope().getBody().getFirstElement();
OMElement element = messageContext.getEnvelope();
ByteArrayOutputStream outStream = new ByteArrayOutputStream();
try {
//Creates StAX document serializer which actually implements the XMLStreamWriter
XMLStreamWriter streamWriter = new StAXDocumentSerializer(outStream);
-// streamWriter.writeStartDocument();
element.serializeAndConsume(streamWriter);
- //TODO Looks like the SOAP envelop doesn't have a end document tag. Find out why?
+ //TODO Looks like the SOAP envelop doesn't have an end document tag. Find out why?
streamWriter.writeEndDocument();
return outStream.toByteArray();
@@ -95,7 +93,7 @@
String contentType = (String) messageContext.getProperty(Constants.Configuration.CONTENT_TYPE);
String encoding = format.getCharSetEncoding();
- //FIXME Is this a right thing to do? Need to clarify with a vetarant
+ //If the Content Type is not available with the property "Content Type" retrieve it from the property "Message Type"
if (contentType == null) {
contentType = (String) messageContext.getProperty(Constants.Configuration.MESSAGE_TYPE);
}
@@ -146,14 +144,11 @@
*/
public void writeTo(MessageContext messageContext, OMOutputFormat format,
OutputStream outputStream, boolean preserve) throws AxisFault {
-
- //OMElement element = messageContext.getEnvelope().getBody().getFirstElement();
OMElement element = messageContext.getEnvelope();
try {
//Create the StAX document serializer
XMLStreamWriter streamWriter = new StAXDocumentSerializer(outputStream);
-// streamWriter.writeStartDocument();
if (preserve) {
element.serialize(streamWriter);
} else {
Modified: webservices/axis2/branches/java/jaxws21/modules/fastinfoset/src/org/apache/axis2/fastinfoset/FastInfosetPOXBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/fastinfoset/src/org/apache/axis2/fastinfoset/FastInfosetPOXBuilder.java?view=diff&rev=560403&r1=560402&r2=560403
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/fastinfoset/src/org/apache/axis2/fastinfoset/FastInfosetPOXBuilder.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/fastinfoset/src/org/apache/axis2/fastinfoset/FastInfosetPOXBuilder.java Fri Jul 27 15:08:09 2007
@@ -21,10 +21,8 @@
import javax.xml.stream.XMLStreamReader;
import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMNode;
import org.apache.axiom.om.impl.builder.StAXBuilder;
import org.apache.axiom.om.impl.builder.StAXOMBuilder;
-import org.apache.axiom.om.impl.llom.OMNodeImpl;
import org.apache.axis2.AxisFault;
import org.apache.axis2.builder.Builder;
import org.apache.axis2.context.MessageContext;
@@ -34,7 +32,7 @@
import com.sun.xml.fastinfoset.stax.StAXDocumentParser;
/**
- * @author Sanjaya Karunasena
+ * @author Sanjaya Karunasena (sanjayak@yahoo.com)
* @date May 19, 2007
*/
@@ -58,12 +56,10 @@
if (logger.isDebugEnabled()) {
logger.debug("Processing a Document with the content type: " + contentType);
}
+ //Create a instance of the StAX Parser which can handle the fast infoset stream
XMLStreamReader streamReader = new StAXDocumentParser(inputStream);
StAXBuilder builder = new StAXOMBuilder(streamReader);
- //TODO Check whether we need to perform any validations here...
- OMElement element = builder.getDocumentElement();
-// element = (OMElement) element.detach();
-// ((OMNodeImpl) element).setParent(null);
- return element;
+
+ return builder.getDocumentElement();
}
}
Modified: webservices/axis2/branches/java/jaxws21/modules/fastinfoset/src/org/apache/axis2/fastinfoset/FastInfosetPOXMessageFormatter.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/fastinfoset/src/org/apache/axis2/fastinfoset/FastInfosetPOXMessageFormatter.java?view=diff&rev=560403&r1=560402&r2=560403
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/fastinfoset/src/org/apache/axis2/fastinfoset/FastInfosetPOXMessageFormatter.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/fastinfoset/src/org/apache/axis2/fastinfoset/FastInfosetPOXMessageFormatter.java Fri Jul 27 15:08:09 2007
@@ -20,6 +20,11 @@
import com.sun.xml.fastinfoset.stax.StAXDocumentSerializer;
+/**
+ * @author Sanjaya Karunasena (sanjayak@yahoo.com)
+ * @date May 19, 2007
+ */
+
public class FastInfosetPOXMessageFormatter implements MessageFormatter {
private Log logger = LogFactory.getLog(FastInfosetMessageFormatter.class);
@@ -42,15 +47,16 @@
*/
public byte[] getBytes(MessageContext messageContext, OMOutputFormat format)
throws AxisFault {
+ //For POX drop the SOAP envelope and use the message body
OMElement element = messageContext.getEnvelope().getBody().getFirstElement();
ByteArrayOutputStream outStream = new ByteArrayOutputStream();
try {
//Creates StAX document serializer which actually implements the XMLStreamWriter
XMLStreamWriter streamWriter = new StAXDocumentSerializer(outStream);
- //streamWriter.writeStartDocument();
+ //Since we drop the SOAP envelop we have to manually write the start document and the end document events
+ streamWriter.writeStartDocument();
element.serializeAndConsume(streamWriter);
- //TODO Looks like the SOAP envelop doesn't have a end document tag. Find out why?
streamWriter.writeEndDocument();
return outStream.toByteArray();
@@ -71,7 +77,7 @@
String contentType = (String) messageContext.getProperty(Constants.Configuration.CONTENT_TYPE);
String encoding = format.getCharSetEncoding();
- //FIXME Is this a right thing to do? Need to clarify with a vetarant
+ //If the Content Type is not available with the property "Content Type" retrieve it from the property "Message Type"
if (contentType == null) {
contentType = (String) messageContext.getProperty(Constants.Configuration.MESSAGE_TYPE);
}
@@ -122,20 +128,19 @@
*/
public void writeTo(MessageContext messageContext, OMOutputFormat format,
OutputStream outputStream, boolean preserve) throws AxisFault {
-
+ //For POX drop the SOAP envelope and use the message body
OMElement element = messageContext.getEnvelope().getBody().getFirstElement();
-// OMElement element = messageContext.getEnvelope();
try {
//Create the StAX document serializer
XMLStreamWriter streamWriter = new StAXDocumentSerializer(outputStream);
+ //Since we drop the SOAP envelop we have to manually write the start document and the end document events
streamWriter.writeStartDocument();
if (preserve) {
element.serialize(streamWriter);
} else {
element.serializeAndConsume(streamWriter);
}
-// TODO Looks like the SOAP envelop doesn't have a end document tag. Find out why?
streamWriter.writeEndDocument();
} catch (XMLStreamException xmlse) {
logger.error(xmlse.getMessage());
Modified: webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMFaultReportTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMFaultReportTest.java?view=diff&rev=560403&r1=560402&r2=560403
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMFaultReportTest.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMFaultReportTest.java Fri Jul 27 15:08:09 2007
@@ -117,8 +117,11 @@
if (httppost.getStatusCode() ==
HttpStatus.SC_INTERNAL_SERVER_ERROR) {
- assertEquals("HTTP/1.1 500 Internal server error",
- httppost.getStatusLine().toString());
+
+ // TODO: There is a missing wsa:Action header in the SOAP message. Fix or look for correct fault text!
+
+// assertEquals("HTTP/1.1 500 Internal server error",
+// httppost.getStatusLine().toString());
}
} catch (NoHttpResponseException e) {
} finally {
Modified: webservices/axis2/branches/java/jaxws21/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDL.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDL.java?view=diff&rev=560403&r1=560402&r2=560403
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDL.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDL.java Fri Jul 27 15:08:09 2007
@@ -35,26 +35,29 @@
}
public static void printUsage() {
- System.out.println("Usage java2wsdl -cn <fully qualified class name> : class file name");
- System.out.println("-o <output Location> : output file location");
- System.out.println("-cp <class path uri> : list of classpath entries - (urls)");
- System.out.println("-tn <target namespace> : target namespace");
- System.out.println("-tp <target namespace prefix> : target namespace prefix");
- System.out.println("-stn <schema target namespace> : target namespace for schema");
- System.out.println("-stp <schema target namespace prefix> : target namespace prefix for schema");
- System.out.println("-sn <service name> : service name");
- System.out.println("-of <output file name> : output file name for the WSDL");
- System.out.println("-st <binding style> : style for the WSDL");
- System.out.println("-u <binding use> : use for the WSDL");
- System.out.println("-l <soap address> : address of the port for the WSDL");
- System.out.println("-nsg <generator class name> : fully qualified name of the class that implements NamespaceGenerator");
- System.out.println("-p2n [<java package>,<namespace] [<java package>,<namespace]... : java package to namespace mapping for argument and return types..." +
- "\t\t to assign all types to a single namespace : -p2n [all , <namespace>] ...");
- System.out.println("-efd <qualified/unqualified> : Setting for elementFormDefault (defaults to qualified)");
- System.out.println("-afd <qualified/unqualified> : Setting for attributeFormDefault (defaults to qualified)");
- System.out.println("-xc <extra class> : Extra class for which schematype must be generated. " +
- "\t\tUse as : -xc class1 -xc class2 ...");
-
+ System.out.println("Usage: java2wsdl [options] -cn <fully qualified class name>");
+ System.out.println("\nwhere [options] include:");
+ System.out.println(" -o <output location> output directory");
+ System.out.println(" -of <output file name> output file name for the WSDL");
+ System.out.println(" -sn <service name> service name");
+ System.out.println(" -l <soap address> address of the port for the WSDL");
+ System.out.println(" -cp <class path uri> list of classpath entries - (urls)");
+ System.out.println(" -tn <target namespace> target namespace for service");
+ System.out.println(" -tp <target namespace prefix> target namespace prefix for service");
+ System.out.println(" -stn <schema target namespace> target namespace for schema");
+ System.out.println(" -stp <schema target namespace prefix> target namespace prefix for schema");
+ System.out.println(" -st <binding style> style for the WSDL");
+ System.out.println(" -u <binding use> use for the WSDL");
+ System.out.println(" -nsg <class name> fully qualified name of a class that implements NamespaceGenerator");
+ System.out.println(" -sg <class name> fully qualified name of a class that implements SchemaGenerator");
+ System.out.println(" -p2n [<java package>,<namespace] [<java package>,<namespace]... ");
+ System.out.println(" java package to namespace mapping for argument and return types");
+ System.out.println(" -p2n [all, <namespace>] to assign all types to a single namespace");
+ System.out.println(" -efd <qualified/unqualified> setting for elementFormDefault (defaults to qualified)");
+ System.out.println(" -afd <qualified/unqualified> setting for attributeFormDefault (defaults to qualified)");
+ System.out.println(" -xc class1 -xc class2... extra class(es) for which schematype must be generated. ");
+ System.out.println(" -wv <1.1/2.0> wsdl version - defaults to 1.1 if not specified");
+ System.out.println(" -dlb generate schemas conforming to doc/lit/bare style");
System.exit(0);
}
Modified: webservices/axis2/branches/java/jaxws21/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLTask.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLTask.java?view=diff&rev=560403&r1=560402&r2=560403
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLTask.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLTask.java Fri Jul 27 15:08:09 2007
@@ -50,6 +50,8 @@
private String locationUri;
private String attrFormDefault = null;
private String elementFormDefault = null;
+ private String wsdlVersion = null;
+ private String docLitBare = null;
//names of java types not used in the service defn. directly, but for which schema must be generated
private String[] extraClasses;
@@ -185,6 +187,14 @@
Java2WSDLConstants.SCHEMA_GENERATOR_OPTION,
getSchemaGenClassName());
+ addToOptionMap(optionMap,
+ Java2WSDLConstants.WSDL_VERSION_OPTION,
+ getWSDLVersion());
+
+ addToOptionMap(optionMap,
+ Java2WSDLConstants.DOC_LIT_BARE,
+ getDocLitBare());
+
loadPkg2NsMap();
addToOptionMap(optionMap,
Java2WSDLConstants.JAVA_PKG_2_NSMAP_OPTION,
@@ -397,5 +407,20 @@
mappings.addMappingSet(mappingset);
}
+ public String getDocLitBare() {
+ return docLitBare;
+ }
+
+ public void setDocLitBare(String docLitBare) {
+ this.docLitBare = docLitBare;
+ }
+
+ public String getWSDLVersion() {
+ return wsdlVersion;
+ }
+
+ public void setWSDLVersion(String wsdlVersion) {
+ this.wsdlVersion = wsdlVersion;
+ }
}
Modified: webservices/axis2/branches/java/jaxws21/modules/java2wsdl/src/org/apache/ws/java2wsdl/utils/Java2WSDLOptionsValidator.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/java2wsdl/src/org/apache/ws/java2wsdl/utils/Java2WSDLOptionsValidator.java?view=diff&rev=560403&r1=560402&r2=560403
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/java2wsdl/src/org/apache/ws/java2wsdl/utils/Java2WSDLOptionsValidator.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/java2wsdl/src/org/apache/ws/java2wsdl/utils/Java2WSDLOptionsValidator.java Fri Jul 27 15:08:09 2007
@@ -25,49 +25,48 @@
boolean invalid;
String optionType = option.getOptionType();
- invalid = !((Java2WSDLConstants.CLASSNAME_OPTION).equalsIgnoreCase(optionType) ||
- Java2WSDLConstants.OUTPUT_LOCATION_OPTION.equalsIgnoreCase(optionType) ||
- Java2WSDLConstants.OUTPUT_FILENAME_OPTION.equalsIgnoreCase(optionType) ||
+ invalid = !(
+ Java2WSDLConstants.ATTR_FORM_DEFAULT_OPTION.equalsIgnoreCase(optionType) ||
+ Java2WSDLConstants.ATTR_FORM_DEFAULT_OPTION_LONG.equalsIgnoreCase(optionType) ||
+ Java2WSDLConstants.CLASSNAME_OPTION.equalsIgnoreCase(optionType) ||
+ Java2WSDLConstants.CLASSNAME_OPTION_LONG.equalsIgnoreCase(optionType) ||
Java2WSDLConstants.CLASSPATH_OPTION.equalsIgnoreCase(optionType) ||
- Java2WSDLConstants.TARGET_NAMESPACE_OPTION.equalsIgnoreCase(optionType) ||
- Java2WSDLConstants.TARGET_NAMESPACE_PREFIX_OPTION.equalsIgnoreCase(optionType) ||
- Java2WSDLConstants.SCHEMA_TARGET_NAMESPACE_OPTION.equalsIgnoreCase(optionType) ||
- Java2WSDLConstants.SCHEMA_TARGET_NAMESPACE_PREFIX_OPTION.equalsIgnoreCase(optionType) ||
- Java2WSDLConstants.SERVICE_NAME_OPTION.equalsIgnoreCase(optionType) ||
- Java2WSDLConstants.STYLE_OPTION.equalsIgnoreCase(optionType) ||
- Java2WSDLConstants.USE_OPTION.equalsIgnoreCase(optionType) ||
+ Java2WSDLConstants.CLASSPATH_OPTION_LONG.equalsIgnoreCase(optionType) ||
Java2WSDLConstants.DOC_LIT_BARE.equalsIgnoreCase(optionType) ||
- Java2WSDLConstants.LOCATION_OPTION.equalsIgnoreCase(optionType) ||
- Java2WSDLConstants.ATTR_FORM_DEFAULT_OPTION.equalsIgnoreCase(optionType) ||
+ Java2WSDLConstants.DOC_LIT_BARE_LONG.equalsIgnoreCase(optionType) ||
Java2WSDLConstants.ELEMENT_FORM_DEFAULT_OPTION.equalsIgnoreCase(optionType) ||
- Java2WSDLConstants.ATTR_FORM_DEFAULT_OPTION_LONG.equalsIgnoreCase(optionType) ||
Java2WSDLConstants.ELEMENT_FORM_DEFAULT_OPTION_LONG.equalsIgnoreCase(optionType) ||
- Java2WSDLConstants.ELEMENT_FORM_DEFAULT_OPTION.equalsIgnoreCase(optionType) ||
- Java2WSDLConstants.EXTRA_CLASSES_DEFAULT_OPTION_LONG.equalsIgnoreCase(optionType) ||
Java2WSDLConstants.EXTRA_CLASSES_DEFAULT_OPTION.equalsIgnoreCase(optionType) ||
- Java2WSDLConstants.NAMESPACE_GENERATOR_OPTION.equalsIgnoreCase(optionType) ||
- Java2WSDLConstants.NAMESPACE_GENERATOR_OPTION_LONG.equalsIgnoreCase(optionType) ||
- Java2WSDLConstants.SCHEMA_GENERATOR_OPTION.equalsIgnoreCase(optionType) ||
- Java2WSDLConstants.SCHEMA_GENERATOR_OPTION_LONG.equalsIgnoreCase(optionType) ||
+ Java2WSDLConstants.EXTRA_CLASSES_DEFAULT_OPTION_LONG.equalsIgnoreCase(optionType) ||
Java2WSDLConstants.JAVA_PKG_2_NSMAP_OPTION.equalsIgnoreCase(optionType) ||
Java2WSDLConstants.JAVA_PKG_2_NSMAP_OPTION_LONG.equalsIgnoreCase(optionType) ||
- Java2WSDLConstants.DOC_LIT_BARE_LONG.equalsIgnoreCase(optionType) ||
-
- Java2WSDLConstants.CLASSNAME_OPTION_LONG.equalsIgnoreCase(optionType) ||
+ Java2WSDLConstants.LOCATION_OPTION.equalsIgnoreCase(optionType) ||
+ Java2WSDLConstants.LOCATION_OPTION_LONG.equalsIgnoreCase(optionType) ||
+ Java2WSDLConstants.NAMESPACE_GENERATOR_OPTION.equalsIgnoreCase(optionType) ||
+ Java2WSDLConstants.NAMESPACE_GENERATOR_OPTION_LONG.equalsIgnoreCase(optionType) ||
+ Java2WSDLConstants.OUTPUT_FILENAME_OPTION.equalsIgnoreCase(optionType) ||
Java2WSDLConstants.OUTPUT_FILENAME_OPTION_LONG.equalsIgnoreCase(optionType) ||
+ Java2WSDLConstants.OUTPUT_LOCATION_OPTION.equalsIgnoreCase(optionType) ||
Java2WSDLConstants.OUTPUT_LOCATION_OPTION_LONG.equalsIgnoreCase(optionType) ||
- Java2WSDLConstants.CLASSNAME_OPTION_LONG.equalsIgnoreCase(optionType) ||
- Java2WSDLConstants.CLASSPATH_OPTION_LONG.equalsIgnoreCase(optionType) ||
- Java2WSDLConstants.TARGET_NAMESPACE_OPTION_LONG.equalsIgnoreCase(optionType) ||
- Java2WSDLConstants.TARGET_NAMESPACE_PREFIX_OPTION_LONG.equalsIgnoreCase(optionType) ||
+ Java2WSDLConstants.SCHEMA_GENERATOR_OPTION.equalsIgnoreCase(optionType) ||
+ Java2WSDLConstants.SCHEMA_GENERATOR_OPTION_LONG.equalsIgnoreCase(optionType) ||
+ Java2WSDLConstants.SCHEMA_TARGET_NAMESPACE_OPTION.equalsIgnoreCase(optionType) ||
Java2WSDLConstants.SCHEMA_TARGET_NAMESPACE_OPTION_LONG.equalsIgnoreCase(optionType) ||
+ Java2WSDLConstants.SCHEMA_TARGET_NAMESPACE_PREFIX_OPTION.equalsIgnoreCase(optionType) ||
Java2WSDLConstants.SCHEMA_TARGET_NAMESPACE_PREFIX_OPTION_LONG.equalsIgnoreCase(optionType) ||
+ Java2WSDLConstants.SERVICE_NAME_OPTION.equalsIgnoreCase(optionType) ||
Java2WSDLConstants.SERVICE_NAME_OPTION_LONG.equalsIgnoreCase(optionType)||
+ Java2WSDLConstants.STYLE_OPTION.equalsIgnoreCase(optionType) ||
Java2WSDLConstants.STYLE_OPTION_LONG.equalsIgnoreCase(optionType)||
+ Java2WSDLConstants.TARGET_NAMESPACE_OPTION.equalsIgnoreCase(optionType) ||
+ Java2WSDLConstants.TARGET_NAMESPACE_OPTION_LONG.equalsIgnoreCase(optionType) ||
+ Java2WSDLConstants.TARGET_NAMESPACE_PREFIX_OPTION.equalsIgnoreCase(optionType) ||
+ Java2WSDLConstants.TARGET_NAMESPACE_PREFIX_OPTION_LONG.equalsIgnoreCase(optionType) ||
+ Java2WSDLConstants.USE_OPTION.equalsIgnoreCase(optionType) ||
Java2WSDLConstants.USE_OPTION_LONG.equalsIgnoreCase(optionType)||
Java2WSDLConstants.WSDL_VERSION_OPTION.equalsIgnoreCase(optionType)||
- Java2WSDLConstants.WSDL_VERSION_OPTION_LONG.equalsIgnoreCase(optionType)||
- Java2WSDLConstants.LOCATION_OPTION_LONG.equalsIgnoreCase(optionType));
+ Java2WSDLConstants.WSDL_VERSION_OPTION_LONG.equalsIgnoreCase(optionType)
+ );
return invalid;
Modified: webservices/axis2/branches/java/jaxws21/modules/jibx/src/org/apache/axis2/jibx/JiBXDataSource.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/jibx/src/org/apache/axis2/jibx/JiBXDataSource.java?view=diff&rev=560403&r1=560402&r2=560403
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/jibx/src/org/apache/axis2/jibx/JiBXDataSource.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/jibx/src/org/apache/axis2/jibx/JiBXDataSource.java Fri Jul 27 15:08:09 2007
@@ -164,7 +164,12 @@
try {
if (marshallerIndex < 0) {
- ((IMarshallable)dataObject).marshal(ctx);
+ if (dataObject instanceof IMarshallable) {
+ ((IMarshallable)dataObject).marshal(ctx);
+ } else {
+ throw new IllegalStateException("Object of class " + dataObject.getClass().getName() +
+ " needs a JiBX <mapping> to be marshalled");
+ }
} else {
IXMLWriter wrtr = ctx.getXmlWriter();
String name = elementName;
@@ -195,7 +200,7 @@
ctx.getXmlWriter().flush();
} catch (IOException e) {
- throw new JiBXException("Error marshalling XML representation", e);
+ throw new JiBXException("Error marshalling XML representation: " + e.getMessage(), e);
}
}
@@ -211,7 +216,7 @@
marshal(true, ctx);
} catch (JiBXException e) {
- throw new XMLStreamException("Error in JiBX marshalling", e);
+ throw new XMLStreamException("Error in JiBX marshalling: " + e.getMessage(), e);
}
}
@@ -227,7 +232,7 @@
marshal(true, ctx);
} catch (JiBXException e) {
- throw new XMLStreamException("Error in JiBX marshalling", e);
+ throw new XMLStreamException("Error in JiBX marshalling: " + e.getMessage(), e);
}
}
@@ -262,7 +267,7 @@
marshal(full, ctx);
} catch (JiBXException e) {
- throw new XMLStreamException("Error in JiBX marshalling", e);
+ throw new XMLStreamException("Error in JiBX marshalling: " + e.getMessage(), e);
}
}
Modified: webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/description/AxisService.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/description/AxisService.java?view=diff&rev=560403&r1=560402&r2=560403
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/description/AxisService.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/description/AxisService.java Fri Jul 27 15:08:09 2007
@@ -86,6 +86,18 @@
*/
public class AxisService extends AxisDescription {
+ //////////////////////////////////////////////////////////////////
+ // Standard Parameter names
+
+ /**
+ * If this param is true, and the service has exactly one AxisOperation,
+ * normal operation dispatch (via URI/soapAction/etc) will not be necessary,
+ * and we'll just default to funneling all messages to that op. This is
+ * useful for passthrough/ESB/embedded applications.
+ */
+ public static final String SUPPORT_SINGLE_OP = "supportSingleOperation";
+ //////////////////////////////////////////////////////////////////
+
public static final String IMPORT_TAG = "import";
public static final String INCLUDE_TAG = "include";
public static final String SCHEMA_LOCATION = "schemaLocation";
Modified: webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/description/OutInAxisOperation.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/description/OutInAxisOperation.java?view=diff&rev=560403&r1=560402&r2=560403
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/description/OutInAxisOperation.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/description/OutInAxisOperation.java Fri Jul 27 15:08:09 2007
@@ -362,6 +362,8 @@
msgContext.getConfigurationContext().createMessageContext();
responseMessageContext.setServerSide(false);
+ responseMessageContext.setOperationContext(msgContext.getOperationContext());
+ responseMessageContext.setOptions(new Options(options));
responseMessageContext.setMessageID(msgContext.getMessageID());
addMessageContext(responseMessageContext);
responseMessageContext.setServiceContext(msgContext.getServiceContext());
Modified: webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/description/java2wsdl/Java2WSDLConstants.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/description/java2wsdl/Java2WSDLConstants.java?view=diff&rev=560403&r1=560402&r2=560403
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/description/java2wsdl/Java2WSDLConstants.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/description/java2wsdl/Java2WSDLConstants.java Fri Jul 27 15:08:09 2007
@@ -92,49 +92,48 @@
String URI_2001_SCHEMA_XSD = "http://www.w3.org/2001/XMLSchema";
- String OUTPUT_LOCATION_OPTION = "o";
- String OUTPUT_FILENAME_OPTION = "of";
+ String ATTR_FORM_DEFAULT_OPTION = "afd";
+ String ATTR_FORM_DEFAULT_OPTION_LONG = "attributeFormDefault";
String CLASSNAME_OPTION = "cn";
+ String CLASSNAME_OPTION_LONG = "className";
String CLASSPATH_OPTION = "cp";
- String TARGET_NAMESPACE_OPTION = "tn";
- String TARGET_NAMESPACE_PREFIX_OPTION = "tp";
- String SCHEMA_TARGET_NAMESPACE_OPTION = "stn";
- String SCHEMA_TARGET_NAMESPACE_PREFIX_OPTION = "stp";
- String SERVICE_NAME_OPTION = "sn";
- String STYLE_OPTION = "st";
- String USE_OPTION = "u";
- String LOCATION_OPTION = "l";
- String ATTR_FORM_DEFAULT_OPTION = "afd";
+ String CLASSPATH_OPTION_LONG = "classPath";
+ String DOC_LIT_BARE = "dlb";
+ String DOC_LIT_BARE_LONG = "doclitbare";
String ELEMENT_FORM_DEFAULT_OPTION = "efd";
+ String ELEMENT_FORM_DEFAULT_OPTION_LONG = "elementFormDefault";
String EXTRA_CLASSES_DEFAULT_OPTION = "xc";
- String NAMESPACE_GENERATOR_OPTION = "nsg";
- String SCHEMA_GENERATOR_OPTION = "sg";
+ String EXTRA_CLASSES_DEFAULT_OPTION_LONG = "extraClasses";
String JAVA_PKG_2_NSMAP_OPTION = "p2n";
- String WSDL_VERSION_OPTION = "wv";
- String DOC_LIT_BARE = "dlb";
-
- //long option constants
- String OUTPUT_LOCATION_OPTION_LONG = "output";
- String TARGET_NAMESPACE_OPTION_LONG = "targetNamespace";
- String TARGET_NAMESPACE_PREFIX_OPTION_LONG = "targetNamespacePrefix";
- String SERVICE_NAME_OPTION_LONG = "serviceName";
- String CLASSNAME_OPTION_LONG = "className";
- String CLASSPATH_OPTION_LONG = "classPath";
+ String JAVA_PKG_2_NSMAP_OPTION_LONG = "package2Namespace";
+ String LOCATION_OPTION = "l";
+ String LOCATION_OPTION_LONG = "location";
+ String NAMESPACE_GENERATOR_OPTION = "nsg";
+ String NAMESPACE_GENERATOR_OPTION_LONG = "namespaceGenerator";
+ String OUTPUT_FILENAME_OPTION = "of";
String OUTPUT_FILENAME_OPTION_LONG = "outputFilename";
+ String OUTPUT_LOCATION_OPTION = "o";
+ String OUTPUT_LOCATION_OPTION_LONG = "output";
+ String SCHEMA_GENERATOR_OPTION = "sg";
+ String SCHEMA_GENERATOR_OPTION_LONG = "schemaGenerator";
+ String SCHEMA_TARGET_NAMESPACE_OPTION = "stn";
String SCHEMA_TARGET_NAMESPACE_OPTION_LONG = "schemaTargetnamespace";
+ String SCHEMA_TARGET_NAMESPACE_PREFIX_OPTION = "stp";
String SCHEMA_TARGET_NAMESPACE_PREFIX_OPTION_LONG = "schemaTargetnamespacePrefix";
+ String SERVICE_NAME_OPTION = "sn";
+ String SERVICE_NAME_OPTION_LONG = "serviceName";
+ String STYLE_OPTION = "st";
String STYLE_OPTION_LONG = "style";
+ String TARGET_NAMESPACE_OPTION = "tn";
+ String TARGET_NAMESPACE_OPTION_LONG = "targetNamespace";
+ String TARGET_NAMESPACE_PREFIX_OPTION = "tp";
+ String TARGET_NAMESPACE_PREFIX_OPTION_LONG = "targetNamespacePrefix";
+ String USE_OPTION = "u";
String USE_OPTION_LONG = "use";
- String LOCATION_OPTION_LONG = "location";
- String AXIS2_NAMESPACE_PREFIX = "ns1";
- String ATTR_FORM_DEFAULT_OPTION_LONG = "attributeFormDefault";
- String ELEMENT_FORM_DEFAULT_OPTION_LONG = "elementFormDefault";
- String EXTRA_CLASSES_DEFAULT_OPTION_LONG = "extraClasses";
- String NAMESPACE_GENERATOR_OPTION_LONG = "namespaceGenerator";
- String SCHEMA_GENERATOR_OPTION_LONG = "schemaGenerator";
- String JAVA_PKG_2_NSMAP_OPTION_LONG = "package2Namespace";
+ String WSDL_VERSION_OPTION = "wv";
String WSDL_VERSION_OPTION_LONG = "wsdl-version";
- String DOC_LIT_BARE_LONG = "doclitbare";
+
+ String AXIS2_NAMESPACE_PREFIX = "ns1";
public static final String SOLE_INPUT = "SOLE_INPUT";
Modified: webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/engine/DispatchPhase.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/engine/DispatchPhase.java?view=diff&rev=560403&r1=560402&r2=560403
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/engine/DispatchPhase.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/engine/DispatchPhase.java Fri Jul 27 15:08:09 2007
@@ -31,7 +31,6 @@
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.AxisServiceGroup;
-import org.apache.axis2.description.WSDL2Constants;
import org.apache.axis2.i18n.Messages;
import org.apache.axis2.transport.RequestResponseTransport;
import org.apache.axis2.transport.TransportListener;
@@ -68,7 +67,7 @@
AxisOperation operation = msgContext.getAxisOperation();
// If we're configured to do so, check the service for a single op...
if (operation == null &&
- JavaUtils.isTrue(service.getParameterValue("supportSingleOperation"))) {
+ JavaUtils.isTrue(service.getParameterValue(AxisService.SUPPORT_SINGLE_OP))) {
Iterator ops = service.getOperations();
// If there's exactly one, that's the one we want. If there's more, forget it.
if (ops.hasNext()) {
Modified: webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/transport/TransportUtils.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/transport/TransportUtils.java?view=diff&rev=560403&r1=560402&r2=560403
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/transport/TransportUtils.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/transport/TransportUtils.java Fri Jul 27 15:08:09 2007
@@ -41,6 +41,7 @@
import org.apache.axis2.transport.http.ApplicationXMLFormatter;
import org.apache.axis2.transport.http.HTTPConstants;
import org.apache.axis2.transport.http.SOAPMessageFormatter;
+import org.apache.axis2.transport.http.XFormURLEncodedFormatter;
import org.apache.axis2.util.JavaUtils;
import org.apache.axis2.wsdl.WSDLConstants;
import org.apache.commons.logging.Log;
@@ -278,7 +279,12 @@
// If we are doing rest better default to Application/xml formatter
if (msgContext.isDoingREST()) {
- messageFormatter = new ApplicationXMLFormatter();
+ String httpMethod = (String) msgContext.getProperty(Constants.Configuration.HTTP_METHOD);
+ if (Constants.Configuration.HTTP_METHOD_GET.equals(httpMethod) ||
+ Constants.Configuration.HTTP_METHOD_DELETE.equals(httpMethod)) {
+ return new XFormURLEncodedFormatter();
+ }
+ return new ApplicationXMLFormatter();
} else {
// Lets default to SOAP formatter
//TODO need to improve this to use the stateless nature
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org