Author: rmannibucau
Date: Thu Oct 11 23:21:20 2012
New Revision: 1397367
URL: http://svn.apache.org/viewvc?rev=1397367&view=rev
Log:
TOMEE-461 empty faces-config.xml + using pax-url as excluded prefix instead of
pax-
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java
openejb/trunk/openejb/container/openejb-core/src/main/resources/default.exclusions
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java?rev=1397367&r1=1397366&r2=1397367&view=diff
==============================================================================
---
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java
(original)
+++
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java
Thu Oct 11 23:21:20 2012
@@ -751,10 +751,17 @@ public class ReadDescriptors implements
}
public static FacesConfig readFacesConfig(URL url) throws OpenEJBException
{
- FacesConfig facesConfig;
try {
- facesConfig = (FacesConfig) JaxbJavaee
- .unmarshalJavaee(FacesConfig.class, IO.read(url));
+ final Source src = getSource(url);
+ if (src == null) {
+ return new FacesConfig();
+ }
+
+ final String content = IO.slurp(src.get());
+ if (isEmpty(new ByteArrayInputStream(content.getBytes()),
"faces-config")) {
+ return new FacesConfig();
+ }
+ return (FacesConfig)
JaxbJavaee.unmarshalJavaee(FacesConfig.class, new
ByteArrayInputStream(content.getBytes()));
} catch (SAXException e) {
throw new OpenEJBException("Cannot parse the faces configuration
file: " + url.toExternalForm(), e);
} catch (JAXBException e) {
@@ -764,7 +771,6 @@ public class ReadDescriptors implements
} catch (Exception e) {
throw new OpenEJBException("Encountered unknown error parsing the
faces configuration file: " + url.toExternalForm(), e);
}
- return facesConfig;
}
private static Source getSource(Object o) {
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/resources/default.exclusions
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/resources/default.exclusions?rev=1397367&r1=1397366&r2=1397367&view=diff
==============================================================================
---
openejb/trunk/openejb/container/openejb-core/src/main/resources/default.exclusions
(original)
+++
openejb/trunk/openejb/container/openejb-core/src/main/resources/default.exclusions
Thu Oct 11 23:21:20 2012
@@ -145,7 +145,7 @@ org.eclipse.
org.junit.
org.osgi.core-
oro-
-pax-
+pax-url
plexus-
quartz-
rmock-
