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 sc...@apache.org on 2006/12/08 23:18:27 UTC
svn commit: r484823 -
/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/description/impl/EndpointDescriptionImpl.java
Author: scheu
Date: Fri Dec 8 14:18:26 2006
New Revision: 484823
URL: http://svn.apache.org/viewvc?view=rev&rev=484823
Log:
AXIS2-1852
Contributor:Rich Scheuerle
Quick Change to enable both the schema walk and annotation walk when determining the JAXBContext packages.
Modified:
webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/description/impl/EndpointDescriptionImpl.java
Modified: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/description/impl/EndpointDescriptionImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/description/impl/EndpointDescriptionImpl.java?view=diff&rev=484823&r1=484822&r2=484823
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/description/impl/EndpointDescriptionImpl.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/description/impl/EndpointDescriptionImpl.java Fri Dec 8 14:18:26 2006
@@ -18,6 +18,7 @@
import java.net.URLClassLoader;
import java.util.ArrayList;
+import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -314,7 +315,7 @@
//set the sdimpl from the impl. class composite
wsdl4jWrapper = new WSDL4JWrapper(composite.getWsdlURL(), composite.getWsdlDefinition());
getServiceDescriptionImpl().setWsdlWrapper(wsdl4jWrapper);
- }
+ }
} catch (WSDLException e) {
throw ExceptionFactory.makeWebServiceException(Messages.getMessage("wsdlException", e.getMessage()), e);
}
@@ -1206,13 +1207,18 @@
// @TODO There are two ways to get the packages.
// Schema Walk (prefered) and Annotation Walk.
// The Schema walk requires an existing or generated schema.
- // For now, we will force the use of annotation walk
- // @See PackageSetBuilder for details
- boolean useSchemaWalk = true;
- if (useSchemaWalk) {
- packages = PackageSetBuilder.getPackagesFromSchema(this.getServiceDescription());
- } else {
- packages = PackageSetBuilder.getPackagesFromAnnotations(this);
+ //
+ // There are some limitations in the current schema walk
+ // And there are problems in the annotation walk.
+ // So for now we will do both.
+ boolean doSchemaWalk = true;
+ boolean doAnnotationWalk = true;
+ packages = new HashSet<String>();
+ if (doSchemaWalk) {
+ packages.addAll(PackageSetBuilder.getPackagesFromSchema(this.getServiceDescription()));
+ }
+ if (doAnnotationWalk) {
+ packages.addAll(PackageSetBuilder.getPackagesFromAnnotations(this));
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org