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 de...@apache.org on 2007/04/03 07:19:41 UTC
svn commit: r525037 - in /webservices/axis2/branches/java/1_2: etc/
modules/java2wsdl/src/org/apache/ws/java2wsdl/
Author: deepal
Date: Mon Apr 2 22:19:40 2007
New Revision: 525037
URL: http://svn.apache.org/viewvc?view=rev&rev=525037
Log:
-exclude saaj from the build
- fixed byte to bases64 conversion issue
- add wsaw for java2wsdl
Modified:
webservices/axis2/branches/java/1_2/etc/project.properties
webservices/axis2/branches/java/1_2/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2OMBuilder.java
webservices/axis2/branches/java/1_2/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLConstants.java
webservices/axis2/branches/java/1_2/modules/java2wsdl/src/org/apache/ws/java2wsdl/SchemaGenerator.java
Modified: webservices/axis2/branches/java/1_2/etc/project.properties
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_2/etc/project.properties?view=diff&rev=525037&r1=525036&r2=525037
==============================================================================
--- webservices/axis2/branches/java/1_2/etc/project.properties (original)
+++ webservices/axis2/branches/java/1_2/etc/project.properties Mon Apr 2 22:19:40 2007
@@ -64,8 +64,6 @@
modules/mex/project.xml,\
modules/mtompolicy/project.xml,\
modules/ping/project.xml,\
-modules/saaj-api/project.xml,\
-modules/saaj/project.xml,\
modules/json/project.xml,\
modules/fastinfoset/project.xml,\
${optional.includes}
@@ -75,6 +73,8 @@
maven.multiproject.includes.requiresJDK15=\
modules/metadata/project.xml,\
modules/jaxbri/project.xml,\
+modules/saaj-api/project.xml,\
+modules/saaj/project.xml,\
modules/jaxws/project.xml,\
modules/jaxws-api/project.xml,\
modules/scripting/project.xml
Modified: webservices/axis2/branches/java/1_2/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2OMBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_2/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2OMBuilder.java?view=diff&rev=525037&r1=525036&r2=525037
==============================================================================
--- webservices/axis2/branches/java/1_2/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2OMBuilder.java (original)
+++ webservices/axis2/branches/java/1_2/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2OMBuilder.java Mon Apr 2 22:19:40 2007
@@ -288,6 +288,9 @@
null);
message = fac.createOMElement(IN_PUT_LOCAL_NAME, wsdl);
+ OMNamespace namespace = message.declareNamespace(WSAD_NS,
+ "wsaw");
+ message.addAttribute("Action", "urn:" + jmethod.getSimpleName(), namespace);
message.addAttribute(MESSAGE_LOCAL_NAME, tns.getPrefix()
+ COLON_SEPARATOR + jmethod.getSimpleName()
+ MESSAGE_SUFFIX, null);
@@ -298,6 +301,9 @@
message.addAttribute(MESSAGE_LOCAL_NAME, tns.getPrefix()
+ COLON_SEPARATOR + jmethod.getSimpleName()
+ RESPONSE_MESSAGE, null);
+ namespace = message.declareNamespace(WSAD_NS,
+ "wsaw");
+ message.addAttribute("Action", "urn:" + jmethod.getSimpleName(), namespace);
operation.addChild(message);
}
if (jmethod.getExceptionTypes().length > 0) {
@@ -307,6 +313,9 @@
+ "Fault", null);
message.addAttribute(ATTRIBUTE_NAME, jmethod.getSimpleName()
+ "Fault", null);
+ namespace = message.declareNamespace(WSAD_NS,
+ "wsaw");
+ message.addAttribute("Action", "urn:" + jmethod.getSimpleName(), namespace);
operation.addChild(message);
}
}
Modified: webservices/axis2/branches/java/1_2/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLConstants.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_2/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLConstants.java?view=diff&rev=525037&r1=525036&r2=525037
==============================================================================
--- webservices/axis2/branches/java/1_2/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLConstants.java (original)
+++ webservices/axis2/branches/java/1_2/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLConstants.java Mon Apr 2 22:19:40 2007
@@ -36,6 +36,8 @@
String URI_WSDL11_SOAP = "http://schemas.xmlsoap.org/wsdl/soap/";
String TRANSPORT_URI = "http://schemas.xmlsoap.org/soap/http";
String DEFAULT_LOCATION_URL = "http://localhost:8080/axis2/services/";
+ String WSAD_NS = "http://www.w3.org/2006/05/addressing/wsdl";
+
String HTTP_NAMESPACE = "http://schemas.xmlsoap.org/wsdl/http/";
String MIME_NAMESPACE = "http://schemas.xmlsoap.org/wsdl/mime/";
Modified: webservices/axis2/branches/java/1_2/modules/java2wsdl/src/org/apache/ws/java2wsdl/SchemaGenerator.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_2/modules/java2wsdl/src/org/apache/ws/java2wsdl/SchemaGenerator.java?view=diff&rev=525037&r1=525036&r2=525037
==============================================================================
--- webservices/axis2/branches/java/1_2/modules/java2wsdl/src/org/apache/ws/java2wsdl/SchemaGenerator.java (original)
+++ webservices/axis2/branches/java/1_2/modules/java2wsdl/src/org/apache/ws/java2wsdl/SchemaGenerator.java Mon Apr 2 22:19:40 2007
@@ -460,11 +460,10 @@
elt1.setSchemaTypeName(typeTable.getSimpleSchemaTypeName(propertyName));
sequence.getItems().add(elt1);
- if (isArryType) {
- elt1.setMaxOccurs(Long.MAX_VALUE);
- elt1.setMinOccurs(1);
- }
-
+ if (isArryType && (!propertyName.equals("base64Binary"))){
+ elt1.setMaxOccurs(Long.MAX_VALUE);
+ elt1.setMinOccurs(1);
+ }
if (String.class.getName().equals(propertyName)) {
elt1.setNillable(true);
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org