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 gd...@apache.org on 2005/07/11 19:49:08 UTC
svn commit: r210165 [13/20] - in /webservices/axis/trunk/java/modules:
addressing/src/org/apache/axis2/handlers/addressing/
addressing/test/org/apache/axis2/handlers/addressing/
addressing/test/org/apache/axis2/handlers/util/ core/src/org/apache/axis2/...
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/CodeGenConfiguration.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/CodeGenConfiguration.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/CodeGenConfiguration.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/CodeGenConfiguration.java Mon Jul 11 10:48:55 2005
@@ -75,15 +75,20 @@
public CodeGenConfiguration(WSDLDescription wom, Map optionMap) {
this.wom = wom;
- String outputLocation = ((CommandLineOption) optionMap.get(OUTPUT_LOCATION_OPTION)).getOptionValue();
+ String outputLocation = ((CommandLineOption) optionMap.get(
+ OUTPUT_LOCATION_OPTION)).getOptionValue();
this.outputLocation = new File(outputLocation);
serverSide = (optionMap.get(SERVER_SIDE_CODE_OPTION) != null);
- generateDeployementDescriptor = (optionMap.get(GENERATE_SERVICE_DESCRIPTION_OPTION) != null);
+ generateDeployementDescriptor = (optionMap.get(
+ GENERATE_SERVICE_DESCRIPTION_OPTION) !=
+ null);
writeTestCase = (optionMap.get(GENERATE_TEST_CASE_OPTION) != null);
- boolean asyncFlagPresent = (optionMap.get(CODEGEN_ASYNC_ONLY_OPTION) != null);
- boolean syncFlagPresent = (optionMap.get(CODEGEN_SYNC_ONLY_OPTION) != null);
+ boolean asyncFlagPresent = (optionMap.get(CODEGEN_ASYNC_ONLY_OPTION) !=
+ null);
+ boolean syncFlagPresent = (optionMap.get(CODEGEN_SYNC_ONLY_OPTION) !=
+ null);
if (asyncFlagPresent) {
this.asyncOn = true;
this.syncOn = false;
@@ -93,12 +98,14 @@
this.syncOn = true;
}
- CommandLineOption packageOption = (CommandLineOption) optionMap.get(PACKAGE_OPTION);
+ CommandLineOption packageOption = (CommandLineOption) optionMap.get(
+ PACKAGE_OPTION);
if (packageOption != null) {
this.packageName = packageOption.getOptionValue();
}
- CommandLineOption langOption = (CommandLineOption) optionMap.get(STUB_LANGUAGE_OPTION);
+ CommandLineOption langOption = (CommandLineOption) optionMap.get(
+ STUB_LANGUAGE_OPTION);
if (langOption != null) {
loadLanguge(langOption.getOptionValue());
}
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/CodeGenerationEngine.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/CodeGenerationEngine.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/CodeGenerationEngine.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/CodeGenerationEngine.java Mon Jul 11 10:48:55 2005
@@ -20,7 +20,11 @@
import org.apache.axis2.wsdl.codegen.emitter.CSharpEmitter;
import org.apache.axis2.wsdl.codegen.emitter.Emitter;
import org.apache.axis2.wsdl.codegen.emitter.JavaEmitter;
-import org.apache.axis2.wsdl.codegen.extension.*;
+import org.apache.axis2.wsdl.codegen.extension.AxisBindingBuilder;
+import org.apache.axis2.wsdl.codegen.extension.CodeGenExtension;
+import org.apache.axis2.wsdl.codegen.extension.PackageFinder;
+import org.apache.axis2.wsdl.codegen.extension.WSDLValidatorExtension;
+import org.apache.axis2.wsdl.codegen.extension.XMLBeansExtension;
import org.apache.axis2.wsdl.databinding.TypeMapper;
import org.apache.wsdl.WSDLDescription;
@@ -104,10 +108,13 @@
}
- private WSDLDescription getWOM(CommandLineOptionParser parser) throws WSDLException, IOException {
- String uri = ((CommandLineOption) parser.getAllOptions().get(CommandLineOptionConstants.WSDL_LOCATION_URI_OPTION)).getOptionValue();
+ private WSDLDescription getWOM(CommandLineOptionParser parser) throws WSDLException,
+ IOException {
+ String uri = ((CommandLineOption) parser.getAllOptions().get(
+ CommandLineOptionConstants.WSDL_LOCATION_URI_OPTION)).getOptionValue();
InputStream in = new FileInputStream(new File(uri));
- return WOMBuilderFactory.getBuilder(WOMBuilderFactory.WSDL11).build(in).getDescription();
+ return WOMBuilderFactory.getBuilder(WOMBuilderFactory.WSDL11).build(in)
+ .getDescription();
}
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/CommandLineOption.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/CommandLineOption.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/CommandLineOption.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/CommandLineOption.java Mon Jul 11 10:48:55 2005
@@ -96,7 +96,8 @@
(CODEGEN_ASYNC_ONLY_OPTION).equalsIgnoreCase(optionType) ||
(CODEGEN_SYNC_ONLY_OPTION).equalsIgnoreCase(optionType) ||
(PACKAGE_OPTION).equalsIgnoreCase(optionType) ||
- (GENERATE_SERVICE_DESCRIPTION_OPTION).equalsIgnoreCase(optionType) ||
+ (GENERATE_SERVICE_DESCRIPTION_OPTION).equalsIgnoreCase(
+ optionType) ||
(GENERATE_TEST_CASE_OPTION).equalsIgnoreCase(optionType) ||
(STUB_LANGUAGE_OPTION).equalsIgnoreCase(optionType));
}
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/CommandLineOptionParser.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/CommandLineOptionParser.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/CommandLineOptionParser.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/CommandLineOptionParser.java Mon Jul 11 10:48:55 2005
@@ -16,7 +16,11 @@
package org.apache.axis2.wsdl.codegen;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
/**
* @author chathura@opensource.lk
@@ -64,8 +68,10 @@
optionType = args[i];
} else if (2 == state || 1 == state) {
// new one but old one should be saved
- commandLineOption = new CommandLineOption(optionType, optionBundle);
- commandLineOptions.put(commandLineOption.getType(), commandLineOption);
+ commandLineOption =
+ new CommandLineOption(optionType, optionBundle);
+ commandLineOptions.put(commandLineOption.getType(),
+ commandLineOption);
state = 1;
optionType = args[i];
optionBundle = null;
@@ -73,8 +79,12 @@
}
} else {
if (0 == state) {
- commandLineOption = new CommandLineOption(CommandLineOptionConstants.SOLE_INPUT, args);
- commandLineOptions.put(commandLineOption.getType(), commandLineOption);
+ commandLineOption =
+ new CommandLineOption(
+ CommandLineOptionConstants.SOLE_INPUT,
+ args);
+ commandLineOptions.put(commandLineOption.getType(),
+ commandLineOption);
return commandLineOptions;
} else if (1 == state) {
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/emitter/CSharpEmitter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/emitter/CSharpEmitter.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/emitter/CSharpEmitter.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/emitter/CSharpEmitter.java Mon Jul 11 10:48:55 2005
@@ -31,7 +31,8 @@
}
- public CSharpEmitter(CodeGenConfiguration configuration, TypeMapper mapper) {
+ public CSharpEmitter(CodeGenConfiguration configuration,
+ TypeMapper mapper) {
this.configuration = configuration;
this.mapper = mapper;
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/emitter/MultiLanguageClientEmitter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/emitter/MultiLanguageClientEmitter.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/emitter/MultiLanguageClientEmitter.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/emitter/MultiLanguageClientEmitter.java Mon Jul 11 10:48:55 2005
@@ -4,10 +4,32 @@
import org.apache.axis2.wsdl.codegen.CodeGenerationException;
import org.apache.axis2.wsdl.codegen.Constants;
import org.apache.axis2.wsdl.codegen.extension.AxisBindingBuilder;
-import org.apache.axis2.wsdl.codegen.writer.*;
+import org.apache.axis2.wsdl.codegen.writer.BeanWriter;
+import org.apache.axis2.wsdl.codegen.writer.CallbackHandlerWriter;
+import org.apache.axis2.wsdl.codegen.writer.ClassWriter;
+import org.apache.axis2.wsdl.codegen.writer.DatabindingSupportClassWriter;
+import org.apache.axis2.wsdl.codegen.writer.InterfaceImplementationWriter;
+import org.apache.axis2.wsdl.codegen.writer.InterfaceWriter;
+import org.apache.axis2.wsdl.codegen.writer.LocalTestClassWriter;
+import org.apache.axis2.wsdl.codegen.writer.MessageReceiverWriter;
+import org.apache.axis2.wsdl.codegen.writer.ServiceXMLWriter;
+import org.apache.axis2.wsdl.codegen.writer.SkeletonWriter;
+import org.apache.axis2.wsdl.codegen.writer.TestClassWriter;
+import org.apache.axis2.wsdl.codegen.writer.TestServiceXMLWriter;
+import org.apache.axis2.wsdl.codegen.writer.TestSkeletonImplWriter;
import org.apache.axis2.wsdl.databinding.TypeMapper;
import org.apache.crimson.tree.XmlDocument;
-import org.apache.wsdl.*;
+import org.apache.wsdl.MessageReference;
+import org.apache.wsdl.WSDLBinding;
+import org.apache.wsdl.WSDLBindingOperation;
+import org.apache.wsdl.WSDLConstants;
+import org.apache.wsdl.WSDLDescription;
+import org.apache.wsdl.WSDLEndpoint;
+import org.apache.wsdl.WSDLExtensibilityElement;
+import org.apache.wsdl.WSDLInterface;
+import org.apache.wsdl.WSDLOperation;
+import org.apache.wsdl.WSDLService;
+import org.apache.wsdl.WSDLTypes;
import org.apache.wsdl.extensions.ExtensionConstants;
import org.apache.wsdl.extensions.SOAPBody;
import org.apache.wsdl.extensions.SOAPOperation;
@@ -101,7 +123,8 @@
try {
//get the binding
WSDLDescription wom = this.configuration.getWom();
- WSDLBinding axisBinding = wom.getBinding(AxisBindingBuilder.AXIS_BINDING_QNAME);
+ WSDLBinding axisBinding = wom.getBinding(
+ AxisBindingBuilder.AXIS_BINDING_QNAME);
WSDLService axisService = null;
//write interfaces
Map services = wom.getServices();
@@ -109,7 +132,8 @@
if (services.size() == 1) {
axisService = (WSDLService) services.values().toArray()[0];
} else {
- throw new UnsupportedOperationException("Single service WSDL files only");
+ throw new UnsupportedOperationException(
+ "Single service WSDL files only");
}
}
//
@@ -139,8 +163,9 @@
if (configuration.isWriteTestCase()) {
XmlDocument classModel = createDocumentForTestSkeletonImpl(binding);
TestSkeletonImplWriter callbackWriter =
- new TestSkeletonImplWriter(this.configuration.getOutputLocation(),
- this.configuration.getOutputLanguage());
+ new TestSkeletonImplWriter(
+ this.configuration.getOutputLocation(),
+ this.configuration.getOutputLanguage());
writeClass(classModel, callbackWriter);
}
}
@@ -151,10 +176,12 @@
protected void writeCallBackHandlers(WSDLBinding binding) throws Exception {
if (configuration.isAsyncOn()) {
- XmlDocument interfaceModel = createDOMDocumentForCallbackHandler(binding);
+ XmlDocument interfaceModel = createDOMDocumentForCallbackHandler(
+ binding);
CallbackHandlerWriter callbackWriter =
- new CallbackHandlerWriter(this.configuration.getOutputLocation(),
- this.configuration.getOutputLanguage());
+ new CallbackHandlerWriter(
+ this.configuration.getOutputLocation(),
+ this.configuration.getOutputLanguage());
writeClass(interfaceModel, callbackWriter);
}
@@ -171,10 +198,12 @@
protected void writeLocalTestClasses(WSDLBinding binding) throws Exception {
if (configuration.isWriteTestCase()) {
- XmlDocument classModel = createDOMDocuementForLocalTestCase(binding);
+ XmlDocument classModel = createDOMDocuementForLocalTestCase(
+ binding);
LocalTestClassWriter callbackWriter =
- new LocalTestClassWriter(this.configuration.getOutputLocation(),
- this.configuration.getOutputLanguage());
+ new LocalTestClassWriter(
+ this.configuration.getOutputLocation(),
+ this.configuration.getOutputLanguage());
writeClass(classModel, callbackWriter);
}
}
@@ -188,7 +217,7 @@
XmlDocument classModel = createDOMDocuementForTestCase(binding);
TestClassWriter callbackWriter =
new TestClassWriter(this.configuration.getOutputLocation(),
- this.configuration.getOutputLanguage());
+ this.configuration.getOutputLanguage());
writeClass(classModel, callbackWriter);
}
@@ -201,10 +230,11 @@
* @throws Exception
*/
protected void writeInterface(WSDLBinding axisBinding) throws Exception {
- XmlDocument interfaceModel = createDOMDocuementForInterface(axisBinding);
+ XmlDocument interfaceModel = createDOMDocuementForInterface(
+ axisBinding);
InterfaceWriter interfaceWriter =
new InterfaceWriter(this.configuration.getOutputLocation(),
- this.configuration.getOutputLanguage());
+ this.configuration.getOutputLanguage());
writeClass(interfaceModel, interfaceWriter);
}
@@ -218,8 +248,9 @@
//Note - One can generate the skeleton using the interface XML
XmlDocument skeletonModel = createDOMDocuementForSkeleton(axisBinding);
- ClassWriter skeletonWriter = new SkeletonWriter(this.configuration.getOutputLocation(),
- this.configuration.getOutputLanguage());
+ ClassWriter skeletonWriter = new SkeletonWriter(
+ this.configuration.getOutputLocation(),
+ this.configuration.getOutputLanguage());
writeClass(skeletonModel, skeletonWriter);
@@ -232,13 +263,17 @@
* @throws Exception
*/
protected void writeDatabindingSupporters(WSDLBinding axisBinding) throws Exception {
- Collection col = axisBinding.getBoundInterface().getOperations().values();
+ Collection col = axisBinding.getBoundInterface().getOperations()
+ .values();
for (Iterator iterator = col.iterator(); iterator.hasNext();) {
//Note - there will be a supporter generated per method and will contain the methods to serilize and
//deserilize the relevant objects
- XmlDocument databindingSupporterModel = createDOMDocumentforSerialization((WSDLOperation) iterator.next());
- ClassWriter databindingSupportWriter = new DatabindingSupportClassWriter(this.configuration.getOutputLocation(),
- this.configuration.getOutputLanguage(), this.configuration.getDatabindingType());
+ XmlDocument databindingSupporterModel = createDOMDocumentforSerialization(
+ (WSDLOperation) iterator.next());
+ ClassWriter databindingSupportWriter = new DatabindingSupportClassWriter(
+ this.configuration.getOutputLocation(),
+ this.configuration.getOutputLanguage(),
+ this.configuration.getDatabindingType());
writeClass(databindingSupporterModel, databindingSupportWriter);
}
@@ -247,9 +282,11 @@
protected void writeTestServiceXML(WSDLBinding axisBinding) throws Exception {
if (this.configuration.isWriteTestCase()) {
//Note - One can generate the service xml using the interface XML
- XmlDocument skeletonModel = createDOMDocuementForServiceXML(axisBinding, true);
- TestServiceXMLWriter testServiceXmlWriter = new TestServiceXMLWriter(this.configuration.getOutputLocation(),
- this.configuration.getOutputLanguage());
+ XmlDocument skeletonModel = createDOMDocuementForServiceXML(
+ axisBinding, true);
+ TestServiceXMLWriter testServiceXmlWriter = new TestServiceXMLWriter(
+ this.configuration.getOutputLocation(),
+ this.configuration.getOutputLanguage());
writeClass(skeletonModel, testServiceXmlWriter);
}
}
@@ -262,9 +299,11 @@
*/
protected void writeServiceXml(WSDLBinding axisBinding) throws Exception {
if (this.configuration.isGenerateDeployementDescriptor()) {
- XmlDocument skeletonModel = createDOMDocuementForServiceXML(axisBinding, false);
- ClassWriter serviceXmlWriter = new ServiceXMLWriter(this.configuration.getOutputLocation(),
- this.configuration.getOutputLanguage());
+ XmlDocument skeletonModel = createDOMDocuementForServiceXML(
+ axisBinding, false);
+ ClassWriter serviceXmlWriter = new ServiceXMLWriter(
+ this.configuration.getOutputLocation(),
+ this.configuration.getOutputLanguage());
writeClass(skeletonModel, serviceXmlWriter);
}
}
@@ -276,20 +315,25 @@
* @param axisBinding
* @throws Exception
*/
- protected void writeInterfaceImplementation(WSDLBinding axisBinding, WSDLService service) throws Exception {
- XmlDocument interfaceImplModel = createDOMDocuementForInterfaceImplementation(axisBinding, service);
+ protected void writeInterfaceImplementation(WSDLBinding axisBinding,
+ WSDLService service) throws Exception {
+ XmlDocument interfaceImplModel = createDOMDocuementForInterfaceImplementation(
+ axisBinding, service);
InterfaceImplementationWriter writer =
- new InterfaceImplementationWriter(this.configuration.getOutputLocation(),
- this.configuration.getOutputLanguage());
+ new InterfaceImplementationWriter(
+ this.configuration.getOutputLocation(),
+ this.configuration.getOutputLanguage());
writeClass(interfaceImplModel, writer);
}
protected void writeMessageReceiver(WSDLBinding axisBinding) throws Exception {
if (configuration.isWriteMessageReceiver()) {
- XmlDocument classModel = createDocumentForMessageReceiver(axisBinding);
+ XmlDocument classModel = createDocumentForMessageReceiver(
+ axisBinding);
MessageReceiverWriter writer =
- new MessageReceiverWriter(this.configuration.getOutputLocation(),
- this.configuration.getOutputLanguage());
+ new MessageReceiverWriter(
+ this.configuration.getOutputLocation(),
+ this.configuration.getOutputLanguage());
writeClass(classModel, writer);
}
}
@@ -303,11 +347,12 @@
protected void writeBeans(WSDLTypes wsdlType) throws Exception {
Collection collection = wsdlType.getExtensibilityElements();
if (collection != null) {
- for (Iterator iterator = collection.iterator(); iterator.hasNext();) {
+ for (Iterator iterator = collection.iterator();
+ iterator.hasNext();) {
XmlDocument interfaceModel = createDOMDocuementForBean();
BeanWriter beanWriter =
new BeanWriter(this.configuration.getOutputLocation(),
- this.configuration.getOutputLanguage());
+ this.configuration.getOutputLanguage());
writeClass(interfaceModel, beanWriter);
}
}
@@ -322,13 +367,16 @@
* @throws IOException
* @throws Exception
*/
- protected void writeClass(XmlDocument model, ClassWriter writer) throws IOException, Exception {
+ protected void writeClass(XmlDocument model, ClassWriter writer) throws IOException,
+ Exception {
ByteArrayOutputStream memoryStream = new ByteArrayOutputStream();
model.write(memoryStream);
writer.loadTemplate();
- writer.createOutFile(model.getDocumentElement().getAttribute("package"),
- model.getDocumentElement().getAttribute("name"));
- writer.writeOutFile(new ByteArrayInputStream(memoryStream.toByteArray()));
+ writer.createOutFile(
+ model.getDocumentElement().getAttribute("package"),
+ model.getDocumentElement().getAttribute("name"));
+ writer.writeOutFile(
+ new ByteArrayInputStream(memoryStream.toByteArray()));
}
/**
@@ -337,7 +385,8 @@
public void emitSkeleton() throws CodeGenerationException {
try {
//get the binding
- WSDLBinding axisBinding = this.configuration.getWom().getBinding(AxisBindingBuilder.AXIS_BINDING_QNAME);
+ WSDLBinding axisBinding = this.configuration.getWom().getBinding(
+ AxisBindingBuilder.AXIS_BINDING_QNAME);
//
testCompatibiltyAll(axisBinding);
//write interfaces
@@ -362,16 +411,33 @@
}
}
- protected XmlDocument createDocumentForTestSkeletonImpl(WSDLBinding binding) {
+ protected XmlDocument createDocumentForTestSkeletonImpl(
+ WSDLBinding binding) {
WSDLInterface boundInterface = binding.getBoundInterface();
XmlDocument doc = new XmlDocument();
Element rootElement = doc.createElement("class");
- addAttribute(doc, "package", configuration.getPackageName() + TEST_PACKAGE_NAME_SUFFIX, rootElement);
- addAttribute(doc, "servicename", boundInterface.getName().getLocalPart() + SERVICE_CLASS_SUFFIX, rootElement);
- addAttribute(doc, "implpackage", configuration.getPackageName(), rootElement);
- addAttribute(doc, "name", boundInterface.getName().getLocalPart() + TEST_SERVICE_CLASS_NAME_SUFFIX, rootElement);
- addAttribute(doc, "namespace", boundInterface.getName().getNamespaceURI(), rootElement);
+ addAttribute(doc,
+ "package",
+ configuration.getPackageName() + TEST_PACKAGE_NAME_SUFFIX,
+ rootElement);
+ addAttribute(doc,
+ "servicename",
+ boundInterface.getName().getLocalPart() + SERVICE_CLASS_SUFFIX,
+ rootElement);
+ addAttribute(doc,
+ "implpackage",
+ configuration.getPackageName(),
+ rootElement);
+ addAttribute(doc,
+ "name",
+ boundInterface.getName().getLocalPart() +
+ TEST_SERVICE_CLASS_NAME_SUFFIX,
+ rootElement);
+ addAttribute(doc,
+ "namespace",
+ boundInterface.getName().getNamespaceURI(),
+ rootElement);
fillSyncAttributes(doc, rootElement);
loadOperations(boundInterface, doc, rootElement);
doc.appendChild(rootElement);
@@ -384,13 +450,24 @@
* @param binding
* @return
*/
- protected XmlDocument createDOMDocumentForCallbackHandler(WSDLBinding binding) {
+ protected XmlDocument createDOMDocumentForCallbackHandler(
+ WSDLBinding binding) {
WSDLInterface boundInterface = binding.getBoundInterface();
XmlDocument doc = new XmlDocument();
Element rootElement = doc.createElement("callback");
- addAttribute(doc, "package", configuration.getPackageName(), rootElement);
- addAttribute(doc, "name", boundInterface.getName().getLocalPart() + CALL_BACK_HANDLER_SUFFIX, rootElement);
- addAttribute(doc, "namespace", boundInterface.getName().getNamespaceURI(), rootElement);
+ addAttribute(doc,
+ "package",
+ configuration.getPackageName(),
+ rootElement);
+ addAttribute(doc,
+ "name",
+ boundInterface.getName().getLocalPart() +
+ CALL_BACK_HANDLER_SUFFIX,
+ rootElement);
+ addAttribute(doc,
+ "namespace",
+ boundInterface.getName().getNamespaceURI(),
+ rootElement);
//TODO JAXRPC mapping support should be considered
this.loadOperations(boundInterface, doc, rootElement);
@@ -407,19 +484,25 @@
* @param operation
* @return
*/
- protected Element getInputElement(XmlDocument doc, WSDLOperation operation) {
+ protected Element getInputElement(XmlDocument doc,
+ WSDLOperation operation) {
Element inputElt = doc.createElement("input");
Element param = getInputParamElement(doc, operation);
inputElt.appendChild(param);
return inputElt;
}
- private Element getInputParamElement(XmlDocument doc, WSDLOperation operation) {
+ private Element getInputParamElement(XmlDocument doc,
+ WSDLOperation operation) {
//todo this should go in a loop
Element param = doc.createElement("param");
MessageReference inputMessage = operation.getInputMessage();
- addAttribute(doc, "name", this.mapper.getParameterName(inputMessage.getElement()), param);
- String typeMapping = this.mapper.getTypeMapping(inputMessage.getElement());
+ addAttribute(doc,
+ "name",
+ this.mapper.getParameterName(inputMessage.getElement()),
+ param);
+ String typeMapping = this.mapper.getTypeMapping(
+ inputMessage.getElement());
String typeMappingStr = typeMapping == null ? "" : typeMapping;
addAttribute(doc, "type", typeMappingStr, param);
return param;
@@ -432,18 +515,25 @@
* @param operation
* @return
*/
- protected Element getOutputElement(XmlDocument doc, WSDLOperation operation) {
+ protected Element getOutputElement(XmlDocument doc,
+ WSDLOperation operation) {
Element outputElt = doc.createElement("output");
Element param = getOutputParamElement(doc, operation);
outputElt.appendChild(param);
return outputElt;
}
- private Element getOutputParamElement(XmlDocument doc, WSDLOperation operation) {
+ private Element getOutputParamElement(XmlDocument doc,
+ WSDLOperation operation) {
Element param = doc.createElement("param");
- addAttribute(doc, "name", this.mapper.getParameterName(operation.getOutputMessage().getElement()), param);
+ addAttribute(doc,
+ "name",
+ this.mapper.getParameterName(
+ operation.getOutputMessage().getElement()),
+ param);
- String typeMapping = this.mapper.getTypeMapping(operation.getOutputMessage().getElement());
+ String typeMapping = this.mapper.getTypeMapping(
+ operation.getOutputMessage().getElement());
String typeMappingStr = typeMapping == null ? "" : typeMapping;
addAttribute(doc, "type", typeMappingStr, param);
return param;
@@ -458,23 +548,42 @@
return null;
}
- protected XmlDocument createDOMDocuementForServiceXML(WSDLBinding binding, boolean forTesting) {
+ protected XmlDocument createDOMDocuementForServiceXML(WSDLBinding binding,
+ boolean forTesting) {
WSDLInterface boundInterface = binding.getBoundInterface();
XmlDocument doc = new XmlDocument();
Element rootElement = doc.createElement("interface");
String localPart = boundInterface.getName().getLocalPart();
if (forTesting) {
- addAttribute(doc, "package", configuration.getPackageName() + TEST_PACKAGE_NAME_SUFFIX, rootElement);
- addAttribute(doc, "name", localPart + TEST_SERVICE_CLASS_NAME_SUFFIX, rootElement);
- addAttribute(doc, "servicename", localPart + TEST_SERVICE_CLASS_NAME_SUFFIX, rootElement);
+ addAttribute(doc,
+ "package",
+ configuration.getPackageName() + TEST_PACKAGE_NAME_SUFFIX,
+ rootElement);
+ addAttribute(doc,
+ "name",
+ localPart + TEST_SERVICE_CLASS_NAME_SUFFIX,
+ rootElement);
+ addAttribute(doc,
+ "servicename",
+ localPart + TEST_SERVICE_CLASS_NAME_SUFFIX,
+ rootElement);
} else {
- addAttribute(doc, "package", configuration.getPackageName(), rootElement);
- addAttribute(doc, "name", localPart + SERVICE_CLASS_SUFFIX, rootElement);
+ addAttribute(doc,
+ "package",
+ configuration.getPackageName(),
+ rootElement);
+ addAttribute(doc,
+ "name",
+ localPart + SERVICE_CLASS_SUFFIX,
+ rootElement);
addAttribute(doc, "servicename", localPart, rootElement);
}
- addAttribute(doc, "messagereceiver", localPart + MESSAGE_RECEIVER_SUFFIX, rootElement);
+ addAttribute(doc,
+ "messagereceiver",
+ localPart + MESSAGE_RECEIVER_SUFFIX,
+ rootElement);
fillSyncAttributes(doc, rootElement);
loadOperations(boundInterface, doc, rootElement);
doc.appendChild(rootElement);
@@ -488,12 +597,28 @@
XmlDocument doc = new XmlDocument();
Element rootElement = doc.createElement("interface");
- addAttribute(doc, "package", configuration.getPackageName(), rootElement);
+ addAttribute(doc,
+ "package",
+ configuration.getPackageName(),
+ rootElement);
String localPart = boundInterface.getName().getLocalPart();
- addAttribute(doc, "name", localPart + MESSAGE_RECEIVER_SUFFIX, rootElement);
- addAttribute(doc, "skeletonname", localPart + SERVICE_CLASS_SUFFIX, rootElement);
- addAttribute(doc, "basereceiver", "org.apache.axis2.receivers.AbstractInOutSyncMessageReceiver", rootElement);
- addAttribute(doc, "dbsupportpackage", configuration.getPackageName() + DATABINDING_PACKAGE_NAME_SUFFIX, rootElement);
+ addAttribute(doc,
+ "name",
+ localPart + MESSAGE_RECEIVER_SUFFIX,
+ rootElement);
+ addAttribute(doc,
+ "skeletonname",
+ localPart + SERVICE_CLASS_SUFFIX,
+ rootElement);
+ addAttribute(doc,
+ "basereceiver",
+ "org.apache.axis2.receivers.AbstractInOutSyncMessageReceiver",
+ rootElement);
+ addAttribute(doc,
+ "dbsupportpackage",
+ configuration.getPackageName() +
+ DATABINDING_PACKAGE_NAME_SUFFIX,
+ rootElement);
fillSyncAttributes(doc, rootElement);
loadOperations(boundInterface, doc, rootElement, binding);
doc.appendChild(rootElement);
@@ -513,9 +638,19 @@
XmlDocument doc = new XmlDocument();
Element rootElement = doc.createElement("interface");
- addAttribute(doc, "package", configuration.getPackageName(), rootElement);
- addAttribute(doc, "name", boundInterface.getName().getLocalPart(), rootElement);
- addAttribute(doc, "callbackname", boundInterface.getName().getLocalPart() + CALL_BACK_HANDLER_SUFFIX, rootElement);
+ addAttribute(doc,
+ "package",
+ configuration.getPackageName(),
+ rootElement);
+ addAttribute(doc,
+ "name",
+ boundInterface.getName().getLocalPart(),
+ rootElement);
+ addAttribute(doc,
+ "callbackname",
+ boundInterface.getName().getLocalPart() +
+ CALL_BACK_HANDLER_SUFFIX,
+ rootElement);
fillSyncAttributes(doc, rootElement);
loadOperations(boundInterface, doc, rootElement);
doc.appendChild(rootElement);
@@ -528,9 +663,19 @@
XmlDocument doc = new XmlDocument();
Element rootElement = doc.createElement("interface");
- addAttribute(doc, "package", configuration.getPackageName(), rootElement);
- addAttribute(doc, "name", boundInterface.getName().getLocalPart() + SERVICE_CLASS_SUFFIX, rootElement);
- addAttribute(doc, "callbackname", boundInterface.getName().getLocalPart() + CALL_BACK_HANDLER_SUFFIX, rootElement);
+ addAttribute(doc,
+ "package",
+ configuration.getPackageName(),
+ rootElement);
+ addAttribute(doc,
+ "name",
+ boundInterface.getName().getLocalPart() + SERVICE_CLASS_SUFFIX,
+ rootElement);
+ addAttribute(doc,
+ "callbackname",
+ boundInterface.getName().getLocalPart() +
+ CALL_BACK_HANDLER_SUFFIX,
+ rootElement);
fillSyncAttributes(doc, rootElement);
loadOperations(boundInterface, doc, rootElement);
doc.appendChild(rootElement);
@@ -539,15 +684,26 @@
}
private void fillSyncAttributes(XmlDocument doc, Element rootElement) {
- addAttribute(doc, "isAsync", this.configuration.isAsyncOn() ? "1" : "0", rootElement);
- addAttribute(doc, "isSync", this.configuration.isSyncOn() ? "1" : "0", rootElement);
+ addAttribute(doc,
+ "isAsync",
+ this.configuration.isAsyncOn() ? "1" : "0",
+ rootElement);
+ addAttribute(doc,
+ "isSync",
+ this.configuration.isSyncOn() ? "1" : "0",
+ rootElement);
}
- private void loadOperations(WSDLInterface boundInterface, XmlDocument doc, Element rootElement) {
+ private void loadOperations(WSDLInterface boundInterface,
+ XmlDocument doc,
+ Element rootElement) {
loadOperations(boundInterface, doc, rootElement, null);
}
- private void loadOperations(WSDLInterface boundInterface, XmlDocument doc, Element rootElement, WSDLBinding binding) {
+ private void loadOperations(WSDLInterface boundInterface,
+ XmlDocument doc,
+ Element rootElement,
+ WSDLBinding binding) {
Collection col = boundInterface.getOperations().values();
Element methodElement = null;
WSDLOperation operation = null;
@@ -557,16 +713,26 @@
methodElement = doc.createElement("method");
String localPart = operation.getName().getLocalPart();
addAttribute(doc, "name", localPart, methodElement);
- addAttribute(doc, "namespace", operation.getName().getNamespaceURI(), methodElement);
+ addAttribute(doc,
+ "namespace",
+ operation.getName().getNamespaceURI(),
+ methodElement);
addAttribute(doc, "style", operation.getStyle(), methodElement);
- addAttribute(doc, "dbsupportname", localPart + DATABINDING_SUPPORTER_NAME_SUFFIX, methodElement);
+ addAttribute(doc,
+ "dbsupportname",
+ localPart + DATABINDING_SUPPORTER_NAME_SUFFIX,
+ methodElement);
if (null != binding) {
- WSDLBindingOperation bindingOperation = binding.getBindingOperation(operation.getName());
+ WSDLBindingOperation bindingOperation = binding.getBindingOperation(
+ operation.getName());
addSOAPAction(doc, methodElement, bindingOperation);
testCompatibilityInput(bindingOperation);
testCompatibilityOutput(bindingOperation);
}
- addAttribute(doc, "mep", operation.getMessageExchangePattern(), methodElement);
+ addAttribute(doc,
+ "mep",
+ operation.getMessageExchangePattern(),
+ methodElement);
methodElement.appendChild(getInputElement(doc, operation));
methodElement.appendChild(getOutputElement(doc, operation));
rootElement.appendChild(methodElement);
@@ -574,13 +740,18 @@
}
- private void addSOAPAction(XmlDocument doc, Element rootElement, WSDLBindingOperation binding) {
+ private void addSOAPAction(XmlDocument doc,
+ Element rootElement,
+ WSDLBindingOperation binding) {
Iterator extIterator = binding.getExtensibilityElements().iterator();
boolean actionAdded = false;
while (extIterator.hasNext()) {
WSDLExtensibilityElement element = (WSDLExtensibilityElement) extIterator.next();
if (element.getType().equals(ExtensionConstants.SOAP_OPERATION)) {
- addAttribute(doc, "soapaction", ((SOAPOperation) element).getSoapAction(), rootElement);
+ addAttribute(doc,
+ "soapaction",
+ ((SOAPOperation) element).getSoapAction(),
+ rootElement);
actionAdded = true;
}
}
@@ -595,14 +766,27 @@
XmlDocument doc = new XmlDocument();
Element rootElement = doc.createElement("class");
- addAttribute(doc, "package", configuration.getPackageName(), rootElement);
+ addAttribute(doc,
+ "package",
+ configuration.getPackageName(),
+ rootElement);
String localPart = boundInterface.getName().getLocalPart();
addAttribute(doc, "name", localPart + TEST_SUFFIX, rootElement);
- addAttribute(doc, "namespace", boundInterface.getName().getNamespaceURI(), rootElement);
+ addAttribute(doc,
+ "namespace",
+ boundInterface.getName().getNamespaceURI(),
+ rootElement);
addAttribute(doc, "interfaceName", localPart, rootElement);
- addAttribute(doc, "callbackname", localPart + CALL_BACK_HANDLER_SUFFIX, rootElement);
+ addAttribute(doc,
+ "callbackname",
+ localPart + CALL_BACK_HANDLER_SUFFIX,
+ rootElement);
addAttribute(doc, "stubname", localPart + STUB_SUFFIX, rootElement);
- addAttribute(doc, "dbsupportpackage", configuration.getPackageName() + DATABINDING_PACKAGE_NAME_SUFFIX, rootElement);
+ addAttribute(doc,
+ "dbsupportpackage",
+ configuration.getPackageName() +
+ DATABINDING_PACKAGE_NAME_SUFFIX,
+ rootElement);
fillSyncAttributes(doc, rootElement);
loadOperations(boundInterface, doc, rootElement);
doc.appendChild(rootElement);
@@ -610,22 +794,43 @@
}
- protected XmlDocument createDOMDocuementForLocalTestCase(WSDLBinding binding) {
+ protected XmlDocument createDOMDocuementForLocalTestCase(
+ WSDLBinding binding) {
WSDLInterface boundInterface = binding.getBoundInterface();
XmlDocument doc = new XmlDocument();
Element rootElement = doc.createElement("class");
- String serviceXMLPath = configuration.getPackageName().replace('.', '/') + TEST_PACKAGE_NAME_SUFFIX.replace('.', '/') + "/testservice.xml";
- addAttribute(doc, "package", configuration.getPackageName() + TEST_PACKAGE_NAME_SUFFIX, rootElement);
+ String serviceXMLPath = configuration.getPackageName().replace('.',
+ '/') +
+ TEST_PACKAGE_NAME_SUFFIX.replace('.', '/') +
+ "/testservice.xml";
+ addAttribute(doc,
+ "package",
+ configuration.getPackageName() + TEST_PACKAGE_NAME_SUFFIX,
+ rootElement);
addAttribute(doc, "servicexmlpath", serviceXMLPath, rootElement);
- addAttribute(doc, "implpackage", configuration.getPackageName(), rootElement);
+ addAttribute(doc,
+ "implpackage",
+ configuration.getPackageName(),
+ rootElement);
String localPart = boundInterface.getName().getLocalPart();
addAttribute(doc, "name", localPart + LOCAL_TEST_SUFFIX, rootElement);
- addAttribute(doc, "namespace", boundInterface.getName().getNamespaceURI(), rootElement);
+ addAttribute(doc,
+ "namespace",
+ boundInterface.getName().getNamespaceURI(),
+ rootElement);
addAttribute(doc, "interfaceName", localPart, rootElement);
- addAttribute(doc, "callbackname", localPart + CALL_BACK_HANDLER_SUFFIX, rootElement);
+ addAttribute(doc,
+ "callbackname",
+ localPart + CALL_BACK_HANDLER_SUFFIX,
+ rootElement);
addAttribute(doc, "stubname", localPart + STUB_SUFFIX, rootElement);
- addAttribute(doc, "address", "http://localhost:" + Constants.TEST_PORT + "/services/" + boundInterface.getName().getLocalPart() + TEST_SERVICE_CLASS_NAME_SUFFIX, rootElement);
+ addAttribute(doc,
+ "address",
+ "http://localhost:" + Constants.TEST_PORT + "/services/" +
+ boundInterface.getName().getLocalPart() +
+ TEST_SERVICE_CLASS_NAME_SUFFIX,
+ rootElement);
fillSyncAttributes(doc, rootElement);
loadOperations(boundInterface, doc, rootElement);
doc.appendChild(rootElement);
@@ -633,14 +838,25 @@
}
- protected XmlDocument createDOMDocumentforSerialization(WSDLOperation operation) {
+ protected XmlDocument createDOMDocumentforSerialization(
+ WSDLOperation operation) {
XmlDocument doc = new XmlDocument();
Element rootElement = doc.createElement("class");
- addAttribute(doc, "package", configuration.getPackageName() + DATABINDING_PACKAGE_NAME_SUFFIX, rootElement);
+ addAttribute(doc,
+ "package",
+ configuration.getPackageName() +
+ DATABINDING_PACKAGE_NAME_SUFFIX,
+ rootElement);
String localPart = operation.getName().getLocalPart();
- addAttribute(doc, "name", localPart + DATABINDING_SUPPORTER_NAME_SUFFIX, rootElement);
+ addAttribute(doc,
+ "name",
+ localPart + DATABINDING_SUPPORTER_NAME_SUFFIX,
+ rootElement);
addAttribute(doc, "methodname", localPart, rootElement);
- addAttribute(doc, "namespace", operation.getName().getNamespaceURI(), rootElement);
+ addAttribute(doc,
+ "namespace",
+ operation.getName().getNamespaceURI(),
+ rootElement);
rootElement.appendChild(getInputParamElement(doc, operation));
rootElement.appendChild(getOutputParamElement(doc, operation));
doc.appendChild(rootElement);
@@ -654,21 +870,35 @@
* @param service
* @return
*/
- protected XmlDocument createDOMDocuementForInterfaceImplementation(WSDLBinding binding, WSDLService service) {
+ protected XmlDocument createDOMDocuementForInterfaceImplementation(
+ WSDLBinding binding, WSDLService service) {
WSDLInterface boundInterface = binding.getBoundInterface();
WSDLEndpoint endpoint = null;
HashMap endpoints = service.getEndpoints();
XmlDocument doc = new XmlDocument();
Element rootElement = doc.createElement("class");
- addAttribute(doc, "package", configuration.getPackageName(), rootElement);
+ addAttribute(doc,
+ "package",
+ configuration.getPackageName(),
+ rootElement);
String localPart = boundInterface.getName().getLocalPart();
addAttribute(doc, "name", localPart + STUB_SUFFIX, rootElement);
addAttribute(doc, "servicename", localPart, rootElement);
- addAttribute(doc, "namespace", boundInterface.getName().getNamespaceURI(), rootElement);
+ addAttribute(doc,
+ "namespace",
+ boundInterface.getName().getNamespaceURI(),
+ rootElement);
addAttribute(doc, "interfaceName", localPart, rootElement);
- addAttribute(doc, "callbackname", localPart + CALL_BACK_HANDLER_SUFFIX, rootElement);
- addAttribute(doc, "dbsupportpackage", configuration.getPackageName() + DATABINDING_PACKAGE_NAME_SUFFIX, rootElement);
+ addAttribute(doc,
+ "callbackname",
+ localPart + CALL_BACK_HANDLER_SUFFIX,
+ rootElement);
+ addAttribute(doc,
+ "dbsupportpackage",
+ configuration.getPackageName() +
+ DATABINDING_PACKAGE_NAME_SUFFIX,
+ rootElement);
addEndpoints(doc, rootElement, endpoints);
fillSyncAttributes(doc, rootElement);
loadOperations(boundInterface, doc, rootElement, binding);
@@ -679,7 +909,9 @@
}
- protected void addEndpoints(XmlDocument doc, Element rootElement, HashMap endpointMap) {
+ protected void addEndpoints(XmlDocument doc,
+ Element rootElement,
+ HashMap endpointMap) {
Object[] endpoints = endpointMap.values().toArray();
WSDLEndpoint endpoint;
Element endpointElement;
@@ -702,7 +934,10 @@
}
- protected void addAttribute(XmlDocument document, String AttribName, String attribValue, Element element) {
+ protected void addAttribute(XmlDocument document,
+ String AttribName,
+ String attribValue,
+ Element element) {
Attr attribute = document.createAttribute(AttribName);
attribute.setValue(attribValue);
element.setAttributeNode(attribute);
@@ -727,12 +962,15 @@
private void testCompatibilityInput(WSDLBindingOperation binding) {
- Iterator extIterator = binding.getInput().getExtensibilityElements().iterator();
+ Iterator extIterator = binding.getInput().getExtensibilityElements()
+ .iterator();
while (extIterator.hasNext()) {
WSDLExtensibilityElement element = (WSDLExtensibilityElement) extIterator.next();
if (element.getType().equals(ExtensionConstants.SOAP_BODY)) {
- if (WSDLConstants.WSDL_USE_ENCODED.equals(((SOAPBody) element).getUse())) {
- throw new RuntimeException("The use 'encoded' is not supported!");
+ if (WSDLConstants.WSDL_USE_ENCODED.equals(
+ ((SOAPBody) element).getUse())) {
+ throw new RuntimeException(
+ "The use 'encoded' is not supported!");
}
}
}
@@ -740,12 +978,15 @@
private void testCompatibilityOutput(WSDLBindingOperation binding) {
- Iterator extIterator = binding.getOutput().getExtensibilityElements().iterator();
+ Iterator extIterator = binding.getOutput().getExtensibilityElements()
+ .iterator();
while (extIterator.hasNext()) {
WSDLExtensibilityElement element = (WSDLExtensibilityElement) extIterator.next();
if (element.getType().equals(ExtensionConstants.SOAP_BODY)) {
- if (WSDLConstants.WSDL_USE_ENCODED.equals(((SOAPBody) element).getUse())) {
- throw new RuntimeException("The use 'encoded' is not supported!");
+ if (WSDLConstants.WSDL_USE_ENCODED.equals(
+ ((SOAPBody) element).getUse())) {
+ throw new RuntimeException(
+ "The use 'encoded' is not supported!");
}
}
}
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/extension/AxisBindingBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/extension/AxisBindingBuilder.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/extension/AxisBindingBuilder.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/extension/AxisBindingBuilder.java Mon Jul 11 10:48:55 2005
@@ -17,7 +17,11 @@
package org.apache.axis2.wsdl.codegen.extension;
import org.apache.axis2.wsdl.codegen.CodeGenConfiguration;
-import org.apache.wsdl.*;
+import org.apache.wsdl.WSDLBinding;
+import org.apache.wsdl.WSDLDescription;
+import org.apache.wsdl.WSDLExtensibilityAttribute;
+import org.apache.wsdl.WSDLExtensibilityElement;
+import org.apache.wsdl.WSDLInterface;
import javax.xml.namespace.QName;
import java.util.Iterator;
@@ -29,7 +33,9 @@
public static final String AXIS_NAMESPACE = "http://ws.apache.org/axis2/";
- public static final QName AXIS_BINDING_QNAME = new QName(AXIS_NAMESPACE, "codeGenerationBinding", "axis");
+ public static final QName AXIS_BINDING_QNAME = new QName(AXIS_NAMESPACE,
+ "codeGenerationBinding",
+ "axis");
public AxisBindingBuilder() {
@@ -53,12 +59,15 @@
newBinding.setBindingOperations(binding.getBindingOperations());
Iterator elementIterator = binding.getExtensibilityElements().iterator();
while (elementIterator.hasNext()) {
- newBinding.addExtensibilityElement((WSDLExtensibilityElement) elementIterator.next());
+ newBinding.addExtensibilityElement(
+ (WSDLExtensibilityElement) elementIterator.next());
}
- Iterator attributeIterator = binding.getExtensibilityAttributes().iterator();
+ Iterator attributeIterator = binding.getExtensibilityAttributes()
+ .iterator();
while (attributeIterator.hasNext()) {
- newBinding.addExtensibleAttributes((WSDLExtensibilityAttribute) attributeIterator.next());
+ newBinding.addExtensibleAttributes(
+ (WSDLExtensibilityAttribute) attributeIterator.next());
}
wom.addBinding(newBinding);
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/extension/PackageFinder.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/extension/PackageFinder.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/extension/PackageFinder.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/extension/PackageFinder.java Mon Jul 11 10:48:55 2005
@@ -36,12 +36,16 @@
public void engage() {
Map allOptions = this.configuration.getParser().getAllOptions();
- CommandLineOption packageOption = (CommandLineOption) (allOptions.get(CommandLineOptionConstants.PACKAGE_OPTION));
- String packageName = packageOption == null ? null : packageOption.getOptionValue();
+ CommandLineOption packageOption = (CommandLineOption) (allOptions.get(
+ CommandLineOptionConstants.PACKAGE_OPTION));
+ String packageName = packageOption == null ?
+ null : packageOption.getOptionValue();
if (packageName == null) {
- WSDLBinding binding = configuration.getWom().getBinding(AxisBindingBuilder.AXIS_BINDING_QNAME);
- String temp = binding.getBoundInterface().getName().getNamespaceURI();
+ WSDLBinding binding = configuration.getWom().getBinding(
+ AxisBindingBuilder.AXIS_BINDING_QNAME);
+ String temp = binding.getBoundInterface().getName()
+ .getNamespaceURI();
packageName = URLProcessor.getNameSpaceFromURL(temp);
}
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/extension/WSDLValidatorExtension.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/extension/WSDLValidatorExtension.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/extension/WSDLValidatorExtension.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/extension/WSDLValidatorExtension.java Mon Jul 11 10:48:55 2005
@@ -46,12 +46,14 @@
Schema schema = (Schema) element;
NamedNodeMap attributes = schema.getElelment().getAttributes();
for (int i = 0; i < attributes.getLength(); i++) {
- if (TARGETNAMESPACE_STRING.equalsIgnoreCase(attributes.item(i).getLocalName()))
+ if (TARGETNAMESPACE_STRING.equalsIgnoreCase(
+ attributes.item(i).getLocalName()))
targetnamespaceFound = true;
}
}
if (!targetnamespaceFound)
- throw new CodeGenerationException("Invalid WSDL: The WSDL Types Schema does not define a targetNamespace");
+ throw new CodeGenerationException(
+ "Invalid WSDL: The WSDL Types Schema does not define a targetNamespace");
}
}
}
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/extension/XMLBeansExtension.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/extension/XMLBeansExtension.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/extension/XMLBeansExtension.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/extension/XMLBeansExtension.java Mon Jul 11 10:48:55 2005
@@ -6,10 +6,22 @@
import org.apache.wsdl.WSDLTypes;
import org.apache.wsdl.extensions.ExtensionConstants;
import org.apache.wsdl.extensions.Schema;
-import org.apache.xmlbeans.*;
+import org.apache.xmlbeans.BindingConfig;
+import org.apache.xmlbeans.Filer;
+import org.apache.xmlbeans.SchemaType;
+import org.apache.xmlbeans.SchemaTypeSystem;
+import org.apache.xmlbeans.XmlBeans;
+import org.apache.xmlbeans.XmlException;
+import org.apache.xmlbeans.XmlObject;
+import org.apache.xmlbeans.XmlOptions;
import org.w3c.dom.Element;
-import java.io.*;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.Writer;
import java.util.List;
/*
@@ -56,9 +68,11 @@
// //add the namespaces
XmlOptions options = new XmlOptions();
options.setCompileDownloadUrls();
- options.setLoadAdditionalNamespaces(configuration.getWom().getNamespaces());
+ options.setLoadAdditionalNamespaces(
+ configuration.getWom().getNamespaces());
//options.
- xmlObjects[i] = XmlObject.Factory.parse(schemaElement, options);
+ xmlObjects[i] =
+ XmlObject.Factory.parse(schemaElement, options);
} catch (XmlException e) {
throw new RuntimeException(e);
}
@@ -70,26 +84,28 @@
try {
SchemaTypeSystem sts = XmlBeans.compileXmlBeans(DEFUALT_STS_NAME, null,
- xmlObjects,
- new BindingConfig(), XmlBeans.getContextTypeLoader(),
- new Filer() {
- public OutputStream createBinaryFile(String typename)
- throws IOException {
- File file = new File(outputFolder, typename);
- file.getParentFile().mkdirs();
- file.createNewFile();
- return new FileOutputStream(file);
- }
-
- public Writer createSourceFile(String typename)
- throws IOException {
- typename = typename.replace('.', File.separatorChar);
- File file = new File(outputFolder, typename + ".java");
- file.getParentFile().mkdirs();
- file.createNewFile();
- return new FileWriter(file);
- }
- }, null);
+ xmlObjects,
+ new BindingConfig(), XmlBeans.getContextTypeLoader(),
+ new Filer() {
+ public OutputStream createBinaryFile(String typename)
+ throws IOException {
+ File file = new File(outputFolder, typename);
+ file.getParentFile().mkdirs();
+ file.createNewFile();
+ return new FileOutputStream(file);
+ }
+
+ public Writer createSourceFile(String typename)
+ throws IOException {
+ typename =
+ typename.replace('.', File.separatorChar);
+ File file = new File(outputFolder,
+ typename + ".java");
+ file.getParentFile().mkdirs();
+ file.createNewFile();
+ return new FileWriter(file);
+ }
+ }, null);
//create the type mapper
JavaTypeMapper mapper = new JavaTypeMapper();
@@ -97,7 +113,8 @@
for (int i = 0; i < types.length; i++) {
//System.out.println("type name = " + types[i].getFullJavaImplName()+" "+types[i].getDocumentElementName());
- mapper.addTypeMapping(types[i].getDocumentElementName(), types[i].getFullJavaName());
+ mapper.addTypeMapping(types[i].getDocumentElementName(),
+ types[i].getFullJavaName());
}
//set the type mapper to the config
configuration.setTypeMapper(mapper);
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/writer/BeanWriter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/writer/BeanWriter.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/writer/BeanWriter.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/writer/BeanWriter.java Mon Jul 11 10:48:55 2005
@@ -40,10 +40,14 @@
Class clazz = this.getClass();
switch (language) {
case XSLTConstants.LanguageTypes.JAVA:
- this.xsltStream = clazz.getResourceAsStream(XSLTConstants.XSLTBeanTemplates.JAVA_TEMPLATE);
+ this.xsltStream =
+ clazz.getResourceAsStream(
+ XSLTConstants.XSLTBeanTemplates.JAVA_TEMPLATE);
break;
case XSLTConstants.LanguageTypes.C_SHARP:
- this.xsltStream = clazz.getResourceAsStream(XSLTConstants.XSLTBeanTemplates.CSHARP_TEMPLATE);
+ this.xsltStream =
+ clazz.getResourceAsStream(
+ XSLTConstants.XSLTBeanTemplates.CSHARP_TEMPLATE);
break;
case XSLTConstants.LanguageTypes.C_PLUS_PLUS:
case XSLTConstants.LanguageTypes.VB_DOT_NET:
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/writer/CallbackHandlerWriter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/writer/CallbackHandlerWriter.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/writer/CallbackHandlerWriter.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/writer/CallbackHandlerWriter.java Mon Jul 11 10:48:55 2005
@@ -38,10 +38,14 @@
Class clazz = this.getClass();
switch (language) {
case XSLTConstants.LanguageTypes.JAVA:
- this.xsltStream = clazz.getResourceAsStream(XSLTConstants.XSLTCallbackHandlerTemplates.JAVA_TEMPLATE);
+ this.xsltStream =
+ clazz.getResourceAsStream(
+ XSLTConstants.XSLTCallbackHandlerTemplates.JAVA_TEMPLATE);
break;
case XSLTConstants.LanguageTypes.C_SHARP:
- this.xsltStream = clazz.getResourceAsStream(XSLTConstants.XSLTCallbackHandlerTemplates.CSHARP_TEMPLATE);
+ this.xsltStream =
+ clazz.getResourceAsStream(
+ XSLTConstants.XSLTCallbackHandlerTemplates.CSHARP_TEMPLATE);
break;
case XSLTConstants.LanguageTypes.C_PLUS_PLUS:
case XSLTConstants.LanguageTypes.VB_DOT_NET:
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/writer/ClassWriter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/writer/ClassWriter.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/writer/ClassWriter.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/writer/ClassWriter.java Mon Jul 11 10:48:55 2005
@@ -58,7 +58,10 @@
* @throws Exception
*/
public void createOutFile(String packageName, String fileName) throws Exception {
- File outputFile = FileWriter.createClassFile(outputFileLocation, packageName, fileName, language);
+ File outputFile = FileWriter.createClassFile(outputFileLocation,
+ packageName,
+ fileName,
+ language);
this.stream = new FileOutputStream(outputFile);
}
@@ -69,7 +72,9 @@
* @throws Exception
*/
public void writeOutFile(InputStream documentStream) throws Exception {
- XSLTTemplateProcessor.parse(this.stream, documentStream, this.xsltStream);
+ XSLTTemplateProcessor.parse(this.stream,
+ documentStream,
+ this.xsltStream);
this.stream.flush();
this.stream.close();
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/writer/DatabindingSupportClassWriter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/writer/DatabindingSupportClassWriter.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/writer/DatabindingSupportClassWriter.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/writer/DatabindingSupportClassWriter.java Mon Jul 11 10:48:55 2005
@@ -30,7 +30,9 @@
this.outputFileLocation = new File(outputFileLocation);
}
- public DatabindingSupportClassWriter(File outputFileLocation, int language, int databindingFramework) {
+ public DatabindingSupportClassWriter(File outputFileLocation,
+ int language,
+ int databindingFramework) {
this.outputFileLocation = outputFileLocation;
this.language = language;
this.databindingFramework = databindingFramework;
@@ -41,11 +43,14 @@
}
public void loadTemplate() {
- if (this.databindingFramework == XSLTConstants.DataBindingTypes.XML_BEANS) {
+ if (this.databindingFramework ==
+ XSLTConstants.DataBindingTypes.XML_BEANS) {
Class clazz = this.getClass();
switch (language) {
case XSLTConstants.LanguageTypes.JAVA:
- this.xsltStream = clazz.getResourceAsStream(XSLTConstants.XSLTDatabindingSupporterTemplates.JAVA_TEMPLATE);
+ this.xsltStream =
+ clazz.getResourceAsStream(
+ XSLTConstants.XSLTDatabindingSupporterTemplates.JAVA_TEMPLATE);
break;
case XSLTConstants.LanguageTypes.C_SHARP:
case XSLTConstants.LanguageTypes.C_PLUS_PLUS:
@@ -54,7 +59,8 @@
throw new UnsupportedOperationException();
}
} else {
- throw new UnsupportedOperationException("Unsupported Data binding Framework!");
+ throw new UnsupportedOperationException(
+ "Unsupported Data binding Framework!");
}
}
}
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/writer/InterfaceImplementationWriter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/writer/InterfaceImplementationWriter.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/writer/InterfaceImplementationWriter.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/writer/InterfaceImplementationWriter.java Mon Jul 11 10:48:55 2005
@@ -27,7 +27,8 @@
this.outputFileLocation = new File(outputFileLocation);
}
- public InterfaceImplementationWriter(File outputFileLocation, int language) {
+ public InterfaceImplementationWriter(File outputFileLocation,
+ int language) {
this.outputFileLocation = outputFileLocation;
this.language = language;
}
@@ -39,10 +40,14 @@
Class clazz = this.getClass();
switch (language) {
case XSLTConstants.LanguageTypes.JAVA:
- this.xsltStream = clazz.getResourceAsStream(XSLTConstants.XSLTInterfaceImplementationTemplates.JAVA_TEMPLATE);
+ this.xsltStream =
+ clazz.getResourceAsStream(
+ XSLTConstants.XSLTInterfaceImplementationTemplates.JAVA_TEMPLATE);
break;
case XSLTConstants.LanguageTypes.C_SHARP:
- this.xsltStream = clazz.getResourceAsStream(XSLTConstants.XSLTInterfaceImplementationTemplates.CSHARP_TEMPLATE);
+ this.xsltStream =
+ clazz.getResourceAsStream(
+ XSLTConstants.XSLTInterfaceImplementationTemplates.CSHARP_TEMPLATE);
break;
case XSLTConstants.LanguageTypes.C_PLUS_PLUS:
case XSLTConstants.LanguageTypes.VB_DOT_NET:
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/writer/InterfaceWriter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/writer/InterfaceWriter.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/writer/InterfaceWriter.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/writer/InterfaceWriter.java Mon Jul 11 10:48:55 2005
@@ -41,10 +41,14 @@
Class clazz = this.getClass();
switch (language) {
case XSLTConstants.LanguageTypes.JAVA:
- this.xsltStream = clazz.getResourceAsStream(XSLTConstants.XSLTInterfaceTemplates.JAVA_TEMPLATE);
+ this.xsltStream =
+ clazz.getResourceAsStream(
+ XSLTConstants.XSLTInterfaceTemplates.JAVA_TEMPLATE);
break;
case XSLTConstants.LanguageTypes.C_SHARP:
- this.xsltStream = clazz.getResourceAsStream(XSLTConstants.XSLTInterfaceTemplates.CSHARP_TEMPLATE);
+ this.xsltStream =
+ clazz.getResourceAsStream(
+ XSLTConstants.XSLTInterfaceTemplates.CSHARP_TEMPLATE);
break;
case XSLTConstants.LanguageTypes.C_PLUS_PLUS:
case XSLTConstants.LanguageTypes.VB_DOT_NET:
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/writer/LocalTestClassWriter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/writer/LocalTestClassWriter.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/writer/LocalTestClassWriter.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/writer/LocalTestClassWriter.java Mon Jul 11 10:48:55 2005
@@ -37,10 +37,14 @@
Class clazz = this.getClass();
switch (language) {
case XSLTConstants.LanguageTypes.JAVA:
- this.xsltStream = clazz.getResourceAsStream(XSLTConstants.XSLTLocalTestClassTemplates.JAVA_TEMPLATE);
+ this.xsltStream =
+ clazz.getResourceAsStream(
+ XSLTConstants.XSLTLocalTestClassTemplates.JAVA_TEMPLATE);
break;
case XSLTConstants.LanguageTypes.C_SHARP:
- this.xsltStream = clazz.getResourceAsStream(XSLTConstants.XSLTLocalTestClassTemplates.CSHARP_TEMPLATE);
+ this.xsltStream =
+ clazz.getResourceAsStream(
+ XSLTConstants.XSLTLocalTestClassTemplates.CSHARP_TEMPLATE);
break;
case XSLTConstants.LanguageTypes.C_PLUS_PLUS:
case XSLTConstants.LanguageTypes.VB_DOT_NET:
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/writer/MessageReceiverWriter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/writer/MessageReceiverWriter.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/writer/MessageReceiverWriter.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/writer/MessageReceiverWriter.java Mon Jul 11 10:48:55 2005
@@ -38,7 +38,9 @@
Class clazz = this.getClass();
switch (language) {
case XSLTConstants.LanguageTypes.JAVA:
- this.xsltStream = clazz.getResourceAsStream(XSLTConstants.XSLTMessageReceiverTemplates.JAVA_TEMPLATE);
+ this.xsltStream =
+ clazz.getResourceAsStream(
+ XSLTConstants.XSLTMessageReceiverTemplates.JAVA_TEMPLATE);
break;
default:
throw new UnsupportedOperationException();
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/writer/ServiceXMLWriter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/writer/ServiceXMLWriter.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/writer/ServiceXMLWriter.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/writer/ServiceXMLWriter.java Mon Jul 11 10:48:55 2005
@@ -41,11 +41,16 @@
*/
public void loadTemplate() {
Class clazz = this.getClass();
- this.xsltStream = clazz.getResourceAsStream(XSLTConstants.XSLTServiceXMLTemplates.GENERAL_SERVICE_TEMPLATE);
+ this.xsltStream =
+ clazz.getResourceAsStream(
+ XSLTConstants.XSLTServiceXMLTemplates.GENERAL_SERVICE_TEMPLATE);
}
public void createOutFile(String packageName, String fileName) throws Exception {
- File outputFile = FileWriter.createClassFile(outputFileLocation, packageName, "service", ".xml");
+ File outputFile = FileWriter.createClassFile(outputFileLocation,
+ packageName,
+ "service",
+ ".xml");
this.stream = new FileOutputStream(outputFile);
}
}
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/writer/SkeletonWriter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/writer/SkeletonWriter.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/writer/SkeletonWriter.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/writer/SkeletonWriter.java Mon Jul 11 10:48:55 2005
@@ -41,10 +41,14 @@
Class clazz = this.getClass();
switch (language) {
case XSLTConstants.LanguageTypes.JAVA:
- this.xsltStream = clazz.getResourceAsStream(XSLTConstants.XSLTSkeletonTemplates.JAVA_TEMPLATE);
+ this.xsltStream =
+ clazz.getResourceAsStream(
+ XSLTConstants.XSLTSkeletonTemplates.JAVA_TEMPLATE);
break;
case XSLTConstants.LanguageTypes.C_SHARP:
- this.xsltStream = clazz.getResourceAsStream(XSLTConstants.XSLTSkeletonTemplates.CSHARP_TEMPLATE);
+ this.xsltStream =
+ clazz.getResourceAsStream(
+ XSLTConstants.XSLTSkeletonTemplates.CSHARP_TEMPLATE);
break;
case XSLTConstants.LanguageTypes.C_PLUS_PLUS:
case XSLTConstants.LanguageTypes.VB_DOT_NET:
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/writer/TestClassWriter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/writer/TestClassWriter.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/writer/TestClassWriter.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/writer/TestClassWriter.java Mon Jul 11 10:48:55 2005
@@ -37,10 +37,14 @@
Class clazz = this.getClass();
switch (language) {
case XSLTConstants.LanguageTypes.JAVA:
- this.xsltStream = clazz.getResourceAsStream(XSLTConstants.XSLTTestClassTemplates.JAVA_TEMPLATE);
+ this.xsltStream =
+ clazz.getResourceAsStream(
+ XSLTConstants.XSLTTestClassTemplates.JAVA_TEMPLATE);
break;
case XSLTConstants.LanguageTypes.C_SHARP:
- this.xsltStream = clazz.getResourceAsStream(XSLTConstants.XSLTTestClassTemplates.CSHARP_TEMPLATE);
+ this.xsltStream =
+ clazz.getResourceAsStream(
+ XSLTConstants.XSLTTestClassTemplates.CSHARP_TEMPLATE);
break;
case XSLTConstants.LanguageTypes.C_PLUS_PLUS:
case XSLTConstants.LanguageTypes.VB_DOT_NET:
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/writer/TestServiceXMLWriter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/writer/TestServiceXMLWriter.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/writer/TestServiceXMLWriter.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/writer/TestServiceXMLWriter.java Mon Jul 11 10:48:55 2005
@@ -35,7 +35,10 @@
}
public void createOutFile(String packageName, String fileName) throws Exception {
- File outputFile = FileWriter.createClassFile(outputFileLocation, packageName, "testservice", ".xml");
+ File outputFile = FileWriter.createClassFile(outputFileLocation,
+ packageName,
+ "testservice",
+ ".xml");
this.stream = new FileOutputStream(outputFile);
}
}
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/writer/TestSkeletonImplWriter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/writer/TestSkeletonImplWriter.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/writer/TestSkeletonImplWriter.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/writer/TestSkeletonImplWriter.java Mon Jul 11 10:48:55 2005
@@ -38,7 +38,9 @@
Class clazz = this.getClass();
switch (language) {
case XSLTConstants.LanguageTypes.JAVA:
- this.xsltStream = clazz.getResourceAsStream(XSLTConstants.XSLTTestSkeletonImplTemplates.JAVA_TEMPLATE);
+ this.xsltStream =
+ clazz.getResourceAsStream(
+ XSLTConstants.XSLTTestSkeletonImplTemplates.JAVA_TEMPLATE);
break;
default:
throw new UnsupportedOperationException();
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/util/FileWriter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/util/FileWriter.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/util/FileWriter.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/util/FileWriter.java Mon Jul 11 10:48:55 2005
@@ -36,7 +36,11 @@
* @throws IOException
* @throws Exception
*/
- public static File createClassFile(File rootLocation, String packageName, String fileName, String extension) throws IOException, Exception {
+ public static File createClassFile(File rootLocation,
+ String packageName,
+ String fileName,
+ String extension) throws IOException,
+ Exception {
File returnFile = null;
File root = rootLocation;
@@ -77,8 +81,15 @@
* @throws IOException
* @throws Exception
*/
- public static File createClassFile(File rootLocation, String packageName, String fileName, int fileType) throws IOException, Exception {
- return createClassFile(rootLocation, packageName, fileName, getExtension(fileType));
+ public static File createClassFile(File rootLocation,
+ String packageName,
+ String fileName,
+ int fileType) throws IOException,
+ Exception {
+ return createClassFile(rootLocation,
+ packageName,
+ fileName,
+ getExtension(fileType));
}
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/util/URLProcessor.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/util/URLProcessor.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/util/URLProcessor.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/util/URLProcessor.java Mon Jul 11 10:48:55 2005
@@ -43,7 +43,9 @@
String[] arrayOfItems = s.split("\\.");
int length = arrayOfItems.length;
for (int i = length; i > 0; i--) {
- returnPackageName = returnPackageName.concat((i == length ? "" : ".") + arrayOfItems[i - 1]);
+ returnPackageName =
+ returnPackageName.concat(
+ (i == length ? "" : ".") + arrayOfItems[i - 1]);
}
} else {
returnPackageName = DEFAULT_PACKAGE;
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/util/XSLTTemplateProcessor.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/util/XSLTTemplateProcessor.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/util/XSLTTemplateProcessor.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/util/XSLTTemplateProcessor.java Mon Jul 11 10:48:55 2005
@@ -1,7 +1,12 @@
package org.apache.axis2.wsdl.util;
-import javax.xml.transform.*;
+import javax.xml.transform.Result;
+import javax.xml.transform.Source;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.TransformerFactoryConfigurationError;
import javax.xml.transform.stream.StreamResult;
import javax.xml.transform.stream.StreamSource;
import java.io.InputStream;
@@ -39,12 +44,15 @@
*
* @throws TransformerException
*/
- public static void parse(OutputStream out, InputStream xmlStream, InputStream xsltStream)
+ public static void parse(OutputStream out,
+ InputStream xmlStream,
+ InputStream xsltStream)
throws TransformerFactoryConfigurationError, TransformerException {
Source xmlSource = new StreamSource(xmlStream);
Source xsltSource = new StreamSource(xsltStream);
Result result = new StreamResult(out);
- Transformer transformer = TransformerFactory.newInstance().newTransformer(xsltSource);
+ Transformer transformer = TransformerFactory.newInstance()
+ .newTransformer(xsltSource);
transformer.transform(xmlSource, result);
}