You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by di...@apache.org on 2008/03/27 17:48:07 UTC
svn commit: r641884 - in /webservices/axis2/trunk/java/modules: jaxws-api/
jaxws-api/src/javax/xml/ws/wsaddressing/
jaxws/src/org/apache/axis2/jaxws/framework/
jaxws/src/org/apache/axis2/jaxws/message/databinding/
metadata/src/org/apache/axis2/jaxws/de...
Author: dims
Date: Thu Mar 27 09:48:00 2008
New Revision: 641884
URL: http://svn.apache.org/viewvc?rev=641884&view=rev
Log:
Working on a JAXWS Addressing sample from Brian, trying to get it to work under simple axis server
- Pass on the configuration context (and don't create one internally) so that addressing mar can be found and engaged
- Don't swallow javax.xml.ws.wsaddressing package in JAXBUtils
- Add a jaxb.index in javax.xml.ws.wsaddressing, so JAXB does not complain
Added:
webservices/axis2/trunk/java/modules/jaxws-api/src/javax/xml/ws/wsaddressing/jaxb.index
Modified:
webservices/axis2/trunk/java/modules/jaxws-api/pom.xml
webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSDeployer.java
webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/JAXBUtils.java
webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/DescriptionFactory.java
webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/DescriptionFactoryImpl.java
Modified: webservices/axis2/trunk/java/modules/jaxws-api/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws-api/pom.xml?rev=641884&r1=641883&r2=641884&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws-api/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/jaxws-api/pom.xml Thu Mar 27 09:48:00 2008
@@ -52,6 +52,14 @@
</dependencies>
<build>
<sourceDirectory>src</sourceDirectory>
+ <resources>
+ <resource>
+ <directory>src</directory>
+ <includes>
+ <include>**/jaxb.index</include>
+ </includes>
+ </resource>
+ </resources>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
Added: webservices/axis2/trunk/java/modules/jaxws-api/src/javax/xml/ws/wsaddressing/jaxb.index
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws-api/src/javax/xml/ws/wsaddressing/jaxb.index?rev=641884&view=auto
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws-api/src/javax/xml/ws/wsaddressing/jaxb.index (added)
+++ webservices/axis2/trunk/java/modules/jaxws-api/src/javax/xml/ws/wsaddressing/jaxb.index Thu Mar 27 09:48:00 2008
@@ -0,0 +1 @@
+W3CEndpointReference
\ No newline at end of file
Modified: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSDeployer.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSDeployer.java?rev=641884&r1=641883&r2=641884&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSDeployer.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSDeployer.java Thu Mar 27 09:48:00 2008
@@ -270,7 +270,7 @@
Class pojoClass = Loader.loadClass(classLoader, className);
AxisService axisService;
try {
- axisService = DescriptionFactory.createAxisService(pojoClass);
+ axisService = DescriptionFactory.createAxisService(pojoClass, configCtx);
} catch (Throwable t) {
log.info("Exception creating Axis Service : " + t.getCause(), t);
return null;
Modified: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/JAXBUtils.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/JAXBUtils.java?rev=641884&r1=641883&r2=641884&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/JAXBUtils.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/JAXBUtils.java Thu Mar 27 09:48:00 2008
@@ -260,6 +260,9 @@
String p = it.next();
// Don't consider java and javax packages
// REVIEW: We might have to refine this
+ if (p.startsWith("javax.xml.ws.wsaddressing")) {
+ continue;
+ }
if (p.startsWith("java.") ||
p.startsWith("javax.")) {
it.remove();
Modified: webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/DescriptionFactory.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/DescriptionFactory.java?rev=641884&r1=641883&r2=641884&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/DescriptionFactory.java (original)
+++ webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/DescriptionFactory.java Thu Mar 27 09:48:00 2008
@@ -343,7 +343,18 @@
* @return An AxisService instance
*/
public static AxisService createAxisService(Class serviceImplClass) {
- ServiceDescription serviceDescription = createServiceDescription(serviceImplClass);
+ return createAxisService(serviceImplClass, null);
+ }
+
+ /**
+ * This provide very convenient way of creating an AxisService from an annotated java class.
+ *
+ * @param serviceImplClass A Web Service implementation class (i.e. one that carries an
+ * WebService or WebServiceProvider annotation).
+ * @return An AxisService instance
+ */
+ public static AxisService createAxisService(Class serviceImplClass, ConfigurationContext configContext) {
+ ServiceDescription serviceDescription = DescriptionFactoryImpl.createServiceDescription(serviceImplClass, configContext);
EndpointDescription[] edArray = serviceDescription.getEndpointDescriptions();
AxisService axisService = edArray[0].getAxisService();
try {
Modified: webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/DescriptionFactoryImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/DescriptionFactoryImpl.java?rev=641884&r1=641883&r2=641884&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/DescriptionFactoryImpl.java (original)
+++ webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/DescriptionFactoryImpl.java Thu Mar 27 09:48:00 2008
@@ -213,12 +213,17 @@
/** @see org.apache.axis2.jaxws.description.DescriptionFactory#createServiceDescription(Class) */
public static ServiceDescription createServiceDescription(Class serviceImplClass) {
+ return createServiceDescription(serviceImplClass, null);
+ }
+
+ /** @see org.apache.axis2.jaxws.description.DescriptionFactory#createServiceDescription(Class) */
+ public static ServiceDescription createServiceDescription(Class serviceImplClass, ConfigurationContext configContext) {
ServiceDescription serviceDesc = null;
if (serviceImplClass != null) {
JavaClassToDBCConverter converter = new JavaClassToDBCConverter(serviceImplClass);
HashMap<String, DescriptionBuilderComposite> dbcMap = converter.produceDBC();
- List<ServiceDescription> serviceDescList = createServiceDescriptionFromDBCMap(dbcMap, null);
+ List<ServiceDescription> serviceDescList = createServiceDescriptionFromDBCMap(dbcMap, configContext);
if (serviceDescList != null && serviceDescList.size() > 0) {
serviceDesc = serviceDescList.get(0);
if (log.isDebugEnabled()) {
@@ -234,7 +239,6 @@
}
return serviceDesc;
}
-
/** @see org.apache.axis2.jaxws.description.DescriptionFactory#createServiceDescriptionFromDBCMap(HashMap) */
public static List<ServiceDescription> createServiceDescriptionFromDBCMap(
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org