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 pr...@apache.org on 2008/04/24 11:42:43 UTC
svn commit: r651209 - in /webservices/axis2/trunk/java/modules:
jaxws-api/src/javax/xml/ws/wsaddressing/
jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/
jaxws/src/org/apache/axis2/jaxws/utility/ samples/jaxws-calculator/
Author: pradine
Date: Thu Apr 24 02:42:40 2008
New Revision: 651209
URL: http://svn.apache.org/viewvc?rev=651209&view=rev
Log:
Fix for AXIS2-3763
Removed:
webservices/axis2/trunk/java/modules/jaxws-api/src/javax/xml/ws/wsaddressing/jaxb.index
Modified:
webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/ClassFinderImpl.java
webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/utility/ClassUtils.java
webservices/axis2/trunk/java/modules/samples/jaxws-calculator/README.txt
Modified: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/ClassFinderImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/ClassFinderImpl.java?rev=651209&r1=651208&r2=651209&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/ClassFinderImpl.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/ClassFinderImpl.java Thu Apr 24 02:42:40 2008
@@ -74,8 +74,7 @@
//We are only going to add the class that belong to the provided package.
if (clazzName.startsWith(pkg)) {
try {
- Class clazz = forName(clazzName, false,
- getContextClassLoader());
+ Class clazz = forName(clazzName, false, cl);
// Don't add any interfaces or JAXWS specific classes.
// Only classes that represent data and can be marshalled
// by JAXB should be added.
Modified: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/utility/ClassUtils.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/utility/ClassUtils.java?rev=651209&r1=651208&r2=651209&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/utility/ClassUtils.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/utility/ClassUtils.java Thu Apr 24 02:42:40 2008
@@ -284,11 +284,14 @@
return true;
}
- if (cls.getPackage() != null && cls.getPackage().getName().startsWith("javax.xml.ws")) {
+ String className = cls.getPackage() == null ? null : cls.getPackage().getName();
+ if (className != null && className.startsWith("javax.xml.ws") && !className.startsWith("javax.xml.ws.wsaddressing")) {
return true;
}
+
return false;
}
+
/**
* Get an annotation. This is wrappered to avoid a Java2Security violation.
* @param cls Class that contains annotation
Modified: webservices/axis2/trunk/java/modules/samples/jaxws-calculator/README.txt
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/samples/jaxws-calculator/README.txt?rev=651209&r1=651208&r2=651209&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/jaxws-calculator/README.txt (original)
+++ webservices/axis2/trunk/java/modules/samples/jaxws-calculator/README.txt Thu Apr 24 02:42:40 2008
@@ -42,8 +42,3 @@
Improvements
============
Make this sample run possible with ant
-
-
-**** WARNING ****
-Please Remove xalan jar from <AXIS2_HOME>/ before you start axis2 server. If you are using this
-sample inside a WAR, please remove xalan jar from WEB-INF/lib
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org