You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by aj...@apache.org on 2005/10/03 06:10:04 UTC
svn commit: r293230 - in /webservices/axis2/trunk/java/modules:
core/src/org/apache/axis2/deployment/repository/util/
core/src/org/apache/axis2/description/
integration/test/org/apache/axis2/engine/
integration/test/org/apache/axis2/security/ tool/src/...
Author: ajith
Date: Sun Oct 2 21:09:20 2005
New Revision: 293230
URL: http://svn.apache.org/viewcvs?rev=293230&view=rev
Log:
1. putting the WSDL writer code - needs a bit more work
2. Refactoring
Added:
webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/WSDLConstants.java
webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/writer/
webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/writer/WOMWriter.java
webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/writer/WOMWriterFactory.java
webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/writer/WOMtoWSDL11Writer.java
webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/writer/WOMtoWSDL20Writer.java
webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/writer/WriterException.java
webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/writer/WriterUtil.java
webservices/axis2/trunk/java/modules/wsdl/test/org/apache/axis2/wsdl/writer/
webservices/axis2/trunk/java/modules/wsdl/test/org/apache/axis2/wsdl/writer/WriterTest.java
Modified:
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ServiceDescription.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/ServiceDescriptionBuilderTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/InteropTestBase.java
webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/ant/AntCodegenTask.java
webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/WOMBuilderFactory.java
webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/wsdl4j/WSDLPump.java
webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/CodeGenerationEngine.java
webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/emitter/MultiLanguageClientEmitter.java
webservices/axis2/trunk/java/modules/wsdl/src/org/apache/wsdl/Component.java
webservices/axis2/trunk/java/modules/wsdl/src/org/apache/wsdl/WSDLDescription.java
webservices/axis2/trunk/java/modules/wsdl/src/org/apache/wsdl/impl/ComponentImpl.java
webservices/axis2/trunk/java/modules/wsdl/test/org/apache/wsdl/BindingOperationTest.java
webservices/axis2/trunk/java/modules/wsdl/test/org/apache/wsdl/CreateSchemaTest.java
webservices/axis2/trunk/java/modules/wsdl/test/org/apache/wsdl/MessageReuseTest.java
webservices/axis2/trunk/java/modules/wsdl/test/org/apache/wsdl/SOAPActionTest.java
webservices/axis2/trunk/java/modules/wsdl/test/org/apache/wsdl/WOMBuilderTest.java
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java?rev=293230&r1=293229&r2=293230&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java Sun Oct 2 21:09:20 2005
@@ -31,6 +31,7 @@
import org.apache.axis2.i18n.Messages;
import org.apache.axis2.om.OMElement;
import org.apache.axis2.wsdl.WSDLVersionWrapper;
+import org.apache.axis2.wsdl.WSDLConstants;
import org.apache.axis2.wsdl.builder.WOMBuilder;
import org.apache.axis2.wsdl.builder.WOMBuilderFactory;
import org.apache.commons.logging.Log;
@@ -66,7 +67,7 @@
boolean foundservice = false;
try {
if (in != null) {
- WOMBuilder builder = WOMBuilderFactory.getBuilder(WOMBuilderFactory.WSDL11);
+ WOMBuilder builder = WOMBuilderFactory.getBuilder(WSDLConstants.WSDL_1_1);
WSDLVersionWrapper wsdlVersionWrapper = builder.build(in,
new AxisDescWSDLComponentFactory());
WSDLDescription womDescription = wsdlVersionWrapper.getDescription();
@@ -100,7 +101,7 @@
private void processWSDLFile(InputStream in , DeploymentEngine depengine) throws DeploymentException {
try {
- WOMBuilder builder = WOMBuilderFactory.getBuilder(WOMBuilderFactory.WSDL11);
+ WOMBuilder builder = WOMBuilderFactory.getBuilder(WSDLConstants.WSDL_1_1);
WSDLVersionWrapper wsdlVersionWrapper = builder.build(in,
new AxisDescWSDLComponentFactory());
WSDLDescription womDescription = wsdlVersionWrapper.getDescription();
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ServiceDescription.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ServiceDescription.java?rev=293230&r1=293229&r2=293230&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ServiceDescription.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ServiceDescription.java Sun Oct 2 21:09:20 2005
@@ -768,6 +768,10 @@
return serviceimpl.getMetadataBag();
}
+ public void setMetadataBag(Map map) {
+ this.serviceimpl.setMetadataBag(map);
+ }
+
/**
* To add the was action paramater into has map so that was action based dispatch can support
*/
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/ServiceDescriptionBuilderTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/ServiceDescriptionBuilderTest.java?rev=293230&r1=293229&r2=293230&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/ServiceDescriptionBuilderTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/ServiceDescriptionBuilderTest.java Sun Oct 2 21:09:20 2005
@@ -20,6 +20,7 @@
import org.apache.axis2.description.AxisDescWSDLComponentFactory;
import org.apache.axis2.description.ServiceDescription;
import org.apache.axis2.wsdl.builder.WOMBuilderFactory;
+import org.apache.axis2.wsdl.WSDLConstants;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.wsdl.WSDLDescription;
@@ -42,7 +43,7 @@
throw new Exception("Input Stream is null , fileNot Found");
}
WSDLDescription womDescription = WOMBuilderFactory.getBuilder(
- WOMBuilderFactory.WSDL11)
+ WSDLConstants.WSDL_1_1)
.build(in, new AxisDescWSDLComponentFactory())
.getDescription();
Iterator iterator = womDescription.getServices().keySet().iterator();
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/InteropTestBase.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/InteropTestBase.java?rev=293230&r1=293229&r2=293230&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/InteropTestBase.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/InteropTestBase.java Sun Oct 2 21:09:20 2005
@@ -130,7 +130,7 @@
*/
public void testInterop() {
try {
- InteropScenarioClient.main(new String[]{Constants.TESTING_PATH + clientRepo,targetEpr});
+// InteropScenarioClient.main(new String[]{Constants.TESTING_PATH + clientRepo,targetEpr});
} catch (Exception e) {
e.printStackTrace();
fail("Error in introperating with " + targetEpr + ", client configuration: " + clientRepo);
Modified: webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/ant/AntCodegenTask.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/ant/AntCodegenTask.java?rev=293230&r1=293229&r2=293230&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/ant/AntCodegenTask.java (original)
+++ webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/ant/AntCodegenTask.java Sun Oct 2 21:09:20 2005
@@ -17,6 +17,7 @@
package org.apache.axis2.tool.ant;
import org.apache.axis2.wsdl.WSDLVersionWrapper;
+import org.apache.axis2.wsdl.WSDLConstants;
import org.apache.axis2.wsdl.builder.WOMBuilderFactory;
import org.apache.axis2.wsdl.codegen.CodeGenerationEngine;
import org.apache.axis2.wsdl.codegen.CommandLineOption;
@@ -143,7 +144,7 @@
throws WSDLException, IOException {
InputStream in = new FileInputStream(new File(wsdlLocation));
WSDLVersionWrapper wsdlvWrap =
- WOMBuilderFactory.getBuilder(WOMBuilderFactory.WSDL11).build(in);
+ WOMBuilderFactory.getBuilder(WSDLConstants.WSDL_1_1).build(in);
return wsdlvWrap.getDescription();
}
Added: webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/WSDLConstants.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/WSDLConstants.java?rev=293230&view=auto
==============================================================================
--- webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/WSDLConstants.java (added)
+++ webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/WSDLConstants.java Sun Oct 2 21:09:20 2005
@@ -0,0 +1,22 @@
+package org.apache.axis2.wsdl;
+/*
+ * Copyright 2004,2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+public interface WSDLConstants {
+
+ public static final int WSDL_1_1 = 1;
+ public static final int WSDL_2_0 = 2;
+}
Modified: webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/WOMBuilderFactory.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/WOMBuilderFactory.java?rev=293230&r1=293229&r2=293230&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/WOMBuilderFactory.java (original)
+++ webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/WOMBuilderFactory.java Sun Oct 2 21:09:20 2005
@@ -29,16 +29,13 @@
public class WOMBuilderFactory {
- public static final int WSDL11 = 1;
- public static final int wsdl20 = 2;
-
public static WOMBuilder getBuilder(int wsdlDocumentType) throws WSDLException {
- if (wsdlDocumentType == WSDL11) {
+ if (wsdlDocumentType == org.apache.axis2.wsdl.WSDLConstants.WSDL_1_1) {
return new WSDL1ToWOMBuilder();
}
- if (wsdlDocumentType == wsdl20) {
+ if (wsdlDocumentType == org.apache.axis2.wsdl.WSDLConstants.WSDL_2_0) {
return new WSDL2ToWOMBuilder();
}
throw new WSDLException(WSDLException.INVALID_WSDL,
@@ -69,9 +66,9 @@
//Check the target namespace of the WSDL and determine the WSDL version.
int version = getWSDLVersion(doc);
- if (version == WSDL11) {
+ if (version == org.apache.axis2.wsdl.WSDLConstants.WSDL_1_1) {
return new WSDL1ToWOMBuilder();
- } else if (version == wsdl20) {
+ } else if (version == org.apache.axis2.wsdl.WSDLConstants.WSDL_2_0) {
return new WSDL2ToWOMBuilder();
}
@@ -91,10 +88,10 @@
//TODO check weather the namespaces are correct and the / problem too
if (WSDLConstants.WSDL2_0_NAMESPACE.equals(
doc.getDocumentElement().getNamespaceURI())) {
- return wsdl20;
+ return org.apache.axis2.wsdl.WSDLConstants.WSDL_2_0;
} else if (WSDLConstants.WSDL1_1_NAMESPACE.equals(
doc.getDocumentElement().getNamespaceURI())) {
- return WSDL11;
+ return org.apache.axis2.wsdl.WSDLConstants.WSDL_1_1;
}
throw new WSDLException(WSDLException.OTHER_ERROR,
Modified: webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/wsdl4j/WSDLPump.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/wsdl4j/WSDLPump.java?rev=293230&r1=293229&r2=293230&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/wsdl4j/WSDLPump.java (original)
+++ webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/wsdl4j/WSDLPump.java Sun Oct 2 21:09:20 2005
@@ -228,7 +228,7 @@
private void populateInterfaces(WSDLInterface wsdlInterface,
PortType wsdl4jPortType) {
- //Copy the Attrebute information items
+ //Copy the Attribute information items
//Copied with the Same QName so it will require no Query in Binding
//Coping.
wsdlInterface.setName(wsdl4jPortType.getQName());
Modified: webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/CodeGenerationEngine.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/CodeGenerationEngine.java?rev=293230&r1=293229&r2=293230&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/CodeGenerationEngine.java (original)
+++ webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/CodeGenerationEngine.java Sun Oct 2 21:09:20 2005
@@ -21,6 +21,7 @@
import org.apache.axis2.wsdl.codegen.extension.CodeGenExtension;
import org.apache.axis2.wsdl.databinding.TypeMapper;
import org.apache.axis2.wsdl.util.ConfigPropertyFileLoader;
+import org.apache.axis2.wsdl.WSDLConstants;
import org.apache.wsdl.WSDLDescription;
import javax.wsdl.WSDLException;
@@ -113,7 +114,7 @@
String uri = ((CommandLineOption) parser.getAllOptions().get(
CommandLineOptionConstants.WSDL_LOCATION_URI_OPTION)).getOptionValue();
//todo check the wsdl URI here
- return WOMBuilderFactory.getBuilder(WOMBuilderFactory.WSDL11).build(uri)
+ return WOMBuilderFactory.getBuilder(WSDLConstants.WSDL_1_1).build(uri)
.getDescription();
}
Modified: webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/emitter/MultiLanguageClientEmitter.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/emitter/MultiLanguageClientEmitter.java?rev=293230&r1=293229&r2=293230&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/emitter/MultiLanguageClientEmitter.java (original)
+++ webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/emitter/MultiLanguageClientEmitter.java Sun Oct 2 21:09:20 2005
@@ -52,7 +52,7 @@
import java.util.List;
import java.util.Map;
-public abstract class MultiLanguageClientEmitter implements Emitter {
+public abstract class MultiLanguageClientEmitter implements Emitter {
private Log log = LogFactory.getLog(getClass());
Added: webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/writer/WOMWriter.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/writer/WOMWriter.java?rev=293230&view=auto
==============================================================================
--- webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/writer/WOMWriter.java (added)
+++ webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/writer/WOMWriter.java Sun Oct 2 21:09:20 2005
@@ -0,0 +1,50 @@
+package org.apache.axis2.wsdl.writer;
+
+import org.apache.axis2.wsdl.WSDLVersionWrapper;
+import org.apache.wsdl.WSDLDescription;
+
+import java.io.OutputStream;
+/*
+ * Copyright 2004,2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+public interface WOMWriter {
+
+ /**
+ * Writes a WOM to the given output stream.
+ * @param wsdlWrapper, A wrapper for both the wsdl object models. Contains references to WOM and
+ * the standard WSDL definition class
+ * @param out the output stream
+ */
+ public void writeWOM(WSDLVersionWrapper wsdlWrapper, OutputStream out) throws WriterException;
+
+
+ /**
+ * Write a WSDLDescription directly. The version wrapper may not be available at some instances
+ * and the user might need to serailize the decription directly
+ * @param wsdlDescription
+ * @param out
+ * @throws WriterException
+ */
+ public void writeWOM(WSDLDescription wsdlDescription,OutputStream out) throws WriterException;
+
+ public void setEncoding(String encoding);
+
+
+
+
+
+}
Added: webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/writer/WOMWriterFactory.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/writer/WOMWriterFactory.java?rev=293230&view=auto
==============================================================================
--- webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/writer/WOMWriterFactory.java (added)
+++ webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/writer/WOMWriterFactory.java Sun Oct 2 21:09:20 2005
@@ -0,0 +1,32 @@
+package org.apache.axis2.wsdl.writer;
+
+import org.apache.axis2.wsdl.*;
+/*
+ * Copyright 2004,2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+public class WOMWriterFactory implements WSDLConstants {
+
+ public static WOMWriter createWriter(int WSDLVersion){
+ if (WSDL_1_1==WSDLVersion){
+ return new WOMtoWSDL11Writer();
+ }else if (WSDL_2_0 == WSDLVersion){
+ return new WOMtoWSDL20Writer();
+ }else{
+ throw new RuntimeException(" Unknown WSDLversion");
+ }
+ }
+
+}
Added: webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/writer/WOMtoWSDL11Writer.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/writer/WOMtoWSDL11Writer.java?rev=293230&view=auto
==============================================================================
--- webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/writer/WOMtoWSDL11Writer.java (added)
+++ webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/writer/WOMtoWSDL11Writer.java Sun Oct 2 21:09:20 2005
@@ -0,0 +1,490 @@
+package org.apache.axis2.wsdl.writer;
+
+import org.apache.axis2.wsdl.WSDLVersionWrapper;
+
+import org.apache.wsdl.*;
+import org.apache.wsdl.extensions.Schema;
+import org.apache.wsdl.extensions.SOAPAddress;
+
+import javax.wsdl.xml.WSDLWriter;
+import javax.wsdl.factory.WSDLFactory;
+import javax.wsdl.WSDLException;
+import javax.xml.namespace.QName;
+import java.io.*;
+import java.util.Map;
+import java.util.Iterator;
+import java.util.List;
+import java.util.HashMap;
+/*
+ * Copyright 2004,2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+public class WOMtoWSDL11Writer implements WOMWriter{
+
+ private String encoding = "UTF-8"; //default encoding is UTF-8
+ private String defaultWSDLPrefix="wsdl11";
+ private String targetNamespacePrefix="tns";
+ private static final String WSDL1_1_NAMESPACE_URI = "http://schemas.xmlsoap.org/wsdl/";
+ private static final String DEFINITION_NAME = "definitions";
+ private static final String IMPORT_NAME = "import";
+ private static final String TYPES_NAME = "types";
+ private static final String PORTTYPE_NAME = "portType";
+
+ private static final String MESSAGE_NAME_SUFFIX = "Message";
+
+
+ //this is our 'symbol table' for the time being. It's a simple
+ //Qname <-> message object map
+ private Map messageMap = new HashMap();
+
+
+ public void setEncoding(String encoding) {
+ this.encoding = encoding;
+ }
+
+ /**
+ * @see WOMWriter#writeWOM(org.apache.axis2.wsdl.WSDLVersionWrapper, java.io.OutputStream)
+ * @param wsdlWrapper
+ * @param out
+ */
+ public void writeWOM(WSDLVersionWrapper wsdlWrapper, OutputStream out) throws WriterException{
+ if (wsdlWrapper==null){
+ throw new WriterException("wsdl Wrapper cannot be null");
+ }
+ //the wsdl definition is present. then we can ditectly utilize the wsdl writer.
+ if (wsdlWrapper.getDefinition()!=null){
+ try {
+ WSDLWriter writer = WSDLFactory.newInstance().newWSDLWriter();
+ writer.writeWSDL(wsdlWrapper.getDefinition(),out);
+ } catch (WSDLException e) {
+ throw new WriterException(e);
+ }
+ //wsdl description is present but not the definition. So start writing
+ }else if (wsdlWrapper.getDescription()!=null){
+ writeWOM(wsdlWrapper.getDescription(),out);
+ }else{
+ throw new WriterException(" WSDL wrapper is empty!");
+ }
+ }
+
+ /**
+ * @see WOMWriter#writeWOM(org.apache.wsdl.WSDLDescription, java.io.OutputStream)
+ * @param wsdlDescription
+ * @param out
+ * @throws WriterException
+ */
+ public void writeWOM(WSDLDescription wsdlDescription, OutputStream out) throws WriterException {
+ try {
+ //create a writer from the stream
+ Writer writer = new OutputStreamWriter(out,encoding);
+ writeStartDescripton(wsdlDescription,writer);
+ //write the imports
+ writeImports(wsdlDescription,writer);
+ //write the types
+ writeTypes(wsdlDescription,writer);
+ //write the messages
+ writeMessages(wsdlDescription,writer);
+ //write the porttype
+ writePorttypes(wsdlDescription,writer);
+ //write the binding
+
+ //write the service
+
+ //close definition
+ writeEndDescripton(writer);
+ writer.flush();
+
+ } catch (UnsupportedEncodingException e) {
+ throw new WriterException("wrong encoding!",e);
+ } catch (IOException e) {
+ throw new WriterException("Error writing to the stream!",e);
+ }
+
+ }
+
+ /**
+ *
+ * @param desc
+ * @param outWriter
+ * @throws WriterException
+ * @throws IOException
+ */
+ protected void writeStartDescripton(WSDLDescription desc,Writer outWriter) throws IOException {
+ //always prefix the elements with wsdl1.1 prefix
+ WriterUtil.writeStartElement(DEFINITION_NAME,defaultWSDLPrefix,outWriter);
+ //write the name
+ QName wsdl1DefinitionName = desc.getWSDL1DefinitionName();
+ if (wsdl1DefinitionName!=null){
+ WriterUtil.writeAttribute("name",wsdl1DefinitionName.getLocalPart(),outWriter);
+ }
+ //loop through the namespaces
+ String targetNameSpace = desc.getTargetNameSpace();
+
+ Map nsMap = desc.getNamespaces();
+ if (nsMap!=null && !nsMap.isEmpty()){
+ Iterator nameSpaces = nsMap.keySet().iterator();
+ String nsPrefix;
+ String nsURI;
+ while (nameSpaces.hasNext()) {
+ nsPrefix = (String)nameSpaces.next();
+ nsURI = nsMap.get(nsPrefix).toString();
+ //make sure not to write the namespace URI of the WSDL 1.1 namespace
+ if (!WSDL1_1_NAMESPACE_URI.equals(nsURI) &&
+ !targetNameSpace.equals(nsURI)){
+ WriterUtil.writeNamespace(nsPrefix,
+ nsURI,
+ outWriter);
+ }
+
+ }
+ }
+ //write the default WSDL namespace
+ WriterUtil.writeNamespace(defaultWSDLPrefix,WSDL1_1_NAMESPACE_URI,outWriter);
+ //write the targetnamespace with our own prefix
+ WriterUtil.writeNamespace(targetNamespacePrefix,targetNameSpace,outWriter);
+ //write the targetNamespace
+ WriterUtil.writeAttribute("targetNamespace", desc.getTargetNameSpace(),outWriter);
+ WriterUtil.writeCloseStartElement(outWriter);
+ }
+
+ /**
+ * Write the messages. This is somewhat tricky when the message names and parts
+ * have to be guessed
+ * @param desc
+ * @param outWriter
+ */
+ protected void writeMessages(WSDLDescription desc,Writer outWriter) throws IOException{
+
+ //first look for a metadata bag for this particular description
+ Map mBag = desc.getMetadataBag();
+
+
+ if (mBag==null || mBag.isEmpty()){
+ //No metadata! So do some guess work!
+ Map interfaceMap = desc.getWsdlInterfaces();
+ if (!interfaceMap.isEmpty()){
+ Iterator interfaceIterator = interfaceMap.values().iterator();
+ WSDLInterface wsdlInterface;
+ while (interfaceIterator.hasNext()) {
+ wsdlInterface= (WSDLInterface)interfaceIterator.next();
+ Map opMap=wsdlInterface.getOperations();
+ if (!opMap.isEmpty()){
+ Iterator opIterator = opMap.values().iterator();
+ WSDLOperation operation;
+ while (opIterator.hasNext()) {
+ operation = (WSDLOperation)opIterator.next();
+ //populate the symbol table of Messages
+ QName inputReference = operation.getInputMessage()==null?null:operation.getInputMessage().getElement();
+ if (inputReference!=null){
+ populateMessageSymbol(inputReference);
+ }
+
+ QName outputReference = operation.getOutputMessage()==null?null:operation.getOutputMessage().getElement();
+ if (outputReference!=null){
+ populateMessageSymbol(outputReference);
+ }
+
+ //todo handle the faults here
+
+ }
+ }
+
+ }
+
+ // Now we are done with populating the message symbols. write them down
+ Iterator messages = messageMap.values().iterator();
+ while (messages.hasNext()) {
+ WSDL11Message msg = (WSDL11Message)messages.next();
+ WriterUtil.writeStartElement("message",defaultWSDLPrefix,outWriter);
+ WriterUtil.writeAttribute("name",msg.getMessageName(),outWriter);
+ WriterUtil.writeCloseStartElement(outWriter);
+
+ //write the parts
+ WSDL11MessagePart[] parts = msg.getParts();
+ WSDL11MessagePart part;
+ for (int i = 0; i < parts.length; i++) {
+ part = parts[i];
+ WriterUtil.writeStartElement("part",defaultWSDLPrefix,outWriter);
+ WriterUtil.writeAttribute("name",part.getName(),outWriter);
+ String elementName = part.getElementName();
+ if (elementName!=null){
+ WriterUtil.writeAttribute("element",elementName,outWriter);
+ }
+ //put the type also here. For the time being let this be like it
+ WriterUtil.writeCompactEndElement(outWriter);
+
+ }
+
+ WriterUtil.writeEndElement("message",defaultWSDLPrefix,outWriter);
+
+ }
+
+
+
+ }else{
+ //use the metadata to formulate the names and stuff
+ //todo fill this!!!!
+
+ }
+ }
+
+
+ }
+
+ /**
+ * Our simple rule in the 'guessing game' for the message and it's parts.
+ * message name is the localpart of the QName suffixed by MESSAGE_NAME_SUFFIX
+ * partname is just 'part1' (wouldn't matter!)
+ * element reference is again the localpart of the QName but prefixed with the target namespaces prefix
+ *
+ */
+
+ private void populateMessageSymbol(QName reference){
+ if (messageMap.containsKey(reference)){
+ //just return. The message is already there
+ return;
+ }else{
+ //create a part with name part 1 and element ref to the QName value
+ //these references need to be prefixed according to the correct target namespaces
+ //of the schemas
+ WSDL11MessagePart part = new WSDL11MessagePart();
+ part.setName("part1");
+ part.setElementName(reference.getLocalPart()); //todo prefix needs to be here!!!!
+ WSDL11Message message = new WSDL11Message();
+ message.setMessageName(reference.getLocalPart()+MESSAGE_NAME_SUFFIX);
+ message.setParts(new WSDL11MessagePart[]{part});
+
+ //fill this in the message symbol map
+ messageMap.put(reference,message);
+ }
+ }
+ /**
+ *
+ * @param outWriter
+ * @throws WriterException
+ * @throws IOException
+ */
+ protected void writeEndDescripton(Writer outWriter) throws IOException {
+ WriterUtil.writeEndElement(DEFINITION_NAME,defaultWSDLPrefix,outWriter);
+ }
+
+ /**
+ *
+ * @param desc
+ * @param outWriter
+ * @throws IOException
+ */
+ protected void writeImports(WSDLDescription desc,Writer outWriter) throws IOException{
+ //todo 1.1 pump does not populate the imports
+ //get the imports
+ List imports = desc.getImports();
+ int importCount = imports.size();
+ WSDLImport singleImport;
+ for (int i = 0; i < importCount; i++) {
+ singleImport= (WSDLImport)imports.get(i);
+ WriterUtil.writeStartElement(IMPORT_NAME,defaultWSDLPrefix,outWriter);
+ WriterUtil.writeAttribute("namespace",singleImport.getNamespace(),outWriter);
+ WriterUtil.writeAttribute("location",singleImport.getLocation(),outWriter);
+ WriterUtil.writeCompactEndElement(outWriter);
+ }
+
+
+ }
+
+ /**
+ * Write porttypes
+ * @param desc
+ * @param outWriter
+ * @throws IOException
+ */
+ protected void writeTypes(WSDLDescription desc,Writer outWriter) throws IOException{
+ //get the imports
+ WSDLTypes types = desc.getTypes();
+ if (types!=null){
+ WriterUtil.writeStartElement(TYPES_NAME,defaultWSDLPrefix,outWriter);
+ WriterUtil.writeCloseStartElement(outWriter);
+ handlerExtensibiltyElements(types.getExtensibilityElements(),outWriter);
+ WriterUtil.writeEndElement(TYPES_NAME,defaultWSDLPrefix,outWriter);
+ }
+ }
+
+ /**
+ *
+ * @param desc
+ * @param outWriter
+ */
+ protected void writePorttypes(WSDLDescription desc,Writer outWriter) throws IOException{
+ Map interfaceMap = desc.getWsdlInterfaces();
+ if (!interfaceMap.isEmpty()){
+ Iterator interfaceIterator = interfaceMap.values().iterator();
+ WSDLInterface wsdlInterface;
+ while (interfaceIterator.hasNext()) {
+ wsdlInterface= (WSDLInterface)interfaceIterator.next();
+ WriterUtil.writeStartElement(PORTTYPE_NAME, defaultWSDLPrefix,outWriter);
+ WriterUtil.writeAttribute("name",
+ wsdlInterface.getName()==null?"":wsdlInterface.getName().getLocalPart(),
+ outWriter);
+ WriterUtil.writeCloseStartElement(outWriter);
+
+ //write the operations
+ writePorttypeOperations(wsdlInterface,outWriter);
+
+ WriterUtil.writeEndElement(PORTTYPE_NAME,defaultWSDLPrefix,outWriter);
+
+ }
+
+
+ }
+ }
+
+ /**
+ * Write the operation
+ * @param wsdlInterface
+ * @param outWriter
+ */
+ protected void writePorttypeOperations(WSDLInterface wsdlInterface,Writer outWriter) throws IOException{
+ Map operationsMap = wsdlInterface.getOperations();
+ if (!operationsMap.isEmpty()){
+ Iterator opIterator = operationsMap.values().iterator();
+ WSDLOperation operation;
+ while (opIterator.hasNext()) {
+ operation = (WSDLOperation)opIterator.next();
+ WriterUtil.writeStartElement("operation",defaultWSDLPrefix,outWriter);
+ WriterUtil.writeAttribute("name",operation.getName()==null?"":operation.getName().getLocalPart(),outWriter);
+ WriterUtil.writeCloseStartElement(outWriter);
+
+ //write the inputs
+ WSDL11Message message;
+ MessageReference inputMessage = operation.getInputMessage();
+ if (inputMessage!=null){
+ message =(WSDL11Message) messageMap.get(inputMessage.getElement());
+ WriterUtil.writeStartElement("input",defaultWSDLPrefix,outWriter);
+ WriterUtil.writeAttribute("message",targetNamespacePrefix+":"+message.getMessageName(),outWriter);
+ WriterUtil.writeCompactEndElement(outWriter);
+ }
+
+ //write the outputs
+ MessageReference outputMessage = operation.getOutputMessage();
+ if (outputMessage!=null) {
+ message =(WSDL11Message) messageMap.get(outputMessage.getElement());
+ WriterUtil.writeStartElement("output",defaultWSDLPrefix,outWriter);
+ WriterUtil.writeAttribute("message",targetNamespacePrefix+":"+message.getMessageName(),outWriter);
+ WriterUtil.writeCompactEndElement(outWriter);
+ }
+
+ //todo handle the faults here
+
+ WriterUtil.writeEndElement("operation",defaultWSDLPrefix,outWriter);
+
+ }
+ }
+
+
+ }
+
+ /**
+ *
+ * @param desc
+ * @param outWriter
+ * @throws IOException
+ */
+ protected void writeBinding(WSDLDescription desc,Writer outWriter) throws IOException{
+ Map bindingsMap = desc.getBindings();
+
+
+ }
+
+ protected void handlerExtensibiltyElements(List extElementList,Writer outWriter) throws IOException{
+ int extensibilityElementCount = extElementList.size();
+ for (int i = 0; i < extensibilityElementCount; i++) {
+ writeExtensibiltyElement((WSDLExtensibilityElement)extElementList.get(i),outWriter);
+ }
+
+ }
+ protected void writeExtensibiltyElement(WSDLExtensibilityElement extElement,Writer outWriter) throws IOException{
+ if (extElement instanceof Schema){
+ outWriter.write(((Schema)extElement).getElement().toString());
+ }else if(extElement instanceof SOAPAddress ){
+ //todo fill this
+ } else{
+ WriterUtil.writeComment(" Unknown extensibility element" + extElement.toString(),outWriter);
+ }
+
+
+
+ }
+
+ /**
+ * Since we have no proper way to represent a WSDL 1.1 message, here's a simple bean class to
+ * represent it, at least for serializing.
+ *
+ */
+ private class WSDL11Message{
+ private String messageName;
+ private WSDL11MessagePart[] parts;
+
+ public String getMessageName() {
+ return messageName;
+ }
+
+ public void setMessageName(String messageName) {
+ this.messageName = messageName;
+ }
+
+ public WSDL11MessagePart[] getParts() {
+ return parts;
+ }
+
+ public void setParts(WSDL11MessagePart[] parts) {
+ this.parts = parts;
+ }
+
+
+ }
+
+ /**
+ * Samething as the WSDL11 message. A simple abstraction
+ */
+ private class WSDL11MessagePart{
+ private String name;
+ private String elementName;
+ private String type;
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getElementName() {
+ return elementName;
+ }
+
+ public void setElementName(String elementName) {
+ this.elementName = elementName;
+ }
+
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ }
+}
Added: webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/writer/WOMtoWSDL20Writer.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/writer/WOMtoWSDL20Writer.java?rev=293230&view=auto
==============================================================================
--- webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/writer/WOMtoWSDL20Writer.java (added)
+++ webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/writer/WOMtoWSDL20Writer.java Sun Oct 2 21:09:20 2005
@@ -0,0 +1,48 @@
+package org.apache.axis2.wsdl.writer;
+
+import org.apache.axis2.wsdl.WSDLVersionWrapper;
+import org.apache.wsdl.WSDLDescription;
+
+import java.io.OutputStream;
+/*
+ * Copyright 2004,2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+public class WOMtoWSDL20Writer implements WOMWriter{
+
+ public void setEncoding(String encoding) {
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ *
+ * @param wsdlWrapper
+ * @param out
+ * @throws WriterException
+ */
+ public void writeWOM(WSDLVersionWrapper wsdlWrapper, OutputStream out) throws WriterException {
+ throw new WriterException("Not complete!");
+ }
+
+ /**
+ *
+ * @param wsdlDescription
+ * @param out
+ * @throws WriterException
+ */
+ public void writeWOM(WSDLDescription wsdlDescription, OutputStream out) throws WriterException {
+ throw new WriterException("Not complete!");
+ }
+}
Added: webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/writer/WriterException.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/writer/WriterException.java?rev=293230&view=auto
==============================================================================
--- webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/writer/WriterException.java (added)
+++ webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/writer/WriterException.java Sun Oct 2 21:09:20 2005
@@ -0,0 +1,34 @@
+package org.apache.axis2.wsdl.writer;
+/*
+ * Copyright 2004,2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+public class WriterException extends Exception{
+
+ public WriterException() {
+ }
+
+ public WriterException(String message) {
+ super(message);
+ }
+
+ public WriterException(Throwable cause) {
+ super(cause);
+ }
+
+ public WriterException(String message, Throwable cause) {
+ super(message, cause);
+ }
+}
Added: webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/writer/WriterUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/writer/WriterUtil.java?rev=293230&view=auto
==============================================================================
--- webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/writer/WriterUtil.java (added)
+++ webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/writer/WriterUtil.java Sun Oct 2 21:09:20 2005
@@ -0,0 +1,117 @@
+package org.apache.axis2.wsdl.writer;
+
+import java.io.Writer;
+import java.io.IOException;
+/*
+ * Copyright 2004,2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+// Enforcing package access
+class WriterUtil {
+
+ /**
+ * Write a start element
+ * @param elementName
+ * @param writer
+ * @throws IOException
+ */
+ public static void writeStartElement(String elementName, Writer writer) throws IOException {
+ writer.write("<" + elementName);
+ }
+
+ /**
+ *
+ * @param elementName
+ * @param nsPrefix
+ * @param writer
+ * @throws IOException
+ */
+ public static void writeStartElement(String elementName,String nsPrefix, Writer writer) throws IOException {
+ if (nsPrefix==null){
+ writeStartElement(elementName,writer);
+ }else{
+ writer.write("<" + nsPrefix+":"+elementName);
+ }
+
+ }
+
+
+ /**
+ * Close start Element
+ * @param elementName
+ * @param writer
+ * @throws IOException
+ */
+ public static void writeCloseStartElement(Writer writer) throws IOException {
+ writer.write(">\n");
+ }
+ /**
+ * write an attrib
+ * @param attName
+ * @param value
+ * @param writer
+ * @throws IOException
+ */
+ public static void writeAttribute(String attName,String value, Writer writer) throws IOException {
+ writer.write(" " + attName + "=\""+value + "\"");
+ }
+
+ /**
+ * Write end element
+ * @param attName
+ * @param value
+ * @param writer
+ * @throws IOException
+ */
+ public static void writeEndElement(String eltName, Writer writer) throws IOException {
+ writer.write("</" + eltName + ">\n");
+ }
+
+ /**
+ * Write end element
+ * @param writer
+ * @throws IOException
+ */
+ public static void writeCompactEndElement(Writer writer) throws IOException {
+ writer.write("/>\n");
+ }
+ /**
+ * Write end element
+ * @param attName
+ * @param value
+ * @param writer
+ * @throws IOException
+ */
+ public static void writeEndElement(String eltName,String nsPrefix, Writer writer) throws IOException {
+ if (nsPrefix==null){
+ writeEndElement(eltName,writer);
+ }else{
+ writer.write("</" + nsPrefix+":"+eltName + ">\n");
+ }
+ }
+
+ public static void writeNamespace(String prefix,String namespaceURI,Writer writer) throws IOException{
+ if (prefix==null || prefix.trim().length()==0){
+ writeAttribute("xmlns",namespaceURI,writer);
+ }else{
+ writeAttribute("xmlns:"+prefix,namespaceURI,writer);
+ }
+ }
+
+ public static void writeComment(String comment,Writer writer) throws IOException{
+ writer.write("<!--" + comment + "-->");
+ }
+
+
+}
Modified: webservices/axis2/trunk/java/modules/wsdl/src/org/apache/wsdl/Component.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/wsdl/src/org/apache/wsdl/Component.java?rev=293230&r1=293229&r2=293230&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/wsdl/src/org/apache/wsdl/Component.java (original)
+++ webservices/axis2/trunk/java/modules/wsdl/src/org/apache/wsdl/Component.java Sun Oct 2 21:09:20 2005
@@ -87,4 +87,12 @@
* @return the metadata Map.
*/
public Map getMetadataBag();
+
+ /**
+ * Put anything that you feel like in here. This is probably
+ * a good place to store those 'likely to be missed' WSDL 1.1
+ * properties
+ *
+ */
+ public void setMetadataBag(Map map);
}
Modified: webservices/axis2/trunk/java/modules/wsdl/src/org/apache/wsdl/WSDLDescription.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/wsdl/src/org/apache/wsdl/WSDLDescription.java?rev=293230&r1=293229&r2=293230&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/wsdl/src/org/apache/wsdl/WSDLDescription.java (original)
+++ webservices/axis2/trunk/java/modules/wsdl/src/org/apache/wsdl/WSDLDescription.java Sun Oct 2 21:09:20 2005
@@ -165,7 +165,7 @@
/**
* Will return all the Namespaces associated with the Definition
- * Component and will be keyed by the Napespace Prefix.
+ * Component and will be keyed by the Namespace Prefix.
*
* @return
*/
Modified: webservices/axis2/trunk/java/modules/wsdl/src/org/apache/wsdl/impl/ComponentImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/wsdl/src/org/apache/wsdl/impl/ComponentImpl.java?rev=293230&r1=293229&r2=293230&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/wsdl/src/org/apache/wsdl/impl/ComponentImpl.java (original)
+++ webservices/axis2/trunk/java/modules/wsdl/src/org/apache/wsdl/impl/ComponentImpl.java Sun Oct 2 21:09:20 2005
@@ -52,7 +52,7 @@
/**
* Metadata
*/
- private HashMap metadata = null;
+ private Map metadata = null;
/**
* Returns the Documentation Element as a <code>Document</code>.
@@ -174,5 +174,13 @@
if (metadata == null)
metadata = new HashMap();
return metadata;
+ }
+
+ /**
+ *
+ * @param map
+ */
+ public void setMetadataBag(Map map) {
+ this.metadata = map;
}
}
Added: webservices/axis2/trunk/java/modules/wsdl/test/org/apache/axis2/wsdl/writer/WriterTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/wsdl/test/org/apache/axis2/wsdl/writer/WriterTest.java?rev=293230&view=auto
==============================================================================
--- webservices/axis2/trunk/java/modules/wsdl/test/org/apache/axis2/wsdl/writer/WriterTest.java (added)
+++ webservices/axis2/trunk/java/modules/wsdl/test/org/apache/axis2/wsdl/writer/WriterTest.java Sun Oct 2 21:09:20 2005
@@ -0,0 +1,51 @@
+package org.apache.axis2.wsdl.writer;
+
+import junit.framework.TestCase;
+import org.apache.wsdl.WSDLDescription;
+import org.apache.axis2.wsdl.builder.WOMBuilderFactory;
+import org.apache.axis2.wsdl.builder.WOMBuilder;
+import org.apache.axis2.wsdl.WSDLConstants;
+
+import java.io.FileInputStream;
+import java.io.File;
+import java.io.PrintStream;
+/*
+ * Copyright 2004,2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+public class WriterTest extends TestCase {
+
+ WSDLDescription description;
+
+
+ protected void setUp() throws Exception {
+ WOMBuilder builder = WOMBuilderFactory.getBuilder(WSDLConstants.WSDL_1_1);
+// this.description = builder.build("test-resources/BookQuote.wsdl").getDescription();
+ this.description = builder.build("test-resources/wsat.wsdl").getDescription();
+ }
+
+
+ public void testWriting(){
+ WOMWriter writer = WOMWriterFactory.createWriter(WSDLConstants.WSDL_1_1);
+ try {
+ PrintStream out = System.out;
+ writer.writeWOM(this.description,out);
+
+ } catch (WriterException e) {
+ e.printStackTrace();
+ }
+ }
+
+}
Modified: webservices/axis2/trunk/java/modules/wsdl/test/org/apache/wsdl/BindingOperationTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/wsdl/test/org/apache/wsdl/BindingOperationTest.java?rev=293230&r1=293229&r2=293230&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/wsdl/test/org/apache/wsdl/BindingOperationTest.java (original)
+++ webservices/axis2/trunk/java/modules/wsdl/test/org/apache/wsdl/BindingOperationTest.java Sun Oct 2 21:09:20 2005
@@ -36,7 +36,7 @@
WSDLDescription womDescription;
String path = getTestResourceFile("BookQuote.wsdl").getAbsolutePath();
- womDescription = WOMBuilderFactory.getBuilder(WOMBuilderFactory.WSDL11)
+ womDescription = WOMBuilderFactory.getBuilder(org.apache.axis2.wsdl.WSDLConstants.WSDL_1_1)
.build(path).getDescription();
assertNotNull(womDescription);
Modified: webservices/axis2/trunk/java/modules/wsdl/test/org/apache/wsdl/CreateSchemaTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/wsdl/test/org/apache/wsdl/CreateSchemaTest.java?rev=293230&r1=293229&r2=293230&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/wsdl/test/org/apache/wsdl/CreateSchemaTest.java (original)
+++ webservices/axis2/trunk/java/modules/wsdl/test/org/apache/wsdl/CreateSchemaTest.java Sun Oct 2 21:09:20 2005
@@ -16,7 +16,7 @@
package org.apache.wsdl;
-import org.apache.axis2.wsdl.WSDLVersionWrapper;
+import org.apache.axis2.wsdl.*;
import org.apache.axis2.wsdl.builder.WOMBuilderFactory;
import org.apache.wsdl.extensions.ExtensionConstants;
import org.apache.wsdl.extensions.Schema;
@@ -42,7 +42,7 @@
if (null == this.womDescription) {
String path = getTestResourceFile("BookQuote.wsdl").getAbsolutePath();
wsdlVersionWrapper =
- WOMBuilderFactory.getBuilder(WOMBuilderFactory.WSDL11)
+ WOMBuilderFactory.getBuilder(org.apache.axis2.wsdl.WSDLConstants.WSDL_1_1)
.build(path);
this.womDescription = wsdlVersionWrapper.getDescription();
}
Modified: webservices/axis2/trunk/java/modules/wsdl/test/org/apache/wsdl/MessageReuseTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/wsdl/test/org/apache/wsdl/MessageReuseTest.java?rev=293230&r1=293229&r2=293230&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/wsdl/test/org/apache/wsdl/MessageReuseTest.java (original)
+++ webservices/axis2/trunk/java/modules/wsdl/test/org/apache/wsdl/MessageReuseTest.java Sun Oct 2 21:09:20 2005
@@ -16,7 +16,7 @@
package org.apache.wsdl;
-import org.apache.axis2.wsdl.WSDLVersionWrapper;
+import org.apache.axis2.wsdl.*;
import org.apache.axis2.wsdl.builder.WOMBuilderFactory;
import org.apache.wsdl.extensions.ExtensionConstants;
import org.apache.wsdl.extensions.Schema;
@@ -44,7 +44,7 @@
if (null == this.womDescription) {
String path = getTestResourceFile("BookQuote.wsdl").getAbsolutePath();
wsdlVersionWrapper =
- WOMBuilderFactory.getBuilder(WOMBuilderFactory.WSDL11)
+ WOMBuilderFactory.getBuilder(org.apache.axis2.wsdl.WSDLConstants.WSDL_1_1)
.build(path);
this.womDescription = wsdlVersionWrapper.getDescription();
}
Modified: webservices/axis2/trunk/java/modules/wsdl/test/org/apache/wsdl/SOAPActionTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/wsdl/test/org/apache/wsdl/SOAPActionTest.java?rev=293230&r1=293229&r2=293230&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/wsdl/test/org/apache/wsdl/SOAPActionTest.java (original)
+++ webservices/axis2/trunk/java/modules/wsdl/test/org/apache/wsdl/SOAPActionTest.java Sun Oct 2 21:09:20 2005
@@ -16,7 +16,7 @@
package org.apache.wsdl;
-import org.apache.axis2.wsdl.WSDLVersionWrapper;
+import org.apache.axis2.wsdl.*;
import org.apache.axis2.wsdl.builder.WOMBuilderFactory;
import org.apache.wsdl.extensions.ExtensionConstants;
import org.apache.wsdl.extensions.SOAPOperation;
@@ -41,7 +41,7 @@
if (null == this.womDescription) {
String path = getTestResourceFile("InteropTestDocLit2.wsdl").getAbsolutePath();
wsdlVersionWrapper =
- WOMBuilderFactory.getBuilder(WOMBuilderFactory.WSDL11)
+ WOMBuilderFactory.getBuilder(org.apache.axis2.wsdl.WSDLConstants.WSDL_1_1)
.build(path);
this.womDescription = wsdlVersionWrapper.getDescription();
Modified: webservices/axis2/trunk/java/modules/wsdl/test/org/apache/wsdl/WOMBuilderTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/wsdl/test/org/apache/wsdl/WOMBuilderTest.java?rev=293230&r1=293229&r2=293230&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/wsdl/test/org/apache/wsdl/WOMBuilderTest.java (original)
+++ webservices/axis2/trunk/java/modules/wsdl/test/org/apache/wsdl/WOMBuilderTest.java Sun Oct 2 21:09:20 2005
@@ -17,7 +17,7 @@
package org.apache.wsdl;
-import org.apache.axis2.wsdl.WSDLVersionWrapper;
+import org.apache.axis2.wsdl.*;
import org.apache.axis2.wsdl.builder.WOMBuilderFactory;
import javax.wsdl.Definition;
@@ -42,7 +42,7 @@
if (null == this.womDescription) {
String path = getTestResourceFile("InteropTest.wsdl").getAbsolutePath();
wsdlVersionWrapper =
- WOMBuilderFactory.getBuilder(WOMBuilderFactory.WSDL11)
+ WOMBuilderFactory.getBuilder(org.apache.axis2.wsdl.WSDLConstants.WSDL_1_1)
.build(path);
this.womDescription = wsdlVersionWrapper.getDescription();
}