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/09/16 21:50:01 UTC
svn commit: r289639 - in /webservices/axis2/trunk/java/modules:
core/src/org/apache/axis2/clientapi/ wsdl/src/org/apache/axis2/wsdl/codegen/
wsdl/src/org/apache/axis2/wsdl/codegen/emitter/
wsdl/src/org/apache/axis2/wsdl/template/java/ xml/src/org/apach...
Author: gdaniels
Date: Fri Sep 16 12:49:51 2005
New Revision: 289639
URL: http://svn.apache.org/viewcvs?rev=289639&view=rev
Log:
Tidying a bit, add "none" option for databinding, and switch on namespace repairing.
Modified:
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/clientapi/Stub.java
webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/CodeGenConfiguration.java
webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/CommandLineOptionConstants.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/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl
webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/java/InterfaceTemplate.xsl
webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/OMOutputImpl.java
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/clientapi/Stub.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/clientapi/Stub.java?rev=289639&r1=289638&r2=289639&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/clientapi/Stub.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/clientapi/Stub.java Fri Sep 16 12:49:51 2005
@@ -22,7 +22,6 @@
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.context.ServiceContext;
-import org.apache.axis2.deployment.DeploymentException;
import org.apache.axis2.description.ServiceDescription;
import org.apache.axis2.om.OMAbstractFactory;
import org.apache.axis2.om.OMElement;
@@ -42,7 +41,7 @@
import java.util.Iterator;
-public abstract class Stub{
+public abstract class Stub {
public static final int SOAP_11 =0;
public static final int SOAP_12 =1;
@@ -112,8 +111,7 @@
protected String _currentSessionId = null;
- protected Stub() throws DeploymentException, AxisFault {
-
+ protected Stub() {
}
/**
Modified: webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/CodeGenConfiguration.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/CodeGenConfiguration.java?rev=289639&r1=289638&r2=289639&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/CodeGenConfiguration.java (original)
+++ webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/CodeGenConfiguration.java Fri Sep 16 12:49:51 2005
@@ -96,9 +96,11 @@
public void setDatabindingType(String databindingType) {
if (Databinding.XML_BEANS.equalsIgnoreCase(databindingType)) {
this.databindingType = XSLTConstants.DataBindingTypes.XML_BEANS;
- }else if(Databinding.JAXB.equalsIgnoreCase(databindingType)){
+ } else if (Databinding.JAXB.equalsIgnoreCase(databindingType)) {
this.databindingType = XSLTConstants.DataBindingTypes.JAXB;
- }else{
+ } else if (Databinding.NONE.equalsIgnoreCase(databindingType)) {
+ this.databindingType = XSLTConstants.DataBindingTypes.NONE;
+ } else {
this.databindingType = XSLTConstants.DataBindingTypes.NONE;
// throw new UnsupportedOperationException();
}
Modified: webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/CommandLineOptionConstants.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/CommandLineOptionConstants.java?rev=289639&r1=289638&r2=289639&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/CommandLineOptionConstants.java (original)
+++ webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/CommandLineOptionConstants.java Fri Sep 16 12:49:51 2005
@@ -45,5 +45,6 @@
public interface Databinding {
public static final String XML_BEANS = "xmlbeans";
public static final String JAXB = "jaxb";
+ public static final String NONE = "none";
}
}
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=289639&r1=289638&r2=289639&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 Fri Sep 16 12:49:51 2005
@@ -79,7 +79,7 @@
private static final String CALL_BACK_HANDLER_SUFFIX = "CallbackHandler";
private static final String STUB_SUFFIX = "Stub";
private static final String TEST_SUFFIX = "Test";
- private static final String LOCAL_TEST_SUFFIX = "LocalTest";
+// private static final String LOCAL_TEST_SUFFIX = "LocalTest";
private static final String SERVICE_CLASS_SUFFIX = "Skeleton";
private static final String TEST_PACKAGE_NAME_SUFFIX = ".test";
private static final String DATABINDING_SUPPORTER_NAME_SUFFIX = "DatabindingSupporter";
@@ -617,7 +617,7 @@
param);
String typeMapping = this.mapper.getTypeMapping(
inputMessage.getElement());
- String typeMappingStr = typeMapping == null ? "" : typeMapping;
+ String typeMappingStr = typeMapping == null ? "org.apache.axis2.om.OMElement" : typeMapping;
addAttribute(doc, "type", typeMappingStr, param);
//add this as a body parameter
addAttribute(doc,"location","body",param);
Modified: webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl?rev=289639&r1=289638&r2=289639&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl (original)
+++ webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl Fri Sep 16 12:49:51 2005
@@ -27,10 +27,10 @@
org.apache.axis2.description.OperationDescription __operation;
_operations = new org.apache.axis2.description.OperationDescription[<xsl:value-of select="count(method)"/>];
<xsl:for-each select="method">
- __operation = new org.apache.axis2.description.OperationDescription();
- __operation.setName(new javax.xml.namespace.QName("<xsl:value-of select="@namespace"/>", "<xsl:value-of select="@name"/>"));
- _operations[<xsl:value-of select="position()-1"/>]=__operation;
- _service.addOperation(__operation);
+ __operation = new org.apache.axis2.description.OperationDescription();
+ __operation.setName(new javax.xml.namespace.QName("<xsl:value-of select="@namespace"/>", "<xsl:value-of select="@name"/>"));
+ _operations[<xsl:value-of select="position()-1"/>]=__operation;
+ _service.addOperation(__operation);
</xsl:for-each>
}
Modified: webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/java/InterfaceTemplate.xsl
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/java/InterfaceTemplate.xsl?rev=289639&r1=289638&r2=289639&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/java/InterfaceTemplate.xsl (original)
+++ webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/java/InterfaceTemplate.xsl Fri Sep 16 12:49:51 2005
@@ -21,12 +21,10 @@
<!-- start of the sync block -->
<xsl:if test="$isSync='1'">
/**
- * Auto generated method signature
- <xsl:for-each select="input/param[@type!='']">
- *@param <xsl:value-of select="@name"></xsl:value-of><xsl:text>
- </xsl:text></xsl:for-each>
+ * Auto generated method signatures
+ <xsl:for-each select="input/param[@type!='']">* @param <xsl:value-of select="@name"></xsl:value-of></xsl:for-each>
*/
- public <xsl:choose><xsl:when test="$outputtype=''">void</xsl:when><xsl:otherwise><xsl:value-of select="$outputtype"/></xsl:otherwise></xsl:choose>
+ public <xsl:choose><xsl:when test="$outputtype=''">void</xsl:when><xsl:otherwise><xsl:value-of select="$outputtype"/></xsl:otherwise></xsl:choose>
<xsl:text> </xsl:text><xsl:value-of select="@name"/>(
<xsl:for-each select="input/param[@type!='']">
<xsl:if test="position()>1">,</xsl:if><xsl:value-of select="@type"/><xsl:text> </xsl:text><xsl:value-of select="@name"/>
@@ -37,13 +35,11 @@
<!-- start of the async block -->
<xsl:if test="$isAsync='1'">
/**
- * Auto generated method signature
- <xsl:for-each select="input/param">
- <xsl:if test="@type!=''">* @param <xsl:value-of select="@name"></xsl:value-of><xsl:text>
- </xsl:text></xsl:if></xsl:for-each>
- */
+ * Auto generated method signature
+ <xsl:for-each select="input/param"><xsl:if test="@type!=''">* @param <xsl:value-of select="@name"></xsl:value-of></xsl:if></xsl:for-each>
+ */
- public void start<xsl:value-of select="@name"/>(
+ public void start<xsl:value-of select="@name"/>(
<xsl:variable name="paramCount"><xsl:value-of select="count(input/param[@type!=''])"></xsl:value-of></xsl:variable>
<xsl:for-each select="input/param">
<xsl:if test="@type!=''"><xsl:if test="position()>1">,</xsl:if><xsl:value-of select="@type"/><xsl:text> </xsl:text><xsl:value-of select="@name"></xsl:value-of></xsl:if></xsl:for-each>
Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/OMOutputImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/OMOutputImpl.java?rev=289639&r1=289638&r2=289639&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/OMOutputImpl.java (original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/OMOutputImpl.java Fri Sep 16 12:49:51 2005
@@ -87,7 +87,7 @@
this.charSetEncoding = DEFAULT_CHAR_SET_ENCODING;
XMLOutputFactory factory = XMLOutputFactory.newInstance();
-// factory.setProperty("javax.xml.stream.isRepairingNamespaces", Boolean.TRUE);
+ factory.setProperty("javax.xml.stream.isRepairingNamespaces", Boolean.TRUE);
if (doOptimize) {
bufferedSoapOutStream = new ByteArrayOutputStream();
xmlWriter = factory.createXMLStreamWriter(bufferedSoapOutStream,