Author: rfeng
Date: Tue Feb 17 23:41:16 2009
New Revision: 745299
URL: http://svn.apache.org/viewvc?rev=745299&view=rev
Log:
Fix the JAXBException if package-info annotated with @XmlSchema is present
without ObjectFactory
Modified:
tuscany/branches/sca-java-1.x/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextCache.java
(contents, props changed)
Modified:
tuscany/branches/sca-java-1.x/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextCache.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextCache.java?rev=745299&r1=745298&r2=745299&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextCache.java
(original)
+++
tuscany/branches/sca-java-1.x/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextCache.java
Tue Feb 17 23:41:16 2009
@@ -42,7 +42,6 @@
import javax.xml.bind.JAXBException;
import javax.xml.bind.Marshaller;
import javax.xml.bind.Unmarshaller;
-import javax.xml.bind.annotation.XmlSchema;
import javax.xml.transform.Source;
import org.apache.tuscany.sca.databinding.util.LRUCache;
@@ -195,6 +194,9 @@
// Ignore
}
+ // [rfeng] If no ObjectFactory or jaxb.index is present,
JAXBContext.newInstance(contextPath, classloader)
+ // will fail
+ /*
try {
Class<?> cls = forName(p + ".package-info", false, cl);
if (cls != null) {
@@ -205,6 +207,7 @@
} catch (Throwable e) {
// Ignore
}
+ */
return false;
}
Propchange:
tuscany/branches/sca-java-1.x/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextCache.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 17 23:41:16 2009
@@ -1,2 +1,2 @@
/tuscany/branches/sca-java-1.3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextCache.java:671193
-/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextCache.java:723438-743922
+/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextCache.java:723438-743922,745298
