You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2014/12/18 17:54:32 UTC
tomee git commit: TOMEE-1481 supporting FacesServlet declaration in
web-fragment.xml
Repository: tomee
Updated Branches:
refs/heads/tomee-1.7.x e7c86e9d1 -> d0713920f
TOMEE-1481 supporting FacesServlet declaration in web-fragment.xml
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/d0713920
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/d0713920
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/d0713920
Branch: refs/heads/tomee-1.7.x
Commit: d0713920faebf9b182e71c854bff52700fdc85cc
Parents: e7c86e9
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Thu Dec 18 17:54:03 2014 +0100
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Thu Dec 18 17:54:03 2014 +0100
----------------------------------------------------------------------
.../tomee/myfaces/TomEEWebConfigProvider.java | 59 ++++++++++++++++++++
.../org.apache.myfaces.spi.WebConfigProvider | 1 +
2 files changed, 60 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/d0713920/tomee/tomee-myfaces/src/main/java/org/apache/tomee/myfaces/TomEEWebConfigProvider.java
----------------------------------------------------------------------
diff --git a/tomee/tomee-myfaces/src/main/java/org/apache/tomee/myfaces/TomEEWebConfigProvider.java b/tomee/tomee-myfaces/src/main/java/org/apache/tomee/myfaces/TomEEWebConfigProvider.java
new file mode 100644
index 0000000..9068d5e
--- /dev/null
+++ b/tomee/tomee-myfaces/src/main/java/org/apache/tomee/myfaces/TomEEWebConfigProvider.java
@@ -0,0 +1,59 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.tomee.myfaces;
+
+import org.apache.myfaces.spi.ServletMapping;
+import org.apache.myfaces.spi.impl.DefaultWebConfigProvider;
+import org.apache.myfaces.spi.impl.ServletMappingImpl;
+import org.apache.openejb.util.reflection.Reflections;
+
+import javax.faces.context.ExternalContext;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletRegistration;
+import java.util.List;
+import java.util.Map;
+
+// support web-fragment.xml as well
+public class TomEEWebConfigProvider extends DefaultWebConfigProvider {
+ @Override
+ public List<ServletMapping> getFacesServletMappings(final ExternalContext externalContext) {
+ final List<ServletMapping> facesServletMappings = super.getFacesServletMappings(externalContext);
+ try { // getContext() is a runtime object where getServletRegistrations() is forbidden so unwrap
+ final ServletContext sc = ServletContext.class.cast(Reflections.get(externalContext.getContext(), "sc"));
+ if (sc != null && sc.getServletRegistrations() != null) {
+ for (final Map.Entry<String, ? extends ServletRegistration> reg : sc.getServletRegistrations().entrySet()) {
+ final ServletRegistration value = reg.getValue();
+ if ("javax.faces.webapp.FacesServlet".equals(value.getClassName())) {
+ for (final String mapping : value.getMappings()) {
+ final Class<?> clazz = sc.getClassLoader().loadClass(value.getClassName());
+ final org.apache.myfaces.shared_impl.webapp.webxml.ServletMapping mappingImpl =
+ new org.apache.myfaces.shared_impl.webapp.webxml.ServletMapping(
+ value.getName(), clazz, mapping);
+ facesServletMappings.add(new ServletMappingImpl(mappingImpl));
+ }
+ }
+ }
+ } else {
+ facesServletMappings.addAll(super.getFacesServletMappings(externalContext));
+ }
+ } catch (final Exception e) { // don't fail cause our cast failed
+ facesServletMappings.clear();
+ facesServletMappings.addAll(super.getFacesServletMappings(externalContext));
+ }
+ return facesServletMappings;
+ }
+}
http://git-wip-us.apache.org/repos/asf/tomee/blob/d0713920/tomee/tomee-myfaces/src/main/resources/META-INF/services/org.apache.myfaces.spi.WebConfigProvider
----------------------------------------------------------------------
diff --git a/tomee/tomee-myfaces/src/main/resources/META-INF/services/org.apache.myfaces.spi.WebConfigProvider b/tomee/tomee-myfaces/src/main/resources/META-INF/services/org.apache.myfaces.spi.WebConfigProvider
new file mode 100644
index 0000000..400fc72
--- /dev/null
+++ b/tomee/tomee-myfaces/src/main/resources/META-INF/services/org.apache.myfaces.spi.WebConfigProvider
@@ -0,0 +1 @@
+org.apache.tomee.myfaces.TomEEWebConfigProvider