You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by xu...@apache.org on 2010/09/15 08:20:32 UTC
svn commit: r997195 -
/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/JaxbOpenejb.java
Author: xuhaihong
Date: Wed Sep 15 06:20:32 2010
New Revision: 997195
URL: http://svn.apache.org/viewvc?rev=997195&view=rev
Log:
OPENEJB-1355 Double check the default service-jar xml file shipped with openejb-core package
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/JaxbOpenejb.java
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/JaxbOpenejb.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/JaxbOpenejb.java?rev=997195&r1=997194&r2=997195&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/JaxbOpenejb.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/JaxbOpenejb.java Wed Sep 15 06:20:32 2010
@@ -124,12 +124,16 @@ public abstract class JaxbOpenejb {
URL url = null;
try {
ResourceFinder finder = new ResourceFinder("META-INF/", Thread.currentThread().getContextClassLoader());
- url = finder.find(providerName + "/service-jar.xml");
+ String resourceName = providerName + "/service-jar.xml";
+ try {
+ url = finder.find(resourceName);
+ } catch (IOException e) {
+ //Make sure the default service-jar shipped with openejb-core could be read
+ finder = new ResourceFinder("META-INF/", JaxbOpenejb.class.getClassLoader());
+ url = finder.find(resourceName);
+ }
in = url.openStream();
-
ServicesJar servicesJar = parseServicesJar(in);
-
-// ServicesJar servicesJar = unmarshal(ServicesJar.class, in);
return servicesJar;
} catch (MalformedURLException e) {
throw new OpenEJBException("Unable to resolve service provider " + providerName, e);