svn commit: r916333 - in /axis/axis2/java/core/trunk/modules: jaxws/src/org/apache/axis2/jaxws/spi/Provider.java kernel/src/org/apache/axis2/addressing/metadata/WSDLLocation.java kernel/test/org/apach
Author: nagy
Date: Thu Feb 25 16:04:00 2010
New Revision: 916333
URL: http://svn.apache.org/viewvc?rev=916333&view=rev
Log:
AXIS2-4574
Update WSDL Instance namespace on wsdlLocation Metadata attribute to make it
match the example in the WS-A Metadata Spec and be compliant with the new WSDL
2.0 spec.
Contributor: Katherine Sanders
Modified:
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/spi/Provider.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/addressing/metadata/WSDLLocation.java
axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/addressing/EndpointReferenceHelperTest.java
Modified:
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/spi/Provider.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/spi/Provider.java?rev=916333&r1=916332&r2=916333&view=diff
==
---
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/spi/Provider.java
(original)
+++
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/spi/Provider.java
Thu Feb 25 16:04:00 2010
@@ -26,6 +26,8 @@
import org.apache.axis2.jaxws.addressing.util.EndpointReferenceUtils;
import org.apache.axis2.jaxws.i18n.Messages;
import org.apache.axis2.jaxws.server.endpoint.EndpointImpl;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.w3c.dom.Element;
import javax.xml.namespace.QName;
@@ -40,6 +42,8 @@
import java.util.List;
public class Provider extends javax.xml.ws.spi.Provider {
+private static final Log log = LogFactory.getLog(Provider.class);
+
private static final Element[] ZERO_LENGTH_ARRAY = new Element[0];
@Override
@@ -126,10 +130,17 @@
EndpointReferenceHelper.getWSDLLocationMetadata(axis2EPR,
addressingNamespace);
URL wsdlLocationURL = null;
-if (wsdlLocation.getLocation() != null)
+if (wsdlLocation.getLocation() != null) {
wsdlLocationURL = new URL(wsdlLocation.getLocation());
-else
+if (log.isDebugEnabled()) {
+log.debug("getPort: Using EPR wsdlLocationURL = " +
wsdlLocationURL);
+}
+} else {
wsdlLocationURL = new URL(axis2EPR.getAddress() + "?wsdl");
+if (log.isDebugEnabled()) {
+log.debug("getPort: Using default wsdlLocationURL = " +
wsdlLocationURL);
+}
+}
serviceDelegate =
new org.apache.axis2.jaxws.spi.ServiceDelegate(wsdlLocationURL,
serviceName.getName(), Service.class);
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/addressing/metadata/WSDLLocation.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/addressing/metadata/WSDLLocation.java?rev=916333&r1=916332&r2=916333&view=diff
==
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/addressing/metadata/WSDLLocation.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/addressing/metadata/WSDLLocation.java
Thu Feb 25 16:04:00 2010
@@ -23,11 +23,17 @@
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMNamespace;
import org.apache.axis2.AxisFault;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import javax.xml.namespace.QName;
public class WSDLLocation {
+private static final Log log = LogFactory.getLog(WSDLLocation.class);
+
+// Support both WSDLI namespaces on inbound messages to allow interop with
earlier versions of axis2
private static final QName WSDLI = new
QName("http://www.w3.org/2006/01/wsdl-instance";, "wsdlLocation", "wsdli");
+private static final QName FINAL_WSDLI = new
QName("http://www.w3.org/ns/wsdl-instance";, "wsdlLocation", "wsdli");
private String targetNamespace;
private String wsdlURL;
@@ -55,29 +61,35 @@
/**
* Convenience method to convert an object of this type to an
OMAttribute
+ *
+ * <... xmlns:wsdli="http://www.w3.org/ns/wsdl-instance";
wsdli:wsdlLocation="targetNamespace wsdlURL" ...>
+ *
* @param factory OMFactory to use when generating
OMElements
*
* @return an OMAttribute that can be added to an
EndpointReference
*/
public OMAttribute toOM(OMFactory factory) {
String value = new StringBuffer(targetNamespace).append("
").append(wsdlURL).toString();
-OMNamespace wsdliNs =
factory.createO
svn commit: r918666 - in /axis/axis2/java/core/trunk/modules/jaxws-integration: ./ test-resources/pdf/ test-resources/wsdl/ test/org/apache/axis2/jaxws/sample/ test/org/apache/axis2/jaxws/sample/mtomf
Author: nagy Date: Wed Mar 3 19:51:46 2010 New Revision: 918666 URL: http://svn.apache.org/viewvc?rev=918666&view=rev Log: AXIS2-4644 Added new tests to verify MTOMFeature JAX-WS API functionality. Contributor: Nikhil Thaker Added: axis/axis2/java/core/trunk/modules/jaxws-integration/test-resources/pdf/ axis/axis2/java/core/trunk/modules/jaxws-integration/test-resources/pdf/JAX-WS.pdf (with props) axis/axis2/java/core/trunk/modules/jaxws-integration/test-resources/wsdl/ProcessDocumentService.wsdl axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/MTOMFeatureTests.java axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/mtomfeature/ axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/mtomfeature/META-INF/ axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/mtomfeature/META-INF/ProcessDocumentService.wsdl axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/mtomfeature/ProcessDocumentDelegate.java axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/mtomfeature/ProcessDocumentPortBindingImpl.java axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/mtomfeature/ProcessDocumentService.java Modified: axis/axis2/java/core/trunk/modules/jaxws-integration/pom.xml Modified: axis/axis2/java/core/trunk/modules/jaxws-integration/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws-integration/pom.xml?rev=918666&r1=918665&r2=918666&view=diff == --- axis/axis2/java/core/trunk/modules/jaxws-integration/pom.xml (original) +++ axis/axis2/java/core/trunk/modules/jaxws-integration/pom.xml Wed Mar 3 19:51:46 2010 @@ -369,6 +369,12 @@ +Generating java from ProcessDocumentService.wsdl + + + + + @@ -1280,6 +1286,22 @@ + + + + + + + + + + + + + + @@ -1369,6 +1391,7 @@ **/BasicAuthSecurityTests.java **/AddressBookTests.java **/MtomSampleTests.java +**/MTOMFeatureTests.java **/JAXBProviderTests.java **/BareTests.java **/AddNumbersHandlerTests.java @@ -1419,6 +1442,7 @@ **/SoapMessageProviderTests.java **/StringProviderTests.java **/OMProviderTests.java + Added: axis/axis2/java/core/trunk/modules/jaxws-integration/test-resources/pdf/JAX-WS.pdf URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws-integration/test-resources/pdf/JAX-WS.pdf?rev=918666&view=auto == Binary file - no diff available. Propchange: axis/axis2/java/core/trunk/modules/jaxws-integration/test-resources/pdf/JAX-WS.pdf -- svn:mime-type = application/octet-stream Added:
svn commit: r919621 - in /axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider: AddressingProviderTests.java addressing/AddressingProvider.java addressing/META-INF
Author: nagy
Date: Fri Mar 5 21:14:01 2010
New Revision: 919621
URL: http://svn.apache.org/viewvc?rev=919621&view=rev
Log:
Added new tests to verify the RespectBindingFeature JAX-WS API functionality.
Contributor: Roy Wood
Modified:
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/AddressingProviderTests.java
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/addressing/AddressingProvider.java
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/addressing/META-INF/AddressingProvider.wsdl
Modified:
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/AddressingProviderTests.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/AddressingProviderTests.java?rev=919621&r1=919620&r2=919621&view=diff
==
---
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/AddressingProviderTests.java
(original)
+++
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/AddressingProviderTests.java
Fri Mar 5 21:14:01 2010
@@ -31,11 +31,14 @@
import javax.xml.soap.SOAPBody;
import javax.xml.soap.SOAPElement;
import javax.xml.soap.SOAPMessage;
+
+import org.apache.axis2.jaxws.spi.Binding;
import javax.xml.ws.BindingProvider;
import javax.xml.ws.Dispatch;
import javax.xml.ws.Service;
import javax.xml.ws.WebServiceFeature;
import javax.xml.ws.soap.AddressingFeature;
+import javax.xml.ws.RespectBindingFeature;
import junit.framework.Test;
import junit.framework.TestSuite;
@@ -130,6 +133,51 @@
System.out.println(response.toString());
}
+/**
+ * Message already contains wsa headers. Make sure there is no mismatch
between
+ * SOAPAction and wsa:Action.
+ */
+public void testWithRespectBinding() throws Exception {
+
+Dispatch dispatch = createDispatchWithRespectBinding();
+
+BindingProvider bp = (BindingProvider) dispatch;
+Binding binding = (Binding) bp.getBinding();
+
+WebServiceFeature addressingFeature =
binding.getFeature(AddressingFeature.ID);
+assertNotNull(addressingFeature);
+assertTrue("Expecting AddressingFeature to be enabled.",
addressingFeature.isEnabled());
+
+WebServiceFeature respectBindingFeature =
binding.getFeature(RespectBindingFeature.ID);
+assertNotNull(respectBindingFeature);
+assertTrue("Expecting RespectBindingFeature to be enabled.",
respectBindingFeature.isEnabled());
+
+bp.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
endpointUrl);
+
+String msg = MessageFormat.format(SOAP_MESSAGE_2,
+ endpointUrl,
+ "urn:" + UUID.randomUUID(),
+ ACTION);
+
+System.out.println(msg);
+
+MessageFactory factory = MessageFactory.newInstance();
+SOAPMessage request = factory.createMessage(null, new
ByteArrayInputStream(msg.getBytes()));
+
+SOAPMessage response = dispatch.invoke(request);
+
+assertResponseXML(response, "Hello Response");
+
+System.out.println(response.toString());
+
+// Try again to verify
+response = dispatch.invoke(request);
+
+assertResponseXML(response, "Hello Response");
+
+System.out.println(response.toString());
+}
+
private SOAPElement assertResponseXML(SOAPMessage msg, String
expectedText) throws Exception {
assertTrue(msg != null);
SOAPBody body = msg.getSOAPBody();
@@ -163,6 +211,19 @@
return dispatch;
}
+private Dispatch createDispatchWithRespectBinding() throws
Exception {
+URL wsdlURL = getWsdl();
+assertNotNull(wsdlURL);
+Service svc = Service.create(wsdlURL, serviceName);
+
+WebServiceFeature[] wsf = {new AddressingFeature(true), new
RespectBindingFeature(true)};
+
+Dispatch dispatch =
+svc.createDispatch(portName, SOAPMessage.class,
Service.Mode.MESSAGE, wsf);
+
+return dispatch;
+}
+
private URL getWsdl() throws Exception {
String wsdlLocation =
"/test/org/apache/axis2/jaxws/provider/addressing/META-INF/AddressingProvider.wsdl";
String baseDir = new
File(System.getProperty("basedir",".")).getCanonicalPath();
Modified:
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/addressing/AddressingProvider.j
svn commit: r921527 - /axis/axis2/java/transports/trunk/LICENSE.txt
Author: nagy Date: Wed Mar 10 19:43:16 2010 New Revision: 921527 URL: http://svn.apache.org/viewvc?rev=921527&view=rev Log: Added Apache License Added: axis/axis2/java/transports/trunk/LICENSE.txt (with props) Added: axis/axis2/java/transports/trunk/LICENSE.txt URL: http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/LICENSE.txt?rev=921527&view=auto == --- axis/axis2/java/transports/trunk/LICENSE.txt (added) +++ axis/axis2/java/transports/trunk/LICENSE.txt Wed Mar 10 19:43:16 2010 @@ -0,0 +1,203 @@ + + Apache License + Version 2.0, January 2004 +http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) pa
svn commit: r928797 - in /axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/spi: Provider.java ServiceDelegate.java
Author: nagy
Date: Mon Mar 29 14:55:09 2010
New Revision: 928797
URL: http://svn.apache.org/viewvc?rev=928797&view=rev
Log:
Added method signatures to support JAX-WS 2.2 changes.
Modified:
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/spi/Provider.java
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/spi/ServiceDelegate.java
Modified:
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/spi/Provider.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/spi/Provider.java?rev=928797&r1=928796&r2=928797&view=diff
==
---
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/spi/Provider.java
(original)
+++
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/spi/Provider.java
Mon Mar 29 14:55:09 2010
@@ -46,8 +46,12 @@ public class Provider extends javax.xml.
private static final Element[] ZERO_LENGTH_ARRAY = new Element[0];
-@Override
+ @Override
public Endpoint createAndPublishEndpoint(String s, Object obj) {
+ return createAndPublishEndpoint(s, obj, (WebServiceFeature[]) null);
+}
+
+public Endpoint createAndPublishEndpoint(String s, Object obj,
WebServiceFeature... features) {
Endpoint ep = new EndpointImpl(obj);
ep.publish(s);
return ep;
@@ -55,12 +59,27 @@ public class Provider extends javax.xml.
@Override
public Endpoint createEndpoint(String binding, Object obj) {
+return createEndpoint(binding, obj, (WebServiceFeature[])null);
+}
+
+//TODO: Fix the Endpoint to support WebServiceFeatures (for non-JEE users)
+public Endpoint createEndpoint(String binding, Object obj,
WebServiceFeature... features) {
return new EndpointImpl(obj);
}
+//TODO: Fix the Endpoint to support WebServiceFeatures (for non-JEE users)
+//@Override
+//public Endpoint createEndpoint(String binding, Class clazz, Invoker
invoker, WebServiceFeature... features) {
+//
+//}
+
@Override
public ServiceDelegate createServiceDelegate(URL url, QName qname, Class
clazz) {
-return new org.apache.axis2.jaxws.spi.ServiceDelegate(url, qname,
clazz);
+return createServiceDelegate(url, qname, clazz,
(WebServiceFeature[])null);
+}
+
+public ServiceDelegate createServiceDelegate(URL url, QName qname, Class
clazz, WebServiceFeature... features) {
+return new org.apache.axis2.jaxws.spi.ServiceDelegate(url, qname,
clazz, features);
}
@Override
Modified:
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/spi/ServiceDelegate.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/spi/ServiceDelegate.java?rev=928797&r1=928796&r2=928797&view=diff
==
---
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/spi/ServiceDelegate.java
(original)
+++
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/spi/ServiceDelegate.java
Mon Mar 29 14:55:09 2010
@@ -85,6 +85,8 @@ public class ServiceDelegate extends jav
private HandlerResolver handlerResolver = null;
+private WebServiceFeature[] features = null;
+
/**
* NON-STANDARD SPI! Set any metadata to be used on the creation of the
NEXT Service by this thread.
* NOTE that this uses ThreadLocal to store the metadata, and that
ThreadLocal is cleared after it is
@@ -195,9 +197,10 @@ public class ServiceDelegate extends jav
sparsePortCompositeThreadLocal.set(null);
}
-public ServiceDelegate(URL url, QName qname, Class clazz) throws
WebServiceException {
+public ServiceDelegate(URL url, QName qname, Class clazz,
WebServiceFeature... features) throws WebServiceException {
super();
this.serviceQname = qname;
+this.features = features;
if (!isValidServiceName()) {
throw ExceptionFactory
@@ -228,7 +231,7 @@ public class ServiceDelegate extends jav
ApplicationContextMigratorUtil.addApplicationContextMigrator(context,
Constants.APPLICATION_CONTEXT_MIGRATOR_LIST_ID, new
PropertyMigrator());
}
-
+
//
// JAX-WS API methods
//
@@ -263,7 +266,7 @@ public class ServiceDelegate extends jav
*/
public Dispatch createDispatch(QName portName, Class type, Mode
mode)
throws WebServiceException {
-return createDispatch(portName, type, mode, (WebServiceFeature[])
null);
+return createDispatch(portName, type, mode, (WebServiceFeature[])
features);
}
/*
@@ -271,7 +274,7 @@ public class
svn commit: r934847 - in /axis/axis2/java/core/trunk/modules: documentation/ metadata/ metadata/src/org/apache/axis2/jaxws/description/builder/ parent/
Author: nagy
Date: Fri Apr 16 12:31:38 2010
New Revision: 934847
URL: http://svn.apache.org/viewvc?rev=934847&view=rev
Log:
Switched to Geronimo JAX-WS 2.2 API jar and updated annotations to be 2.2
compliant
Modified:
axis/axis2/java/core/trunk/modules/documentation/pom.xml
axis/axis2/java/core/trunk/modules/metadata/pom.xml
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/AddressingAnnot.java
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/RequestWrapperAnnot.java
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/ResponseWrapperAnnot.java
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/WebFaultAnnot.java
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/WebServiceRefAnnot.java
axis/axis2/java/core/trunk/modules/parent/pom.xml
Modified: axis/axis2/java/core/trunk/modules/documentation/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/documentation/pom.xml?rev=934847&r1=934846&r2=934847&view=diff
==
--- axis/axis2/java/core/trunk/modules/documentation/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/documentation/pom.xml Fri Apr 16
12:31:38 2010
@@ -39,7 +39,7 @@
org.apache.geronimo.specs
-geronimo-jaxws_2.1_spec
+geronimo-jaxws_2.2_spec
com.sun.xml.fastinfoset
Modified: axis/axis2/java/core/trunk/modules/metadata/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/metadata/pom.xml?rev=934847&r1=934846&r2=934847&view=diff
==
--- axis/axis2/java/core/trunk/modules/metadata/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/metadata/pom.xml Fri Apr 16 12:31:38 2010
@@ -39,7 +39,7 @@
org.apache.geronimo.specs
-geronimo-jaxws_2.1_spec
+geronimo-jaxws_2.2_spec
org.apache.axis2
@@ -135,6 +135,28 @@
+maven-dependency-plugin
+
+
+generate-sources
+
+copy
+
+
+
+
+ org.apache.geronimo.specs
+ geronimo-jaxws_2.2_spec
+ jar
+ true
+ target/endorsed
+
+
+
+
+
+
+
maven-jar-plugin
@@ -147,7 +169,7 @@
true
-
-Xbootclasspath/p:${basedir}/../jaxws-api/target/classes${path.separator}${basedir}/../jws-api/target/classes
+
-Xbootclasspath/p:${basedir}/target/endorsed/geronimo-jaxws_2.2_spec-1.0-SNAPSHOT.jar
1.5
1.5
Modified:
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/AddressingAnnot.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/AddressingAnnot.java?rev=934847&r1=934846&r2=934847&view=diff
==
---
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/AddressingAnnot.java
(original)
+++
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/AddressingAnnot.java
Fri Apr 16 12:31:38 2010
@@ -20,12 +20,14 @@
package org.apache.axis2.jaxws.description.builder;
import javax.xml.ws.soap.Addressing;
+import javax.xml.ws.soap.AddressingFeature;
import java.lang.annotation.Annotation;
public class AddressingAnnot implements Addressing {
private boolean enabled = true;
private boolean required;
+private AddressingFeature.Responses responses =
AddressingFeature.Responses.ALL;
public boolean enabled() {
return enabled;
@@ -43,6 +45,14 @@ public class AddressingAnnot implements
required = r;
}
+public AddressingFeature.Responses responses() {
+ return responses;
+}
+
+public void setResponses(AddressingFeature.Responses r) {
+ responses = r;
+}
+
public Class annotationType() {
return Addressing.class;
svn commit: r935004 - in /axis/axis2/java/core/trunk/modules: jaxws/src/org/apache/axis2/jaxws/spi/ServiceDelegate.java metadata/src/org/apache/axis2/jaxws/i18n/resource.properties
Author: nagy
Date: Fri Apr 16 17:29:04 2010
New Revision: 935004
URL: http://svn.apache.org/viewvc?rev=935004&view=rev
Log:
Fix to bring use of features during service creation in line with spec so as to
prevent potential portability issues.
Modified:
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/spi/ServiceDelegate.java
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/i18n/resource.properties
Modified:
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/spi/ServiceDelegate.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/spi/ServiceDelegate.java?rev=935004&r1=935003&r2=935004&view=diff
==
---
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/spi/ServiceDelegate.java
(original)
+++
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/spi/ServiceDelegate.java
Fri Apr 16 17:29:04 2010
@@ -85,8 +85,6 @@ public class ServiceDelegate extends jav
private HandlerResolver handlerResolver = null;
-private WebServiceFeature[] features = null;
-
/**
* NON-STANDARD SPI! Set any metadata to be used on the creation of the
NEXT Service by this thread.
* NOTE that this uses ThreadLocal to store the metadata, and that
ThreadLocal is cleared after it is
@@ -200,12 +198,17 @@ public class ServiceDelegate extends jav
public ServiceDelegate(URL url, QName qname, Class clazz,
WebServiceFeature... features) throws WebServiceException {
super();
this.serviceQname = qname;
-this.features = features;
if (!isValidServiceName()) {
throw ExceptionFactory
.makeWebServiceException(Messages.getMessage("serviceDelegateConstruct0", ""));
}
+
+if ((features != null) && (features.length != 0)) {
+ throw ExceptionFactory
+
.makeWebServiceException(Messages.getMessage("serviceDelegateConstruct2",
serviceQname.toString()));
+}
+
// Get any metadata that is to be used to build up this service, then
reset it so it isn't used
// to create any other services.
DescriptionBuilderComposite sparseComposite = getServiceMetadata();
@@ -266,7 +269,7 @@ public class ServiceDelegate extends jav
*/
public Dispatch createDispatch(QName portName, Class type, Mode
mode)
throws WebServiceException {
-return createDispatch(portName, type, mode, (WebServiceFeature[])
features);
+return createDispatch(portName, type, mode, (WebServiceFeature[])
null);
}
/*
@@ -274,7 +277,7 @@ public class ServiceDelegate extends jav
* @see
javax.xml.ws.spi.ServiceDelegate#createDispatch(javax.xml.namespace.QName,
javax.xml.bind.JAXBContext, javax.xml.ws.Service.Mode)
*/
public Dispatch createDispatch(QName portName,
JAXBContext context, Mode mode) {
-return createDispatch(portName, context, mode, (WebServiceFeature[])
features);
+return createDispatch(portName, context, mode, (WebServiceFeature[])
null);
}
@Override
@@ -500,7 +503,7 @@ public class ServiceDelegate extends jav
* @see javax.xml.ws.spi.ServiceDelegate#getPort(java.lang.Class)
*/
public T getPort(Class sei) throws WebServiceException {
-return getPort((QName) null, sei, (WebServiceFeature[]) features);
+return getPort((QName) null, sei, (WebServiceFeature[]) null);
}
/*
@@ -508,7 +511,7 @@ public class ServiceDelegate extends jav
* @see javax.xml.ws.spi.ServiceDelegate#getPort(javax.xml.namespace.QName,
java.lang.Class)
*/
public T getPort(QName portName, Class sei) throws
WebServiceException {
-return getPort(portName, sei, (WebServiceFeature[]) features);
+return getPort(portName, sei, (WebServiceFeature[]) null);
}
@Override
Modified:
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/i18n/resource.properties
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/i18n/resource.properties?rev=935004&r1=935003&r2=935004&view=diff
==
---
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/i18n/resource.properties
(original)
+++
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/i18n/resource.properties
Fri Apr 16 17:29:04 2010
@@ -349,4 +349,6 @@ missingInvocationController=An invocatio
unknownClassType=Unknown class type {0}
axisEndpointReferenceFactoryErr=Cannot create an endpoint reference because
the service name is null, and the port name is set to {0}
axisEndpointReferenceFactoryErr2=Cannot create an endp
svn commit: r959069 - in /axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/server/dispatcher: JavaBeanDispatcher.java JavaDispatcher.java
Author: nagy
Date: Tue Jun 29 18:26:12 2010
New Revision: 959069
URL: http://svn.apache.org/viewvc?rev=959069&view=rev
Log:
Correctly identify checked exceptions in JAX-WS as being application faults so
that they are not erroneously logged.
Contributor: Phil Adams
Modified:
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/server/dispatcher/JavaBeanDispatcher.java
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/server/dispatcher/JavaDispatcher.java
Modified:
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/server/dispatcher/JavaBeanDispatcher.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/server/dispatcher/JavaBeanDispatcher.java?rev=959069&r1=959068&r2=959069&view=diff
==
---
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/server/dispatcher/JavaBeanDispatcher.java
(original)
+++
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/server/dispatcher/JavaBeanDispatcher.java
Tue Jun 29 18:26:12 2010
@@ -100,6 +100,9 @@ public class JavaBeanDispatcher extends
catch (Throwable e) {
faultThrown = true;
fault = e;
+if (log.isDebugEnabled()) {
+ log.debug("Caught exception from 'invokeTargetOperation': " +
fault.toString());
+}
}
MessageContext response = null;
@@ -108,12 +111,20 @@ public class JavaBeanDispatcher extends
// we cannot create a MessageContext for one-way responses.
return null;
} else if (faultThrown) {
+if (log.isDebugEnabled()) {
+ log.debug("Processing fault response: " + fault.toString());
+}
+
response = createFaultResponse(mc, mc.getMessage().getProtocol(),
fault);
setExceptionProperties(response, target, fault);
} else {
response = createResponse(mc, mc.getMessage().getProtocol(),
methodInputParams, output);
}
-
+
+
+if (log.isDebugEnabled()) {
+ log.debug("Returning from JavaBeanDispatcher.invoke()...");
+}
return response;
}
@@ -329,7 +340,10 @@ public class JavaBeanDispatcher extends
}
public MessageContext createFaultResponse(MessageContext request, Protocol
p, Throwable t) {
-
+if (log.isDebugEnabled()) {
+ log.debug("Entered JavaBeanDispatcher.createFaultResponse()...");
+}
+
// call the InvocationListener instances before marshalling
// the fault into a message
// call the InvocationListener instances before marshalling
@@ -354,6 +368,10 @@ public class JavaBeanDispatcher extends
response.setCausedByException(axisFault);
setFaultResponseAction(t, request, response);
+
+if (log.isDebugEnabled()) {
+ log.debug("Leaving JavaBeanDispatcher.createFaultResponse()...");
+}
return response;
}
Modified:
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/server/dispatcher/JavaDispatcher.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/server/dispatcher/JavaDispatcher.java?rev=959069&r1=959068&r2=959069&view=diff
==
---
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/server/dispatcher/JavaDispatcher.java
(original)
+++
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/server/dispatcher/JavaDispatcher.java
Tue Jun 29 18:26:12 2010
@@ -19,6 +19,7 @@
package org.apache.axis2.jaxws.server.dispatcher;
+import org.apache.axis2.AxisFault;
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.jaxws.Constants;
import org.apache.axis2.jaxws.WebServiceExceptionLogger;
@@ -315,6 +316,10 @@ public abstract class JavaDispatcher imp
* @param t Throwable
*/
protected static void setCheckedExceptionProperty(MessageContext response,
Method m, Throwable t) {
+if (log.isDebugEnabled()) {
+ log.debug("Entered JavaDispatcher.setCheckedExceptionProperty(), t="
+ t);
+}
+
// Get the root of the exception
if (t instanceof InvocationTargetException) {
t = ((InvocationTargetException) t).getTargetException();
@@ -325,7 +330,20 @@ public abstract class JavaDispatcher imp
// Add the property
if (checkedException != null) {
+if (log.isDebugEnabled()) {
+ log.debug("The exception is a checked exception: " +
checkedException.getCanonicalName());
+
