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;
}
Modified:
axis/axis2/java/core/trunk/module
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 endpoint reference because
the address, service name, and/or port name are n
svn commit: r935122 - /axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl
Author: amilas
Date: Sat Apr 17 04:46:26 2010
New Revision: 935122
URL: http://svn.apache.org/viewvc?rev=935122&view=rev
Log:
added a null check. otherwise stub throws a null pointer exception other than
the original one
Modified:
axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl
Modified:
axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl?rev=935122&r1=935121&r2=935122&view=diff
==
---
axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl
(original)
+++
axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl
Sat Apr 17 04:46:26 2010
@@ -571,7 +571,9 @@
throw f;
}
} finally {
-
_messageContext.getTransportOut().getSender().cleanup(_messageContext);
+if (_messageContext.getTransportOut() != null) {
+
_messageContext.getTransportOut().getSender().cleanup(_messageContext);
+}
}
}
@@ -1098,11 +1100,15 @@
throw f;
}
} finally {
-
_messageContext.getTransportOut().getSender().cleanup(_messageContext);
+if (_messageContext.getTransportOut() != null) {
+
_messageContext.getTransportOut().getSender().cleanup(_messageContext);
+}
}
-
_messageContext.getTransportOut().getSender().cleanup(_messageContext);
+ if (_messageContext.getTransportOut() != null) {
+
_messageContext.getTransportOut().getSender().cleanup(_messageContext);
+ }
return;
}
svn commit: r935124 - in /axis/axis2/java/core/trunk/modules: kernel/src/org/apache/axis2/transport/TransportUtils.java transport/http/src/org/apache/axis2/transport/http/util/RESTUtil.java
Author: amilas
Date: Sat Apr 17 04:49:56 2010
New Revision: 935124
URL: http://svn.apache.org/viewvc?rev=935124&view=rev
Log:
set the message type for empty envelops
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/transport/TransportUtils.java
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/util/RESTUtil.java
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/transport/TransportUtils.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/transport/TransportUtils.java?rev=935124&r1=935123&r2=935124&view=diff
==
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/transport/TransportUtils.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/transport/TransportUtils.java
Sat Apr 17 04:49:56 2010
@@ -169,27 +169,7 @@ public class TransportUtils {
OMElement documentElement = null;
String type = null;
if (contentType != null) {
-int index = contentType.indexOf(';');
-if (index > 0) {
-type = contentType.substring(0, index);
-} else {
-type = contentType;
-}
-// Some services send REST responces as text/xml. We should
convert it to
-// application/xml if its a REST response, if not it will try to
use the SOAPMessageBuilder.
-// isDoingREST should already be properly set by
HTTPTransportUtils.initializeMessageContext
-if (msgContext.isDoingREST() &&
HTTPConstants.MEDIA_TYPE_TEXT_XML.equals(type)) {
-//if (HTTPConstants.MEDIA_TYPE_TEXT_XML.equals(type)) {
-if (msgContext.isServerSide()) {
-if (msgContext.getSoapAction() == null) {
-type = HTTPConstants.MEDIA_TYPE_APPLICATION_XML;
-}
-//} else if (msgContext.isDoingREST() &&
-//
!msgContext.isPropertyTrue(Constants.Configuration.SOAP_RESPONSE_MEP)) {
-} else if
(!msgContext.isPropertyTrue(Constants.Configuration.SOAP_RESPONSE_MEP)) {
-type = HTTPConstants.MEDIA_TYPE_APPLICATION_XML;
-}
-}
+type = getContentType(contentType, msgContext);
Builder builder = BuilderUtil.getBuilderFromSelector(type,
msgContext);
if (builder != null) {
if (log.isDebugEnabled()) {
@@ -221,6 +201,29 @@ public class TransportUtils {
return documentElement;
}
+public static String getContentType(String contentType, MessageContext
msgContext) {
+String type;
+int index = contentType.indexOf(';');
+if (index > 0) {
+type = contentType.substring(0, index);
+} else {
+type = contentType;
+}
+// Some services send REST responces as text/xml. We should convert it
to
+// application/xml if its a REST response, if not it will try to use
the SOAPMessageBuilder.
+// isDoingREST should already be properly set by
HTTPTransportUtils.initializeMessageContext
+if (msgContext.isDoingREST() &&
HTTPConstants.MEDIA_TYPE_TEXT_XML.equals(type)) {
+if (msgContext.isServerSide()) {
+if (msgContext.getSoapAction() == null) {
+type = HTTPConstants.MEDIA_TYPE_APPLICATION_XML;
+}
+} else if
(!msgContext.isPropertyTrue(Constants.Configuration.SOAP_RESPONSE_MEP)) {
+type = HTTPConstants.MEDIA_TYPE_APPLICATION_XML;
+}
+}
+return type;
+}
+
/**
* Extracts and returns the character set encoding from the
* Content-type header
Modified:
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/util/RESTUtil.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/util/RESTUtil.java?rev=935124&r1=935123&r2=935124&view=diff
==
---
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/util/RESTUtil.java
(original)
+++
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/util/RESTUtil.java
Sat Apr 17 04:49:56 2010
@@ -110,6 +110,7 @@ public class RESTUtil {
SOAPEnvelope soapEnvelope;
if (msgContext.getAxisService() == null) {
soapEnvelope = TransportUtils.createSOAPEnvelope(null);
+msgContext.setProperty(Constants.Configuration.MESSAGE_TYPE,
TransportUtils.getContentType(contentType, msgContext));
} else {
try {
soapEnvelope =
TransportUtils.createSO
