You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ta...@apache.org on 2020/11/02 11:00:51 UTC

[myfaces] branch master updated: removed TomEE backward compatibility hacks

This is an automated email from the ASF dual-hosted git repository.

tandraschko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces.git


The following commit(s) were added to refs/heads/master by this push:
     new f643992  removed TomEE backward compatibility hacks
f643992 is described below

commit f643992a9e6abaa9ff37aecc27fc9232ed57ca54
Author: Thomas Andraschko <ta...@apache.org>
AuthorDate: Mon Nov 2 12:00:42 2020 +0100

    removed TomEE backward compatibility hacks
---
 .../config/impl/digester/elements/FacesConfig.java | 28 ----------
 .../myfaces/ee/MyFacesContainerInitializer.java    | 62 ----------------------
 .../org/apache/myfaces/shared/util/ClassUtils.java | 46 ----------------
 3 files changed, 136 deletions(-)

diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/FacesConfig.java b/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/FacesConfig.java
deleted file mode 100644
index f060547..0000000
--- a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/FacesConfig.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * 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
deleted file mode 100644
index a0d5337..0000000
--- a/impl/src/main/java/org/apache/myfaces/ee/MyFacesContainerInitializer.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * 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 jakarta.faces.application.ResourceDependencies;
-import jakarta.faces.application.ResourceDependency;
-import jakarta.faces.component.FacesComponent;
-import jakarta.faces.component.UIComponent;
-import jakarta.faces.component.behavior.FacesBehavior;
-import jakarta.faces.convert.Converter;
-import jakarta.faces.convert.FacesConverter;
-import jakarta.faces.event.ListenerFor;
-import jakarta.faces.event.ListenersFor;
-import jakarta.faces.event.NamedEvent;
-import jakarta.faces.model.FacesDataModel;
-import jakarta.faces.render.FacesBehaviorRenderer;
-import jakarta.faces.render.FacesRenderer;
-import jakarta.faces.render.Renderer;
-import jakarta.faces.validator.FacesValidator;
-import jakarta.faces.validator.Validator;
-import jakarta.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
deleted file mode 100644
index 7b8b19b..0000000
--- a/impl/src/main/java/org/apache/myfaces/shared/util/ClassUtils.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * 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);
-    }
-}