You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by aj...@apache.org on 2006/07/17 07:16:35 UTC
svn commit: r422623 - in /webservices/axis2/trunk/java/modules:
codegen/src/org/apache/axis2/wsdl/codegen/emitter/
codegen/src/org/apache/axis2/wsdl/codegen/extension/
core/src/org/apache/axis2/description/
xmlbeans/src/org/apache/axis2/xmlbeans/
Author: ajith
Date: Sun Jul 16 22:16:33 2006
New Revision: 422623
URL: http://svn.apache.org/viewvc?rev=422623&view=rev
Log:
1. Removed some unused methods and improved the comments
Modified:
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/SchemaUnwrapperExtension.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java
webservices/axis2/trunk/java/modules/xmlbeans/src/org/apache/axis2/xmlbeans/CodeGenerationUtility.java
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java?rev=422623&r1=422622&r2=422623&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java Sun Jul 16 22:16:33 2006
@@ -2,6 +2,7 @@
import java.io.File;
import java.io.IOException;
+import java.io.StringWriter;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
@@ -16,6 +17,11 @@
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.transform.URIResolver;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.dom.DOMSource;
import org.apache.axis2.addressing.AddressingConstants;
import org.apache.axis2.description.AxisMessage;
@@ -445,7 +451,7 @@
addAttribute(doc, "package", packageName, rootElement);
addAttribute(doc, "name", stubName, rootElement);
addAttribute(doc, "servicename", localPart, rootElement);
- //todo is this right ??
+ //The target nemespace is added as the namespace for this service
addAttribute(doc, "namespace", axisService.getTargetNamespace(), rootElement);
addAttribute(doc, "interfaceName", localPart, rootElement);
addAttribute(doc, "callbackname", localPart + CALL_BACK_HANDLER_SUFFIX, rootElement);
@@ -636,7 +642,7 @@
addAttribute(doc, "package", codeGenConfiguration.getPackageName(), rootElement);
addAttribute(doc, "name", makeJavaClassName(axisService.getName()) + CALL_BACK_HANDLER_SUFFIX, rootElement);
- // TODO JAXRPC mapping support should be considered
+ // TODO JAXRPC mapping support should be considered here ??
this.loadOperations(doc, rootElement, null);
doc.appendChild(rootElement);
@@ -1523,21 +1529,19 @@
protected void debugLogDocument(String description, Document doc) {
if (log.isDebugEnabled()) {
try {
-// System.err.println(DOM2Writer.nodeToString(doc.getDocumentElement()));
-// DOMSource source = new DOMSource(doc);
-// StringWriter swrite = new StringWriter();
-// swrite.write(description);
-// swrite.write("\n");
-// Transformer transformer =
-// TransformerFactory.newInstance().newTransformer();
-// transformer.setOutputProperty("omit-xml-declaration", "yes");
-// transformer.setOutputProperty(OutputKeys.INDENT, "yes");
-// transformer.transform(source, new StreamResult(swrite));
-//
-// log.debug(swrite.toString());
+ DOMSource source = new DOMSource(doc);
+ StringWriter swrite = new StringWriter();
+ swrite.write(description);
+ swrite.write("\n");
+ Transformer transformer =
+ TransformerFactory.newInstance().newTransformer();
+ transformer.setOutputProperty("omit-xml-declaration", "yes");
+ transformer.setOutputProperty(OutputKeys.INDENT, "yes");
+ transformer.transform(source, new StreamResult(swrite));
- } catch (Exception e) {
+ log.debug(swrite.toString());
+ } catch (Exception e) {
e.printStackTrace();
}
}
@@ -1781,8 +1785,7 @@
Iterator iter = msg.getExtensibilityAttributes().iterator();
while (iter.hasNext()) {
- //TODO : implement this
-//
+ // process extensibility attributes
}
params.add(paramElement);
}
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/SchemaUnwrapperExtension.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/SchemaUnwrapperExtension.java?rev=422623&r1=422622&r2=422623&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/SchemaUnwrapperExtension.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/SchemaUnwrapperExtension.java Sun Jul 16 22:16:33 2006
@@ -46,7 +46,20 @@
* This extension invokes the schema unwrapper depending on the users setting.
* it is desirable to put this extension before other extensions since extnsions
* such as the databinding extension may well depend on the schema being unwrapped
- * previously
+ * previously.
+ * For a complete unwrap the following format of the schema is expected
+ * < element >
+ * < complexType >
+ * < sequence >
+ * < element />
+ * < /sequence >
+ * < /complexType >
+ * < /element >
+ *
+ * When an unwrapped WSDL is encountered Axis2 generates a wrapper schema
+ * and that wrapper schema has the above mentioned format. This unwrapping algorithm
+ * will work on a pure doc/lit WSDL if it has the above mentioned format
+ * only
*/
public class SchemaUnwrapperExtension extends AbstractCodeGenerationExtension {
@@ -109,7 +122,7 @@
throw new CodeGenerationException(CodegenMessages.getMessage("extension.unsupportedSchemaFormat",
"named type","anonymous type"));
}
-
+
//create a type mapper
if (schemaType instanceof XmlSchemaComplexType){
@@ -182,22 +195,22 @@
//we do not know how to deal with other particles
//such as xs:all or xs:choice. Usually occurs when
//passed with the user built WSDL where the style
- //is document. We'll just return here doing nothing
+ //is document.
}else if (particle instanceof XmlSchemaChoice){
- throw new CodeGenerationException(CodegenMessages.getMessage("extension.unsupportedSchemaFormat",
- "choice","sequence"));
+ throw new CodeGenerationException(CodegenMessages.getMessage("extension.unsupportedSchemaFormat",
+ "choice","sequence"));
}else if (particle instanceof XmlSchemaAll){
- throw new CodeGenerationException(CodegenMessages.getMessage("extension.unsupportedSchemaFormat",
- "all","sequence"));
+ throw new CodeGenerationException(CodegenMessages.getMessage("extension.unsupportedSchemaFormat",
+ "all","sequence"));
}else{
throw new CodeGenerationException(CodegenMessages.getMessage("extension.unsupportedSchemaFormat",
- "unknown","sequence"));
+ "unknown","sequence"));
}
}else{
- //we've no idea how to unwrap a non complexYype!!!!!!
- throw new CodeGenerationException(CodegenMessages.getMessage("extension.unsupportedSchemaFormat",
- "unknown","complexType"));
+ //we've no idea how to unwrap a non complexType!!!!!!
+ throw new CodeGenerationException(CodegenMessages.getMessage("extension.unsupportedSchemaFormat",
+ "unknown","complexType"));
}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java?rev=422623&r1=422622&r2=422623&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java Sun Jul 16 22:16:33 2006
@@ -840,41 +840,6 @@
return axisOperation;
}
-// /**
-// * Generates a referenceQName
-// *
-// * @param wsdl4jMessage
-// */
-// private QName generateReferenceQname(QName outerName,
-// Message wsdl4jMessage,
-// boolean isWrappable) {
-// QName referenceQName = null;
-// if (isWrappable) {
-// //The schema for this should be already made ! Find the QName from
-// // the list
-// referenceQName = (QName) resolvedRpcWrappedElementMap.get(outerName
-// .getLocalPart());
-//
-// } else {
-// //Only one part so copy the QName of the referenced type.
-// Iterator outputIterator = wsdl4jMessage.getParts().values()
-// .iterator();
-// if (outputIterator.hasNext()) {
-// Part outPart = ((Part) outputIterator.next());
-// QName typeName;
-// if (null != (typeName = outPart.getTypeName())) {
-// referenceQName = typeName;
-// } else {
-// referenceQName = outPart.getElementName();
-// }
-// }
-// }
-// ////////////////////////////////////////////////////////////////////////////////
-// System.out.println(wsdl4jMessage.getQName());
-// System.out.println("final referenceQName = " + referenceQName);
-// ////////////////////////////////////////////////////////////////////////////////
-// return referenceQName;
-// }
/**
* Generates a list of wrapper schemas
@@ -1195,12 +1160,6 @@
}
-// Element[] complexTypeElements = (Element[]) complexTypeElementsMap
-// .values().toArray(new Element[complexTypeElementsMap.size()]);
-// for (int i = 0; i < complexTypeElements.length; i++) {
-// schemaElement.appendChild(complexTypeElements[i]);
-//
-// }
Element[] elementDeclarations = (Element[]) elementElementsList
.toArray(new Element[elementElementsList.size()]);
@@ -1585,7 +1544,7 @@
PolicyInclude.BINDING_POLICY, policyRefElement);
}
- //TODO wsdl:portType ?
+ //TODO policy for wsdl:portType ?
} else if (description instanceof AxisOperation) {
Modified: webservices/axis2/trunk/java/modules/xmlbeans/src/org/apache/axis2/xmlbeans/CodeGenerationUtility.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/xmlbeans/src/org/apache/axis2/xmlbeans/CodeGenerationUtility.java?rev=422623&r1=422622&r2=422623&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xmlbeans/src/org/apache/axis2/xmlbeans/CodeGenerationUtility.java (original)
+++ webservices/axis2/trunk/java/modules/xmlbeans/src/org/apache/axis2/xmlbeans/CodeGenerationUtility.java Sun Jul 16 22:16:33 2006
@@ -46,7 +46,6 @@
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.description.AxisMessage;
import org.apache.ws.commons.schema.XmlSchema;
-import org.apache.ws.commons.schema.XmlSchemaType;
import org.apache.xmlbeans.BindingConfig;
import org.apache.xmlbeans.Filer;
import org.apache.xmlbeans.SchemaProperty;
@@ -555,33 +554,7 @@
}
- /**
- * Populate the schema objects into the
- *
- * @param schemaMap
- * @param schemaList
- */
- private static void populateSchemaMap(Map schemaMap, List schemaList) {
- for (int i = 0; i < schemaList.size(); i++) {
- XmlSchema xmlSchema = (XmlSchema) schemaList.get(i);
- schemaMap.put(xmlSchema.getTargetNamespace(), xmlSchema);
- }
- }
- /**
- * Look for a given schema type given the schema type Qname
- * @param schemaMap
- * @param namespaceURI
- * @return null if the schema is not found
- */
- private static XmlSchemaType findSchemaType(Map schemaMap, QName schemaTypeName) {
- //find the schema
- XmlSchema schema = (XmlSchema) schemaMap.get(schemaTypeName.getNamespaceURI());
- if (schema!=null){
- return schema.getTypeByName(schemaTypeName);
- }
- return null;
- }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org