tomee-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rmannibu...@apache.org
Subject tomee git commit: TOMEE-2159 Thomas Andraschko patch to upgrade to mf 2.3
Date Mon, 08 Jan 2018 15:42:27 GMT
Repository: tomee
Updated Branches:
  refs/heads/fb_tomee8 c6aed8e87 -> acc6a5cb6


TOMEE-2159  Thomas Andraschko patch to upgrade to mf 2.3


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/acc6a5cb
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/acc6a5cb
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/acc6a5cb

Branch: refs/heads/fb_tomee8
Commit: acc6a5cb68aac67546eca48e7e5fa37c8233f1e9
Parents: c6aed8e
Author: Romain Manni-Bucau <rmannibucau@gmail.com>
Authored: Mon Jan 8 16:42:02 2018 +0100
Committer: Romain Manni-Bucau <rmannibucau@gmail.com>
Committed: Mon Jan 8 16:42:02 2018 +0100

----------------------------------------------------------------------
 .../org/apache/openejb/util/classloader/URLClassLoaderFirst.java | 2 +-
 examples/deltaspike-fullstack/pom.xml                            | 2 +-
 pom.xml                                                          | 4 ++--
 .../apache/tomee/myfaces/TomEEMyFacesContainerInitializer.java   | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tomee/blob/acc6a5cb/container/openejb-core/src/main/java/org/apache/openejb/util/classloader/URLClassLoaderFirst.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/util/classloader/URLClassLoaderFirst.java
b/container/openejb-core/src/main/java/org/apache/openejb/util/classloader/URLClassLoaderFirst.java
index 7280e1b..c6c9bcf 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/util/classloader/URLClassLoaderFirst.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/util/classloader/URLClassLoaderFirst.java
@@ -349,7 +349,7 @@ public class URLClassLoaderFirst extends URLClassLoader {
                     if (myfaces.startsWith("shared.")) {
                         return true;
                     }
-                    if (myfaces.startsWith("ee6.")) {
+                    if (myfaces.startsWith("ee.")) {
                         return true;
                     }
                     if (myfaces.startsWith("lifecycle.")) {

http://git-wip-us.apache.org/repos/asf/tomee/blob/acc6a5cb/examples/deltaspike-fullstack/pom.xml
----------------------------------------------------------------------
diff --git a/examples/deltaspike-fullstack/pom.xml b/examples/deltaspike-fullstack/pom.xml
index 6c8b925..d0ebfa6 100644
--- a/examples/deltaspike-fullstack/pom.xml
+++ b/examples/deltaspike-fullstack/pom.xml
@@ -22,7 +22,7 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-    <version.myfaces2>2.2.7</version.myfaces2>
+    <version.myfaces2>2.3.0-SNAPSHOT</version.myfaces2>
     <version.deltaspike>1.3.0</version.deltaspike>
     <version.extval>2.0.8</version.extval>
     <tomee.version>8.0.0-SNAPSHOT</tomee.version>

http://git-wip-us.apache.org/repos/asf/tomee/blob/acc6a5cb/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a557e90..35a1cb8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -175,8 +175,8 @@
     <geronimo.connector.version>3.1.4</geronimo.connector.version>
     <geronimo-osgi.version>1.1</geronimo-osgi.version>
     <geronimo-javamail_1.4_spec.version>1.9.0-alpha-2</geronimo-javamail_1.4_spec.version>
-    <myfaces.version>2.2.12</myfaces.version>
-    <mojarra.version>2.2.12</mojarra.version>
+    <myfaces.version>2.3.0-SNAPSHOT</myfaces.version>
+    <mojarra.version>2.3.3</mojarra.version>
     <slf4j.version>1.7.21</slf4j.version>
     <log4j.version>1.2.17</log4j.version>
     <log4j2.version>2.0.1</log4j2.version>

http://git-wip-us.apache.org/repos/asf/tomee/blob/acc6a5cb/tomee/tomee-myfaces/src/main/java/org/apache/tomee/myfaces/TomEEMyFacesContainerInitializer.java
----------------------------------------------------------------------
diff --git a/tomee/tomee-myfaces/src/main/java/org/apache/tomee/myfaces/TomEEMyFacesContainerInitializer.java
b/tomee/tomee-myfaces/src/main/java/org/apache/tomee/myfaces/TomEEMyFacesContainerInitializer.java
index cc62cbd..1a985d4 100644
--- a/tomee/tomee-myfaces/src/main/java/org/apache/tomee/myfaces/TomEEMyFacesContainerInitializer.java
+++ b/tomee/tomee-myfaces/src/main/java/org/apache/tomee/myfaces/TomEEMyFacesContainerInitializer.java
@@ -22,7 +22,7 @@ import org.apache.catalina.Wrapper;
 import org.apache.catalina.core.ApplicationContext;
 import org.apache.catalina.core.ApplicationContextFacade;
 import org.apache.catalina.core.StandardContext;
-import org.apache.myfaces.ee6.MyFacesContainerInitializer;
+import org.apache.myfaces.ee.MyFacesContainerInitializer;
 import org.apache.myfaces.webapp.AbstractFacesInitializer;
 import org.apache.myfaces.webapp.StartupServletContextListener;
 import org.apache.openejb.loader.SystemInstance;


Mime
View raw message