svn commit: r1100957 - in /axis/axis2/java/core/trunk/modules: adb/src/org/apache/axis2/databinding/ java2wsdl/src/org/apache/ws/java2wsdl/ java2wsdl/src/org/apache/ws/java2wsdl/utils/ kernel/src/org/
Author: amilas
Date: Mon May 9 11:01:51 2011
New Revision: 1100957
URL: http://svn.apache.org/viewvc?rev=1100957&view=rev
Log:
adding an option to java2wsdl not to generate nillable true
Modified:
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/ADBDataSource.java
axis/axis2/java/core/trunk/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDL.java
axis/axis2/java/core/trunk/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLBuilder.java
axis/axis2/java/core/trunk/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLCodegenEngine.java
axis/axis2/java/core/trunk/modules/java2wsdl/src/org/apache/ws/java2wsdl/utils/Java2WSDLOptionsValidator.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/Java2WSDLConstants.java
Modified:
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/ADBDataSource.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/ADBDataSource.java?rev=1100957&r1=1100956&r2=1100957&view=diff
==
---
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/ADBDataSource.java
(original)
+++
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/ADBDataSource.java
Mon May 9 11:01:51 2011
@@ -101,7 +101,7 @@ public class ADBDataSource implements OM
MTOMAwareOMBuilder mtomAwareOMBuilder = new MTOMAwareOMBuilder();
serialize(mtomAwareOMBuilder);
return mtomAwareOMBuilder.getOMElement().getXMLStreamReader();
-}
+}
/**
* Returns the backing Object.
Modified:
axis/axis2/java/core/trunk/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDL.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDL.java?rev=1100957&r1=1100956&r2=1100957&view=diff
==
---
axis/axis2/java/core/trunk/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDL.java
(original)
+++
axis/axis2/java/core/trunk/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDL.java
Mon May 9 11:01:51 2011
@@ -61,6 +61,7 @@ public class Java2WSDL {
System.out.println(" -xc class1 -xc class2...extra
class(es) for which schematype must be generated. ");
System.out.println(" -wv <1.1/2.0> wsdl
version - defaults to 1.1 if not specified");
System.out.println(" -dlbgenerate
schemas conforming to doc/lit/bare style");
+System.out.println(" -dnedisallow
nillable elements in the generated schema");
System.exit(0);
}
Modified:
axis/axis2/java/core/trunk/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLBuilder.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLBuilder.java?rev=1100957&r1=1100956&r2=1100957&view=diff
==
---
axis/axis2/java/core/trunk/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLBuilder.java
(original)
+++
axis/axis2/java/core/trunk/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLBuilder.java
Mon May 9 11:01:51 2011
@@ -67,6 +67,7 @@ public class Java2WSDLBuilder implements
private String use = Java2WSDLConstants.LITERAL;
private String locationUri;
private ArrayList extraClasses;
+private boolean nillableElementsAllowed = true;
private String nsGenClassName = null;
private Map pkg2nsMap = null;
@@ -244,6 +245,11 @@ public class Java2WSDLBuilder implements
inOutmessageReceiver);
}
AxisService service = new AxisService();
+
+if (!nillableElementsAllowed) {
+
service.addParameter(Java2WSDLConstants.DISALLOW_NILLABLE_ELEMENTS_OPTION_LONG,
"true");
+}
+
schemaGenerator.setAxisService(service);
AxisService axisService = AxisService.createService(className,
serviceName == null ? Java2WSDLUtils
@@ -434,4 +440,12 @@ public class Java2WSDLBuilder implements
public void setMappingFileLocation(String mappingFileLocation) {
this.mappingFileLocation = mappingFileLocation;
}
+
+public boolean isNillableElementsAllowed() {
+return nillableElementsAllowed;
+}
+
+public void setNillableElementsAllowed(boolean nillableElementsAllowed) {
+this.nillableElementsAllowed = nillableElementsAllowed;
+}
}
Modified:
axis/axis2/java/core/trunk/modules/java2wsdl/src/org/apache/ws
svn commit: r1101023 - /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java
Author: amilas
Date: Mon May 9 13:45:09 2011
New Revision: 1101023
URL: http://svn.apache.org/viewvc?rev=1101023&view=rev
Log:
making the complex type for abstract classes abstract
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java?rev=1101023&r1=1101022&r2=1101023&view=diff
==
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java
Mon May 9 13:45:09 2011
@@ -576,6 +576,10 @@ public class DefaultSchemaGenerator impl
complexType.setName(simpleName);
+if (Modifier.isAbstract(javaType.getModifiers())) {
+complexType.setAbstract(true);
+}
+
//xmlSchema.getItems().add(eltOuter);
xmlSchema.getElements().add(schemaTypeName, eltOuter);
eltOuter.setSchemaTypeName(complexType.getQName());
svn commit: r1101037 - in /axis/axis2/java/core/trunk/legal: jaxws-tools-LICENSE.txt jsr311-api-LICENSE.txt regexp-LICENSE.txt woden-impl-commons-LICENSE.txt
Author: sagara Date: Mon May 9 14:23:12 2011 New Revision: 1101037 URL: http://svn.apache.org/viewvc?rev=1101037&view=rev Log: Added missing license files. Added: axis/axis2/java/core/trunk/legal/jaxws-tools-LICENSE.txt axis/axis2/java/core/trunk/legal/jsr311-api-LICENSE.txt axis/axis2/java/core/trunk/legal/regexp-LICENSE.txt axis/axis2/java/core/trunk/legal/woden-impl-commons-LICENSE.txt Added: axis/axis2/java/core/trunk/legal/jaxws-tools-LICENSE.txt URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/legal/jaxws-tools-LICENSE.txt?rev=1101037&view=auto == --- axis/axis2/java/core/trunk/legal/jaxws-tools-LICENSE.txt (added) +++ axis/axis2/java/core/trunk/legal/jaxws-tools-LICENSE.txt Mon May 9 14:23:12 2011 @@ -0,0 +1,119 @@ +COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 + +1. Definitions. + +1.1. Contributor means each individual or entity that creates or contributes to the creation of Modifications. + +1.2. Contributor Version means the combination of the Original Software, prior Modifications used by a Contributor (if any), and the Modifications made by that particular Contributor. + +1.3. Covered Software means (a) the Original Software, or (b) Modifications, or (c) the combination of files containing Original Software with files containing Modifications, in each case including portions thereof. + +1.4. Executable means the Covered Software in any form other than Source Code. + +1.5. Initial Developer means the individual or entity that first makes Original Software available under this License. + +1.6. Larger Work means a work which combines Covered Software or portions thereof with code not governed by the terms of this License. + +1.7. License means this document. + +1.8. Licensable means having the right to grant, to the maximum extent possible, whether at the time of the initial grant or subsequently acquired, any and all of the rights conveyed herein. + +1.9. Modifications means the Source Code and Executable form of any of the following: + +A. Any file that results from an addition to, deletion from or modification of the contents of a file containing Original Software or previous Modifications; + +B. Any new file that contains any part of the Original Software or previous Modification; or + +C. Any new file that is contributed or otherwise made available under the terms of this License. + +1.10. Original Software means the Source Code and Executable form of computer software code that is originally released under this License. + +1.11. Patent Claims means any patent claim(s), now owned or hereafter acquired, including without limitation, method, process, and apparatus claims, in any patent Licensable by grantor. + +1.12. Source Code means (a) the common form of computer software code in which modifications are made and (b) associated documentation included in or with such code. + +1.13. You (or Your) means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, You includes any entity which controls, is controlled by, or is under common control with You. For purposes of this definition, control means (a)�the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (b)�ownership of more than fifty percent (50%) of the outstanding shares or beneficial ownership of such entity. + +2. License Grants. + +2.1. The Initial Developer Grant. +Conditioned upon Your compliance with Section 3.1 below and subject to third party intellectual property claims, the Initial Developer hereby grants You a world-wide, royalty-free, non-exclusive license: +(a) under intellectual property rights (other than patent or trademark) Licensable by Initial Developer, to use, reproduce, modify, display, perform, sublicense and distribute the Original Software (or portions thereof), with or without Modifications, and/or as part of a Larger Work; and +(b) under Patent Claims infringed by the making, using or selling of Original Software, to make, have made, use, practice, sell, and offer for sale, and/or otherwise dispose of the Original Software (or portions thereof). +(c) The licenses granted in Sections�2.1(a) and (b) are effective on the date Initial Developer first distributes or otherwise makes the Original Software available to a third party under the terms of this License. +(d) Notwithstanding Section�2.1(b) above, no patent license is granted: (1)�for code that You delete from the Original Software, or (2)�for infringements caused by: (i)�the modification of the Original Software, or (ii)�the combination of the Original Software with other software or devices. + +2.2. Contributor Grant. +Conditioned upon Your compliance with Section 3.1 below and subject to third party intellectual property claims, each Contri
svn commit: r1101055 - in /axis/axis2/java/core/branches/1_6: ./ legal/jaxws-tools-LICENSE.txt legal/jsr311-api-LICENSE.txt legal/regexp-LICENSE.txt legal/woden-impl-commons-LICENSE.txt
Author: sagara Date: Mon May 9 15:15:47 2011 New Revision: 1101055 URL: http://svn.apache.org/viewvc?rev=1101055&view=rev Log: Merged r1101037 to the 1.6 branch. Added: axis/axis2/java/core/branches/1_6/legal/jaxws-tools-LICENSE.txt - copied unchanged from r1101037, axis/axis2/java/core/trunk/legal/jaxws-tools-LICENSE.txt axis/axis2/java/core/branches/1_6/legal/jsr311-api-LICENSE.txt - copied unchanged from r1101037, axis/axis2/java/core/trunk/legal/jsr311-api-LICENSE.txt axis/axis2/java/core/branches/1_6/legal/regexp-LICENSE.txt - copied unchanged from r1101037, axis/axis2/java/core/trunk/legal/regexp-LICENSE.txt axis/axis2/java/core/branches/1_6/legal/woden-impl-commons-LICENSE.txt - copied unchanged from r1101037, axis/axis2/java/core/trunk/legal/woden-impl-commons-LICENSE.txt Modified: axis/axis2/java/core/branches/1_6/ (props changed) Propchange: axis/axis2/java/core/branches/1_6/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon May 9 15:15:47 2011 @@ -1 +1 @@ -/axis/axis2/java/core/trunk:1070439,1072077,1072271,1072499,1072510,1078242,1081563,1081587,1081590,1082316,1082322,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083425,1083433,1083446,1084753,1085514,1087073,1088239,1088248-1088249,1088251,1088268,1091178,1091191,1099385,1099389,1100628 +/axis/axis2/java/core/trunk:1070439,1072077,1072271,1072499,1072510,1078242,1081563,1081587,1081590,1082316,1082322,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083425,1083433,1083446,1084753,1085514,1087073,1088239,1088248-1088249,1088251,1088268,1091178,1091191,1099385,1099389,1100628,1101037
svn commit: r1101309 - /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java
Author: amilas
Date: Tue May 10 05:03:02 2011
New Revision: 1101309
URL: http://svn.apache.org/viewvc?rev=1101309&view=rev
Log:
fixed an issue with processing @WebResult name annotation
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java?rev=1101309&r1=1101308&r2=1101309&view=diff
==
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java
Tue May 10 05:03:02 2011
@@ -398,7 +398,7 @@ public class DefaultSchemaGenerator impl
String returnName = "return";
if (returnAnnon != null) {
returnName = returnAnnon.getName();
-if (returnName != null && !"".equals(returnName)) {
+if (returnName == null || "".equals(returnName)) {
returnName = "return";
}
}
svn commit: r1101316 - in /axis/axis2/java/core/trunk/modules: java2wsdl/src/org/apache/ws/java2wsdl/ java2wsdl/src/org/apache/ws/java2wsdl/utils/ kernel/src/org/apache/axis2/description/java2wsdl/
Author: amilas
Date: Tue May 10 05:39:31 2011
New Revision: 1101316
URL: http://svn.apache.org/viewvc?rev=1101316&view=rev
Log:
adding an option to disable soap11 soap12 and rest bindings from the java2wsdl
tool
Modified:
axis/axis2/java/core/trunk/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLBuilder.java
axis/axis2/java/core/trunk/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLCodegenEngine.java
axis/axis2/java/core/trunk/modules/java2wsdl/src/org/apache/ws/java2wsdl/utils/Java2WSDLOptionsValidator.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/Java2WSDLConstants.java
Modified:
axis/axis2/java/core/trunk/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLBuilder.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLBuilder.java?rev=1101316&r1=1101315&r2=1101316&view=diff
==
---
axis/axis2/java/core/trunk/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLBuilder.java
(original)
+++
axis/axis2/java/core/trunk/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLBuilder.java
Tue May 10 05:39:31 2011
@@ -38,6 +38,7 @@ import org.apache.axis2.engine.AxisConfi
import org.apache.axis2.engine.MessageReceiver;
import org.apache.axis2.util.Loader;
import org.apache.axis2.util.XMLPrettyPrinter;
+import org.apache.axis2.Constants;
import java.io.OutputStream;
import java.lang.reflect.Constructor;
@@ -82,6 +83,10 @@ public class Java2WSDLBuilder implements
private String mappingFileLocation;
private HashMap messageReceivers = null;
+private boolean disableSOAP11 = false;
+private boolean disableSOAP12 = false;
+private boolean disableREST = false;
+
public Java2WSDLBuilder() {
try {
ConfigurationContext configCtx =
ConfigurationContextFactory
@@ -264,6 +269,19 @@ public class Java2WSDLBuilder implements
axisService.setSchemaTargetNamespace(getSchemaTargetNamespace());
axisService
.setSchemaTargetNamespacePrefix(getSchemaTargetNamespacePrefix());
+
+if (disableREST) {
+axisService.addParameter(Constants.Configuration.DISABLE_REST,
disableREST);
+}
+
+if (disableSOAP11) {
+axisService.addParameter(Constants.Configuration.DISABLE_SOAP11,
disableSOAP11);
+}
+
+if (disableSOAP12) {
+axisService.addParameter(Constants.Configuration.DISABLE_SOAP12,
disableSOAP12);
+}
+
String uri = locationUri;
if (uri == null) {
uri = DEFAULT_LOCATION_URL
@@ -448,4 +466,28 @@ public class Java2WSDLBuilder implements
public void setNillableElementsAllowed(boolean nillableElementsAllowed) {
this.nillableElementsAllowed = nillableElementsAllowed;
}
+
+public boolean isDisableREST() {
+return disableREST;
+}
+
+public void setDisableREST(boolean disableREST) {
+this.disableREST = disableREST;
+}
+
+public boolean isDisableSOAP12() {
+return disableSOAP12;
+}
+
+public void setDisableSOAP12(boolean disableSOAP12) {
+this.disableSOAP12 = disableSOAP12;
+}
+
+public boolean isDisableSOAP11() {
+return disableSOAP11;
+}
+
+public void setDisableSOAP11(boolean disableSOAP11) {
+this.disableSOAP11 = disableSOAP11;
+}
}
Modified:
axis/axis2/java/core/trunk/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLCodegenEngine.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLCodegenEngine.java?rev=1101316&r1=1101315&r2=1101316&view=diff
==
---
axis/axis2/java/core/trunk/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLCodegenEngine.java
(original)
+++
axis/axis2/java/core/trunk/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLCodegenEngine.java
Tue May 10 05:39:31 2011
@@ -244,6 +244,19 @@ public class Java2WSDLCodegenEngine impl
if (option != null) {
java2WsdlBuilder.setNillableElementsAllowed(false);
}
+
+option = loadOption(Java2WSDLConstants.DISABLE_BINDING_SOAP11, null,
optionsMap);
+if (option != null) {
+java2WsdlBuilder.setDisableSOAP11(true);
+}
+option = loadOption(Java2WSDLConstants.DISABLE_BINDING_SOAP12, null,
optionsMap);
+if (option != null) {
+java2WsdlBuilder.setDisableSOAP12(true);
+}
+option = loadOption(Java2WSDLConstants.DISABLE_BINDING_REST, null,
optionsMap);
+if (option != null) {
+java2WsdlBuilder.setDisableREST(true);
+}
}
private Java2WSDLCommandLineOption loadOption(String
svn commit: r1101318 - /axis/axis2/java/core/trunk/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDL.java
Author: amilas
Date: Tue May 10 05:46:57 2011
New Revision: 1101318
URL: http://svn.apache.org/viewvc?rev=1101318&view=rev
Log:
adding options to display message
Modified:
axis/axis2/java/core/trunk/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDL.java
Modified:
axis/axis2/java/core/trunk/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDL.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDL.java?rev=1101318&r1=1101317&r2=1101318&view=diff
==
---
axis/axis2/java/core/trunk/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDL.java
(original)
+++
axis/axis2/java/core/trunk/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDL.java
Tue May 10 05:46:57 2011
@@ -62,6 +62,9 @@ public class Java2WSDL {
System.out.println(" -wv <1.1/2.0> wsdl
version - defaults to 1.1 if not specified");
System.out.println(" -dlbgenerate
schemas conforming to doc/lit/bare style");
System.out.println(" -dnedisallow
nillable elements in the generated schema");
+System.out.println(" -disableSOAP11 disable
binding generation for SOAP11");
+System.out.println(" -disableSOAP12 disable
binding generation for SOAP12");
+System.out.println(" -disableRESTdisable
binding generation for REST");
System.exit(0);
}
svn commit: r1101320 - /axis/axis2/java/core/trunk/modules/transport/local/src/org/apache/axis2/transport/local/LocalResponder.java
Author: sagara
Date: Tue May 10 05:55:11 2011
New Revision: 1101320
URL: http://svn.apache.org/viewvc?rev=1101320&view=rev
Log:
Fixed AXIS2-4991 - patch provided by Heshan Suriyaarachchi.
Modified:
axis/axis2/java/core/trunk/modules/transport/local/src/org/apache/axis2/transport/local/LocalResponder.java
Modified:
axis/axis2/java/core/trunk/modules/transport/local/src/org/apache/axis2/transport/local/LocalResponder.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/local/src/org/apache/axis2/transport/local/LocalResponder.java?rev=1101320&r1=1101319&r2=1101320&view=diff
==
---
axis/axis2/java/core/trunk/modules/transport/local/src/org/apache/axis2/transport/local/LocalResponder.java
(original)
+++
axis/axis2/java/core/trunk/modules/transport/local/src/org/apache/axis2/transport/local/LocalResponder.java
Tue May 10 05:55:11 2011
@@ -216,13 +216,15 @@ public class LocalResponder extends Abst
TransportUtils.writeMessage(messageContext, out);
ByteArrayInputStream bs = new ByteArrayInputStream(out.toByteArray());
+InputStreamReader streamReader = new InputStreamReader(bs);
OMXMLParserWrapper builder;
+
try {
-builder = BuilderUtil.getBuilder(bs);
+builder = BuilderUtil.getBuilder(streamReader);
} catch (XMLStreamException e) {
throw AxisFault.makeFault(e);
}
-return TransportUtils.createSOAPEnvelope(builder.getDocumentElement());
+return (SOAPEnvelope) builder.getDocumentElement();
}
}
svn commit: r1101323 - /axis/axis2/java/core/trunk/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportReceiver.java
Author: sagara
Date: Tue May 10 06:04:48 2011
New Revision: 1101323
URL: http://svn.apache.org/viewvc?rev=1101323&view=rev
Log:
Fixed AXIS2-5024 - patch provided by Heshan Suriyaarachchi.
Modified:
axis/axis2/java/core/trunk/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportReceiver.java
Modified:
axis/axis2/java/core/trunk/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportReceiver.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportReceiver.java?rev=1101323&r1=1101322&r2=1101323&view=diff
==
---
axis/axis2/java/core/trunk/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportReceiver.java
(original)
+++
axis/axis2/java/core/trunk/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportReceiver.java
Tue May 10 06:04:48 2011
@@ -131,6 +131,11 @@ public class LocalTransportReceiver {
msgCtx.setTransportOut(localTransportResOut);
msgCtx.setProperty(MessageContext.TRANSPORT_OUT, response);
+Object headers =
inMessageContext.getProperty(MessageContext.TRANSPORT_HEADERS);
+if (headers != null) {
+msgCtx.setProperty(MessageContext.TRANSPORT_HEADERS, headers);
+}
+
msgCtx.setTo(to);
msgCtx.setWSAAction(action);
msgCtx.setServerSide(true);
svn commit: r1101328 - /axis/axis2/java/core/branches/1_6/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportReceiver.java
Author: sagara
Date: Tue May 10 06:26:05 2011
New Revision: 1101328
URL: http://svn.apache.org/viewvc?rev=1101328&view=rev
Log:
Merged r1101323 to the 1.6 branch.
Modified:
axis/axis2/java/core/branches/1_6/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportReceiver.java
Modified:
axis/axis2/java/core/branches/1_6/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportReceiver.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportReceiver.java?rev=1101328&r1=1101327&r2=1101328&view=diff
==
---
axis/axis2/java/core/branches/1_6/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportReceiver.java
(original)
+++
axis/axis2/java/core/branches/1_6/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportReceiver.java
Tue May 10 06:26:05 2011
@@ -104,6 +104,11 @@ public class LocalTransportReceiver {
msgCtx.setTransportOut(localTransportResOut);
msgCtx.setProperty(MessageContext.TRANSPORT_OUT, response);
+Object headers =
inMessageContext.getProperty(MessageContext.TRANSPORT_HEADERS);
+if (headers != null) {
+msgCtx.setProperty(MessageContext.TRANSPORT_HEADERS, headers);
+}
+
msgCtx.setTo(to);
msgCtx.setWSAAction(action);
msgCtx.setServerSide(true);
svn commit: r1101329 - in /axis/axis2/java/core/branches/1_5/modules/transport/local: ./ src/org/apache/axis2/transport/local/LocalTransportReceiver.java
Author: sagara Date: Tue May 10 06:26:56 2011 New Revision: 1101329 URL: http://svn.apache.org/viewvc?rev=1101329&view=rev Log: Merged r1101323 to the 1.5 branch. Modified: axis/axis2/java/core/branches/1_5/modules/transport/local/ (props changed) axis/axis2/java/core/branches/1_5/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportReceiver.java Propchange: axis/axis2/java/core/branches/1_5/modules/transport/local/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue May 10 06:26:56 2011 @@ -1,2 +1,2 @@ -/axis/axis2/java/core/trunk/modules/transport/local:922914,922941,922983,935122,935169,935174,935338,937004,937237,939924,944074,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,966536,979882-979883,979886,980242,981036,981038,981055-981056,981058,981095,981188,981220-981221,981237,981262,981278,981293,981306,981311,981985,981992,982008,982387,982393,982795,982800,983101,983110,983114,983119-983120,983128,983185,983236,983270,983276,983280,983316,983363,983370,983372,985458,985464,985626,985634,985661,985715,985717,985744,985748,985752,985763,985791,985796,985851,986844,986889,987313,987712-987715,987783,987832,987873,987883,987913,987935,990350,990369,990377,990384,990394,990398,990404,990434,990445,990449,1001279,1001452-1001466,1001673,1029034,1029153,1029308,1029372,1029377,1029610-1029651,1030008,1030538,1031350,1031352,1031799,1032001,103 2390,1032401,1032681,1032694,1033898,1033942,1033956,1034010,1034015,1034142,1034173,1034213,1034254,1035545,1036624,1036659,1037144,1037210,1037617,1038024,1038070,1039635,1039712-1039729,1039862,1039881,1042118,1042416,1042442,1042527,1050589,1050632,1050793,1050819,1050823,1050836,1050916,1050923,1052223,1054463,1055120,1056933,1062170,1081563,1082316,1082702,1083180,1083379,1083381,1083433,1083446,1088239,1088249,1088251,1088268,1091191,1099385,1099389,1100628,1101037 +/axis/axis2/java/core/trunk/modules/transport/local:922914,922941,922983,935122,935169,935174,935338,937004,937237,939924,944074,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,966536,979882-979883,979886,980242,981036,981038,981055-981056,981058,981095,981188,981220-981221,981237,981262,981278,981293,981306,981311,981985,981992,982008,982387,982393,982795,982800,983101,983110,983114,983119-983120,983128,983185,983236,983270,983276,983280,983316,983363,983370,983372,985458,985464,985626,985634,985661,985715,985717,985744,985748,985752,985763,985791,985796,985851,986844,986889,987313,987712-987715,987783,987832,987873,987883,987913,987935,990350,990369,990377,990384,990394,990398,990404,990434,990445,990449,1001279,1001452-1001466,1001673,1029034,1029153,1029308,1029372,1029377,1029610-1029651,1030008,1030538,1031350,1031352,1031799,1032001,103 2390,1032401,1032681,1032694,1033898,1033942,1033956,1034010,1034015,1034142,1034173,1034213,1034254,1035545,1036624,1036659,1037144,1037210,1037617,1038024,1038070,1039635,1039712-1039729,1039862,1039881,1042118,1042416,1042442,1042527,1050589,1050632,1050793,1050819,1050823,1050836,1050916,1050923,1052223,1054463,1055120,1056933,1062170,1081563,1082316,1082702,1083180,1083379,1083381,1083433,1083446,1088239,1088249,1088251,1088268,1091191,1099385,1099389,1100628,1101037,1101323 /webservices/axis2/trunk/java/modules/transport/local:728674,729037,731798,732539,732541,732873,732877,733293,733295,733304,733306,733348,733354,733394,733399,733463-733464,733533,733539-733540,733676,733900,733910,734227,734237,734261,738057,738067,738071,738086,738110,738113,738117,738158,740332,740357,740360,741300,741784,741878,741881,751958,752906,761068,771051,776555,776612,777648,777882,777897,777934,778060,780546,783479,783869,783873,787379,788202,795431,797969,801630,802447,803725,804541,805578,805981,805999,806085,806331,807160,807487,807512,816740,816804,816812,816891,817965,821686,821689,823125,823960,834058,834175,889783,896320,902271,904660,904780,905783,905980,908318 Modified: axis/axis2/java/core/branches/1_5/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportReceiver.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_5/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportReceiver.java?rev=1101329&r1=1101328&r2=1101329&view=diff == --- axis/axis2/java/core/branches/1_5/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportReceiver.java (original) +++ axis/axis2/java/core/branches/1_5/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportReceiver.java Tue May 10 06:26:56 2011 @@ -69,6 +69,11 @@ public
svn commit: r1101330 - in /axis/axis2/java/core/trunk/modules: java2wsdl/src/org/apache/ws/java2wsdl/ java2wsdl/src/org/apache/ws/java2wsdl/utils/ kernel/src/org/apache/axis2/description/java2wsdl/
Author: amilas
Date: Tue May 10 06:29:09 2011
New Revision: 1101330
URL: http://svn.apache.org/viewvc?rev=1101330&view=rev
Log:
add an option to give the message part name
Modified:
axis/axis2/java/core/trunk/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDL.java
axis/axis2/java/core/trunk/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLBuilder.java
axis/axis2/java/core/trunk/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLCodegenEngine.java
axis/axis2/java/core/trunk/modules/java2wsdl/src/org/apache/ws/java2wsdl/utils/Java2WSDLOptionsValidator.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/Java2WSDLConstants.java
Modified:
axis/axis2/java/core/trunk/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDL.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDL.java?rev=1101330&r1=1101329&r2=1101330&view=diff
==
---
axis/axis2/java/core/trunk/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDL.java
(original)
+++
axis/axis2/java/core/trunk/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDL.java
Tue May 10 06:29:09 2011
@@ -65,6 +65,7 @@ public class Java2WSDL {
System.out.println(" -disableSOAP11 disable
binding generation for SOAP11");
System.out.println(" -disableSOAP12 disable
binding generation for SOAP12");
System.out.println(" -disableRESTdisable
binding generation for REST");
+System.out.println(" -mpn change
the part name of the generated wsdl messages");
System.exit(0);
}
Modified:
axis/axis2/java/core/trunk/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLBuilder.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLBuilder.java?rev=1101330&r1=1101329&r2=1101330&view=diff
==
---
axis/axis2/java/core/trunk/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLBuilder.java
(original)
+++
axis/axis2/java/core/trunk/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLBuilder.java
Tue May 10 06:29:09 2011
@@ -87,6 +87,8 @@ public class Java2WSDLBuilder implements
private boolean disableSOAP12 = false;
private boolean disableREST = false;
+private String messagePartName;
+
public Java2WSDLBuilder() {
try {
ConfigurationContext configCtx =
ConfigurationContextFactory
@@ -255,6 +257,10 @@ public class Java2WSDLBuilder implements
service.addParameter(Java2WSDLConstants.DISALLOW_NILLABLE_ELEMENTS_OPTION_LONG,
"true");
}
+if (messagePartName != null){
+
service.addParameter(Java2WSDLConstants.MESSAGE_PART_NAME_OPTION_LONG,
messagePartName);
+}
+
schemaGenerator.setAxisService(service);
AxisService axisService = AxisService.createService(className,
serviceName == null ? Java2WSDLUtils
@@ -490,4 +496,12 @@ public class Java2WSDLBuilder implements
public void setDisableSOAP11(boolean disableSOAP11) {
this.disableSOAP11 = disableSOAP11;
}
+
+public String getMessagePartName() {
+return messagePartName;
+}
+
+public void setMessagePartName(String messagePartName) {
+this.messagePartName = messagePartName;
+}
}
Modified:
axis/axis2/java/core/trunk/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLCodegenEngine.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLCodegenEngine.java?rev=1101330&r1=1101329&r2=1101330&view=diff
==
---
axis/axis2/java/core/trunk/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLCodegenEngine.java
(original)
+++
axis/axis2/java/core/trunk/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLCodegenEngine.java
Tue May 10 06:29:09 2011
@@ -257,6 +257,13 @@ public class Java2WSDLCodegenEngine impl
if (option != null) {
java2WsdlBuilder.setDisableREST(true);
}
+
+option = loadOption(Java2WSDLConstants.MESSAGE_PART_NAME_OPTION,
+ Java2WSDLConstants.MESSAGE_PART_NAME_OPTION_LONG,
+ optionsMap);
+if (option != null) {
+java2WsdlBuilder.setMessagePartName(option.getOptionValue());
+}
}
private Java2WSDLCommandLineOption loadOption(String shortOption, String
longOption,
Modified:
axis/axis2/java/core/tru
