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 di...@apache.org on 2008/02/07 19:52:11 UTC
svn commit: r619564 - in /webservices/axis2/trunk/java/modules:
kernel/src/org/apache/axis2/deployment/
kernel/src/org/apache/axis2/description/java2wsdl/
metadata/src/org/apache/axis2/jaxws/description/builder/
Author: dims
Date: Thu Feb 7 10:52:05 2008
New Revision: 619564
URL: http://svn.apache.org/viewvc?rev=619564&view=rev
Log:
- Enable a jaxws provider to be deployed via the PojoDeployer
- Make sure we call init before we serve a xsd
- If we already have a wsdl, don't bother generating it again.
Modified:
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/POJODeployer.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/AnnotationConstants.java
webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/builder/JAXWSRIWSDLGenerator.java
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/POJODeployer.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/POJODeployer.java?rev=619564&r1=619563&r2=619564&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/POJODeployer.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/POJODeployer.java Thu Feb 7 10:52:05 2008
@@ -190,6 +190,9 @@
*/
JAnnotation annotation =
jclass.getAnnotation(AnnotationConstants.WEB_SERVICE);
+ if(annotation == null) {
+ annotation = jclass.getAnnotation(AnnotationConstants.WEB_SERVICE_PROVIDER);
+ }
if (annotation != null) {
AxisService axisService;
axisService =
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/AnnotationConstants.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/AnnotationConstants.java?rev=619564&r1=619563&r2=619564&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/AnnotationConstants.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/AnnotationConstants.java Thu Feb 7 10:52:05 2008
@@ -23,6 +23,7 @@
String WEB_METHOD = "javax.jws.WebMethod";
String WEB_PARAM = "javax.jws.WebParam";
String WEB_RESULT = "javax.jws.WebResult";
+ String WEB_SERVICE_PROVIDER = "javax.xml.ws.WebServiceProvider";
String TARGETNAMESPACE = "targetNamespace";
String NAME = "name";
String SERVICE_NAME = "serviceName";
Modified: webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/builder/JAXWSRIWSDLGenerator.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/builder/JAXWSRIWSDLGenerator.java?rev=619564&r1=619563&r2=619564&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/builder/JAXWSRIWSDLGenerator.java (original)
+++ webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/builder/JAXWSRIWSDLGenerator.java Thu Feb 7 10:52:05 2008
@@ -3,6 +3,7 @@
import com.sun.tools.ws.spi.WSToolsObjectFactory;
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
+import org.apache.axis2.wsdl.WSDLConstants;
import org.apache.axis2.dataretrieval.SchemaSupplier;
import org.apache.axis2.dataretrieval.WSDLSupplier;
import org.apache.axis2.description.AxisService;
@@ -292,6 +293,10 @@
}
public Definition getWSDL(AxisService service) throws AxisFault {
+ Parameter wsdlParameter = service.getParameter(WSDLConstants.WSDL_4_J_DEFINITION);
+ if (wsdlParameter != null) {
+ return (Definition) wsdlParameter.getValue();
+ }
initialize();
return wsdlDefMap.values().iterator().next();
}
@@ -305,6 +310,7 @@
}
public XmlSchema getSchema(AxisService service, String xsd) throws AxisFault {
+ initialize();
XmlSchema schema = docMap.get(xsd);
if (schema == null) {
docMap.values().iterator().next();
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org