svn commit: r1561323 - in /tomee/tomee/trunk: ./ container/openejb-core/src/main/java/org/apache/openejb/config/ tomee/tomee-mojarra/ tomee/tomee-plume-webapp/

[db...@apache.org]

Author: dblevins
Date: Sat Jan 25 15:28:33 2014
New Revision: 1561323

URL: http://svn.apache.org/r1561323
Log:
TOMEE-1109: Basic mojarra binary now appears to be working

Modified:
    tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java
    tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/TldScanner.java
    tomee/tomee/trunk/pom.xml
    tomee/tomee/trunk/tomee/tomee-mojarra/pom.xml
    tomee/tomee/trunk/tomee/tomee-plume-webapp/pom.xml

Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java?rev=1561323&r1=1561322&r2=1561323&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java Sat Jan 25 15:28:33 2014
@@ -764,6 +764,7 @@ public class ReadDescriptors implements 
         }
 
         try {
+            logger.info("TldTaglib readTldTaglib " + url.toExternalForm());
             return TldTaglibXml.unmarshal(url);
         } catch (SAXException e) {
             throw new OpenEJBException("Cannot parse the JSP tag library definition file: " + url.toExternalForm(), e);

Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/TldScanner.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/TldScanner.java?rev=1561323&r1=1561322&r2=1561323&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/TldScanner.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/TldScanner.java Sat Jan 25 15:28:33 2014
@@ -294,7 +294,7 @@ public class TldScanner {
 
         try {
             urlSet = URLs.cullSystemJars(urlSet);
-            urlSet = applyBuiltinExcludes(urlSet, Filters.tokens("openejb-jstl-1.2", "myfaces-impl", "spring-security-taglibs", "spring-webmvc"));
+            urlSet = applyBuiltinExcludes(urlSet, Filters.tokens("openejb-jstl-1.2", "myfaces-impl", "javax.faces-2.", "spring-security-taglibs", "spring-webmvc"));
         } catch (IOException e) {
             DeploymentLoader.logger.warning("Error scanning class loader for JSP tag libraries", e);
         }

Modified: tomee/tomee/trunk/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/pom.xml?rev=1561323&r1=1561322&r2=1561323&view=diff
==============================================================================
--- tomee/tomee/trunk/pom.xml (original)
+++ tomee/tomee/trunk/pom.xml Sat Jan 25 15:28:33 2014
@@ -168,6 +168,7 @@
     <geronimo-osgi.version>1.1</geronimo-osgi.version>
     <geronimo-javamail_1.4_spec.version>1.7.1</geronimo-javamail_1.4_spec.version>
     <myfaces.version>2.1.14</myfaces.version>
+    <mojarra.version>2.1.27</mojarra.version>
     <slf4j.version>1.7.5</slf4j.version>
     <log4j.version>1.2.17</log4j.version>
     <osgi.framework.version>4.2.0</osgi.framework.version>

Modified: tomee/tomee/trunk/tomee/tomee-mojarra/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-mojarra/pom.xml?rev=1561323&r1=1561322&r2=1561323&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-mojarra/pom.xml (original)
+++ tomee/tomee/trunk/tomee/tomee-mojarra/pom.xml Sat Jan 25 15:28:33 2014
@@ -37,7 +37,7 @@
     <dependency>
       <groupId>org.glassfish</groupId>
       <artifactId>javax.faces</artifactId>
-      <version>2.1.9</version>
+      <version>${mojarra.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>

Modified: tomee/tomee/trunk/tomee/tomee-plume-webapp/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-plume-webapp/pom.xml?rev=1561323&r1=1561322&r2=1561323&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-plume-webapp/pom.xml (original)
+++ tomee/tomee/trunk/tomee/tomee-plume-webapp/pom.xml Sat Jan 25 15:28:33 2014
@@ -35,7 +35,7 @@
     <dependency>
       <groupId>org.glassfish</groupId>
       <artifactId>javax.faces</artifactId>
-      <version>2.1.9</version>
+      <version>${mojarra.version}</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>