TomEE backward compatibility
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/element/FacesConfig.java b/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/FacesConfig.java
similarity index 82%
rename from impl/src/main/java/org/apache/myfaces/config/impl/element/FacesConfig.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/FacesConfig.java
index 61851a1..f060547 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/element/FacesConfig.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/FacesConfig.java
@@ -1,28 +1,28 @@
-/*
- * 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.myfaces.config.impl.element;
-
-/**
- * NOTE: this class is to avoid the integration code in tomee-1.6.0
- * webprofile to fail.
- */
-public class FacesConfig extends FacesConfigImpl
-{
-
-}
+/*
+ * 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.myfaces.config.impl.digester.elements;
+
+import org.apache.myfaces.config.impl.element.FacesConfigImpl;
+
+// TODO: backward compatibility for TomEE
+@Deprecated
+public class FacesConfig extends FacesConfigImpl
+{
+
+}
diff --git a/impl/src/main/java/org/apache/myfaces/ee/MyFacesContainerInitializer.java b/impl/src/main/java/org/apache/myfaces/ee/MyFacesContainerInitializer.java
new file mode 100644
index 0000000..7db484d
--- /dev/null
+++ b/impl/src/main/java/org/apache/myfaces/ee/MyFacesContainerInitializer.java
@@ -0,0 +1,62 @@
+/*
+ * 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.myfaces.ee;
+
+import javax.faces.application.ResourceDependencies;
+import javax.faces.application.ResourceDependency;
+import javax.faces.component.FacesComponent;
+import javax.faces.component.UIComponent;
+import javax.faces.component.behavior.FacesBehavior;
+import javax.faces.convert.Converter;
+import javax.faces.convert.FacesConverter;
+import javax.faces.event.ListenerFor;
+import javax.faces.event.ListenersFor;
+import javax.faces.event.NamedEvent;
+import javax.faces.model.FacesDataModel;
+import javax.faces.render.FacesBehaviorRenderer;
+import javax.faces.render.FacesRenderer;
+import javax.faces.render.Renderer;
+import javax.faces.validator.FacesValidator;
+import javax.faces.validator.Validator;
+import javax.servlet.annotation.HandlesTypes;
+
+// TODO: backward compatibility for TomEE
+@HandlesTypes({
+ FacesBehavior.class,
+ FacesBehaviorRenderer.class,
+ FacesComponent.class,
+ FacesConverter.class,
+ FacesRenderer.class,
+ FacesValidator.class,
+ FacesDataModel.class,
+ ListenerFor.class,
+ ListenersFor.class,
+ NamedEvent.class,
+ ResourceDependencies.class,
+ ResourceDependency.class,
+ UIComponent.class,
+ Converter.class,
+ Renderer.class,
+ Validator.class
+ })
+@Deprecated
+public class MyFacesContainerInitializer extends org.apache.myfaces.webapp.MyFacesContainerInitializer
+{
+
+}
diff --git a/impl/src/main/java/org/apache/myfaces/shared/util/ClassUtils.java b/impl/src/main/java/org/apache/myfaces/shared/util/ClassUtils.java
new file mode 100644
index 0000000..7b8b19b
--- /dev/null
+++ b/impl/src/main/java/org/apache/myfaces/shared/util/ClassUtils.java
@@ -0,0 +1,46 @@
+/*
+ * 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.myfaces.shared.util;
+
+import java.util.Collection;
+
+// TODO: backward compatibility for TomEE
+@Deprecated
+public class ClassUtils
+{
+ public static ClassLoader getContextClassLoader()
+ {
+ return org.apache.myfaces.util.lang.ClassUtils.getContextClassLoader();
+ }
+
+ public static <T> T buildApplicationObject(Class<T> interfaceClass,
+ Collection<String> classNamesIterator, T defaultObject)
+ {
+ return org.apache.myfaces.util.lang.ClassUtils.buildApplicationObject(interfaceClass, classNamesIterator,
+ defaultObject);
+ }
+
+ public static <T> T buildApplicationObject(Class<T> interfaceClass, Class<? extends T> extendedInterfaceClass,
+ Class<? extends T> extendedInterfaceWrapperClass,
+ Collection<String> classNamesIterator, T defaultObject)
+ {
+ return org.apache.myfaces.util.lang.ClassUtils.buildApplicationObject(interfaceClass, extendedInterfaceClass,
+ extendedInterfaceWrapperClass, classNamesIterator, defaultObject);
+ }
+}
