Author: rmannibucau
Date: Sat Aug 11 16:21:36 2012
New Revision: 1371972
URL: http://svn.apache.org/viewvc?rev=1371972&view=rev
Log:
better handling of our internal binary path (in embedded it uses maven path)
Modified:
openejb/trunk/openejb/tomee/tomee-myfaces/src/main/java/org/apache/tomee/myfaces/TomEEMyFacesContainerInitializer.java
Modified:
openejb/trunk/openejb/tomee/tomee-myfaces/src/main/java/org/apache/tomee/myfaces/TomEEMyFacesContainerInitializer.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-myfaces/src/main/java/org/apache/tomee/myfaces/TomEEMyFacesContainerInitializer.java?rev=1371972&r1=1371971&r2=1371972&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-myfaces/src/main/java/org/apache/tomee/myfaces/TomEEMyFacesContainerInitializer.java
(original)
+++
openejb/trunk/openejb/tomee/tomee-myfaces/src/main/java/org/apache/tomee/myfaces/TomEEMyFacesContainerInitializer.java
Sat Aug 11 16:21:36 2012
@@ -79,7 +79,7 @@ public class TomEEMyFacesContainerInitia
// remove our internal faces-config.xml
final Iterator<URL> it = metaInfFacesConfigUrls.iterator();
while (it.hasNext()) {
- if (it.next().toExternalForm().replace(File.separator,
"/").contains("lib/openwebbeans-jsf-")) {
+ if (it.next().toExternalForm().replace(File.separator,
"/").contains("/openwebbeans-jsf-".replace("/", File.separator))) {
it.remove();
}
}