You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by pr...@apache.org on 2007/09/04 19:11:34 UTC
svn commit: r572740 [2/5] - in /webservices/axis2/branches/java/jaxws21: ./
modules/adb-codegen/src/org/apache/axis2/schema/template/
modules/adb-codegen/src/org/apache/axis2/schema/writer/
modules/adb/src/org/apache/axis2/databinding/typemapping/ modu...
Modified: webservices/axis2/branches/java/jaxws21/modules/adb-codegen/src/org/apache/axis2/schema/template/CADBBeanTemplateSource.xsl
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/adb-codegen/src/org/apache/axis2/schema/template/CADBBeanTemplateSource.xsl?rev=572740&r1=572739&r2=572740&view=diff
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/adb-codegen/src/org/apache/axis2/schema/template/CADBBeanTemplateSource.xsl (original)
+++ webservices/axis2/branches/java/jaxws21/modules/adb-codegen/src/org/apache/axis2/schema/template/CADBBeanTemplateSource.xsl Tue Sep 4 10:11:13 2007
@@ -36,6 +36,8 @@
<xsl:variable name="originalName"><xsl:value-of select="@originalName"/></xsl:variable>
<xsl:variable name="nsuri"><xsl:value-of select="@nsuri"/></xsl:variable>
<xsl:variable name="nsprefix"><xsl:value-of select="@nsprefix"/></xsl:variable>
+ <xsl:variable name="anon"><xsl:value-of select="@anon"/></xsl:variable>
+ <xsl:variable name="ordered"><xsl:value-of select="@anon"/></xsl:variable>
/**
* <xsl:value-of select="$axis2_name"/>.h
*
@@ -367,7 +369,7 @@
<xsl:if test="property and (not(@type) or @type='' or property/@attribute)">
axis2_qname_t *qname = NULL;
</xsl:if>-->
- <xsl:if test="not(property/@attribute) and (not(@ordered) or @ordered='' or property/@isarray)">
+ <xsl:if test="not(property/@attribute) and (not(@ordered or not($anon or $istype)) or @ordered='' or property/@isarray)">
axutil_qname_t *element_qname = NULL;
</xsl:if>
<xsl:for-each select="property">
@@ -407,11 +409,22 @@
qname = axiom_element_get_qname( current_element, env, parent);
if ( axutil_qname_equals( qname, env, <xsl:value-of select="$name"/>-> qname ) )
{
- first_node = axiom_node_get_first_child( parent, env);
+ <xsl:choose>
+ <xsl:when test="$anon">
+ first_node = axiom_node_get_first_child( parent, env);
+ </xsl:when>
+ <xsl:otherwise>
+ first_node = parent;
+ </xsl:otherwise>
+ </xsl:choose>
}
else
{
- first_node = parent;
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+ "Failed in building adb object for <xsl:value-of select="$originalName"/> : "
+ "Wrong XML to deserialize");
+ <!-- TODO: ADB specific error should be defiend and set here -->
+ return AXIS2_FAILURE;
}
</xsl:if>
</xsl:for-each>
@@ -636,7 +649,7 @@
<xsl:choose>
<xsl:when test="not(@isarray)"> <!--not an array so continue normal -->
<xsl:choose>
- <xsl:when test="../@ordered">
+ <xsl:when test="../@ordered or not($anon or $istype)"> <!-- since non-anon has just only one sub element-->
<xsl:choose>
<xsl:when test="position()=1">
current_node = first_node;
@@ -675,13 +688,21 @@
</xsl:choose>
if ( current_node != NULL)
{
- <xsl:if test="../@ordered">current_element = axiom_node_get_data_element( current_node, env);</xsl:if>
+ <xsl:if test="../@ordered or not($anon or $istype)">current_element = axiom_node_get_data_element( current_node, env);</xsl:if>
<!-- changes to following choose tag should be changed in another 2 places -->
<xsl:choose>
<xsl:when test="@ours">
element = (void*)adb_<xsl:value-of select="@type"/>_create( env);
+ if(axiom_node_get_first_child(current_node, env)==NULL)
+ {
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+ "Failed in building adb object for <xsl:value-of select="$propertyName"/> : "
+ "Wrong XML to deserialize");
+ <!-- TODO: ADB specific error should be defiend and set here -->
+ return AXIS2_FAILURE;
+ }
status = adb_<xsl:value-of select="@type"/>_deserialize( ( <xsl:value-of select="$nativePropertyType"/>)element, env,
- axiom_node_get_first_child(current_node, env)==NULL?current_node:axiom_node_get_first_child(current_node, env));
+ axiom_node_get_first_child(current_node, env));
if( AXIS2_FAILURE == status)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "failed in building element <xsl:value-of select="$propertyName"/> "
@@ -928,7 +949,7 @@
</xsl:when>
<xsl:otherwise> <!-- when it is all the way an array -->
<xsl:choose>
- <xsl:when test="../@ordered"> <!-- all the elements should follow this -->
+ <xsl:when test="../@ordered or not($anon or $istype)"> <!-- all the elements should follow this -->
element_qname = axutil_qname_create( env, "<xsl:value-of select="$propertyName"/>", "<xsl:value-of select="@nsuri"/>","<xsl:choose>
<xsl:when test="@prefix!=''"><xsl:value-of select="@prefix"/></xsl:when>
<xsl:when test="@nsuri=../@nsuri"><xsl:value-of select="../@nsprefix"/></xsl:when></xsl:choose>");
@@ -955,8 +976,17 @@
<xsl:choose>
<xsl:when test="@ours">
element = (void*)adb_<xsl:value-of select="@type"/>_create( env);
+ if(axiom_node_get_first_child(current_node, env)==NULL)
+ {
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+ "Failed in building adb object for <xsl:value-of select="$propertyName"/> : "
+ "Wrong XML to deserialize");
+ <!-- TODO: ADB specific error should be defiend and set here -->
+ return AXIS2_FAILURE;
+ }
status = adb_<xsl:value-of select="@type"/>_deserialize( ( <xsl:value-of select="$nativePropertyType"/>)element, env,
- axiom_node_get_first_child(current_node, env)==NULL?current_node:axiom_node_get_first_child(current_node, env));
+ axiom_node_get_first_child(current_node, env));
+
if( AXIS2_FAILURE == status)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "failed in building element <xsl:value-of select="$propertyName"/> "
@@ -1089,7 +1119,7 @@
arr_list);
</xsl:when>
- <xsl:otherwise> <!-- otherwse for "../@ordered" -->
+ <xsl:otherwise> <!-- otherwse for "../@ordered or not($anon or $istype)" -->
element_qname = axutil_qname_create( env, "<xsl:value-of select="$propertyName"/>", "<xsl:value-of select="@nsuri"/>","<xsl:choose>
<xsl:when test="@prefix!=''"><xsl:value-of select="@prefix"/></xsl:when>
<xsl:when test="@nsuri=../@nsuri"><xsl:value-of select="../@nsprefix"/></xsl:when></xsl:choose>");
@@ -1110,8 +1140,16 @@
<xsl:choose>
<xsl:when test="@ours">
element = (void*)adb_<xsl:value-of select="@type"/>_create( env);
+ if(axiom_node_get_first_child(current_node, env)==NULL)
+ {
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+ "Failed in building adb object for <xsl:value-of select="$propertyName"/> : "
+ "Wrong XML to deserialize");
+ <!-- TODO: ADB specific error should be defiend and set here -->
+ return AXIS2_FAILURE;
+ }
status = adb_<xsl:value-of select="@type"/>_deserialize( ( <xsl:value-of select="$nativePropertyType"/>)element, env,
- axiom_node_get_first_child(current_node, env)==NULL?current_node:axiom_node_get_first_child(current_node, env));
+ axiom_node_get_first_child(current_node, env));
if( AXIS2_FAILURE == status)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "failed in building element <xsl:value-of select="$propertyName"/> "
@@ -1237,8 +1275,8 @@
}
status = <xsl:value-of select="$axis2_name"/>_set_<xsl:value-of select="$CName"/>( <xsl:value-of select="$name"/>, env,
arr_list);
- </xsl:otherwise> <!--closing otherwise for "../@ordered" -->
- </xsl:choose> <!-- chooses for ordered or not ordered -->
+ </xsl:otherwise> <!--closing otherwise for "../@ordered or not($anon or $istype)" -->
+ </xsl:choose> <!-- chooses for ordered or not @ordered or not($anon or $istype)-->
</xsl:otherwise> <!-- closing when it is all the way an array -->
</xsl:choose> <!-- check array or not -->
</xsl:otherwise> <!-- closing when it is an element not(@attribute) -->
@@ -1278,6 +1316,7 @@
<xsl:choose>
<xsl:when test="not(@type) or (@ours='yes' and (@type='uri' or @type='qname' or @type='date_time' or @type='base64_binary' or @type='char')) or @type='char' or @type='axis2_char_t*' or @type='axutil_base64_binary_t*' or @type='axutil_date_time_t*' or @type='axiom_node_t*' or @type='axutil_uri_t*' or @type='axutil_qname_t*'">
axis2_char_t *text_value_<xsl:value-of select="$position"/>;
+ axis2_char_t *text_value_<xsl:value-of select="$position"/>_temp;
</xsl:when>
<xsl:otherwise>
axis2_char_t text_value_<xsl:value-of select="$position"/>[64];
@@ -1572,11 +1611,13 @@
<xsl:choose>
<xsl:when test="@ours">
- if(has_parent)
- axutil_stream_write(stream, env, start_input_str, start_input_str_len);
+ <xsl:if test="$anon or $istype">
+ axutil_stream_write(stream, env, start_input_str, start_input_str_len);
+ </xsl:if>
adb_<xsl:value-of select="@type"/>_serialize( <xsl:value-of select="$attriName"/>, env, current_node, AXIS2_TRUE);
- if(has_parent)
- axutil_stream_write(stream, env, end_input_str, end_input_str_len);
+ <xsl:if test="$anon or $istype">
+ axutil_stream_write(stream, env, end_input_str, end_input_str_len);
+ </xsl:if>
</xsl:when>
@@ -1747,7 +1788,17 @@
<xsl:when test="$nativePropertyType='axis2_char_t*'">
text_value_<xsl:value-of select="$position"/> = <xsl:value-of select="$attriName"/>;
axutil_stream_write(stream, env, start_input_str, start_input_str_len);
- axutil_stream_write(stream, env, text_value_<xsl:value-of select="$position"/>, axutil_strlen(text_value_<xsl:value-of select="$position"/>));
+
+ text_value_<xsl:value-of select="$position"/>_temp = axutil_xml_quote_string(env, text_value_<xsl:value-of select="$position"/>, AXIS2_TRUE);
+ if (text_value_2_temp)
+ {
+ axutil_stream_write(stream, env, text_value_<xsl:value-of select="$position"/>_temp, axutil_strlen(text_value_<xsl:value-of select="$position"/>_temp));
+ AXIS2_FREE(env->allocator, text_value_<xsl:value-of select="$position"/>_temp);
+ }
+ else
+ {
+ axutil_stream_write(stream, env, text_value_<xsl:value-of select="$position"/>, axutil_strlen(text_value_<xsl:value-of select="$position"/>));
+ }
axutil_stream_write(stream, env, end_input_str, end_input_str_len);
</xsl:when>
Modified: webservices/axis2/branches/java/jaxws21/modules/adb-codegen/src/org/apache/axis2/schema/writer/CStructWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/adb-codegen/src/org/apache/axis2/schema/writer/CStructWriter.java?rev=572740&r1=572739&r2=572740&view=diff
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/adb-codegen/src/org/apache/axis2/schema/writer/CStructWriter.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/adb-codegen/src/org/apache/axis2/schema/writer/CStructWriter.java Tue Sep 4 10:11:13 2007
@@ -21,10 +21,7 @@
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.apache.axis2.schema.typemap.JavaTypeMap;
-import org.apache.axis2.schema.CompilerOptions;
-import org.apache.axis2.schema.SchemaCompilationException;
-import org.apache.axis2.schema.BeanWriterMetaInfoHolder;
-import org.apache.axis2.schema.SchemaCompiler;
+import org.apache.axis2.schema.*;
import org.apache.axis2.schema.util.SchemaPropertyLoader;
import org.apache.axis2.schema.util.PrimitiveTypeFinder;
import org.apache.axis2.schema.util.PrimitiveTypeWrapper;
@@ -235,6 +232,9 @@
try {
//determine the package for this type.
QName qName = simpleType.getQName();
+ if (qName == null) {
+ qName = (QName) simpleType.getMetaInfoMap().get(SchemaConstants.SchemaCompilerInfoHolder.FAKE_QNAME);
+ }
return process(qName, metainf, typeMap, false);
} catch (SchemaCompilationException e) {
Modified: webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/databinding/typemapping/SimpleTypeMapper.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/databinding/typemapping/SimpleTypeMapper.java?rev=572740&r1=572739&r2=572740&view=diff
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/databinding/typemapping/SimpleTypeMapper.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/databinding/typemapping/SimpleTypeMapper.java Tue Sep 4 10:11:13 2007
@@ -31,7 +31,6 @@
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
-import java.util.GregorianCalendar;
import java.util.Iterator;
import java.util.TimeZone;
@@ -48,7 +47,6 @@
private static final String W_FLOAT = "java.lang.Float";
private static final String W_CALENDAR = "java.util.Calendar";
private static final String W_DATE = "java.util.Date";
- private static final String W_DATA_HANDLER = "javax.activation.DataHandler";
private static final String INT = "int";
private static final String BOOLEAN = "boolean";
private static final String BYTE = "byte";
@@ -201,7 +199,7 @@
}
public static boolean isDataHandler(Class obj) {
- return "javax.activation.DataHandler".equals(obj.getName());
+ return obj.isAssignableFrom(DataHandler.class);
}
public static boolean isCollection(Class obj) {
Modified: webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java?rev=572740&r1=572739&r2=572740&view=diff
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java Tue Sep 4 10:11:13 2007
@@ -32,6 +32,7 @@
import javax.activation.DataHandler;
import javax.xml.namespace.QName;
+import javax.xml.namespace.NamespaceContext;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
@@ -372,9 +373,7 @@
simpleDateFormat.setTimeZone(TimeZone.getTimeZone("GMT"));
} else if (restpart.startsWith("+") || restpart.startsWith("-")) {
// this is a specific time format string
- simpleDateFormat = new SimpleDateFormat("yyyy-MM-ddz");
- // have to add the GMT part to process the message
- source = source.substring(0, 10) + "GMT" + restpart;
+ simpleDateFormat = new SimpleDateFormat("yyyy-MM-ddZ");
} else {
throw new RuntimeException("In valid string sufix");
}
@@ -1129,6 +1128,10 @@
public static Object getAnyTypeObject(XMLStreamReader xmlStreamReader) throws XMLStreamException {
Object returnObject = null;
+ // make sure reader is at the first element.
+ while(!xmlStreamReader.isStartElement()){
+ xmlStreamReader.next();
+ }
// first check whether this element is null or not
String nillableValue = xmlStreamReader.getAttributeValue(Constants.XSI_NAMESPACE, "nil");
if ("true".equals(nillableValue) || "1".equals(nillableValue)){
@@ -1139,7 +1142,10 @@
if (attributeType.indexOf(":") > -1) {
attributeType = attributeType.substring(attributeType.indexOf(":") + 1);
}
- String attribValue = xmlStreamReader.getElementText();
+ NamespaceContext namespaceContext = xmlStreamReader.getNamespaceContext();
+ xmlStreamReader.next();
+
+ String attribValue = xmlStreamReader.getText();
if (attribValue != null){
if (attributeType.equals("string")) {
returnObject = attribValue;
@@ -1151,7 +1157,7 @@
if (attribValue.indexOf(":") > -1){
namespacePrefix = attribValue.substring(0,attribValue.indexOf(":"));
localPart = attribValue.substring(attribValue.indexOf(":") + 1);
- returnObject = new QName(xmlStreamReader.getNamespaceURI(namespacePrefix),localPart);
+ returnObject = new QName(namespaceContext.getNamespaceURI(namespacePrefix),localPart);
}
} else if ("boolean".equals(attributeType)) {
returnObject = new Boolean(attribValue);
Modified: webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/codegen-config.properties
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/codegen-config.properties?rev=572740&r1=572739&r2=572740&view=diff
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/codegen-config.properties (original)
+++ webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/codegen-config.properties Tue Sep 4 10:11:13 2007
@@ -137,12 +137,12 @@
# file extension for generated source files from this language
c.filename.extension=c
-jax-ws.callback.template=org.apache.axis2.wsdl.codegen.writer.CallbackHandlerWriter,/org/apache/axis2/wsdl/template/java/CallbackHandlerTemplate.xsl
jax-ws.exception.template=org.apache.axis2.wsdl.codegen.writer.ExceptionWriter,/org/apache/axis2/wsdl/template/java/JaxwsExceptionTemplate.xsl
+jax-ws.interface.impl.template=org.apache.axis2.wsdl.codegen.writer.InterfaceImplementationWriter,/org/apache/axis2/wsdl/template/java/JaxwsServiceEndpointInterfaceImplTemplate.xsl
jax-ws.skeleton.template=org.apache.axis2.wsdl.codegen.writer.SkeletonWriter,/org/apache/axis2/wsdl/template/java/JaxwsServiceClassTemplate.xsl
jax-ws.skeleton.interface.template=org.apache.axis2.wsdl.codegen.writer.SkeletonInterfaceWriter,/org/apache/axis2/wsdl/template/java/JaxwsServiceEndpointInterfaceTemplate.xsl
jax-ws.testclass.template=org.apache.axis2.wsdl.codegen.writer.TestClassWriter,/org/apache/axis2/wsdl/template/java/TestClassTemplate.xsl
-jax-ws.service.template=org.apache.axis2.wsdl.codegen.writer.ServiceXMLWriter,/org/apache/axis2/wsdl/template/general/ServiceXMLTemplate.xsl
+jax-ws.service.template=org.apache.axis2.wsdl.codegen.writer.ServiceXMLWriter,/org/apache/axis2/wsdl/template/java/JaxwsServiceXMLTemplate.xsl
jax-ws.antbuild.jaxbri.template=org.apache.axis2.wsdl.codegen.writer.AntBuildWriter,/org/apache/axis2/wsdl/template/general/jaxbriAntBuildTemplate.xsl
jax-ws.antbuild.none.template=org.apache.axis2.wsdl.codegen.writer.AntBuildWriter,/org/apache/axis2/wsdl/template/general/defaultAntBuildTemplate.xsl
# file extension for generated files from this language
Modified: webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java?rev=572740&r1=572739&r2=572740&view=diff
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java Tue Sep 4 10:11:13 2007
@@ -207,6 +207,9 @@
protected static final String TEST_SRC_DIR_NAME = "test";
+ protected boolean useHolderClass_jaxws = false;
+ protected boolean wrapped_jaxws = false;
+
/**
* default constructor - builds
@@ -2148,7 +2151,7 @@
* @return generated element
* @throws DOMException
*/
- private Element generateMethodElement(Document doc, String endpointName,
+ protected Element generateMethodElement(Document doc, String endpointName,
AxisOperation axisOperation) throws DOMException {
Element methodElement;
List soapHeaderInputParameterList = new ArrayList();
@@ -2160,10 +2163,25 @@
addAttribute(doc, "namespace", axisOperation.getName().getNamespaceURI(), methodElement);
addAttribute(doc, "style", (String) getBindingPropertyFromOperation(
WSDLConstants.WSDL_1_1_STYLE, axisOperation.getName()), methodElement);
+
+ String messageExchangePattern = axisOperation.getMessageExchangePattern();
+
+ //Jaxws Specific
+ if("jax-ws".equals(codeGenConfiguration.getOutputLanguage())){
+ boolean wrapped = false;
+ if (WSDLUtil.isInputPresentForMEP(messageExchangePattern)) {
+ AxisMessage msg = axisOperation.getMessage(WSDLConstants.MESSAGE_LABEL_IN_VALUE);
+ if(msg.getParameter(Constants.UNWRAPPED_KEY) != null){
+ wrapped = true;
+ }
+ }
+ addAttribute(doc, "parameterstyle", (wrapped)?"WRAPPPED":"BARE", methodElement);
+ }
+
+
addAttribute(doc, "dbsupportname",
endpointName + localPart + DATABINDING_SUPPORTER_NAME_SUFFIX,
methodElement);
- String messageExchangePattern = axisOperation.getMessageExchangePattern();
addAttribute(doc, "mep", Utils.getAxisSpecifMEPConstant(messageExchangePattern) + "",
methodElement);
addAttribute(doc, "mepURI", messageExchangePattern, methodElement);
@@ -2193,6 +2211,18 @@
if (WSDLUtil.isInputPresentForMEP(messageExchangePattern)) {
+ if("jax-ws".equals(codeGenConfiguration.getOutputLanguage())){
+ useHolderClass_jaxws = false;
+ AxisMessage inMessage = axisOperation.getMessage(WSDLConstants.MESSAGE_LABEL_IN_VALUE);
+ if (WSDLUtil.isOutputPresentForMEP(messageExchangePattern)) {
+ AxisMessage outMessage = axisOperation.getMessage(WSDLConstants.MESSAGE_LABEL_OUT_VALUE);
+ if(inMessage.getName().equals(outMessage.getName())){
+ // in/out message
+ useHolderClass_jaxws = true;
+ addAttribute(doc, "useholder", "true", methodElement);
+ }
+ }
+ }
methodElement.appendChild(getInputElement(doc,
axisOperation, soapHeaderInputParameterList));
}
@@ -2831,7 +2861,9 @@
this.mapper.getTypeMappingName(
inputMessage.getElementQName()),
operation.getName(),
- inputMessage.getElementQName()
+ inputMessage.getElementQName(),
+ inputMessage.getPartName(),
+ false,false
);
paramElementList.add(mainParameter);
@@ -2858,7 +2890,7 @@
MessagePartInformationHolder infoHolder =
(MessagePartInformationHolder) detailsParameter.getValue();
List partsList = infoHolder.getPartsList();
-
+ wrapped_jaxws = true;
//populate the parts list - this list is needed to generate multiple
//parameters in the signatures
for (int i = 0; i < partsList.size(); i++) {
@@ -2961,6 +2993,13 @@
addAttribute(doc, "name",
paramName, paramElement);
+ if (codeGenConfiguration.getOutputLanguage().equals("jax-ws") && useHolderClass_jaxws) {
+ Class primitive = JavaUtils.getWrapperClass(paramType);
+ if(primitive != null){
+ paramType = primitive.getName();
+ }
+ }
+
addAttribute(doc, "type",
(paramType == null) ? "" : paramType,
paramElement);
@@ -2987,12 +3026,17 @@
addAttribute(doc, "localname", paramQName.getLocalPart(), qNameElement);
paramElement.appendChild(qNameElement);
}
+
if (partName != null) {
String javaName = null;
if (JavaUtils.isJavaKeyword(partName)) {
javaName = JavaUtils.makeNonJavaKeyword(partName);
} else {
- javaName = JavaUtils.capitalizeFirstChar(JavaUtils.xmlNameToJava(partName));
+ if (codeGenConfiguration.getOutputLanguage().equals("jax-ws")) {
+ javaName = JavaUtils.xmlNameToJavaIdentifier(JavaUtils.xmlNameToJava(partName));
+ } else {
+ javaName = JavaUtils.capitalizeFirstChar(JavaUtils.xmlNameToJava(partName));
+ }
}
addAttribute(doc, "partname", javaName, paramElement);
}
@@ -3013,7 +3057,7 @@
* @param operation
* @return Returns Element.
*/
- protected Element getOutputParamElement(Document doc, AxisOperation operation) {
+ protected Element getOutputParamElement(Document doc, AxisOperation operation) {
Element paramElement = doc.createElement("param");
AxisMessage outputMessage = operation.getMessage(WSDLConstants.MESSAGE_LABEL_OUT_VALUE);
String typeMappingStr;
@@ -3055,6 +3099,16 @@
Parameter parameter = outputMessage.getParameter(Constants.COMPLEX_TYPE);
addAttribute(doc, "complextype", (String) parameter.getValue(), paramElement);
}
+ }
+ String partName = outputMessage.getPartName();
+ if (partName != null && codeGenConfiguration.getOutputLanguage().equals("jax-ws")) {
+ String javaName = null;
+ if (JavaUtils.isJavaKeyword(partName)) {
+ javaName = JavaUtils.makeNonJavaKeyword(partName);
+ } else {
+ javaName = JavaUtils.xmlNameToJavaIdentifier(JavaUtils.xmlNameToJava(partName));
+ }
+ addAttribute(doc, "partname", javaName, paramElement);
}
// this message has been unwrapped - find the correct references of the
Modified: webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/jaxws/AnnotationElementBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/jaxws/AnnotationElementBuilder.java?rev=572740&r1=572739&r2=572740&view=diff
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/jaxws/AnnotationElementBuilder.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/jaxws/AnnotationElementBuilder.java Tue Sep 4 10:11:13 2007
@@ -25,6 +25,19 @@
return annotationElement;
}
+ static Element buildWebServiceAnnotationElement(String endpointInterface, Document doc) {
+
+ Element annotationElement = doc.createElement("annotation");
+ XSLTUtils.addAttribute(doc, "name", "javax.jws.WebService", annotationElement);
+
+ Element paramElement = doc.createElement("param");
+ XSLTUtils.addAttribute(doc, "type", "endpointInterface", paramElement);
+ XSLTUtils.addAttribute(doc, "value", endpointInterface, paramElement);
+ annotationElement.appendChild(paramElement);
+
+ return annotationElement;
+ }
+
static Element buildWebFaultAnnotationElement(String name, String targetNS, Document doc) {
Element annotationElement = doc.createElement("annotation");
XSLTUtils.addAttribute(doc, "name", "javax.xml.ws.WebFault", annotationElement);
Modified: webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/jaxws/JAXWS20Emitter.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/jaxws/JAXWS20Emitter.java?rev=572740&r1=572739&r2=572740&view=diff
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/jaxws/JAXWS20Emitter.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/jaxws/JAXWS20Emitter.java Tue Sep 4 10:11:13 2007
@@ -3,9 +3,7 @@
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.apache.axis2.description.WSDL2Constants;
-import org.apache.axis2.util.JavaUtils;
-import org.apache.woden.internal.util.dom.DOM2Writer;
-
+import org.apache.axis2.AxisFault;
import javax.xml.namespace.QName;
import java.util.Iterator;
@@ -16,14 +14,18 @@
*
* @return DOM Document
*/
- protected Document createDOMDocumentForSEI() {
+ protected Document createDOMDocumentForSEI() throws AxisFault {
Document doc = getEmptyDocument();
Element rootElement = doc.createElement("javaConstruct");
Element importList = doc.createElement("importList");
rootElement.appendChild(importList);
+ String packageName = codeGenConfiguration.getPackageName();
+ String targetNS = codeGenConfiguration.getTargetNamespace();
+ String portTypeName = (String) axisService.getParameterValue(WSDL2Constants.INTERFACE_LOCAL_NAME);
portTypeName = resolveNameCollision(portTypeName, packageName, TYPE_SUFFIX);
+ this.axisService.addParameter(JAXWS_PORT_TYPE_NAME, portTypeName);
addAttribute(doc, "package", packageName, rootElement);
addAttribute(doc, "targetNamespace", targetNS, rootElement);
@@ -46,6 +48,45 @@
}
/**
+ * Creates the XML model for the Service Endpoint interface
+ *
+ * @return DOM Document
+ */
+ protected Document createDOMDocumentForSEIImpl() throws AxisFault {
+ Document doc = getEmptyDocument();
+ Element rootElement = doc.createElement("javaConstruct");
+
+ //Element importList = doc.createElement("importList");
+ //rootElement.appendChild(importList);
+
+ String packageName = codeGenConfiguration.getPackageName();
+ String targetNS = codeGenConfiguration.getTargetNamespace();
+ String portTypeName = (String) axisService.getParameterValue(WSDL2Constants.INTERFACE_LOCAL_NAME);
+ portTypeName = resolveNameCollision(portTypeName, packageName, TYPE_SUFFIX);
+ this.axisService.addParameter(JAXWS_PORT_TYPE_NAME, portTypeName);
+
+ addAttribute(doc, "package", packageName, rootElement);
+ addAttribute(doc, "targetNamespace", targetNS, rootElement);
+ addAttribute(doc, "name", axisService.getParameter(JAXWS_PORT_TYPE_NAME).getValue() + JAXWS_IMPL_SUFFIX,
+ rootElement);
+
+ Element annotationElement = AnnotationElementBuilder.buildWebServiceAnnotationElement(
+ packageName +"." +axisService.getParameter(JAXWS_PORT_TYPE_NAME).getValue(), doc);
+ rootElement.appendChild(annotationElement);
+
+ loadOperations(doc, rootElement, null);
+
+ //attach a list of faults
+ rootElement.appendChild(getUniqueListofFaults(doc));
+ doc.appendChild(rootElement);
+ //////////////////////////////////////////////////////////
+// System.out.println(DOM2Writer.nodeToString(rootElement));
+ ////////////////////////////////////////////////////////////
+ return doc;
+
+ }
+
+ /**
* Creates the XML model for the Service Class
*
* @return DOM Document
@@ -57,8 +98,11 @@
Element importList = doc.createElement("importList");
rootElement.appendChild(importList);
+ String serviceName = axisService.getName();
String capitalizedServiceName = serviceName.toUpperCase();
String wsdlLocation = "Needs to be fixed";
+ String packageName = codeGenConfiguration.getPackageName();
+ String targetNS = codeGenConfiguration.getTargetNamespace();
serviceName = resolveNameCollision(serviceName, packageName, TYPE_SUFFIX);
@@ -68,12 +112,6 @@
addAttribute(doc, "wsdlLocation", wsdlLocation, rootElement);
addAttribute(doc, "capitalizedServiceName", capitalizedServiceName, rootElement);
- //Adding annotations -- tempory solution hardcoded solution
-// Element importElement;
-// importElement = doc.createElement("import");
-// addAttribute(doc, "value", "java.net.URL", importElement);
-// importList.appendChild(importElement);
-
Element annotationElement = AnnotationElementBuilder.buildWebServiceClientAnnotationElement(serviceName,
targetNS, wsdlLocation, doc);
rootElement.appendChild(annotationElement);
@@ -84,7 +122,8 @@
Element portElement = doc.createElement("port");
addAttribute(doc, "portName", portName, portElement);
- addAttribute(doc, "portTypeName", portTypeName, portElement);
+ addAttribute(doc, "portTypeName", (String) this.axisService.getParameter(JAXWS_PORT_TYPE_NAME).getValue(),
+ portElement);
Element endPointAnnoElement = AnnotationElementBuilder.buildWebEndPointAnnotationElement(portName, doc);
portElement.appendChild(endPointAnnoElement);
@@ -115,18 +154,20 @@
Element importList = doc.createElement("importList");
faultElement.appendChild(importList);
+ String packageName = codeGenConfiguration.getPackageName();
+ String targetNS = codeGenConfiguration.getTargetNamespace();
+
addAttribute(doc, "package", packageName, faultElement);
addAttribute(doc, "targetNamespace", targetNS, faultElement);
String exceptionClassName = (String) faultClassNameMap.get(key);
- exceptionClassName = resolveNameCollision(exceptionClassName, packageName, EXCEPTION_SUFFIX);
- addAttribute(doc, "name",exceptionClassName, faultElement);
-// addAttribute(doc, "shortName",
-// (String) faultClassNameMap.get(key) + "Exception",
-// faultElement);
+ String resolvedExpClass = resolveNameCollision(exceptionClassName, packageName, EXCEPTION_SUFFIX);
+
+ if (!resolvedExpClass.equals(exceptionClassName))
+ faultClassNameMap.put(key, resolvedExpClass);
+
+ addAttribute(doc, "name", resolvedExpClass, faultElement);
- //the type represents the type that will be wrapped by this
- //name
String typeMapping =
this.mapper.getTypeMappingName((QName) faultElementQNameMap.get(key));
String shortType = extratClassName(typeMapping);
@@ -144,14 +185,6 @@
addAttribute(doc, "value", typeMapping, importElement);
importList.appendChild(importElement);
-// String attribValue = (String) instantiatableMessageClassNames.
-// get(key);
-// addAttribute(doc, "instantiatableType",
-// attribValue == null ? "" : attribValue,
-// faultElement);
-
- // add an extra attribute to say whether the type mapping is
- // the default
if (mapper.getDefaultMappingName().equals(typeMapping)) {
addAttribute(doc, "default", "yes", faultElement);
}
Modified: webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/jaxws/JAXWSEmitter.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/jaxws/JAXWSEmitter.java?rev=572740&r1=572739&r2=572740&view=diff
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/jaxws/JAXWSEmitter.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/jaxws/JAXWSEmitter.java Tue Sep 4 10:11:13 2007
@@ -1,39 +1,27 @@
package org.apache.axis2.wsdl.codegen.emitter.jaxws;
import org.w3c.dom.Document;
-import org.apache.axis2.wsdl.codegen.writer.FileWriter;
-import org.apache.axis2.wsdl.codegen.writer.SkeletonInterfaceWriter;
-import org.apache.axis2.wsdl.codegen.writer.ExceptionWriter;
-import org.apache.axis2.wsdl.codegen.writer.SkeletonWriter;
+import org.w3c.dom.Element;
+import org.apache.axis2.wsdl.codegen.writer.*;
import org.apache.axis2.wsdl.codegen.emitter.AxisServiceBasedMultiLanguageEmitter;
import org.apache.axis2.wsdl.codegen.CodeGenerationException;
import org.apache.axis2.wsdl.codegen.CodeGenConfiguration;
-import org.apache.axis2.wsdl.util.XSLTIncludeResolver;
-import org.apache.axis2.wsdl.databinding.TypeMapper;
import org.apache.axis2.description.AxisService;
-import org.apache.axis2.description.WSDL2Constants;
+import org.apache.axis2.AxisFault;
import java.util.Iterator;
import java.util.Map;
-import java.util.HashMap;
public abstract class JAXWSEmitter extends AxisServiceBasedMultiLanguageEmitter {
protected final static String TYPE_SUFFIX = "Type";
protected final static String SERVICE_SUFFIX = "Service";
protected final static String EXCEPTION_SUFFIX = "Exception";
-
- protected String portTypeName;
- protected String serviceName;
- protected String packageName;
- protected String targetNS;
+ protected final static String JAXWS_PORT_TYPE_NAME = "JaxwsPortTypeName";
+ protected final static String JAXWS_IMPL_SUFFIX = "Impl";
public void setCodeGenConfiguration(CodeGenConfiguration configuration) {
super.setCodeGenConfiguration(configuration);
- portTypeName = (String) axisService.getParameterValue(WSDL2Constants.INTERFACE_LOCAL_NAME);
- serviceName = axisService.getName();
- targetNS = codeGenConfiguration.getTargetNamespace();
- packageName = codeGenConfiguration.getPackageName();
}
public void emitSkeleton() throws CodeGenerationException {
@@ -60,11 +48,14 @@
//handle faults
generateAndPopulateFaultNames();
+ //write the Exceptions
+ writeExceptions();
+
//write the Service Endpoint Interface
writeServiceEndpointInterface();
- //write the Exceptions
- writeExceptions();
+ //write the Service Endpoint Interface
+ writeServiceEndpointInterfaceImpl();
//write the Service Class
writeServiceClass();
@@ -114,6 +105,19 @@
writeFile(skeletonModel, skeletonInterfaceWriter);
}
+ protected void writeServiceEndpointInterfaceImpl() throws Exception {
+ Document skeletonModel = createDOMDocumentForSEIImpl();
+ debugLogDocument("Document for Service Endpoint Interface:", skeletonModel);
+ FileWriter interfaceImplementationWriter = new InterfaceImplementationWriter(
+ codeGenConfiguration.isFlattenFiles() ?
+ getOutputDirectory(codeGenConfiguration.getOutputLocation(), null) :
+ getOutputDirectory(codeGenConfiguration.getOutputLocation(),
+ codeGenConfiguration.getSourceLocation())
+ , this.codeGenConfiguration.getOutputLanguage());
+
+ writeFile(skeletonModel, interfaceImplementationWriter);
+ }
+
/**
* Writes the exception calsses.
*/
@@ -157,12 +161,37 @@
writeFile(skeletonModel, skeletonInterfaceWriter);
}
+ protected Document createDOMDocumentForServiceXML() {
+ Document doc = getEmptyDocument();
+ String className = null;
+ String serviceName = null;
+ Element rootElement = doc.createElement("interfaces");
+ doc.appendChild(rootElement);
+
+ for (Iterator iter = this.axisServices.iterator(); iter.hasNext();) {
+ this.axisService = (AxisService) iter.next();
+ this.axisBinding = axisService.getEndpoint(axisService.getEndpointName()).getBinding();
+ serviceName = axisService.getName();
+ className = (String)axisService.getParameter(JAXWS_PORT_TYPE_NAME).getValue() + JAXWS_IMPL_SUFFIX;
+ rootElement.appendChild(getServiceElement(serviceName, className, doc));
+ }
+
+ return doc;
+ }
+
/**
* Creates the XML model for the Service Endpoint interface
*
* @return DOM Document
*/
- protected abstract Document createDOMDocumentForSEI();
+ protected abstract Document createDOMDocumentForSEI() throws AxisFault;
+
+ /**
+ * Creates the XML model for the Service Endpoint interface Implementation class
+ *
+ * @return DOM Document
+ */
+ protected abstract Document createDOMDocumentForSEIImpl() throws AxisFault;
/**
* Creates the XML model for the Service Class
@@ -178,6 +207,48 @@
* @return DOM Document
*/
protected abstract Document createDOMDocumentForException(String key);
+
+ /**
+ * A resusable method to return the service element for creating the service xml
+ *
+ * @param serviceName
+ * @param className
+ * @param doc
+ * @return DOM Element
+ */
+ protected Element getServiceElement(String serviceName, String className, Document doc) {
+
+ if (allServiceInfoHolder.get(serviceName) != null) {
+ this.infoHolder = (Map) allServiceInfoHolder.get(serviceName);
+ }
+ Element rootElement = doc.createElement("interface");
+
+ addAttribute(doc, "package", "", rootElement);
+ addAttribute(doc, "classpackage", codeGenConfiguration.getPackageName(), rootElement);
+ addAttribute(doc, "name", className, rootElement);
+
+ if (!codeGenConfiguration.isWriteTestCase()) {
+ addAttribute(doc, "testOmit", "true", rootElement);
+ }
+ addAttribute(doc, "servicename", serviceName, rootElement);
+
+ Iterator it = mepToClassMap.keySet().iterator();
+ while (it.hasNext()) {
+ Object key = it.next();
+
+ if (Boolean.TRUE.equals(infoHolder.get(key))) {
+ Element elt = addElement(doc, "messagereceiver",
+ makeJavaClassName(serviceName) + mepToSuffixMap.get(key),
+ rootElement);
+ addAttribute(doc, "mepURI", key.toString(), elt);
+ }
+
+ }
+
+ loadOperations(doc, rootElement, null);
+
+ return rootElement;
+ }
//Util methods
public String extratClassName(String fullyQualifiedName) {
Modified: webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/SchemaUnwrapperExtension.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/SchemaUnwrapperExtension.java?rev=572740&r1=572739&r2=572740&view=diff
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/SchemaUnwrapperExtension.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/SchemaUnwrapperExtension.java Tue Sep 4 10:11:13 2007
@@ -61,7 +61,7 @@
public void engage(CodeGenConfiguration configuration) throws CodeGenerationException {
this.codeGenConfiguration = configuration;
- if (!configuration.isParametersWrapped()) {
+ if (!configuration.isParametersWrapped() && !codeGenConfiguration.getOutputLanguage().equals("jax-ws")) {
// A check to avoid nasty surprises - Since unwrapping is not
// supported by all frameworks, we check the framework name to be
Modified: webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/XMLBeansExtension.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/XMLBeansExtension.java?rev=572740&r1=572739&r2=572740&view=diff
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/XMLBeansExtension.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/XMLBeansExtension.java Tue Sep 4 10:11:13 2007
@@ -20,7 +20,9 @@
package org.apache.axis2.wsdl.codegen.extension;
import org.apache.axis2.description.AxisService;
+import org.apache.axis2.util.CommandLineOptionConstants;
import org.apache.axis2.wsdl.codegen.CodeGenConfiguration;
+import org.apache.axis2.wsdl.codegen.schema.AxisServiceTopElementSchemaGenerator;
import org.apache.axis2.wsdl.databinding.TypeMapper;
import org.apache.axis2.wsdl.i18n.CodegenMessages;
import org.apache.axis2.wsdl.util.ConfigPropertyFileLoader;
@@ -36,13 +38,14 @@
import java.util.Iterator;
import java.util.List;
+
public class XMLBeansExtension extends AbstractDBProcessingExtension {
/** Name of "extra" option used to supply package name for xsb files. */
public static final String TYPESYSTEMNAME_OPTION = "typesystemname";
public static final String SCHEMA_FOLDER = "schemas";
public static final String XSDCONFIG_OPTION = "xc";
public static final String XSDCONFIG_OPTION_LONG = "xsdconfig";
-
+
public static String MAPPINGS = "mappings";
public static String MAPPING = "mapping";
@@ -94,9 +97,18 @@
List schemas = new ArrayList();
List axisServices = configuration.getAxisServices();
AxisService axisService = null;
+ AxisServiceTopElementSchemaGenerator schemaGenerator = null;
for (Iterator iter = axisServices.iterator(); iter.hasNext();) {
axisService = (AxisService)iter.next();
- schemas.addAll(axisService.getSchema());
+ if (configuration.getProperties().containsKey(
+ CommandLineOptionConstants.ExtensionArguments.WITHOUT_DATABIND_CODE)){
+ // use the dummy code
+ schemaGenerator = new AxisServiceTopElementSchemaGenerator(axisService);
+ schemas.addAll(schemaGenerator.getDummySchemaList());
+ } else {
+ schemas.addAll(axisService.getSchema());
+ }
+
}
Element[] additionalSchemas = loadAdditionalSchemas();
Modified: webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/WSDL11Writer.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/WSDL11Writer.java?rev=572740&r1=572739&r2=572740&view=diff
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/WSDL11Writer.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/WSDL11Writer.java Tue Sep 4 10:11:13 2007
@@ -34,12 +34,7 @@
import javax.wsdl.xml.WSDLWriter;
import java.io.File;
import java.io.FileOutputStream;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Vector;
-import java.util.ArrayList;
-import java.util.Stack;
+import java.util.*;
public class WSDL11Writer {
@@ -77,7 +72,10 @@
public void writeWSDL(AxisService axisService, Definition definition, Map changedMap) {
try {
if (axisService != null) {
- writeWSDL(definition, axisService.getName(), changedMap, new Stack());
+ Map baseURIwsdlNameMap = new HashMap();
+ // add the initial definition to the map
+ baseURIwsdlNameMap.put(definition.getDocumentBaseURI(),axisService.getName());
+ writeWSDL(definition, axisService.getName(), changedMap, baseURIwsdlNameMap);
}
} catch (Exception e) {
throw new RuntimeException("WSDL writing failed!", e);
@@ -87,25 +85,35 @@
private void writeWSDL(Definition definition,
String serviceName,
Map changedMap,
- Stack stack) throws Exception {
- stack.push(definition);
+ Map baseURIwsdlNameMap) throws Exception {
// first process the imports and save them.
Map imports = definition.getImports();
if (imports != null && (imports.size() > 0)) {
Vector importsVector = null;
Import wsdlImport = null;
String wsdlName = null;
+ String wsdlLocation = null;
for (Iterator improtsVectorIter = imports.values().iterator();
improtsVectorIter.hasNext();) {
importsVector = (Vector)improtsVectorIter.next();
for (Iterator importsIter = importsVector.iterator(); importsIter.hasNext();) {
wsdlImport = (Import)importsIter.next();
- wsdlName = "wsdl_" + count++ + ".wsdl";
- Definition innerDefinition = wsdlImport.getDefinition();
- if(!stack.contains(innerDefinition)) {
- writeWSDL(innerDefinition, wsdlName, changedMap, stack);
+ wsdlLocation = wsdlImport.getDefinition().getDocumentBaseURI();
+ // we have to process this wsdl file only if it has not been processed earlier
+ if (!baseURIwsdlNameMap.containsKey(wsdlLocation)) {
+ wsdlName = wsdlLocation.substring(wsdlLocation.lastIndexOf('/') + 1);
+
+ //trim the wsdl part
+ wsdlName = wsdlName.substring(0, wsdlName.indexOf(".wsdl"));
+ while (baseURIwsdlNameMap.containsValue(wsdlName)) {
+ wsdlName = wsdlName + count++;
+ }
+ baseURIwsdlNameMap.put(wsdlLocation, wsdlName);
+ Definition innerDefinition = wsdlImport.getDefinition();
+ writeWSDL(innerDefinition, wsdlName, changedMap, baseURIwsdlNameMap);
}
- wsdlImport.setLocationURI(wsdlName);
+
+ wsdlImport.setLocationURI(baseURIwsdlNameMap.get(wsdlLocation) + ".wsdl");
}
}
}
@@ -154,7 +162,6 @@
}
out.flush();
out.close();
- stack.pop();
}
/**
@@ -165,7 +172,7 @@
public void adjustWSDLSchemaLocatins(Definition definition, Map changedSchemaLocations) {
adjustWSDLSchemaLocations(definition, changedSchemaLocations);
}
-
+
/**
* adjust the schema locations in the original wsdl
*
Modified: webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/template/c/StubSourceTemplate.xsl
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/template/c/StubSourceTemplate.xsl?rev=572740&r1=572739&r2=572740&view=diff
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/template/c/StubSourceTemplate.xsl (original)
+++ webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/template/c/StubSourceTemplate.xsl Tue Sep 4 10:11:13 2007
@@ -97,8 +97,8 @@
axis2_msg_increment_ref(msg_in_fault, env);
axis2_op_add_msg(op, env, AXIS2_MSG_OUT, msg_out);
axis2_op_add_msg(op, env, AXIS2_MSG_IN, msg_in);
- axis2_op_add_msg(op, env, AXIS2_MSG_OUT_FAULT, msg_out);
- axis2_op_add_msg(op, env, AXIS2_MSG_IN_FAULT, msg_in);
+ axis2_op_add_msg(op, env, AXIS2_MSG_OUT_FAULT, msg_out_fault);
+ axis2_op_add_msg(op, env, AXIS2_MSG_IN_FAULT, msg_in_fault);
axis2_svc_add_op(svc, env, op);
Modified: webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/template/java/JaxwsExceptionTemplate.xsl
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/template/java/JaxwsExceptionTemplate.xsl?rev=572740&r1=572739&r2=572740&view=diff
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/template/java/JaxwsExceptionTemplate.xsl (original)
+++ webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/template/java/JaxwsExceptionTemplate.xsl Tue Sep 4 10:11:13 2007
@@ -12,8 +12,8 @@
/**
* <xsl:value-of select="@name"/>.java
*
- * This class was generated by Apache Axis2.
- * Apache Axis2 {version} - {date} {time}
+ * This class was auto-generated from WSDL.
+ * Apache Axis2 version: #axisVersion# #today#
*
*/
<xsl:for-each select="annotation">
Modified: webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/template/java/JaxwsServiceClassTemplate.xsl
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/template/java/JaxwsServiceClassTemplate.xsl?rev=572740&r1=572739&r2=572740&view=diff
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/template/java/JaxwsServiceClassTemplate.xsl (original)
+++ webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/template/java/JaxwsServiceClassTemplate.xsl Tue Sep 4 10:11:13 2007
@@ -17,8 +17,8 @@
/**
* <xsl:value-of select="@name"/>.java
*
- * This class was generated by Apache Axis2.
- * Apache Axis2 {version} - {date} {time}
+ * This class was auto-generated from WSDL.
+ * Apache Axis2 version: #axisVersion# #today#
*
*/
<xsl:for-each select="annotation">
Modified: webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/template/java/JaxwsServiceEndpointInterfaceTemplate.xsl
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/template/java/JaxwsServiceEndpointInterfaceTemplate.xsl?rev=572740&r1=572739&r2=572740&view=diff
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/template/java/JaxwsServiceEndpointInterfaceTemplate.xsl (original)
+++ webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/template/java/JaxwsServiceEndpointInterfaceTemplate.xsl Tue Sep 4 10:11:13 2007
@@ -1,9 +1,7 @@
<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
- <xsl:output method="text"/>
-
+ <xsl:output method="text"/>
<xsl:variable name="targetNs" select="/javaConstruct/@targetNamespace"/>
-
<xsl:template match="javaConstruct">package <xsl:value-of select="@package"/>;
<xsl:for-each select="importList/import">
import <xsl:value-of select="@value"/>;</xsl:for-each>
@@ -12,9 +10,8 @@
/**
* <xsl:value-of select="@name"/>.java
*
- * This class was generated by Apache Axis2.
- * Apache Axis2 {version} - {date} {time}
- *
+ * This class was auto-generated from WSDL.
+ * Apache Axis2 version: #axisVersion# #today#
*/
<xsl:for-each select="annotation">
<xsl:variable name="annoparamcount" select="count(param)"/>
@@ -22,55 +19,133 @@
<xsl:choose>
<xsl:when test="$annoparamcount = position()">
<xsl:value-of select="@type"/>
- <xsl:text>=</xsl:text>"<xsl:value-of select="@value"/>"</xsl:when>
+ <xsl:text> = </xsl:text>"<xsl:value-of select="@value"/>"</xsl:when>
<xsl:otherwise>
<xsl:value-of select="@type"/>
- <xsl:text>=</xsl:text>"<xsl:value-of select="@value"/>",<xsl:text> </xsl:text>
+ <xsl:text> = </xsl:text>"<xsl:value-of select="@value"/>",<xsl:text> </xsl:text>
</xsl:otherwise>
</xsl:choose>
</xsl:for-each>)</xsl:for-each>
-public interface <xsl:value-of select="@name"/>{
+public interface <xsl:value-of select="@name"/> {
<xsl:apply-templates/>
}
</xsl:template>
<xsl:template match="method">
<xsl:variable name="outparamcount" select="count(output/param)"/>
- /**<xsl:for-each select="input/param">
- * @param <xsl:value-of select="@name"/></xsl:for-each><xsl:if test="$outparamcount != 0">
- * @return
- * <xsl:value-of select="output/param/@shorttype"/></xsl:if><xsl:for-each select="fault/param[@type!='']">
- * @throws <xsl:value-of select="@name"/></xsl:for-each>
- */
- @javax.jws.WebMethod
+ <xsl:variable name="parameterstyle" select="@parameterstyle"/>
+ <xsl:variable name="useholder" select="@useholder"/>
+ <xsl:variable name="style" select="@style"/>
+ <xsl:variable name="inputWrappedCount" select="count(input/param/param)"/>
+ <xsl:variable name="inparamcount" select="count(input/param)"/>
+ /**<xsl:choose><xsl:when test="$inputWrappedCount > 0"><xsl:for-each select="input/param/param">
+ * @param <xsl:value-of select="@name"/></xsl:for-each><xsl:if test="$outparamcount != 0">
+ * @return <xsl:value-of select="output/param/@shorttype"/></xsl:if><xsl:for-each select="fault/param[@type!='']">
+ * @throws <xsl:value-of select="@name"/></xsl:for-each></xsl:when><xsl:otherwise><xsl:for-each select="input/param">
+ * @param <xsl:value-of select="@name"/></xsl:for-each><xsl:if test="$outparamcount != 0">
+ * @return <xsl:value-of select="output/param/@shorttype"/></xsl:if><xsl:for-each select="fault/param[@type!='']">
+ * @throws <xsl:value-of select="@shortName"/></xsl:for-each></xsl:otherwise> </xsl:choose>
+ */
+ @javax.jws.WebMethod<xsl:choose>
+ <xsl:when test="$outparamcount = 0"><xsl:text>
+ </xsl:text>@javax.jws.Oneway</xsl:when>
+ <xsl:when test="$useholder = 'true'"></xsl:when>
+ <xsl:otherwise><xsl:text>
+ </xsl:text>@javax.jws.WebResult(targetNamespace = "<xsl:value-of select="$targetNs"/>"<xsl:choose>
+ <xsl:when test="$parameterstyle = 'BARE'">, partName = "<xsl:value-of select="output/param/@partname"/>"</xsl:when></xsl:choose>)</xsl:otherwise>
+ </xsl:choose>
<xsl:choose>
- <xsl:when test="$outparamcount = 0">@javax.jws.Oneway</xsl:when>
- <xsl:otherwise>@javax.jws.WebResult(targetNamespace = "<xsl:value-of select="$targetNs"/>")</xsl:otherwise>
+ <xsl:when test="$inputWrappedCount = 0">
+ @javax.jws.soap.SOAPBinding(parameterStyle = javax.jws.soap.SOAPBinding.ParameterStyle.BARE)</xsl:when>
+ <xsl:otherwise>
+ @javax.xml.ws.RequestWrapper(localName = "<xsl:value-of select="input/param/@name"/>", targetNamespace = "<xsl:value-of select="$targetNs"/>", className = "<xsl:value-of select="input/param/@type"/>")<xsl:if test="$outparamcount != 0">
+ @javax.xml.ws.ResponseWrapper(localName = "<xsl:value-of select="output/param/@name"/>", targetNamespace = "<xsl:value-of select="$targetNs"/>", className = "<xsl:value-of select="output/param/@type"/>")</xsl:if>
+ </xsl:otherwise>
</xsl:choose>
public <xsl:choose>
<xsl:when test="$outparamcount = 0">void </xsl:when>
+ <xsl:when test="$useholder = 'true'">void </xsl:when>
+ <xsl:when test="$inputWrappedCount != 0"><xsl:value-of select="output/param/param/@type"/><xsl:text> </xsl:text></xsl:when>
<xsl:otherwise><xsl:value-of select="output/param/@type"/><xsl:text> </xsl:text></xsl:otherwise>
</xsl:choose>
- <xsl:value-of select="@name"/>(<xsl:variable name="inparamcount" select="count(input/param)"/>
- <xsl:for-each select="input/param">
- @javax.jws.WebParam(name = "<xsl:value-of select="@name"/>", targetNamespace = "<xsl:value-of select="$targetNs"/>")
- <xsl:choose>
+ <xsl:value-of select="@name"/>(<xsl:choose>
+ <xsl:when test="$useholder = 'true'">
+ <xsl:choose>
+ <xsl:when test="$inputWrappedCount = 0">
+ <xsl:for-each select="input/param">
+ @javax.jws.WebParam(name = "<xsl:value-of select="@name"/>", targetNamespace = "<xsl:value-of select="$targetNs"/>", mode = javax.jws.WebParam.Mode.INOUT<xsl:choose>
+ <xsl:when test="$parameterstyle = 'BARE'">, partName = "<xsl:value-of select="@partname"/>"</xsl:when></xsl:choose>)<xsl:choose>
<xsl:when test="$inparamcount = position()">
- <xsl:value-of select="@type"/>
- <xsl:text> </xsl:text>
+ javax.xml.ws.Holder<<xsl:value-of select="@type"/>
+ <xsl:text>> </xsl:text>
<xsl:value-of select="@name"/>
</xsl:when>
<xsl:otherwise>
- <xsl:value-of select="@type"/>
- <xsl:text> </xsl:text>
+ javax.xml.ws.Holder<<xsl:value-of select="@type"/>
+ <xsl:text>> </xsl:text>
<xsl:value-of select="@name"/>,<xsl:text> </xsl:text>
</xsl:otherwise>
</xsl:choose>
- </xsl:for-each>)<!--<xsl:for-each select="fault/param[@type!='']">
+ </xsl:for-each>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:for-each select="input/param/param">
+ @javax.jws.WebParam(name = "<xsl:value-of select="@name"/>", targetNamespace = "<xsl:value-of select="$targetNs"/>", mode = javax.jws.WebParam.Mode.INOUT<xsl:choose>
+ <xsl:when test="$parameterstyle = 'BARE'">, partName = "<xsl:value-of select="@partname"/>"</xsl:when></xsl:choose>)<xsl:choose>
+ <xsl:when test="$inputWrappedCount = position()">
+ javax.xml.ws.Holder<<xsl:value-of select="@type"/>
+ <xsl:text>> </xsl:text>
+ <xsl:value-of select="@name"/>
+ </xsl:when>
+ <xsl:otherwise>
+ javax.xml.ws.Holder<<xsl:value-of select="@type"/>
+ <xsl:text>> </xsl:text>
+ <xsl:value-of select="@name"/>,<xsl:text> </xsl:text>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:for-each>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:when>
+ <xsl:when test="$inputWrappedCount > 0">
+ <xsl:for-each select="input/param/param">
+ @javax.jws.WebParam(name = "<xsl:value-of select="@name"/>", targetNamespace = "<xsl:value-of select="$targetNs"/>"<xsl:choose>
+ <xsl:when test="$parameterstyle = 'BARE'">, partName = "<xsl:value-of select="@partname"/>"</xsl:when></xsl:choose>)
+ <xsl:choose>
+ <xsl:when test="$inputWrappedCount = position()">
+ <xsl:value-of select="@type"/>
+ <xsl:text> </xsl:text>
+ <xsl:value-of select="@name"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="@type"/>
+ <xsl:text> </xsl:text>
+ <xsl:value-of select="@name"/>,<xsl:text> </xsl:text>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:for-each>
+ </xsl:when>
+ <xsl:otherwise><xsl:for-each select="input/param">
+ @javax.jws.WebParam(name = "<xsl:value-of select="@name"/>", targetNamespace = "<xsl:value-of select="$targetNs"/>"<xsl:choose>
+ <xsl:when test="$parameterstyle = 'BARE'">, partName = "<xsl:value-of select="@partname"/>"</xsl:when></xsl:choose>)
+ <xsl:choose>
+ <xsl:when test="$inparamcount = position()">
+ <xsl:value-of select="@type"/>
+ <xsl:text> </xsl:text>
+ <xsl:value-of select="@name"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="@type"/>
+ <xsl:text> </xsl:text>
+ <xsl:value-of select="@name"/>,<xsl:text> </xsl:text>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:for-each></xsl:otherwise>
+ </xsl:choose>)<xsl:for-each select="fault/param[@type!='']">
<xsl:if test="position()=1">
- throws </xsl:if>
- <xsl:if test="position()>1">,</xsl:if><xsl:value-of select="@name"/>
- </xsl:for-each>-->;
+ throws </xsl:if>
+ <xsl:if test="position()>1">,</xsl:if><xsl:value-of select="@shortName"/>
+ </xsl:for-each>;
</xsl:template>
</xsl:stylesheet>
Modified: webservices/axis2/branches/java/jaxws21/modules/distribution/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/distribution/pom.xml?rev=572740&r1=572739&r2=572740&view=diff
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/distribution/pom.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/distribution/pom.xml Tue Sep 4 10:11:13 2007
@@ -313,6 +313,7 @@
<mkdir dir="target/tmp-repository"/>
<mkdir dir="target/tmp-repository/modules"/>
<mkdir dir="target/tmp-repository/services"/>
+ <mkdir dir="target/tmp-repository/rmiservices"/>
<copy file="../../modules/soapmonitor/target/soapmonitor-${version}.mar" tofile="target/tmp-repository/modules/soapmonitor-${soapmonitor.mar.version}.mar"/>
<copy file="../../modules/addressing/target/addressing-${version}.mar" tofile="target/tmp-repository/modules/addressing-${addressing.mar.version}.mar"/>
Modified: webservices/axis2/branches/java/jaxws21/modules/distribution/src/main/assembly/bin-assembly.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/distribution/src/main/assembly/bin-assembly.xml?rev=572740&r1=572739&r2=572740&view=diff
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/distribution/src/main/assembly/bin-assembly.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/distribution/src/main/assembly/bin-assembly.xml Tue Sep 4 10:11:13 2007
@@ -259,7 +259,20 @@
<include>mex-impl-${version}.jar</include>
</includes>
</fileSet>
-
+ <fileSet>
+ <directory>../../modules/rmi/target</directory>
+ <outputDirectory>lib</outputDirectory>
+ <includes>
+ <include>axis2-rmi-${version}.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../../modules/corba/target</directory>
+ <outputDirectory>lib</outputDirectory>
+ <includes>
+ <include>axis2-corba-${version}.jar</include>
+ </includes>
+ </fileSet>
<fileSet>
<directory>../../legal</directory>
<outputDirectory>lib</outputDirectory>
@@ -321,6 +334,8 @@
<include>wsdl/**/*</include>
<include>yahoojsonsearch/**/*</include>
<include>yahoorestsearch/**/*</include>
+ <include>rmi/**/*</include>
+ <include>advanced-rmi/**/*</include>
</includes>
<excludes>
<exclude>**/*.iml</exclude>
Modified: webservices/axis2/branches/java/jaxws21/modules/distribution/src/main/assembly/src-assembly.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/distribution/src/main/assembly/src-assembly.xml?rev=572740&r1=572739&r2=572740&view=diff
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/distribution/src/main/assembly/src-assembly.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/distribution/src/main/assembly/src-assembly.xml Tue Sep 4 10:11:13 2007
@@ -43,6 +43,7 @@
<include>modules/tool/**</include>
<include>modules/webapp/**</include>
<include>modules/xmlbeans/**</include>
+ <include>modules/corba/**</include>
<include>modules/distribution/**</include>
</includes>
Modified: webservices/axis2/branches/java/jaxws21/modules/documentation/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/documentation/pom.xml?rev=572740&r1=572739&r2=572740&view=diff
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/documentation/pom.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/documentation/pom.xml Tue Sep 4 10:11:13 2007
@@ -361,7 +361,11 @@
<packageset dir="../../modules/xmlbeans/src" defaultexcludes="yes">
<include name="org/apache/axis2/**"/>
<include name="javax/**"/>
- </packageset>
+ </packageset>
+ <packageset dir="../../modules/corba/src" defaultexcludes="yes">
+ <include name="org/apache/axis2/**"/>
+ <include name="javax/**"/>
+ </packageset>
</javadoc>
</tasks>
</configuration>
Modified: webservices/axis2/branches/java/jaxws21/modules/documentation/xdocs/@axis2_version_dir@/Axis2-rpc-support.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/documentation/xdocs/%40axis2_version_dir%40/Axis2-rpc-support.xml?rev=572740&r1=572739&r2=572740&view=diff
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/documentation/xdocs/@axis2_version_dir@/Axis2-rpc-support.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/documentation/xdocs/@axis2_version_dir@/Axis2-rpc-support.xml Tue Sep 4 10:11:13 2007
@@ -38,7 +38,7 @@
is based on a set of well defined rules. This document aims to
drill down to the details of the strategy and resolve most of the
unknown bits and pieces. Note that Axis2 currently does not support
-the rpc/encoded style fully. Its main support is for the rpc/lit
+the rpc/encoded style. But it fully supports the rpc/literal
style.</p>
<p>We will discuss the Axis2 RPC strategy in the following
steps</p>
Modified: webservices/axis2/branches/java/jaxws21/modules/documentation/xdocs/download/1_2/download.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/documentation/xdocs/download/1_2/download.xml?rev=572740&r1=572739&r2=572740&view=diff
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/documentation/xdocs/download/1_2/download.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/documentation/xdocs/download/1_2/download.xml Tue Sep 4 10:11:13 2007
@@ -56,16 +56,12 @@
included here, and need to be <a href=
"../../modules/index.html">downloaded</a> separately.</td>
<td><a href="[preferred]/ws/axis2/1_2/axis2-1.2.zip" title=
-"[preferred]/ws/axis2/1_2/axis2-1.2.zip" onclick=
-"javascript:urchinTracker ('/downloads/axis2-1.2.zip');">zip</a>
+"[preferred]/ws/axis2/1_2/axis2-1.2.zip" onClick=
+"javascript:urchinTracker ('/downloads/axis2-1.2-bin.zip');">zip</a>
<a href="http://www.apache.org/dist/ws/axis2/1_2/axis2-1.2.zip.md5"
-title="http://www.apache.org/dist/ws/axis2/1_2/axis2-1.2.zip.md5"
-onclick=
-"javascript:urchinTracker ('/downloads/axis2-1.2.zip.md5');">MD5</a>
+title="http://www.apache.org/dist/ws/axis2/1_2/axis2-1.2.zip.md5">MD5</a>
<a href="http://www.apache.org/dist/ws/axis2/1_2/axis2-1.2.zip.asc"
-title="http://www.apache.org/dist/ws/axis2/1_2/axis2-1.2.zip.asc"
-onclick=
-"javascript:urchinTracker ('/downloads/axis2-1.2.zip.asc');">PGP</a></td>
+title="http://www.apache.org/dist/ws/axis2/1_2/axis2-1.2.zip.asc">PGP</a></td>
</tr>
<tr>
<td><a name="src" id="src"></a> <strong>Source
@@ -77,20 +73,16 @@
up Axis2 environment</a> before running this command). Useful for
advanced users.</td>
<td><a href="[preferred]/ws/axis2/1_2/axis2-1.2-src.zip" title=
-"[preferred]/ws/axis2/1_2/axis2-1.2-src.zip" onclick=
+"[preferred]/ws/axis2/1_2/axis2-1.2-src.zip" onClick=
"javascript:urchinTracker ('/downloads/axis2-1.2-src.zip');">zip</a>
<a href=
"http://www.apache.org/dist/ws/axis2/1_2/axis2-1.2-src.zip.md5"
title=
-"http://www.apache.org/dist/ws/axis2/1_2/axis2-1.2-src.zip.md5"
-onclick=
-"javascript:urchinTracker ('/downloads/axis2-1.2-src.zip.md5');">MD5</a>
+"http://www.apache.org/dist/ws/axis2/1_2/axis2-1.2-src.zip.md5">MD5</a>
<a href=
"http://www.apache.org/dist/ws/axis2/1_2/axis2-1.2-src.zip.asc"
title=
-"http://www.apache.org/dist/ws/axis2/1_2/axis2-1.2-src.zip.asc"
-onclick=
-"javascript:urchinTracker ('/downloads/axis2-1.2-src.zip.asc');">PGP</a></td>
+"http://www.apache.org/dist/ws/axis2/1_2/axis2-1.2-src.zip.asc">PGP</a></td>
</tr>
<tr>
<td><a name="war" id="war"></a><strong>WAR (Web Archive)
@@ -98,35 +90,27 @@
<td>This will be the web application of Axis2 which can be deployed
in most of the servlet containers.</td>
<td><a href="[preferred]/ws/axis2/1_2/axis2.war" title=
-"[preferred]/ws/axis2/1_2/axis2.war" onclick=
+"[preferred]/ws/axis2/1_2/axis2.war" onClick=
"javascript:urchinTracker ('/downloads/axis2-1.2.war');">zip</a>
<a href="http://www.apache.org/dist/ws/axis2/1_2/axis2.war.md5"
-title="http://www.apache.org/dist/ws/axis2/1_2/axis2.war.md5"
-onclick=
-"javascript:urchinTracker ('/downloads/axis2-1.2.war.md5');">MD5</a>
+title="http://www.apache.org/dist/ws/axis2/1_2/axis2.war.md5">MD5</a>
<a href="http://www.apache.org/dist/ws/axis2/1_2/axis2.war.asc"
-title="http://www.apache.org/dist/ws/axis2/1_2/axis2.war.asc"
-onclick=
-"javascript:urchinTracker ('/downloads/axis2-1.2.war.asc');">PGP</a></td>
+title="http://www.apache.org/dist/ws/axis2/1_2/axis2.war.asc">PGP</a></td>
</tr>
<tr>
<td><strong>Documents Distribution</strong></td>
<td>This will contain all the documentation in one package.</td>
<td><a href="[preferred]/ws/axis2/1_2/axis2-1.2-docs.zip" title=
-"[preferred]/ws/axis2/1_2/axis2-1.2-docs.zip" onclick=
+"[preferred]/ws/axis2/1_2/axis2-1.2-docs.zip" onClick=
"javascript:urchinTracker ('/downloads/axis2-1.2-docs.zip');">zip</a>
<a href=
"http://www.apache.org/dist/ws/axis2/1_2/axis2-1.2-docs.zip.md5"
title=
-"http://www.apache.org/dist/ws/axis2/1_2/axis2-1.2-docs.zip.md5"
-onclick=
-"javascript:urchinTracker ('/downloads/axis2-1.2-docs.zip.md5');">MD5</a>
+"http://www.apache.org/dist/ws/axis2/1_2/axis2-1.2-docs.zip.md5">MD5</a>
<a href=
"http://www.apache.org/dist/ws/axis2/1_2/axis2-1.2-docs.zip.asc"
title=
-"http://www.apache.org/dist/ws/axis2/1_2/axis2-1.2-docs.zip.asc"
-onclick=
-"javascript:urchinTracker ('/downloads/axis2-1.2-docs.zip.asc');">PGP</a></td>
+"http://www.apache.org/dist/ws/axis2/1_2/axis2-1.2-docs.zip.asc">PGP</a></td>
</tr>
</tbody>
</table>
Modified: webservices/axis2/branches/java/jaxws21/modules/documentation/xdocs/download/1_3/download.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/documentation/xdocs/download/1_3/download.xml?rev=572740&r1=572739&r2=572740&view=diff
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/documentation/xdocs/download/1_3/download.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/documentation/xdocs/download/1_3/download.xml Tue Sep 4 10:11:13 2007
@@ -55,17 +55,13 @@
the other modules that are being developed within Axis2 will not be
included here, and need to be <a href=
"../../modules/index.html">downloaded</a> separately.</td>
-<td><a href="[preferred]/ws/axis2/1_3/axis2-1.3.zip" title=
-"[preferred]/ws/axis2/1_3/axis2-1.3.zip" onclick=
-"javascript:urchinTracker ('/downloads/axis2-1.3.zip');">zip</a>
-<a href="http://www.apache.org/dist/ws/axis2/1_3/axis2-1.3.zip.md5"
-title="http://www.apache.org/dist/ws/axis2/1_3/axis2-1.3.zip.md5"
-onclick=
-"javascript:urchinTracker ('/downloads/axis2-1.3.zip.md5');">MD5</a>
-<a href="http://www.apache.org/dist/ws/axis2/1_3/axis2-1.3.zip.asc"
-title="http://www.apache.org/dist/ws/axis2/1_3/axis2-1.3.zip.asc"
-onclick=
-"javascript:urchinTracker ('/downloads/axis2-1.3.zip.asc');">PGP</a></td>
+<td><a href="[preferred]/ws/axis2/1_3/axis2-1.3-bin.zip" title=
+"[preferred]/ws/axis2/1_3/axis2-1.3-bin.zip" onClick=
+"javascript:urchinTracker ('/downloads/axis2-1.3-bin.zip');">zip</a>
+<a href="http://www.apache.org/dist/ws/axis2/1_3/axis2-1.3-bin.zip.md5"
+title="http://www.apache.org/dist/ws/axis2/1_3/axis2-1.3-bin.zip.md5">MD5</a>
+<a href="http://www.apache.org/dist/ws/axis2/1_3/axis2-1.3-bin.zip.asc"
+title="http://www.apache.org/dist/ws/axis2/1_3/axis2-1.3-bin.zip.asc">PGP</a></td>
</tr>
<tr>
<td><a name="src" id="src"></a> <strong>Source
@@ -77,56 +73,44 @@
up Axis2 environment</a> before running this command). Useful for
advanced users.</td>
<td><a href="[preferred]/ws/axis2/1_3/axis2-1.3-src.zip" title=
-"[preferred]/ws/axis2/1_3/axis2-1.3-src.zip" onclick=
+"[preferred]/ws/axis2/1_3/axis2-1.3-src.zip" onClick=
"javascript:urchinTracker ('/downloads/axis2-1.3-src.zip');">zip</a>
<a href=
"http://www.apache.org/dist/ws/axis2/1_3/axis2-1.3-src.zip.md5"
title=
-"http://www.apache.org/dist/ws/axis2/1_3/axis2-1.3-src.zip.md5"
-onclick=
-"javascript:urchinTracker ('/downloads/axis2-1.3-src.zip.md5');">MD5</a>
+"http://www.apache.org/dist/ws/axis2/1_3/axis2-1.3-src.zip.md5">MD5</a>
<a href=
"http://www.apache.org/dist/ws/axis2/1_3/axis2-1.3-src.zip.asc"
title=
-"http://www.apache.org/dist/ws/axis2/1_3/axis2-1.3-src.zip.asc"
-onclick=
-"javascript:urchinTracker ('/downloads/axis2-1.3-src.zip.asc');">PGP</a></td>
+"http://www.apache.org/dist/ws/axis2/1_3/axis2-1.3-src.zip.asc">PGP</a></td>
</tr>
<tr>
<td><a name="war" id="war"></a><strong>WAR (Web Archive)
Distribution</strong></td>
<td>This will be the web application of Axis2 which can be deployed
in most of the servlet containers.</td>
-<td><a href="[preferred]/ws/axis2/1_3/axis2.war" title=
-"[preferred]/ws/axis2/1_3/axis2.war" onclick=
-"javascript:urchinTracker ('/downloads/axis2-1.3.war');">zip</a>
-<a href="http://www.apache.org/dist/ws/axis2/1_3/axis2.war.md5"
-title="http://www.apache.org/dist/ws/axis2/1_3/axis2.war.md5"
-onclick=
-"javascript:urchinTracker ('/downloads/axis2-1.3.war.md5');">MD5</a>
-<a href="http://www.apache.org/dist/ws/axis2/1_3/axis2.war.asc"
-title="http://www.apache.org/dist/ws/axis2/1_3/axis2.war.asc"
-onclick=
-"javascript:urchinTracker ('/downloads/axis2-1.3.war.asc');">PGP</a></td>
+<td><a href="[preferred]/ws/axis2/1_3/axis2-1.3-war.zip" title=
+"[preferred]/ws/axis2/1_3/axis2-1.3-war.zip" onClick=
+"javascript:urchinTracker ('/downloads/axis2-1.3-war.zip');">zip</a>
+<a href="http://www.apache.org/dist/ws/axis2/1_3/axis2-1.3-war.zip.md5"
+title="http://www.apache.org/dist/ws/axis2/1_3/axis2-1.3-war.zip.md5">MD5</a>
+<a href="http://www.apache.org/dist/ws/axis2/1_3/axis2-1.3-war.zip.asc"
+title="http://www.apache.org/dist/ws/axis2/1_3/axis2-1.3-war.zip.asc">PGP</a></td>
</tr>
<tr>
<td><strong>Documents Distribution</strong></td>
<td>This will contain all the documentation in one package.</td>
<td><a href="[preferred]/ws/axis2/1_3/axis2-1.3-docs.zip" title=
-"[preferred]/ws/axis2/1_3/axis2-1.3-docs.zip" onclick=
+"[preferred]/ws/axis2/1_3/axis2-1.3-docs.zip" onClick=
"javascript:urchinTracker ('/downloads/axis2-1.3-docs.zip');">zip</a>
<a href=
"http://www.apache.org/dist/ws/axis2/1_3/axis2-1.3-docs.zip.md5"
title=
-"http://www.apache.org/dist/ws/axis2/1_3/axis2-1.3-docs.zip.md5"
-onclick=
-"javascript:urchinTracker ('/downloads/axis2-1.3-docs.zip.md5');">MD5</a>
+"http://www.apache.org/dist/ws/axis2/1_3/axis2-1.3-docs.zip.md5">MD5</a>
<a href=
"http://www.apache.org/dist/ws/axis2/1_3/axis2-1.3-docs.zip.asc"
title=
-"http://www.apache.org/dist/ws/axis2/1_3/axis2-1.3-docs.zip.asc"
-onclick=
-"javascript:urchinTracker ('/downloads/axis2-1.3-docs.zip.asc');">PGP</a></td>
+"http://www.apache.org/dist/ws/axis2/1_3/axis2-1.3-docs.zip.asc">PGP</a></td>
</tr>
</tbody>
</table>
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org