Repository: tomee Updated Branches: refs/heads/tomee-1.7.x 750ad70a1 -> 528fa1245
myfaces upgrade + fixing a typo Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/528fa124 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/528fa124 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/528fa124 Branch: refs/heads/tomee-1.7.x Commit: 528fa12455836aac09fc3d4026e8cbafdc5a8385 Parents: 750ad70 Author: Romain Manni-Bucau <[email protected]> Authored: Mon Jan 26 09:22:01 2015 +0100 Committer: Romain Manni-Bucau <[email protected]> Committed: Mon Jan 26 09:22:01 2015 +0100 ---------------------------------------------------------------------- pom.xml | 2 +- .../src/main/java/org/apache/tomee/webservices/CXFJAXRSFilter.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/528fa124/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index a31bda4..e044c0f 100644 --- a/pom.xml +++ b/pom.xml @@ -171,7 +171,7 @@ <geronimo.connector.version>3.1.1</geronimo.connector.version> <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.16</myfaces.version> + <myfaces.version>2.1.17</myfaces.version> <mojarra.version>2.1.29</mojarra.version> <slf4j.version>1.7.7</slf4j.version> <log4j.version>1.2.17</log4j.version> http://git-wip-us.apache.org/repos/asf/tomee/blob/528fa124/tomee/tomee-jaxrs/src/main/java/org/apache/tomee/webservices/CXFJAXRSFilter.java ---------------------------------------------------------------------- diff --git a/tomee/tomee-jaxrs/src/main/java/org/apache/tomee/webservices/CXFJAXRSFilter.java b/tomee/tomee-jaxrs/src/main/java/org/apache/tomee/webservices/CXFJAXRSFilter.java index 4b81f40..13bbcde 100644 --- a/tomee/tomee-jaxrs/src/main/java/org/apache/tomee/webservices/CXFJAXRSFilter.java +++ b/tomee/tomee-jaxrs/src/main/java/org/apache/tomee/webservices/CXFJAXRSFilter.java @@ -99,7 +99,7 @@ public class CXFJAXRSFilter implements Filter { // see org.apache.tomcat.util.http.mapper.Mapper.internalMapWrapper private boolean isServlet(final FilterChain chain) { // will not work if we are not the first filter - which is likely the case the keep security etc - - // and the chain is wrapped which is more unlikely so this should work as long as these untyped constraints are respeted: + // and the chain is wrapped which is more unlikely so this should work as long as these untyped constraints are respected: // - org.apache.catalina.core.ApplicationFilterChain name is stable (case on tomcat 8 for now) // - ApplicationFilterChain as a field servlet with the expected servlet try {
