You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by pr...@apache.org on 2007/06/17 14:11:57 UTC
svn commit: r548033 [6/11] - in /webservices/axis2/branches/java/jaxws21: ./
etc/ modules/adb-codegen/ modules/adb-codegen/src/org/apache/axis2/schema/
modules/adb-codegen/src/org/apache/axis2/schema/template/
modules/adb-codegen/src/org/apache/axis2/s...
Modified: webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/CEmitter.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/CEmitter.java?view=diff&rev=548033&r1=548032&r2=548033
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/CEmitter.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/CEmitter.java Sun Jun 17 05:11:16 2007
@@ -29,7 +29,7 @@
import org.apache.axis2.wsdl.codegen.writer.CStubHeaderWriter;
import org.apache.axis2.wsdl.codegen.writer.CStubSourceWriter;
import org.apache.axis2.wsdl.codegen.writer.CSvcSkeletonWriter;
-import org.apache.axis2.wsdl.codegen.writer.ClassWriter;
+import org.apache.axis2.wsdl.codegen.writer.FileWriter;
import org.apache.axis2.wsdl.databinding.CUtils;
import org.apache.neethi.Policy;
import org.w3c.dom.Document;
@@ -108,7 +108,7 @@
codeGenConfiguration.getSourceLocation()),
codeGenConfiguration.getOutputLanguage());
- writeClass(interfaceImplModel, writerHStub);
+ writeFile(interfaceImplModel, writerHStub);
CStubSourceWriter writerCStub =
@@ -116,7 +116,7 @@
codeGenConfiguration.getSourceLocation()),
codeGenConfiguration.getOutputLanguage());
- writeClass(interfaceImplModel, writerCStub);
+ writeFile(interfaceImplModel, writerCStub);
}
@@ -136,14 +136,14 @@
codeGenConfiguration.getSourceLocation()),
this.codeGenConfiguration.getOutputLanguage());
- writeClass(skeletonModel, skeletonWriter);
+ writeFile(skeletonModel, skeletonWriter);
CSkelSourceWriter skeletonWriterStub = new CSkelSourceWriter(
getOutputDirectory(this.codeGenConfiguration.getOutputLocation(),
codeGenConfiguration.getSourceLocation()),
this.codeGenConfiguration.getOutputLanguage());
- writeClass(skeletonModel, skeletonWriterStub);
+ writeFile(skeletonModel, skeletonWriterStub);
}
/** @throws Exception */
@@ -155,7 +155,7 @@
codeGenConfiguration.getSourceLocation()),
codeGenConfiguration.getOutputLanguage());
- writeClass(skeletonModel, writer);
+ writeFile(skeletonModel, writer);
}
@@ -169,13 +169,13 @@
// Write the service xml in a folder with the
Document serviceXMLModel = createDOMDocumentForServiceXML();
- ClassWriter serviceXmlWriter =
+ FileWriter serviceXmlWriter =
new CServiceXMLWriter(
getOutputDirectory(this.codeGenConfiguration.getOutputLocation(),
codeGenConfiguration.getResourceLocation()),
this.codeGenConfiguration.getOutputLanguage());
- writeClass(serviceXMLModel, serviceXmlWriter);
+ writeFile(serviceXMLModel, serviceXmlWriter);
}
}
Modified: webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/SchemaUnwrapperExtension.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/SchemaUnwrapperExtension.java?view=diff&rev=548033&r1=548032&r2=548033
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/SchemaUnwrapperExtension.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/SchemaUnwrapperExtension.java Sun Jun 17 05:11:16 2007
@@ -57,6 +57,7 @@
*/
public void engage(CodeGenConfiguration configuration) throws CodeGenerationException {
this.codeGenConfiguration = configuration;
+
if (!configuration.isParametersWrapped()) {
// A check to avoid nasty surprises - Since unwrapping is not
Modified: webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/AntBuildWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/AntBuildWriter.java?view=diff&rev=548033&r1=548032&r2=548033
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/AntBuildWriter.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/AntBuildWriter.java Sun Jun 17 05:11:16 2007
@@ -1,6 +1,5 @@
package org.apache.axis2.wsdl.codegen.writer;
-import org.apache.axis2.util.FileWriter;
import org.apache.axis2.util.XSLTTemplateProcessor;
import org.apache.axis2.wsdl.util.ConfigPropertyFileLoader;
import org.w3c.dom.Document;
@@ -26,7 +25,7 @@
* limitations under the License.
*/
-public class AntBuildWriter extends ClassWriter {
+public class AntBuildWriter extends FileWriter {
private String databindingFramework = ConfigPropertyFileLoader.getDefaultDBFrameworkName();
@@ -44,7 +43,7 @@
}
public void createOutFile(String packageName, String fileName) throws Exception {
- File outputFile = FileWriter.createClassFile(outputFileLocation,
+ File outputFile = org.apache.axis2.util.FileWriter.createClassFile(outputFileLocation,
"",
"build",
".xml");
Modified: webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/CServiceXMLWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/CServiceXMLWriter.java?view=diff&rev=548033&r1=548032&r2=548033
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/CServiceXMLWriter.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/CServiceXMLWriter.java Sun Jun 17 05:11:16 2007
@@ -15,12 +15,10 @@
*/
package org.apache.axis2.wsdl.codegen.writer;
-import org.apache.axis2.util.FileWriter;
-
import java.io.File;
import java.io.FileOutputStream;
-public class CServiceXMLWriter extends ClassWriter {
+public class CServiceXMLWriter extends FileWriter {
public CServiceXMLWriter(String outputFileLocation) {
@@ -34,7 +32,7 @@
public void createOutFile(String packageName, String fileName) throws Exception {
- outputFile = FileWriter.createClassFile(outputFileLocation,
+ outputFile = org.apache.axis2.util.FileWriter.createClassFile(outputFileLocation,
"",
"services",
".xml");
Modified: webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/CStubHeaderWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/CStubHeaderWriter.java?view=diff&rev=548033&r1=548032&r2=548033
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/CStubHeaderWriter.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/CStubHeaderWriter.java Sun Jun 17 05:11:16 2007
@@ -16,7 +16,6 @@
package org.apache.axis2.wsdl.codegen.writer;
-import org.apache.axis2.util.FileWriter;
import org.apache.axis2.util.XSLTTemplateProcessor;
import org.w3c.dom.Document;
@@ -24,7 +23,7 @@
import java.io.File;
import java.io.FileOutputStream;
-public class CStubHeaderWriter extends ClassWriter {
+public class CStubHeaderWriter extends FileWriter {
public CStubHeaderWriter(String outputFileLocation) {
this.outputFileLocation = new File(outputFileLocation);
@@ -36,7 +35,7 @@
}
public void createOutFile(String packageName, String fileName) throws Exception {
- outputFile = FileWriter.createClassFile(outputFileLocation,
+ outputFile = org.apache.axis2.util.FileWriter.createClassFile(outputFileLocation,
"",
fileName,
".h");
Modified: webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/CStubSourceWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/CStubSourceWriter.java?view=diff&rev=548033&r1=548032&r2=548033
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/CStubSourceWriter.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/CStubSourceWriter.java Sun Jun 17 05:11:16 2007
@@ -16,7 +16,6 @@
package org.apache.axis2.wsdl.codegen.writer;
-import org.apache.axis2.util.FileWriter;
import org.apache.axis2.util.XSLTTemplateProcessor;
import org.w3c.dom.Document;
@@ -24,7 +23,7 @@
import java.io.File;
import java.io.FileOutputStream;
-public class CStubSourceWriter extends ClassWriter {
+public class CStubSourceWriter extends FileWriter {
public CStubSourceWriter(String outputFileLocation) {
this.outputFileLocation = new File(outputFileLocation);
@@ -36,7 +35,7 @@
}
public void createOutFile(String packageName, String fileName) throws Exception {
- outputFile = FileWriter.createClassFile(outputFileLocation,
+ outputFile = org.apache.axis2.util.FileWriter.createClassFile(outputFileLocation,
"",
fileName,
getFileExtensionForLanguage(language));
Modified: webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/CSvcSkeletonWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/CSvcSkeletonWriter.java?view=diff&rev=548033&r1=548032&r2=548033
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/CSvcSkeletonWriter.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/CSvcSkeletonWriter.java Sun Jun 17 05:11:16 2007
@@ -16,7 +16,6 @@
package org.apache.axis2.wsdl.codegen.writer;
-import org.apache.axis2.util.FileWriter;
import org.apache.axis2.util.XSLTTemplateProcessor;
import org.w3c.dom.Document;
@@ -24,7 +23,7 @@
import java.io.File;
import java.io.FileOutputStream;
-public class CSvcSkeletonWriter extends ClassWriter {
+public class CSvcSkeletonWriter extends FileWriter {
public CSvcSkeletonWriter(String outputFileLocation) {
this.outputFileLocation = new File(outputFileLocation);
@@ -36,7 +35,7 @@
}
public void createOutFile(String packageName, String fileName) throws Exception {
- outputFile = FileWriter.createClassFile(outputFileLocation,
+ outputFile = org.apache.axis2.util.FileWriter.createClassFile(outputFileLocation,
"",
fileName,
getFileExtensionForLanguage(language));
Modified: webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/CallbackHandlerWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/CallbackHandlerWriter.java?view=diff&rev=548033&r1=548032&r2=548033
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/CallbackHandlerWriter.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/CallbackHandlerWriter.java Sun Jun 17 05:11:16 2007
@@ -18,7 +18,7 @@
import java.io.File;
-public class CallbackHandlerWriter extends ClassWriter {
+public class CallbackHandlerWriter extends FileWriter {
public CallbackHandlerWriter(String outputFileLocation) {
this.outputFileLocation = new File(outputFileLocation);
Modified: webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/ExceptionWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/ExceptionWriter.java?view=diff&rev=548033&r1=548032&r2=548033
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/ExceptionWriter.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/ExceptionWriter.java Sun Jun 17 05:11:16 2007
@@ -18,7 +18,7 @@
import java.io.File;
-public class ExceptionWriter extends ClassWriter {
+public class ExceptionWriter extends FileWriter {
public ExceptionWriter(String outputFileLocation) {
this.outputFileLocation = new File(outputFileLocation);
Modified: webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/InterfaceImplementationWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/InterfaceImplementationWriter.java?view=diff&rev=548033&r1=548032&r2=548033
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/InterfaceImplementationWriter.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/InterfaceImplementationWriter.java Sun Jun 17 05:11:16 2007
@@ -18,7 +18,7 @@
import java.io.File;
-public class InterfaceImplementationWriter extends ClassWriter {
+public class InterfaceImplementationWriter extends FileWriter {
public InterfaceImplementationWriter(String outputFileLocation) {
this.outputFileLocation = new File(outputFileLocation);
}
Modified: webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/InterfaceWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/InterfaceWriter.java?view=diff&rev=548033&r1=548032&r2=548033
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/InterfaceWriter.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/InterfaceWriter.java Sun Jun 17 05:11:16 2007
@@ -18,7 +18,7 @@
import java.io.File;
-public class InterfaceWriter extends ClassWriter {
+public class InterfaceWriter extends FileWriter {
public InterfaceWriter(String outputFileLocation) {
Modified: webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/MessageReceiverWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/MessageReceiverWriter.java?view=diff&rev=548033&r1=548032&r2=548033
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/MessageReceiverWriter.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/MessageReceiverWriter.java Sun Jun 17 05:11:16 2007
@@ -18,7 +18,7 @@
import java.io.File;
-public class MessageReceiverWriter extends ClassWriter {
+public class MessageReceiverWriter extends FileWriter {
public MessageReceiverWriter(String outputFileLocation) {
this.outputFileLocation = new File(outputFileLocation);
Modified: webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/PolicyFileWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/PolicyFileWriter.java?view=diff&rev=548033&r1=548032&r2=548033
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/PolicyFileWriter.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/PolicyFileWriter.java Sun Jun 17 05:11:16 2007
@@ -1,7 +1,5 @@
package org.apache.axis2.wsdl.codegen.writer;
-import org.apache.axis2.util.FileWriter;
-
import java.io.File;
import java.io.FileOutputStream;
/*
@@ -20,7 +18,7 @@
* limitations under the License.
*/
-public class PolicyFileWriter extends ClassWriter {
+public class PolicyFileWriter extends FileWriter {
public PolicyFileWriter(File outputFileLocation) {
this.outputFileLocation = outputFileLocation;
@@ -28,7 +26,7 @@
public void createOutFile(String packageName, String fileName) throws Exception {
- File outputFile = FileWriter.createClassFile(outputFileLocation,
+ File outputFile = org.apache.axis2.util.FileWriter.createClassFile(outputFileLocation,
packageName,
fileName,
".xml");
Modified: webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/SchemaWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/SchemaWriter.java?view=diff&rev=548033&r1=548032&r2=548033
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/SchemaWriter.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/SchemaWriter.java Sun Jun 17 05:11:16 2007
@@ -3,8 +3,11 @@
import org.apache.axis2.util.FileWriter;
import org.apache.ws.commons.schema.XmlSchema;
+import javax.xml.transform.OutputKeys;
import java.io.File;
import java.io.FileOutputStream;
+import java.util.Map;
+import java.util.HashMap;
/*
* Copyright 2004,2005 The Apache Software Foundation.
*
@@ -41,7 +44,9 @@
".")),
".xsd");
FileOutputStream fos = new FileOutputStream(outputFile);
- schema.write(fos);
+
+ //set the options for the schemas
+ schema.write(fos,getDefaultOptionMap());
fos.flush();
fos.close();
}
@@ -49,5 +54,14 @@
throw new RuntimeException("Schema writing failed!", e);
}
}
+
+ private Map getDefaultOptionMap(){
+ Map options = new HashMap();
+ options.put(OutputKeys.OMIT_XML_DECLARATION,"no");
+ options.put(OutputKeys.INDENT,"yes");
+
+ return options;
+ }
+
}
Modified: webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/ServiceXMLWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/ServiceXMLWriter.java?view=diff&rev=548033&r1=548032&r2=548033
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/ServiceXMLWriter.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/ServiceXMLWriter.java Sun Jun 17 05:11:16 2007
@@ -16,12 +16,10 @@
package org.apache.axis2.wsdl.codegen.writer;
-import org.apache.axis2.util.FileWriter;
-
import java.io.File;
import java.io.FileOutputStream;
-public class ServiceXMLWriter extends ClassWriter {
+public class ServiceXMLWriter extends FileWriter {
public ServiceXMLWriter(String outputFileLocation) {
@@ -35,7 +33,7 @@
public void createOutFile(String packageName, String fileName) throws Exception {
- File outputFile = FileWriter.createClassFile(outputFileLocation,
+ File outputFile = org.apache.axis2.util.FileWriter.createClassFile(outputFileLocation,
packageName,
"services",
".xml");
Modified: webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/SkeletonInterfaceWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/SkeletonInterfaceWriter.java?view=diff&rev=548033&r1=548032&r2=548033
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/SkeletonInterfaceWriter.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/SkeletonInterfaceWriter.java Sun Jun 17 05:11:16 2007
@@ -17,7 +17,7 @@
* limitations under the License.
*/
-public class SkeletonInterfaceWriter extends ClassWriter {
+public class SkeletonInterfaceWriter extends FileWriter {
public SkeletonInterfaceWriter(String outputFileLocation) {
Modified: webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/SkeletonWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/SkeletonWriter.java?view=diff&rev=548033&r1=548032&r2=548033
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/SkeletonWriter.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/SkeletonWriter.java Sun Jun 17 05:11:16 2007
@@ -18,7 +18,7 @@
import java.io.File;
-public class SkeletonWriter extends ClassWriter {
+public class SkeletonWriter extends FileWriter {
public SkeletonWriter(String outputFileLocation) {
Modified: webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/TestClassWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/TestClassWriter.java?view=diff&rev=548033&r1=548032&r2=548033
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/TestClassWriter.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/TestClassWriter.java Sun Jun 17 05:11:16 2007
@@ -18,7 +18,7 @@
import java.io.File;
-public class TestClassWriter extends ClassWriter {
+public class TestClassWriter extends FileWriter {
public TestClassWriter(String outputFileLocation) {
this.outputFileLocation = new File(outputFileLocation);
Modified: webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl?view=diff&rev=548033&r1=548032&r2=548033
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl (original)
+++ webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl Sun Jun 17 05:11:16 2007
@@ -151,6 +151,22 @@
/**
* Default Constructor
*/
+ public <xsl:value-of select="@name"/>(org.apache.axis2.context.ConfigurationContext configurationContext) throws org.apache.axis2.AxisFault {
+ <xsl:for-each select="endpoint">
+ <xsl:choose>
+ <xsl:when test="position()=1">
+ this(configurationContext,"<xsl:value-of select="."/>" );
+ </xsl:when>
+ <xsl:otherwise>
+ //this(configurationContext,"<xsl:value-of select="."/>" );
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:for-each>
+ }
+
+ /**
+ * Default Constructor
+ */
public <xsl:value-of select="@name"/>() throws org.apache.axis2.AxisFault {
<xsl:for-each select="endpoint">
<xsl:choose>
@@ -655,6 +671,7 @@
_operationClient.setCallback(new org.apache.axis2.client.async.Callback() {
public void onComplete(
org.apache.axis2.client.async.AsyncResult result) {
+ try{
java.lang.Object object = fromOM(result.getResponseEnvelope().getBody().getFirstElement(),
<xsl:value-of select="$outputtype"/>.class,
getEnvelopeNamespaces(result.getResponseEnvelope())
@@ -675,6 +692,9 @@
(<xsl:value-of select="$outputtype"/>)object);
</xsl:otherwise>
</xsl:choose>
+ } catch(org.apache.axis2.AxisFault e){
+ callback.receiveError<xsl:value-of select="@name"/>(e);
+ }
}
Modified: webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/template/java/MessageReceiverTemplate.xsl
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/template/java/MessageReceiverTemplate.xsl?view=diff&rev=548033&r1=548032&r2=548033
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/template/java/MessageReceiverTemplate.xsl (original)
+++ webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/template/java/MessageReceiverTemplate.xsl Sun Jun 17 05:11:16 2007
@@ -231,13 +231,13 @@
newMsgContext.setEnvelope(envelope);
}
<xsl:for-each select="fault-list/fault">
- <xsl:if test="position()=1">}</xsl:if>catch (<xsl:value-of select="@name"/> e) {
+ <xsl:if test="position()=1">}</xsl:if> catch (<xsl:value-of select="@name"/> e) {
msgContext.setProperty(org.apache.axis2.Constants.FAULT_NAME,"<xsl:value-of select="@localname"/>");
org.apache.axis2.AxisFault f = createAxisFault(e);
-
- f.setDetail(toOM(e.getFaultMessage(),false));
-
+ if (e.getFaultMessage() != null){
+ f.setDetail(toOM(e.getFaultMessage(),false));
+ }
throw f;
}
</xsl:for-each>
@@ -558,12 +558,12 @@
}
<xsl:for-each select="fault-list/fault">
- <xsl:if test="position()=1">}</xsl:if>catch (<xsl:value-of select="@name"/> e) {
+ <xsl:if test="position()=1">}</xsl:if> catch (<xsl:value-of select="@name"/> e) {
msgContext.setProperty(org.apache.axis2.Constants.FAULT_NAME,"<xsl:value-of select="@localname"/>");
org.apache.axis2.AxisFault f = createAxisFault(e);
-
- f.setDetail(toOM(e.getFaultMessage(),false));
-
+ if (e.getFaultMessage() != null){
+ f.setDetail(toOM(e.getFaultMessage(),false));
+ }
throw f;
}
</xsl:for-each>
Modified: webservices/axis2/branches/java/jaxws21/modules/fastinfoset/test/org/apache/axis2/fastinfoset/FastInfosetTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/fastinfoset/test/org/apache/axis2/fastinfoset/FastInfosetTest.java?view=diff&rev=548033&r1=548032&r2=548033
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/fastinfoset/test/org/apache/axis2/fastinfoset/FastInfosetTest.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/fastinfoset/test/org/apache/axis2/fastinfoset/FastInfosetTest.java Sun Jun 17 05:11:16 2007
@@ -69,7 +69,7 @@
serverCount++;
service = AxisService.createService("org.apache.axis2.fastinfoset.SimpleAddService",
- server.getConfigurationContext().getAxisConfiguration(), RPCMessageReceiver.class);
+ server.getConfigurationContext().getAxisConfiguration());
server.getConfigurationContext().getAxisConfiguration().addService(
service);
Modified: webservices/axis2/branches/java/jaxws21/modules/integration/maven.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/integration/maven.xml?view=diff&rev=548033&r1=548032&r2=548033
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/integration/maven.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/integration/maven.xml Sun Jun 17 05:11:16 2007
@@ -7,12 +7,6 @@
xmlns:ant="jelly:ant">
<j:set var="samples.dir" value="target/samples"/>
- <postGoal name="itest:compile">
- <mkdir dir="target/itest-classes/modules"/>
- <copy file="../addressing/target/addressing-${addressing_version}.mar"
- tofile="target/itest-classes/modules/addressing-${addressing_version}.mar"/>
- </postGoal>
-
<preGoal name="test:compile">
<!-- Set a property that can be picked up from the ant build.xml's -->
@@ -30,6 +24,23 @@
<!-- make the dirs -->
<mkdir dir="${wsdl.output.base.dir}"/>
+ <ant:echo>Compiling ComplexDataTypes.wsdl</ant:echo>
+ <mkdir dir="${wsdl.output.base.dir}/complexdatatype"/>
+ <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
+ <jvmarg line="${maven.junit.jvmargs}"/>
+ <classpath refid="maven.dependency.classpath"/>
+ <classpath location="${compiled.classes.dir}"/>
+ <arg line="-o target/wsdl/complexdatatype -s -u -uw -uri test-resources/ComplexDataTypes/ComplexDataTypes.wsdl"/>
+ </java>
+ <javac destdir="target/classes" debug="on">
+ <jvmarg line="${maven.junit.jvmargs}"/>
+ <classpath refid="maven.dependency.classpath"/>
+ <classpath location="${compiled.classes.dir}"/>
+ <src path="target/wsdl/complexdatatype"/>
+ </javac>
+
+
+
<ant:echo>Compiling DocumentUnwrappingTest.wsdl </ant:echo>
<mkdir dir="${wsdl.output.base.dir}/documentunwrapping"/>
<java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
@@ -50,48 +61,6 @@
<arg line="-o target/wsdl/rpcunwrapping -ss -sd -ssi -u -g -uw -uri test-resources/wsdl/RPCUnwrappingTest.wsdl"/>
</java>
<ant:ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="target/wsdl/rpcunwrapping"/>
-
- <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
- <classpath refid="maven.dependency.classpath"/>
- <arg line="-d xmlbeans -p samples.wsdl.perf -o target/perf -s -t -ss -sd -g -uri test/samples/wsdl/perf/perf.wsdl"/>
- </java>
- <ant:copy overwrite="yes" todir="target/perf/src/samples/wsdl/perf">
- <ant:fileset dir="test/samples/wsdl/perf">
- <ant:include name="*Skeleton.java"/>
- </ant:fileset>
- </ant:copy>
- <ant:ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="target/perf"
- target="make.repo"/>
- <ant:ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="target/perf"
- target="jar.client"/>
- <ant:move file="target/perf/build/lib/Services-test-client.jar"
- tofile="target/perf/build/lib/PerfSoapService-test-client.jar" />
-
- <ant:move file="target/perf/build/lib/Services.aar"
- tofile="target/perf/build/lib/PerfSoapService.aar" />
-
- <ant:path id="samples.wsdl.perf.client.jar"
- location="target/perf/build/lib/PerfSoapService-test-client.jar"/>
-
- <maven:addPath id="maven.dependency.classpath" refid="samples.wsdl.perf.client.jar"/>
- <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
- <classpath refid="maven.dependency.classpath"/>
- <arg line="-d adb -p samples.wsdl.perf2 -o target/perf2 -s -t -ss -sd -g -uri test/samples/wsdl/perf2/perf.wsdl"/>
- </java>
- <ant:copy overwrite="yes" todir="target/perf2/src/samples/wsdl/perf2">
- <ant:fileset dir="test/samples/wsdl/perf2">
- <ant:include name="*Skeleton.java"/>
- </ant:fileset>
- </ant:copy>
- <ant:ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="target/perf2"
- target="make.repo"/>
- <ant:ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="target/perf2"
- target="jar.client"/>
- <ant:move file="target/perf2/build/lib/Services-test-client.jar"
- tofile="target/perf2/build/lib/PerfSoapService2-test-client.jar" />
- <ant:path id="samples.wsdl.perf2.client.jar"
- location="target/perf2/build/lib/PerfSoapService2-test-client.jar"/>
- <maven:addPath id="maven.dependency.classpath" refid="samples.wsdl.perf2.client.jar"/>
<!-- compile the schema for XMLbeans -->
<java classname="org.apache.xmlbeans.impl.tool.SchemaCompiler" fork="true">
Modified: webservices/axis2/branches/java/jaxws21/modules/integration/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/integration/pom.xml?view=diff&rev=548033&r1=548032&r2=548033
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/integration/pom.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/integration/pom.xml Sun Jun 17 05:11:16 2007
@@ -341,48 +341,6 @@
<ant antfile="build.xml" inheritall="true" inheritrefs="true"
dir="target/wsdl/rpcunwrapping"/>
- <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
- <classpath refid="maven.runtime.classpath"/>
- <arg line="-d xmlbeans -p samples.wsdl.perf -o target/perf -s -ss -sd -g -uri test/samples/wsdl/perf/perf.wsdl"/>
- </java>
- <copy overwrite="yes" todir="target/perf/src/samples/wsdl/perf">
- <fileset dir="test/samples/wsdl/perf">
- <include name="*Skeleton.java"/>
- </fileset>
- </copy>
- <ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="target/perf"
- target="make.repo"/>
- <ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="target/perf"
- target="jar.client"/>
- <move file="target/perf/build/lib/Services-test-client.jar"
- tofile="target/perf/build/lib/PerfSoapService-test-client.jar"/>
-
- <move file="target/perf/build/lib/Services.aar"
- tofile="target/perf/build/lib/PerfSoapService.aar"/>
-
- <path id="samples.wsdl.perf.client.jar"
- location="target/perf/build/lib/PerfSoapService-test-client.jar"/>
- <delete file="target/perf/src/samples/wsdl/perf/PerfPortTypeSkeleton.java"/>
-
- <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
- <classpath refid="maven.runtime.classpath"/>
- <arg line="-d adb -p samples.wsdl.perf2 -o target/perf2 -s -ss -sd -g -uri test/samples/wsdl/perf2/perf.wsdl"/>
- </java>
- <copy overwrite="yes" todir="target/perf2/src/samples/wsdl/perf2">
- <fileset dir="test/samples/wsdl/perf2">
- <include name="*Skeleton.java"/>
- </fileset>
- </copy>
- <ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="target/perf2"
- target="make.repo"/>
- <ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="target/perf2"
- target="jar.client"/>
- <move file="target/perf2/build/lib/Services-test-client.jar"
- tofile="target/perf2/build/lib/PerfSoapService2-test-client.jar"/>
- <path id="samples.wsdl.perf2.client.jar"
- location="target/perf2/build/lib/PerfSoapService2-test-client.jar"/>
- <delete file="target/perf2/src/samples/wsdl/perf2/PerfPortTypeSkeleton.java"/>
-
<!-- compile the schema for XMLbeans -->
<java classname="org.apache.xmlbeans.impl.tool.SchemaCompiler" fork="true">
<classpath refid="maven.runtime.classpath"/>
@@ -419,25 +377,6 @@
<goals>
<goal>run</goal>
</goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>add-test-source</id>
- <phase>process-test-resources</phase>
- <goals>
- <goal>add-test-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>${basedir}/target/perf2/src/</source>
- <source>${basedir}/target/perf/src/</source>
- </sources>
- </configuration>
</execution>
</executions>
</plugin>
Modified: webservices/axis2/branches/java/jaxws21/modules/integration/project.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/integration/project.xml?view=diff&rev=548033&r1=548032&r2=548033
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/integration/project.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/integration/project.xml Sun Jun 17 05:11:16 2007
@@ -358,7 +358,6 @@
<exclude>**/*Abstract*.class</exclude>
<exclude>**/*Util*.class</exclude>
<exclude>**/*InteropStubTest.class</exclude>
- <exclude>**/*ServiceGroupContextTest.class</exclude>
<exclude>**/*EchoRawSwAFileInputTest.class</exclude>
<exclude>**/*EchoRawRuntimeProxyTest.class</exclude>
<exclude>**org/apache/axis2/mail/*.class</exclude>
Modified: webservices/axis2/branches/java/jaxws21/modules/integration/test-resources/BaseDataTypes.wsdl
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/integration/test-resources/BaseDataTypes.wsdl?view=diff&rev=548033&r1=548032&r2=548033
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/integration/test-resources/BaseDataTypes.wsdl (original)
+++ webservices/axis2/branches/java/jaxws21/modules/integration/test-resources/BaseDataTypes.wsdl Sun Jun 17 05:11:16 2007
@@ -1038,11 +1038,10 @@
</wsdl:output>
</wsdl:operation>
</wsdl:binding>
- <wsdl:binding name="BaseDataTypesHttpBinding"
- type="axis2:BaseDataTypesPortType">
+ <wsdl:binding name="BaseDataTypesHttpBinding" type="axis2:BaseDataTypesPortType">
<http:binding verb="POST"/>
<wsdl:operation name="retUInt">
- <http:operation location="retUInt"/>
+ <http:operation location="BaseDataTypes/retUInt"/>
<wsdl:input>
<mime:content type="text/xml" part="retUInt"/>
</wsdl:input>
@@ -1051,7 +1050,7 @@
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="retSingle">
- <http:operation location="retSingle"/>
+ <http:operation location="BaseDataTypes/retSingle"/>
<wsdl:input>
<mime:content type="text/xml" part="retSingle"/>
</wsdl:input>
@@ -1060,7 +1059,7 @@
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="retTimeSpan">
- <http:operation location="retTimeSpan"/>
+ <http:operation location="BaseDataTypes/retTimeSpan"/>
<wsdl:input>
<mime:content type="text/xml" part="retTimeSpan"/>
</wsdl:input>
@@ -1069,7 +1068,7 @@
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="retDateTime">
- <http:operation location="retDateTime"/>
+ <http:operation location="BaseDataTypes/retDateTime"/>
<wsdl:input>
<mime:content type="text/xml" part="retDateTime"/>
</wsdl:input>
@@ -1078,7 +1077,7 @@
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="retGuid">
- <http:operation location="retGuid"/>
+ <http:operation location="BaseDataTypes/retGuid"/>
<wsdl:input>
<mime:content type="text/xml" part="retGuid"/>
</wsdl:input>
@@ -1087,7 +1086,7 @@
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="retByteArray">
- <http:operation location="retByteArray"/>
+ <http:operation location="BaseDataTypes/retByteArray"/>
<wsdl:input>
<mime:content type="text/xml" part="retByteArray"/>
</wsdl:input>
@@ -1096,7 +1095,7 @@
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="retByte">
- <http:operation location="retByte"/>
+ <http:operation location="BaseDataTypes/retByte"/>
<wsdl:input>
<mime:content type="text/xml" part="retByte"/>
</wsdl:input>
@@ -1105,7 +1104,7 @@
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="retSByte">
- <http:operation location="retSByte"/>
+ <http:operation location="BaseDataTypes/retSByte"/>
<wsdl:input>
<mime:content type="text/xml" part="retSByte"/>
</wsdl:input>
@@ -1114,7 +1113,7 @@
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="retShort">
- <http:operation location="retShort"/>
+ <http:operation location="BaseDataTypes/retShort"/>
<wsdl:input>
<mime:content type="text/xml" part="retShort"/>
</wsdl:input>
@@ -1123,7 +1122,7 @@
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="retUri">
- <http:operation location="retUri"/>
+ <http:operation location="BaseDataTypes/retUri"/>
<wsdl:input>
<mime:content type="text/xml" part="retUri"/>
</wsdl:input>
@@ -1132,7 +1131,7 @@
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="retQName">
- <http:operation location="retQName"/>
+ <http:operation location="BaseDataTypes/retQName"/>
<wsdl:input>
<mime:content type="text/xml" part="retQName"/>
</wsdl:input>
@@ -1141,7 +1140,7 @@
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="retFloat">
- <http:operation location="retFloat"/>
+ <http:operation location="BaseDataTypes/retFloat"/>
<wsdl:input>
<mime:content type="text/xml" part="retFloat"/>
</wsdl:input>
@@ -1150,7 +1149,7 @@
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="retObject">
- <http:operation location="retObject"/>
+ <http:operation location="BaseDataTypes/retObject"/>
<wsdl:input>
<mime:content type="text/xml" part="retObject"/>
</wsdl:input>
@@ -1159,7 +1158,7 @@
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="retBool">
- <http:operation location="retBool"/>
+ <http:operation location="BaseDataTypes/retBool"/>
<wsdl:input>
<mime:content type="text/xml" part="retBool"/>
</wsdl:input>
@@ -1168,7 +1167,7 @@
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="retDouble">
- <http:operation location="retDouble"/>
+ <http:operation location="BaseDataTypes/retDouble"/>
<wsdl:input>
<mime:content type="text/xml" part="retDouble"/>
</wsdl:input>
@@ -1177,7 +1176,7 @@
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="retDecimal">
- <http:operation location="retDecimal"/>
+ <http:operation location="BaseDataTypes/retDecimal"/>
<wsdl:input>
<mime:content type="text/xml" part="retDecimal"/>
</wsdl:input>
@@ -1186,7 +1185,7 @@
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="retLong">
- <http:operation location="retLong"/>
+ <http:operation location="BaseDataTypes/retLong"/>
<wsdl:input>
<mime:content type="text/xml" part="retLong"/>
</wsdl:input>
@@ -1195,7 +1194,7 @@
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="retInt">
- <http:operation location="retInt"/>
+ <http:operation location="BaseDataTypes/retInt"/>
<wsdl:input>
<mime:content type="text/xml" part="retInt"/>
</wsdl:input>
@@ -1204,7 +1203,7 @@
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="retChar">
- <http:operation location="retChar"/>
+ <http:operation location="BaseDataTypes/retChar"/>
<wsdl:input>
<mime:content type="text/xml" part="retChar"/>
</wsdl:input>
@@ -1213,7 +1212,7 @@
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="retString">
- <http:operation location="retString"/>
+ <http:operation location="BaseDataTypes/retString"/>
<wsdl:input>
<mime:content type="text/xml" part="retString"/>
</wsdl:input>
@@ -1222,7 +1221,7 @@
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="retUShort">
- <http:operation location="retUShort"/>
+ <http:operation location="BaseDataTypes/retUShort"/>
<wsdl:input>
<mime:content type="text/xml" part="retUShort"/>
</wsdl:input>
@@ -1231,7 +1230,7 @@
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="retULong">
- <http:operation location="retULong"/>
+ <http:operation location="BaseDataTypes/retULong"/>
<wsdl:input>
<mime:content type="text/xml" part="retULong"/>
</wsdl:input>
Modified: webservices/axis2/branches/java/jaxws21/modules/integration/test-resources/ComplexDataTypes/ComplexDataTypes.wsdl
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/integration/test-resources/ComplexDataTypes/ComplexDataTypes.wsdl?view=diff&rev=548033&r1=548032&r2=548033
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/integration/test-resources/ComplexDataTypes/ComplexDataTypes.wsdl (original)
+++ webservices/axis2/branches/java/jaxws21/modules/integration/test-resources/ComplexDataTypes/ComplexDataTypes.wsdl Sun Jun 17 05:11:16 2007
@@ -20,7 +20,7 @@
<xs:element name="ArrayOfshort" type="ax22:ArrayOfshort"/>
<xs:complexType name="ArrayOfshort">
<xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="short"
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="_short"
nillable="true" type="xs:short"/>
</xs:sequence>
</xs:complexType>
@@ -77,7 +77,7 @@
<xs:element name="ArrayOfint" type="ax22:ArrayOfint"/>
<xs:complexType name="ArrayOfint">
<xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="int"
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="_int"
nillable="true" type="xs:int"/>
</xs:sequence>
</xs:complexType>
@@ -1946,11 +1946,10 @@
</wsdl:output>
</wsdl:operation>
</wsdl:binding>
- <wsdl:binding name="ComplexDataTypesHttpBinding"
- type="axis2:ComplexDataTypesPortType">
+ <wsdl:binding name="ComplexDataTypesHttpBinding" type="axis2:ComplexDataTypesPortType">
<http:binding verb="POST"/>
<wsdl:operation name="retStructSNSAS">
- <http:operation location="retStructSNSAS"/>
+ <http:operation location="ComplexDataTypes/retStructSNSAS"/>
<wsdl:input>
<mime:content type="text/xml" part="retStructSNSAS"/>
</wsdl:input>
@@ -1959,7 +1958,7 @@
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="retSingle">
- <http:operation location="retSingle"/>
+ <http:operation location="ComplexDataTypes/retSingle"/>
<wsdl:input>
<mime:content type="text/xml" part="retSingle"/>
</wsdl:input>
@@ -1968,7 +1967,7 @@
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="retArrayString2D">
- <http:operation location="retArrayString2D"/>
+ <http:operation location="ComplexDataTypes/retArrayString2D"/>
<wsdl:input>
<mime:content type="text/xml" part="retArrayString2D"/>
</wsdl:input>
@@ -1977,7 +1976,7 @@
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="retArrayAnyType1D">
- <http:operation location="retArrayAnyType1D"/>
+ <http:operation location="ComplexDataTypes/retArrayAnyType1D"/>
<wsdl:input>
<mime:content type="text/xml" part="retArrayAnyType1D"/>
</wsdl:input>
@@ -1986,7 +1985,7 @@
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="retInts">
- <http:operation location="retInts"/>
+ <http:operation location="ComplexDataTypes/retInts"/>
<wsdl:input>
<mime:content type="text/xml" part="retInts"/>
</wsdl:input>
@@ -1995,7 +1994,7 @@
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="retDateTime">
- <http:operation location="retDateTime"/>
+ <http:operation location="ComplexDataTypes/retDateTime"/>
<wsdl:input>
<mime:content type="text/xml" part="retDateTime"/>
</wsdl:input>
@@ -2004,7 +2003,7 @@
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="retStructSNSA">
- <http:operation location="retStructSNSA"/>
+ <http:operation location="ComplexDataTypes/retStructSNSA"/>
<wsdl:input>
<mime:content type="text/xml" part="retStructSNSA"/>
</wsdl:input>
@@ -2013,7 +2012,7 @@
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="retGuid">
- <http:operation location="retGuid"/>
+ <http:operation location="ComplexDataTypes/retGuid"/>
<wsdl:input>
<mime:content type="text/xml" part="retGuid"/>
</wsdl:input>
@@ -2022,7 +2021,7 @@
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="retByteArray">
- <http:operation location="retByteArray"/>
+ <http:operation location="ComplexDataTypes/retByteArray"/>
<wsdl:input>
<mime:content type="text/xml" part="retByteArray"/>
</wsdl:input>
@@ -2031,7 +2030,7 @@
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="retDerivedClass2">
- <http:operation location="retDerivedClass2"/>
+ <http:operation location="ComplexDataTypes/retDerivedClass2"/>
<wsdl:input>
<mime:content type="text/xml" part="retDerivedClass2"/>
</wsdl:input>
@@ -2040,7 +2039,7 @@
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="retUri">
- <http:operation location="retUri"/>
+ <http:operation location="ComplexDataTypes/retUri"/>
<wsdl:input>
<mime:content type="text/xml" part="retUri"/>
</wsdl:input>
@@ -2049,7 +2048,7 @@
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="retQName">
- <http:operation location="retQName"/>
+ <http:operation location="ComplexDataTypes/retQName"/>
<wsdl:input>
<mime:content type="text/xml" part="retQName"/>
</wsdl:input>
@@ -2058,7 +2057,7 @@
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="retArray1DSN">
- <http:operation location="retArray1DSN"/>
+ <http:operation location="ComplexDataTypes/retArray1DSN"/>
<wsdl:input>
<mime:content type="text/xml" part="retArray1DSN"/>
</wsdl:input>
@@ -2067,7 +2066,7 @@
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="retStrings">
- <http:operation location="retStrings"/>
+ <http:operation location="ComplexDataTypes/retStrings"/>
<wsdl:input>
<mime:content type="text/xml" part="retStrings"/>
</wsdl:input>
@@ -2076,7 +2075,7 @@
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="retEnumInt">
- <http:operation location="retEnumInt"/>
+ <http:operation location="ComplexDataTypes/retEnumInt"/>
<wsdl:input>
<mime:content type="text/xml" part="retEnumInt"/>
</wsdl:input>
@@ -2085,7 +2084,7 @@
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="retLong">
- <http:operation location="retLong"/>
+ <http:operation location="ComplexDataTypes/retLong"/>
<wsdl:input>
<mime:content type="text/xml" part="retLong"/>
</wsdl:input>
@@ -2094,7 +2093,7 @@
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="retUShort">
- <http:operation location="retUShort"/>
+ <http:operation location="ComplexDataTypes/retUShort"/>
<wsdl:input>
<mime:content type="text/xml" part="retUShort"/>
</wsdl:input>
@@ -2103,7 +2102,7 @@
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="retArrayString1D">
- <http:operation location="retArrayString1D"/>
+ <http:operation location="ComplexDataTypes/retArrayString1D"/>
<wsdl:input>
<mime:content type="text/xml" part="retArrayString1D"/>
</wsdl:input>
@@ -2112,7 +2111,7 @@
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="retArrayInt1D">
- <http:operation location="retArrayInt1D"/>
+ <http:operation location="ComplexDataTypes/retArrayInt1D"/>
<wsdl:input>
<mime:content type="text/xml" part="retArrayInt1D"/>
</wsdl:input>
@@ -2121,7 +2120,7 @@
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="retArrayDateTime1D">
- <http:operation location="retArrayDateTime1D"/>
+ <http:operation location="ComplexDataTypes/retArrayDateTime1D"/>
<wsdl:input>
<mime:content type="text/xml" part="retArrayDateTime1D"/>
</wsdl:input>
@@ -2130,7 +2129,7 @@
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="retUInt">
- <http:operation location="retUInt"/>
+ <http:operation location="ComplexDataTypes/retUInt"/>
<wsdl:input>
<mime:content type="text/xml" part="retUInt"/>
</wsdl:input>
@@ -2139,7 +2138,7 @@
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="retArrayDecimal1D">
- <http:operation location="retArrayDecimal1D"/>
+ <http:operation location="ComplexDataTypes/retArrayDecimal1D"/>
<wsdl:input>
<mime:content type="text/xml" part="retArrayDecimal1D"/>
</wsdl:input>
@@ -2148,7 +2147,7 @@
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="retByte">
- <http:operation location="retByte"/>
+ <http:operation location="ComplexDataTypes/retByte"/>
<wsdl:input>
<mime:content type="text/xml" part="retByte"/>
</wsdl:input>
@@ -2157,7 +2156,7 @@
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="retSByte">
- <http:operation location="retSByte"/>
+ <http:operation location="ComplexDataTypes/retSByte"/>
<wsdl:input>
<mime:content type="text/xml" part="retSByte"/>
</wsdl:input>
@@ -2166,7 +2165,7 @@
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="retShort">
- <http:operation location="retShort"/>
+ <http:operation location="ComplexDataTypes/retShort"/>
<wsdl:input>
<mime:content type="text/xml" part="retShort"/>
</wsdl:input>
@@ -2175,7 +2174,7 @@
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="retStructSN">
- <http:operation location="retStructSN"/>
+ <http:operation location="ComplexDataTypes/retStructSN"/>
<wsdl:input>
<mime:content type="text/xml" part="retStructSN"/>
</wsdl:input>
@@ -2184,7 +2183,7 @@
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="retObject">
- <http:operation location="retObject"/>
+ <http:operation location="ComplexDataTypes/retObject"/>
<wsdl:input>
<mime:content type="text/xml" part="retObject"/>
</wsdl:input>
@@ -2193,7 +2192,7 @@
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="retFloat">
- <http:operation location="retFloat"/>
+ <http:operation location="ComplexDataTypes/retFloat"/>
<wsdl:input>
<mime:content type="text/xml" part="retFloat"/>
</wsdl:input>
@@ -2202,7 +2201,7 @@
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="retDouble">
- <http:operation location="retDouble"/>
+ <http:operation location="ComplexDataTypes/retDouble"/>
<wsdl:input>
<mime:content type="text/xml" part="retDouble"/>
</wsdl:input>
@@ -2211,7 +2210,7 @@
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="retBool">
- <http:operation location="retBool"/>
+ <http:operation location="ComplexDataTypes/retBool"/>
<wsdl:input>
<mime:content type="text/xml" part="retBool"/>
</wsdl:input>
@@ -2220,7 +2219,7 @@
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="retDerivedClass">
- <http:operation location="retDerivedClass"/>
+ <http:operation location="ComplexDataTypes/retDerivedClass"/>
<wsdl:input>
<mime:content type="text/xml" part="retDerivedClass"/>
</wsdl:input>
@@ -2229,7 +2228,7 @@
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="retDecimal">
- <http:operation location="retDecimal"/>
+ <http:operation location="ComplexDataTypes/retDecimal"/>
<wsdl:input>
<mime:content type="text/xml" part="retDecimal"/>
</wsdl:input>
@@ -2238,7 +2237,7 @@
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="retEnumString">
- <http:operation location="retEnumString"/>
+ <http:operation location="ComplexDataTypes/retEnumString"/>
<wsdl:input>
<mime:content type="text/xml" part="retEnumString"/>
</wsdl:input>
@@ -2247,7 +2246,7 @@
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="retStructS1">
- <http:operation location="retStructS1"/>
+ <http:operation location="ComplexDataTypes/retStructS1"/>
<wsdl:input>
<mime:content type="text/xml" part="retStructS1"/>
</wsdl:input>
@@ -2256,7 +2255,7 @@
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="retInt">
- <http:operation location="retInt"/>
+ <http:operation location="ComplexDataTypes/retInt"/>
<wsdl:input>
<mime:content type="text/xml" part="retInt"/>
</wsdl:input>
@@ -2265,7 +2264,7 @@
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="retChar">
- <http:operation location="retChar"/>
+ <http:operation location="ComplexDataTypes/retChar"/>
<wsdl:input>
<mime:content type="text/xml" part="retChar"/>
</wsdl:input>
@@ -2274,7 +2273,7 @@
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="retString">
- <http:operation location="retString"/>
+ <http:operation location="ComplexDataTypes/retString"/>
<wsdl:input>
<mime:content type="text/xml" part="retString"/>
</wsdl:input>
@@ -2283,7 +2282,7 @@
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="retULong">
- <http:operation location="retULong"/>
+ <http:operation location="ComplexDataTypes/retULong"/>
<wsdl:input>
<mime:content type="text/xml" part="retULong"/>
</wsdl:input>
Modified: webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/engine/OneWayRawXMLTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/engine/OneWayRawXMLTest.java?view=diff&rev=548033&r1=548032&r2=548033
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/engine/OneWayRawXMLTest.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/engine/OneWayRawXMLTest.java Sun Jun 17 05:11:16 2007
@@ -14,35 +14,63 @@
package org.apache.axis2.engine;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axis2.AxisFault;
+import org.apache.axis2.Constants;
+import org.apache.axis2.addressing.EndpointReference;
+import org.apache.axis2.client.Options;
import org.apache.axis2.client.ServiceClient;
+import org.apache.axis2.context.ConfigurationContext;
+import org.apache.axis2.context.ConfigurationContextFactory;
import org.apache.axis2.context.MessageContext;
+import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.WSDL2Constants;
+import org.apache.axis2.engine.util.TestConstants;
import org.apache.axis2.integration.LocalTestCase;
import org.apache.axis2.integration.TestingUtils;
+import org.apache.axis2.integration.UtilServer;
+import org.apache.axis2.integration.UtilServerBasedTestCase;
+import org.apache.axis2.util.Utils;
-public class OneWayRawXMLTest extends LocalTestCase {
-
+public class OneWayRawXMLTest extends UtilServerBasedTestCase implements TestConstants {
+ public static Test suite() {
+ return getTestSetup(new TestSuite(OneWayRawXMLTest.class));
+ }
+
private boolean received;
+ protected AxisService service;
protected void setUp() throws Exception {
- super.setUp();
- serverConfig.addMessageReceiver(WSDL2Constants.MEP_URI_IN_ONLY, new MessageReceiver(){
- public void receive(MessageContext messageCtx) throws AxisFault {
- SOAPEnvelope envelope = messageCtx.getEnvelope();
+ service = Utils.createSimpleInOnlyService(serviceName,new MessageReceiver(){
+ public void receive(MessageContext messageCtx) throws AxisFault {
+ SOAPEnvelope envelope = messageCtx.getEnvelope();
TestingUtils.compareWithCreatedOMElement(envelope.getBody().getFirstElement());
- received = true;
- }
- });
- deployClassAsService(Echo.SERVICE_NAME, Echo.class);
+ received = true;
+ }
+ },
+ operationName);
+ UtilServer.deployService(service);
}
public void testOneWay() throws Exception {
- ServiceClient sender = getClient(Echo.SERVICE_NAME, "echoOMElementNoResponse");
+ ConfigurationContext configContext =
+ ConfigurationContextFactory.createConfigurationContextFromFileSystem(
+ Constants.TESTING_PATH + "integrationRepo/", null);
+ ServiceClient sender = new ServiceClient(configContext, null);
+ Options op = new Options();
+// op.setTo(new EndpointReference(
+// // "http://127.0.0.1:" + (UtilServer.TESTING_PORT)
+// "http://127.0.0.1:" + 5556
+// + "/axis2/services/"+service.getName()+"/"+operationName.getLocalPart()));
+ op.setTo(targetEPR);
+ op.setAction("urn:SomeAction");
+ sender.setOptions(op);
sender.fireAndForget(TestingUtils.createDummyOMElement());
int index = 0;
while (!received) {
- Thread.sleep(10);
+ Thread.sleep(1000);
index++;
if (index == 20) {
throw new AxisFault("error Occured");
Modified: webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/engine/PausingHandlerExecutionTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/engine/PausingHandlerExecutionTest.java?view=diff&rev=548033&r1=548032&r2=548033
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/engine/PausingHandlerExecutionTest.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/engine/PausingHandlerExecutionTest.java Sun Jun 17 05:11:16 2007
@@ -328,12 +328,8 @@
checkHandler(execIt);
System.out.println(title + "Checking inbound executed phases list.....");
- Iterator inboundIt = mc.getInboundExecutedPhases();
+ Iterator inboundIt = mc.getExecutedPhases();
checkHandler(inboundIt);
-
- System.out.println(title + "Checking outbound executed phases list.....");
- Iterator outboundIt = mc.getOutboundExecutedPhases();
- checkHandler(outboundIt);
}
private void checkHandler(Iterator it) {
Modified: webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/engine/WSDLClientTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/engine/WSDLClientTest.java?view=diff&rev=548033&r1=548032&r2=548033
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/engine/WSDLClientTest.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/engine/WSDLClientTest.java Sun Jun 17 05:11:16 2007
@@ -42,8 +42,7 @@
protected void setUp() throws Exception {
service = AxisService.createService(Echo.class.getName(),
UtilServer
- .getConfigurationContext().getAxisConfiguration(),
- RPCMessageReceiver.class);
+ .getConfigurationContext().getAxisConfiguration());
service.setName(serviceName.getLocalPart());
UtilServer.deployService(service);
}
Modified: webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/integration/LocalTestCase.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/integration/LocalTestCase.java?view=diff&rev=548033&r1=548032&r2=548033
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/integration/LocalTestCase.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/integration/LocalTestCase.java Sun Jun 17 05:11:16 2007
@@ -37,6 +37,7 @@
import org.apache.axis2.rpc.client.RPCServiceClient;
import org.apache.axis2.transport.local.LocalTransportReceiver;
import org.apache.axis2.transport.local.LocalTransportSender;
+import org.apache.axiom.soap.SOAP12Constants;
/**
* LocalTestCase is an extendable base class which provides common functionality
@@ -79,6 +80,8 @@
new RawXMLINOnlyMessageReceiver());
serverConfig.addMessageReceiver(WSDL2Constants.MEP_URI_IN_OUT,
new RawXMLINOutMessageReceiver());
+ serverConfig.addMessageReceiver(WSDL2Constants.MEP_URI_ROBUST_IN_ONLY,
+ new RawXMLINOutMessageReceiver());
///////////////////////////////////////////////////////////////////////
// And client side
@@ -133,12 +136,7 @@
* @throws AxisFault if there's a problem
*/
protected ServiceClient getClient() throws AxisFault {
- TransportOutDescription td = new TransportOutDescription("local");
- td.setSender(sender);
-
- Options opts = new Options();
- opts.setTransportOut(td);
-
+ Options opts = getOptions();
ServiceClient client = new ServiceClient(clientCtx, null);
client.setOptions(opts);
return client;
@@ -153,12 +151,7 @@
* @throws AxisFault if there's a problem
*/
protected RPCServiceClient getRPCClient() throws AxisFault {
- TransportOutDescription td = new TransportOutDescription("local");
- td.setSender(sender);
-
- Options opts = new Options();
- opts.setTransportOut(td);
-
+ Options opts = getOptions();
RPCServiceClient client = new RPCServiceClient(clientCtx, null);
client.setOptions(opts);
return client;
@@ -174,18 +167,28 @@
* @throws AxisFault if there's a problem
*/
protected ServiceClient getClient(String serviceName, String operationName) throws AxisFault {
- TransportOutDescription td = new TransportOutDescription("local");
- td.setSender(sender);
-
- Options opts = new Options();
- opts.setTransportOut(td);
-
String url = LocalTransportReceiver.CONFIG_CONTEXT.getServiceContextPath()+"/"+serviceName;
+ Options opts = getOptions();
opts.setTo(new EndpointReference(url));
opts.setAction(operationName);
ServiceClient client = new ServiceClient(clientCtx, null);
client.setOptions(opts);
return client;
+ }
+
+ /**
+ * Get an Options object initialized with the right transport info, defaulting to SOAP 1.2
+ *
+ * @return pre-initialized Options object
+ */
+ protected Options getOptions() {
+ TransportOutDescription td = new TransportOutDescription("local");
+ td.setSender(sender);
+
+ Options opts = new Options();
+ opts.setTransportOut(td);
+ opts.setSoapVersionURI(SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI);
+ return opts;
}
}
Modified: webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/rpc/AddressServiceTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/rpc/AddressServiceTest.java?view=diff&rev=548033&r1=548032&r2=548033
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/rpc/AddressServiceTest.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/rpc/AddressServiceTest.java Sun Jun 17 05:11:16 2007
@@ -107,7 +107,7 @@
Object[] result = serviceClient.invokeBlocking(opAddEntry, opAddEntryArgs, new Class[]{Entry[].class});
assertNotNull(result);
Entry[] entries = (Entry[]) result[0];
- assertEquals(entries.length, 1);
+ assertEquals(entries.length, 0);
}
public void testEntry3() throws Exception {
Modified: webservices/axis2/branches/java/jaxws21/modules/integration/test/org/tempuri/complex/data/Person.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/integration/test/org/tempuri/complex/data/Person.java?view=diff&rev=548033&r1=548032&r2=548033
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/integration/test/org/tempuri/complex/data/Person.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/integration/test/org/tempuri/complex/data/Person.java Sun Jun 17 05:11:16 2007
@@ -53,7 +53,7 @@
* @return possible object is
* {@link Boolean }
*/
- public Boolean isMale() {
+ public Boolean getMale() {
return male;
}
Modified: webservices/axis2/branches/java/jaxws21/modules/integration/test/org/tempuri/complex/data/arrays/ArrayOfArrayOfstring.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/integration/test/org/tempuri/complex/data/arrays/ArrayOfArrayOfstring.java?view=diff&rev=548033&r1=548032&r2=548033
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/integration/test/org/tempuri/complex/data/arrays/ArrayOfArrayOfstring.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/integration/test/org/tempuri/complex/data/arrays/ArrayOfArrayOfstring.java Sun Jun 17 05:11:16 2007
@@ -11,4 +11,8 @@
return this.arrayOfstring;
}
+
+ public void setArrayOfstring(ArrayOfstring[] arrayOfstring) {
+ this.arrayOfstring = arrayOfstring;
+ }
}
Modified: webservices/axis2/branches/java/jaxws21/modules/integration/test/org/tempuri/complex/data/arrays/ArrayOfNullableOfdecimal.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/integration/test/org/tempuri/complex/data/arrays/ArrayOfNullableOfdecimal.java?view=diff&rev=548033&r1=548032&r2=548033
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/integration/test/org/tempuri/complex/data/arrays/ArrayOfNullableOfdecimal.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/integration/test/org/tempuri/complex/data/arrays/ArrayOfNullableOfdecimal.java Sun Jun 17 05:11:16 2007
@@ -13,4 +13,7 @@
return this.decimal;
}
+ public void setDecimal(BigDecimal[] decimal) {
+ this.decimal = decimal;
+ }
}
Modified: webservices/axis2/branches/java/jaxws21/modules/integration/test/org/tempuri/complex/data/arrays/ArrayOfint.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/integration/test/org/tempuri/complex/data/arrays/ArrayOfint.java?view=diff&rev=548033&r1=548032&r2=548033
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/integration/test/org/tempuri/complex/data/arrays/ArrayOfint.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/integration/test/org/tempuri/complex/data/arrays/ArrayOfint.java Sun Jun 17 05:11:16 2007
@@ -5,11 +5,14 @@
protected Integer[] _int;
- public Integer[] getInt() {
+ public Integer[] get_int() {
if (_int == null) {
_int = new Integer[0];
}
return this._int;
}
+ public void set_int(Integer[] _int) {
+ this._int = _int;
+ }
}
Modified: webservices/axis2/branches/java/jaxws21/modules/integration/test/org/tempuri/complex/data/arrays/ArrayOfshort.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/integration/test/org/tempuri/complex/data/arrays/ArrayOfshort.java?view=diff&rev=548033&r1=548032&r2=548033
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/integration/test/org/tempuri/complex/data/arrays/ArrayOfshort.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/integration/test/org/tempuri/complex/data/arrays/ArrayOfshort.java Sun Jun 17 05:11:16 2007
@@ -4,11 +4,14 @@
protected Short[] _short;
- public Short[] getShort() {
+ public Short[] get_short() {
if (_short == null) {
_short = new Short[0];
}
return this._short;
}
+ public void set_short(Short[] _short) {
+ this._short = _short;
+ }
}
Modified: webservices/axis2/branches/java/jaxws21/modules/integration/test/org/tempuri/complex/data/arrays/ArrayOfstring.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/integration/test/org/tempuri/complex/data/arrays/ArrayOfstring.java?view=diff&rev=548033&r1=548032&r2=548033
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/integration/test/org/tempuri/complex/data/arrays/ArrayOfstring.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/integration/test/org/tempuri/complex/data/arrays/ArrayOfstring.java Sun Jun 17 05:11:16 2007
@@ -11,4 +11,8 @@
return this.string;
}
+
+ public void setString(String[] string) {
+ this.string = string;
+ }
}
Modified: webservices/axis2/branches/java/jaxws21/modules/jaxws/project.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/jaxws/project.xml?view=diff&rev=548033&r1=548032&r2=548033
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/jaxws/project.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/jaxws/project.xml Sun Jun 17 05:11:16 2007
@@ -173,22 +173,27 @@
<artifactId>axis2-saaj</artifactId>
<version>${pom.currentVersion}</version>
</dependency>
- <dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-saaj-api</artifactId>
- <version>${pom.currentVersion}</version>
- </dependency>
- <dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-jws-api</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-saaj-api</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-saaj</artifactId>
<version>${pom.currentVersion}</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-jaxws-api</artifactId>
<version>${pom.currentVersion}</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-metadata</artifactId>
<version>${pom.currentVersion}</version>
@@ -357,31 +362,4 @@
</dependency>
</dependencies>
- <!-- add the build properties-->
- <build>
- <nagEmailAddress>axis-dev@ws.apache.org</nagEmailAddress>
- <sourceDirectory>src</sourceDirectory>
- <unitTestSourceDirectory>test</unitTestSourceDirectory>
- <unitTest>
- <includes>
- <include>**/*Test.java</include>
- </includes>
- </unitTest>
- <resources>
- <resource>
- <directory>resources</directory>
- <includes>
- <include>**/*</include>
- </includes>
- </resource>
- <resource>
- <directory>../../</directory>
- <targetPath>META-INF</targetPath>
- <includes>
- <include>NOTICE.txt</include>
- <include>LICENSE.txt</include>
- </includes>
- </resource>
- </resources>
- </build>
</project>
Modified: webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/JAXBUtils.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/JAXBUtils.java?view=diff&rev=548033&r1=548032&r2=548033
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/JAXBUtils.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/JAXBUtils.java Sun Jun 17 05:11:16 2007
@@ -632,9 +632,14 @@
// by JAXB should be added.
if (!clazz.isInterface()
&& (clazz.isEnum() ||
- ClassUtils.getDefaultPublicConstructor(clazz) != null)
+ ClassUtils.getDefaultPublicConstructor(clazz) != null)
&& !ClassUtils.isJAXWSClass(clazz)
&& !java.lang.Exception.class.isAssignableFrom(clazz)) {
+
+ // Ensure that all the referenced classes are loadable too
+ clazz.getDeclaredMethods();
+ clazz.getDeclaredFields();
+
if (log.isDebugEnabled()) {
log.debug("Adding class: " + file);
}
@@ -661,7 +666,6 @@
e.toString());
log.debug(JavaUtils.stackToString(e));
}
- e.printStackTrace();
}
}
@@ -708,8 +712,8 @@
log.debug("Tried to load class " + className +
" while constructing a JAXBContext. This class will be skipped. Processing Continues.");
log.debug(" The reason that class could not be loaded:" + e.toString());
+ log.debug(JavaUtils.stackToString(e));
}
- e.printStackTrace();
}
}
}
@@ -880,4 +884,4 @@
}
}
-}
\ No newline at end of file
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org