diff --git a/.gitignore b/.gitignore deleted file mode 100644 index d11485a..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/tiles-2.2.2-src.tar.gz diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..2ec5cc6 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +tiles fails to build from source: https://bugzilla.redhat.com/show_bug.cgi?id=1676142 diff --git a/sources b/sources deleted file mode 100644 index adcd710..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -2415ccad008fca7a7b1ccc4c24523a58 tiles-2.2.2-src.tar.gz diff --git a/tiles-2.2.2-commons-ognl.patch b/tiles-2.2.2-commons-ognl.patch deleted file mode 100644 index edaa878..0000000 --- a/tiles-2.2.2-commons-ognl.patch +++ /dev/null @@ -1,144 +0,0 @@ -diff -Nru tiles-2.2.2/src/tiles-ognl/pom.xml tiles-2.2.2-gil/src/tiles-ognl/pom.xml ---- tiles-2.2.2/src/tiles-ognl/pom.xml 2010-06-17 20:31:47.000000000 +0200 -+++ tiles-2.2.2-gil/src/tiles-ognl/pom.xml 2012-05-26 23:47:08.921350602 +0200 -@@ -114,9 +114,9 @@ - test - - -- ognl -- ognl -- 2.7.3 -+ org.apache.commons -+ commons-ognl -+ 4.0-incubating-SNAPSHOT - - - -diff -Nru tiles-2.2.2/src/tiles-ognl/src/main/java/org/apache/tiles/ognl/DelegatePropertyAccessor.java tiles-2.2.2-gil/src/tiles-ognl/src/main/java/org/apache/tiles/ognl/DelegatePropertyAccessor.java ---- tiles-2.2.2/src/tiles-ognl/src/main/java/org/apache/tiles/ognl/DelegatePropertyAccessor.java 2010-06-17 20:31:47.000000000 +0200 -+++ tiles-2.2.2-gil/src/tiles-ognl/src/main/java/org/apache/tiles/ognl/DelegatePropertyAccessor.java 2012-05-26 23:47:08.931350602 +0200 -@@ -23,9 +23,9 @@ - - import java.util.Map; - --import ognl.OgnlContext; --import ognl.OgnlException; --import ognl.PropertyAccessor; -+import org.apache.commons.ognl.OgnlContext; -+import org.apache.commons.ognl.OgnlException; -+import org.apache.commons.ognl.PropertyAccessor; - - /** - * Uses a {@link PropertyAccessorDelegateFactory} to delegate the methods to -diff -Nru tiles-2.2.2/src/tiles-ognl/src/main/java/org/apache/tiles/ognl/NestedObjectDelegatePropertyAccessor.java tiles-2.2.2-gil/src/tiles-ognl/src/main/java/org/apache/tiles/ognl/NestedObjectDelegatePropertyAccessor.java ---- tiles-2.2.2/src/tiles-ognl/src/main/java/org/apache/tiles/ognl/NestedObjectDelegatePropertyAccessor.java 2010-06-17 20:31:47.000000000 +0200 -+++ tiles-2.2.2-gil/src/tiles-ognl/src/main/java/org/apache/tiles/ognl/NestedObjectDelegatePropertyAccessor.java 2012-05-26 23:47:08.937350602 +0200 -@@ -23,9 +23,9 @@ - - import java.util.Map; - --import ognl.OgnlContext; --import ognl.OgnlException; --import ognl.PropertyAccessor; -+import org.apache.commons.ognl.OgnlContext; -+import org.apache.commons.ognl.OgnlException; -+import org.apache.commons.ognl.PropertyAccessor; - - /** - * Uses a {@link PropertyAccessor} as a delegate, but passing a nested object as -diff -Nru tiles-2.2.2/src/tiles-ognl/src/main/java/org/apache/tiles/ognl/OGNLAttributeEvaluator.java tiles-2.2.2-gil/src/tiles-ognl/src/main/java/org/apache/tiles/ognl/OGNLAttributeEvaluator.java ---- tiles-2.2.2/src/tiles-ognl/src/main/java/org/apache/tiles/ognl/OGNLAttributeEvaluator.java 2010-06-17 20:31:47.000000000 +0200 -+++ tiles-2.2.2-gil/src/tiles-ognl/src/main/java/org/apache/tiles/ognl/OGNLAttributeEvaluator.java 2012-05-26 23:47:08.935350602 +0200 -@@ -23,8 +23,8 @@ - - import java.util.Map; - --import ognl.Ognl; --import ognl.OgnlException; -+import org.apache.commons.ognl.Ognl; -+import org.apache.commons.ognl.OgnlException; - - import org.apache.tiles.context.TilesRequestContext; - import org.apache.tiles.evaluator.AbstractAttributeEvaluator; -diff -Nru tiles-2.2.2/src/tiles-ognl/src/main/java/org/apache/tiles/ognl/PropertyAccessorDelegateFactory.java tiles-2.2.2-gil/src/tiles-ognl/src/main/java/org/apache/tiles/ognl/PropertyAccessorDelegateFactory.java ---- tiles-2.2.2/src/tiles-ognl/src/main/java/org/apache/tiles/ognl/PropertyAccessorDelegateFactory.java 2010-06-17 20:31:47.000000000 +0200 -+++ tiles-2.2.2-gil/src/tiles-ognl/src/main/java/org/apache/tiles/ognl/PropertyAccessorDelegateFactory.java 2012-05-26 23:47:08.932350602 +0200 -@@ -21,7 +21,7 @@ - - package org.apache.tiles.ognl; - --import ognl.PropertyAccessor; -+import org.apache.commons.ognl.PropertyAccessor; - - /** - * Decides a {@link PropertyAccessor} depending on the property name and the -diff -Nru tiles-2.2.2/src/tiles-ognl/src/main/java/org/apache/tiles/ognl/TilesContextPropertyAccessorDelegateFactory.java tiles-2.2.2-gil/src/tiles-ognl/src/main/java/org/apache/tiles/ognl/TilesContextPropertyAccessorDelegateFactory.java ---- tiles-2.2.2/src/tiles-ognl/src/main/java/org/apache/tiles/ognl/TilesContextPropertyAccessorDelegateFactory.java 2010-06-17 20:31:47.000000000 +0200 -+++ tiles-2.2.2-gil/src/tiles-ognl/src/main/java/org/apache/tiles/ognl/TilesContextPropertyAccessorDelegateFactory.java 2012-05-26 23:47:08.939350602 +0200 -@@ -23,7 +23,7 @@ - - import java.util.Map; - --import ognl.PropertyAccessor; -+import org.apache.commons.ognl.PropertyAccessor; - - import org.apache.tiles.TilesApplicationContext; - import org.apache.tiles.context.TilesRequestContext; -diff -Nru tiles-2.2.2/src/tiles-ognl/src/test/java/org/apache/tiles/ognl/DelegatePropertyAccessorTest.java tiles-2.2.2-gil/src/tiles-ognl/src/test/java/org/apache/tiles/ognl/DelegatePropertyAccessorTest.java ---- tiles-2.2.2/src/tiles-ognl/src/test/java/org/apache/tiles/ognl/DelegatePropertyAccessorTest.java 2010-06-17 20:31:47.000000000 +0200 -+++ tiles-2.2.2-gil/src/tiles-ognl/src/test/java/org/apache/tiles/ognl/DelegatePropertyAccessorTest.java 2012-05-26 23:47:08.945350602 +0200 -@@ -26,9 +26,9 @@ - - import java.util.Map; - --import ognl.OgnlContext; --import ognl.OgnlException; --import ognl.PropertyAccessor; -+import org.apache.commons.ognl.OgnlContext; -+import org.apache.commons.ognl.OgnlException; -+import org.apache.commons.ognl.PropertyAccessor; - - import org.apache.tiles.ognl.DelegatePropertyAccessor; - import org.apache.tiles.ognl.PropertyAccessorDelegateFactory; -diff -Nru tiles-2.2.2/src/tiles-ognl/src/test/java/org/apache/tiles/ognl/NestedObjectDelegatePropertyAccessorTest.java tiles-2.2.2-gil/src/tiles-ognl/src/test/java/org/apache/tiles/ognl/NestedObjectDelegatePropertyAccessorTest.java ---- tiles-2.2.2/src/tiles-ognl/src/test/java/org/apache/tiles/ognl/NestedObjectDelegatePropertyAccessorTest.java 2010-06-17 20:31:47.000000000 +0200 -+++ tiles-2.2.2-gil/src/tiles-ognl/src/test/java/org/apache/tiles/ognl/NestedObjectDelegatePropertyAccessorTest.java 2012-05-26 23:47:08.942350602 +0200 -@@ -26,9 +26,9 @@ - - import java.util.Map; - --import ognl.OgnlContext; --import ognl.OgnlException; --import ognl.PropertyAccessor; -+import org.apache.commons.ognl.OgnlContext; -+import org.apache.commons.ognl.OgnlException; -+import org.apache.commons.ognl.PropertyAccessor; - - import org.apache.tiles.ognl.NestedObjectDelegatePropertyAccessor; - import org.apache.tiles.ognl.NestedObjectExtractor; -diff -Nru tiles-2.2.2/src/tiles-ognl/src/test/java/org/apache/tiles/ognl/OGNLAttributeEvaluatorTest.java tiles-2.2.2-gil/src/tiles-ognl/src/test/java/org/apache/tiles/ognl/OGNLAttributeEvaluatorTest.java ---- tiles-2.2.2/src/tiles-ognl/src/test/java/org/apache/tiles/ognl/OGNLAttributeEvaluatorTest.java 2010-06-17 20:31:47.000000000 +0200 -+++ tiles-2.2.2-gil/src/tiles-ognl/src/test/java/org/apache/tiles/ognl/OGNLAttributeEvaluatorTest.java 2012-05-26 23:47:08.943350602 +0200 -@@ -25,8 +25,8 @@ - - import junit.framework.TestCase; - --import ognl.OgnlRuntime; --import ognl.PropertyAccessor; -+import org.apache.commons.ognl.OgnlRuntime; -+import org.apache.commons.ognl.PropertyAccessor; - - import org.apache.tiles.Attribute; - import org.apache.tiles.Expression; -diff -Nru tiles-2.2.2/src/tiles-ognl/src/test/java/org/apache/tiles/ognl/TilesContextPropertyAccessorDelegateFactoryTest.java tiles-2.2.2-gil/src/tiles-ognl/src/test/java/org/apache/tiles/ognl/TilesContextPropertyAccessorDelegateFactoryTest.java ---- tiles-2.2.2/src/tiles-ognl/src/test/java/org/apache/tiles/ognl/TilesContextPropertyAccessorDelegateFactoryTest.java 2010-06-17 20:31:47.000000000 +0200 -+++ tiles-2.2.2-gil/src/tiles-ognl/src/test/java/org/apache/tiles/ognl/TilesContextPropertyAccessorDelegateFactoryTest.java 2012-05-26 23:47:08.944350602 +0200 -@@ -27,7 +27,7 @@ - import java.util.HashMap; - import java.util.Map; - --import ognl.PropertyAccessor; -+import org.apache.commons.ognl.PropertyAccessor; - - import org.apache.tiles.TilesApplicationContext; - import org.apache.tiles.context.TilesRequestContext; diff --git a/tiles-2.2.2-fix-build.patch b/tiles-2.2.2-fix-build.patch deleted file mode 100644 index 53f3a77..0000000 --- a/tiles-2.2.2-fix-build.patch +++ /dev/null @@ -1,355 +0,0 @@ -diff -Nru tiles-2.2.2/src/pom.xml tiles-2.2.2-gil/src/pom.xml ---- tiles-2.2.2/src/pom.xml 2010-06-17 20:31:47.000000000 +0200 -+++ tiles-2.2.2-gil/src/pom.xml 2012-06-13 16:34:08.278243928 +0200 -@@ -63,7 +63,7 @@ - tiles-compat - tiles-extras - assembly -- tiles-test-pom -+ - - - -@@ -85,6 +85,7 @@ - - - -+ org.apache.maven.plugins - maven-jar-plugin - - -@@ -161,9 +162,11 @@ - maven-project-info-reports-plugin - - -+ org.apache.maven.plugins - maven-surefire-report-plugin - - -+ org.apache.maven.plugins - maven-checkstyle-plugin - - http://svn.eu.apache.org/repos/asf/tiles/maven/trunk/build/tiles_checks.xml -@@ -171,8 +174,8 @@ - - - -- org.codehaus.mojo -- jxr-maven-plugin -+ org.apache.maven.plugins -+ maven-jxr-plugin - - - maven-pmd-plugin -@@ -215,9 +218,9 @@ - - - -- org.codehaus.mojo -- rat-maven-plugin -- 1.0-alpha-3 -+ org.apache.rat -+ apache-rat-plugin -+ 0.8-SNAPSHOT - - - pom.xml -@@ -233,8 +236,8 @@ - - - -- org.apache.${artifactId} -- org.apache.tiles.*;version=${pom.version} -+ org.apache.${project.artifactId} -+ org.apache.tiles.*;version=${project.version} - * - - -@@ -255,6 +258,7 @@ - - - -+ org.apache.maven.plugins - maven-install-plugin - - true -@@ -298,9 +302,9 @@ - - - -- org.codehaus.mojo -- rat-maven-plugin -- 1.0-alpha-3 -+ org.apache.rat -+ apache-rat-plugin -+ 0.8-SNAPSHOT - - - verify -diff -Nru tiles-2.2.2/src/tiles-api/pom.xml tiles-2.2.2-gil/src/tiles-api/pom.xml ---- tiles-2.2.2/src/tiles-api/pom.xml 2010-06-17 20:31:42.000000000 +0200 -+++ tiles-2.2.2-gil/src/tiles-api/pom.xml 2012-06-13 16:30:44.536233963 +0200 -@@ -77,7 +77,7 @@ - - javax.servlet - servlet-api -- 2.5 -+ 7.0.27 - test - - -diff -Nru tiles-2.2.2/src/tiles-compat/pom.xml tiles-2.2.2-gil/src/tiles-compat/pom.xml ---- tiles-2.2.2/src/tiles-compat/pom.xml 2010-06-17 20:31:43.000000000 +0200 -+++ tiles-2.2.2-gil/src/tiles-compat/pom.xml 2012-06-13 16:30:44.537233963 +0200 -@@ -107,7 +107,7 @@ - - javax.servlet - servlet-api -- 2.5 -+ 7.0.27 - test - - -@@ -125,12 +125,12 @@ - test - - -- -+ - - - -diff -Nru tiles-2.2.2/src/tiles-core/pom.xml tiles-2.2.2-gil/src/tiles-core/pom.xml ---- tiles-2.2.2/src/tiles-core/pom.xml 2010-06-17 20:31:46.000000000 +0200 -+++ tiles-2.2.2-gil/src/tiles-core/pom.xml 2012-06-13 16:30:44.537233963 +0200 -@@ -137,17 +137,17 @@ - test - - -- -+ - - - javax.servlet - servlet-api -- 2.5 -+ 7.0.27 - test - - -diff -Nru tiles-2.2.2/src/tiles-el/pom.xml tiles-2.2.2-gil/src/tiles-el/pom.xml ---- tiles-2.2.2/src/tiles-el/pom.xml 2010-06-17 20:31:47.000000000 +0200 -+++ tiles-2.2.2-gil/src/tiles-el/pom.xml 2012-06-13 16:30:44.538233963 +0200 -@@ -108,28 +108,28 @@ - - - -- javax.el -- el-api -- 1.0 -+ org.apache.tomcat -+ tomcat-el-api -+ 7.0.27 - provided - - - javax.servlet - servlet-api -- 2.5 -+ 7.0.27 - provided - - -- javax.servlet.jsp -- jsp-api -- 2.1 -+ org.apache.tomcat -+ tomcat-jsp-api -+ 7.0.27 - provided - - - - org.apache.tomcat - jasper-el -- 6.0.20 -+ 7.0.27 - compile - true - -diff -Nru tiles-2.2.2/src/tiles-extras/pom.xml tiles-2.2.2-gil/src/tiles-extras/pom.xml ---- tiles-2.2.2/src/tiles-extras/pom.xml 2010-06-17 20:31:37.000000000 +0200 -+++ tiles-2.2.2-gil/src/tiles-extras/pom.xml 2012-06-13 16:30:44.538233963 +0200 -@@ -117,14 +117,14 @@ - - javax.servlet - servlet-api -- 2.5 -+ 7.0.27 - provided - - - -- javax.servlet.jsp -- jsp-api -- 2.1 -+ org.apache.tomcat -+ tomcat-jsp-api -+ 7.0.27 - provided - - -diff -Nru tiles-2.2.2/src/tiles-freemarker/pom.xml tiles-2.2.2-gil/src/tiles-freemarker/pom.xml ---- tiles-2.2.2/src/tiles-freemarker/pom.xml 2010-06-17 20:31:43.000000000 +0200 -+++ tiles-2.2.2-gil/src/tiles-freemarker/pom.xml 2012-06-13 16:30:44.539233963 +0200 -@@ -59,7 +59,7 @@ - - javax.servlet - servlet-api -- 2.5 -+ 7.0.27 - provided - - -diff -Nru tiles-2.2.2/src/tiles-jsp/pom.xml tiles-2.2.2-gil/src/tiles-jsp/pom.xml ---- tiles-2.2.2/src/tiles-jsp/pom.xml 2010-06-17 20:31:47.000000000 +0200 -+++ tiles-2.2.2-gil/src/tiles-jsp/pom.xml 2012-06-13 16:30:44.539233963 +0200 -@@ -82,19 +82,6 @@ - - - -- -- -- -- net.sourceforge.maven-taglib -- maven-taglib-plugin -- -- true -- -- -- -- -- -- - - - org.apache.tiles -@@ -117,13 +104,13 @@ - - javax.servlet - servlet-api -- 2.5 -+ 7.0.27 - provided - - -- javax.servlet.jsp -- jsp-api -- 2.1 -+ org.apache.tomcat -+ tomcat-jsp-api -+ 7.0.27 - provided - - -@@ -144,12 +131,12 @@ - 2.4 - test - -- -+ - - - -diff -Nru tiles-2.2.2/src/tiles-portlet/pom.xml tiles-2.2.2-gil/src/tiles-portlet/pom.xml ---- tiles-2.2.2/src/tiles-portlet/pom.xml 2010-06-17 20:31:46.000000000 +0200 -+++ tiles-2.2.2-gil/src/tiles-portlet/pom.xml 2012-06-13 16:30:44.539233963 +0200 -@@ -135,16 +135,16 @@ - - javax.servlet - servlet-api -- 2.5 -+ 7.0.27 - test - - -- -+ - - - -diff -Nru tiles-2.2.2/src/tiles-servlet/pom.xml tiles-2.2.2-gil/src/tiles-servlet/pom.xml ---- tiles-2.2.2/src/tiles-servlet/pom.xml 2010-06-17 20:31:44.000000000 +0200 -+++ tiles-2.2.2-gil/src/tiles-servlet/pom.xml 2012-06-13 16:30:44.540233963 +0200 -@@ -111,7 +111,7 @@ - - javax.servlet - servlet-api -- 2.5 -+ 7.0.27 - provided - - -@@ -132,12 +132,12 @@ - 2.4 - test - -- -+ - - - -diff -Nru tiles-2.2.2/src/tiles-servlet-wildcard/pom.xml tiles-2.2.2-gil/src/tiles-servlet-wildcard/pom.xml ---- tiles-2.2.2/src/tiles-servlet-wildcard/pom.xml 2010-06-17 20:31:42.000000000 +0200 -+++ tiles-2.2.2-gil/src/tiles-servlet-wildcard/pom.xml 2012-06-13 16:30:44.540233963 +0200 -@@ -109,7 +109,7 @@ - - javax.servlet - servlet-api -- 2.5 -+ 7.0.27 - provided - - -diff -Nru tiles-2.2.2/src/tiles-velocity/pom.xml tiles-2.2.2-gil/src/tiles-velocity/pom.xml ---- tiles-2.2.2/src/tiles-velocity/pom.xml 2010-06-17 20:31:47.000000000 +0200 -+++ tiles-2.2.2-gil/src/tiles-velocity/pom.xml 2012-06-13 16:30:44.541233963 +0200 -@@ -55,7 +55,7 @@ - - javax.servlet - servlet-api -- 2.5 -+ 7.0.27 - provided - - diff --git a/tiles-2.2.2-parent-pom.patch b/tiles-2.2.2-parent-pom.patch deleted file mode 100644 index a7cffeb..0000000 --- a/tiles-2.2.2-parent-pom.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- src/pom.xml 2012-05-27 00:38:23.845328560 +0200 -+++ src/pom.xml-gil 2012-05-27 00:45:06.523325673 +0200 -@@ -27,6 +27,7 @@ - org.apache.tiles - tiles-master - 3 -+ ../pom.xml - - - 4.0.0 diff --git a/tiles-2.2.2-servlet3.1.patch b/tiles-2.2.2-servlet3.1.patch deleted file mode 100644 index 3127e82..0000000 --- a/tiles-2.2.2-servlet3.1.patch +++ /dev/null @@ -1,332 +0,0 @@ -diff -Nru tiles-2.2.2/src/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/InitContainerTag.java tiles-2.2.2.servlet/src/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/InitContainerTag.java ---- tiles-2.2.2/src/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/InitContainerTag.java 2010-06-17 20:31:46.000000000 +0200 -+++ tiles-2.2.2.servlet/src/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/InitContainerTag.java 2015-03-04 17:04:09.417787819 +0100 -@@ -22,17 +22,31 @@ - package org.apache.tiles.jsp.taglib.definition; - - import java.io.InputStream; -+import java.lang.Class; -+import java.lang.ClassLoader; -+import java.lang.IllegalArgumentException; -+import java.lang.IllegalStateException; -+import java.lang.UnsupportedOperationException; - import java.net.MalformedURLException; - import java.net.URL; - import java.util.Enumeration; -+import java.util.EventListener; - import java.util.Hashtable; - import java.util.Iterator; -+import java.util.Map; - import java.util.Set; - -+import javax.servlet.Filter; -+import javax.servlet.FilterRegistration; -+import javax.servlet.FilterRegistration.Dynamic; - import javax.servlet.RequestDispatcher; - import javax.servlet.Servlet; - import javax.servlet.ServletContext; - import javax.servlet.ServletException; -+import javax.servlet.ServletRegistration; -+import javax.servlet.SessionCookieConfig; -+import javax.servlet.SessionTrackingMode; -+import javax.servlet.descriptor.JspConfigDescriptor; - - import org.apache.tiles.ArrayStack; - import org.apache.tiles.AttributeContext; -@@ -319,8 +333,8 @@ - * @param name The name of the parameter. - * @param value The value of the parameter. - */ -- public void setInitParameter(String name, String value) { -- initParameters.put(name, value); -+ public boolean setInitParameter(String name, String value) { -+ return true; - } - - /** -@@ -409,6 +423,110 @@ - return second.next(); - } - } -+ -+ public JspConfigDescriptor getJspConfigDescriptor() { -+ // TODO -+ throw new UnsupportedOperationException("Not supported."); -+ } -+ public ClassLoader getClassLoader() { -+ // TODO -+ throw new UnsupportedOperationException("Not supported."); -+ } -+ public void declareRoles(String... roleNames) { -+ // TODO -+ throw new UnsupportedOperationException("Not supported."); -+ } -+ public T createListener(java.lang.Class c) throws ServletException { -+ // TODO -+ throw new UnsupportedOperationException("Not supported."); -+ } -+ public void addListener(T t) { -+ // TODO -+ throw new UnsupportedOperationException("Not supported."); -+ } -+ public void addListener(String className) { -+ // TODO -+ throw new UnsupportedOperationException("Not supported."); -+ } -+ public void addListener(Class listenerClass) { -+ // TODO -+ throw new UnsupportedOperationException("Not supported."); -+ } -+ public Set getEffectiveSessionTrackingModes() { -+ // TODO -+ throw new UnsupportedOperationException("Not supported."); -+ } -+ public Set getDefaultSessionTrackingModes() { -+ // TODO -+ throw new UnsupportedOperationException("Not supported."); -+ } -+ public void setSessionTrackingModes(Set sessionTrackingModes) throws IllegalStateException, IllegalArgumentException { -+ // TODO -+ throw new UnsupportedOperationException("Not supported."); -+ } -+ public SessionCookieConfig getSessionCookieConfig() { -+ // TODO -+ throw new UnsupportedOperationException("Not supported."); -+ } -+ public Map getFilterRegistrations() { -+ // TODO -+ throw new UnsupportedOperationException("Not supported."); -+ } -+ public FilterRegistration getFilterRegistration(String filterName) { -+ // TODO -+ throw new UnsupportedOperationException("Not supported."); -+ } -+ public T createFilter(Class c) throws ServletException { -+ // TODO -+ throw new UnsupportedOperationException("Not supported."); -+ } -+ public FilterRegistration.Dynamic addFilter(String filterName, Class filterClass) { -+ // TODO -+ throw new UnsupportedOperationException("Not supported."); -+ } -+ public FilterRegistration.Dynamic addFilter(String filterName, Filter filter) { -+ // TODO -+ throw new UnsupportedOperationException("Not supported."); -+ } -+ public FilterRegistration.Dynamic addFilter(String filterName, String className) { -+ // TODO -+ throw new UnsupportedOperationException("Not supported."); -+ } -+ public Map getServletRegistrations() { -+ // TODO -+ throw new UnsupportedOperationException("Not supported."); -+ } -+ public ServletRegistration getServletRegistration(String servletName) { -+ // TODO -+ throw new UnsupportedOperationException("Not supported."); -+ } -+ public T createServlet(Class c) throws ServletException { -+ // TODO -+ throw new UnsupportedOperationException("Not supported."); -+ } -+ public ServletRegistration.Dynamic addServlet(String servletName, Servlet servlet) { -+ // TODO -+ throw new UnsupportedOperationException("Not supported."); -+ } -+ public ServletRegistration.Dynamic addServlet(String servletName, Class servletClass) { -+ // TODO -+ throw new UnsupportedOperationException("Not supported."); -+ } -+ public ServletRegistration.Dynamic addServlet(String servletName, String className) { -+ // TODO -+ throw new UnsupportedOperationException("Not supported."); -+ } -+ public int getEffectiveMinorVersion() { -+ // TODO -+ throw new UnsupportedOperationException("Not supported."); -+ } -+ public int getEffectiveMajorVersion() { -+ // TODO -+ throw new UnsupportedOperationException("Not supported."); -+ } -+ public String getVirtualServerName() { -+ throw new UnsupportedOperationException("Not implemented yet"); -+ } - } - - } -diff -Nru tiles-2.2.2/src/tiles-servlet/src/main/java/org/apache/tiles/web/util/ServletContextAdapter.java tiles-2.2.2.servlet/src/tiles-servlet/src/main/java/org/apache/tiles/web/util/ServletContextAdapter.java ---- tiles-2.2.2/src/tiles-servlet/src/main/java/org/apache/tiles/web/util/ServletContextAdapter.java 2010-06-17 20:31:44.000000000 +0200 -+++ tiles-2.2.2.servlet/src/tiles-servlet/src/main/java/org/apache/tiles/web/util/ServletContextAdapter.java 2015-03-04 16:58:47.622896826 +0100 -@@ -21,17 +21,31 @@ - package org.apache.tiles.web.util; - - import java.io.InputStream; -+import java.lang.Class; -+import java.lang.ClassLoader; -+import java.lang.IllegalArgumentException; -+import java.lang.IllegalStateException; -+import java.lang.UnsupportedOperationException; - import java.net.MalformedURLException; - import java.net.URL; - import java.util.Enumeration; -+import java.util.EventListener; - import java.util.Hashtable; -+import java.util.Map; - import java.util.Set; - -+import javax.servlet.Filter; -+import javax.servlet.FilterRegistration; -+import javax.servlet.FilterRegistration.Dynamic; - import javax.servlet.RequestDispatcher; - import javax.servlet.Servlet; - import javax.servlet.ServletConfig; - import javax.servlet.ServletContext; - import javax.servlet.ServletException; -+import javax.servlet.ServletRegistration; -+import javax.servlet.SessionCookieConfig; -+import javax.servlet.SessionTrackingMode; -+import javax.servlet.descriptor.JspConfigDescriptor; - - /** - * Adapts a servlet config and a servlet context to become a unique servlet -@@ -249,4 +263,139 @@ - return second.nextElement(); - } - } -+ -+ public JspConfigDescriptor getJspConfigDescriptor() { -+ // TODO -+ throw new UnsupportedOperationException("Not supported."); -+ } -+ -+ public ClassLoader getClassLoader() { -+ // TODO -+ throw new UnsupportedOperationException("Not supported."); -+ } -+ -+ public void declareRoles(String... roleNames) { -+ // TODO -+ throw new UnsupportedOperationException("Not supported."); -+ } -+ -+ public T createListener(Class c) throws ServletException { -+ // TODO -+ throw new UnsupportedOperationException("Not supported."); -+ } -+ -+ public void addListener(T t) { -+ // TODO -+ throw new UnsupportedOperationException("Not supported."); -+ } -+ -+ public void addListener(String className) { -+ // TODO -+ throw new UnsupportedOperationException("Not supported."); -+ } -+ -+ public void addListener(Class listenerClass) { -+ // TODO -+ throw new UnsupportedOperationException("Not supported."); -+ } -+ -+ public Set getEffectiveSessionTrackingModes() { -+ // TODO -+ throw new UnsupportedOperationException("Not supported."); -+ } -+ -+ public Set getDefaultSessionTrackingModes() { -+ // TODO -+ throw new UnsupportedOperationException("Not supported."); -+ } -+ -+ public void setSessionTrackingModes(Set sessionTrackingModes) throws IllegalStateException, IllegalArgumentException { -+ // TODO -+ throw new UnsupportedOperationException("Not supported."); -+ } -+ -+ public SessionCookieConfig getSessionCookieConfig() { -+ // TODO -+ throw new UnsupportedOperationException("Not supported."); -+ } -+ -+ public Map getFilterRegistrations() { -+ // TODO -+ throw new UnsupportedOperationException("Not supported."); -+ } -+ -+ public FilterRegistration getFilterRegistration(String filterName) { -+ // TODO -+ throw new UnsupportedOperationException("Not supported."); -+ } -+ -+ public T createFilter(Class c) throws ServletException { -+ // TODO -+ throw new UnsupportedOperationException("Not supported."); -+ } -+ -+ public FilterRegistration.Dynamic addFilter(String filterName, Class filterClass) { -+ // TODO -+ throw new UnsupportedOperationException("Not supported."); -+ } -+ -+ public FilterRegistration.Dynamic addFilter(String filterName, Filter filter) { -+ // TODO -+ throw new UnsupportedOperationException("Not supported."); -+ } -+ -+ public FilterRegistration.Dynamic addFilter(String filterName, String className) { -+ // TODO -+ throw new UnsupportedOperationException("Not supported."); -+ } -+ -+ public Map getServletRegistrations() { -+ // TODO -+ throw new UnsupportedOperationException("Not supported."); -+ } -+ -+ public ServletRegistration getServletRegistration(String servletName) { -+ // TODO -+ throw new UnsupportedOperationException("Not supported."); -+ } -+ -+ public T createServlet(Class c) throws ServletException { -+ // TODO -+ throw new UnsupportedOperationException("Not supported."); -+ } -+ -+ public ServletRegistration.Dynamic addServlet(String servletName, Servlet servlet) { -+ // TODO -+ throw new UnsupportedOperationException("Not supported."); -+ } -+ -+ public ServletRegistration.Dynamic addServlet(String servletName, Class servletClass) { -+ // TODO -+ throw new UnsupportedOperationException("Not supported."); -+ } -+ -+ public ServletRegistration.Dynamic addServlet(String servletName, String className) { -+ // TODO -+ throw new UnsupportedOperationException("Not supported."); -+ } -+ -+ public boolean setInitParameter(String name, String value) { -+ // TODO -+ throw new UnsupportedOperationException("Not supported."); -+ } -+ -+ public int getEffectiveMinorVersion() { -+ // TODO -+ throw new UnsupportedOperationException("Not supported."); -+ } -+ -+ public int getEffectiveMajorVersion() { -+ // TODO -+ throw new UnsupportedOperationException("Not supported."); -+ } -+ -+ public String getVirtualServerName() { -+ throw new UnsupportedOperationException("Not implemented yet"); -+ } -+ - } diff --git a/tiles-master-3-pom.xml b/tiles-master-3-pom.xml deleted file mode 100644 index 096858a..0000000 --- a/tiles-master-3-pom.xml +++ /dev/null @@ -1,238 +0,0 @@ - - - - - - 4.0.0 - - org.apache - apache - 7 - - org.apache.tiles - tiles-master - 3 - pom - Apache Tiles (Master POM) - - - scm:svn:http://svn.apache.org/repos/asf/tiles/maven/tags/tiles-master-3 - scm:svn:https://svn.apache.org/repos/asf/tiles/maven/tags/tiles-master-3 - http://svn.apache.org/repos/asf/tiles/maven/tags/tiles-master-3 - - - - The Apache Tiles project. This master pom provides the default values for - common maven configuration throughout the Tiles project. - - http://tiles.apache.org/ - 2001 - - - Apache Software Foundation - http://www.apache.org - - - - JIRA - https://issues.apache.org/jira/browse/TILES - - - - - Tiles User List - users-subscribe@tiles.apache.org - users-unsubscribe@tiles.apache.org - users@tiles.apache.org - http://mail-archives.apache.org/mod_mbox/tiles-users/ - - - Tiles Development List - dev-subscribe@tiles.apache.org - dev-unsubscribe@tiles.apache.org - dev@tiles.apache.org - http://mail-archives.apache.org/mod_mbox/tiles-dev/ - - - Tiles Commits List - commits-subscribe@tiles.apache.org - commits-unsubscribe@tiles.apache.org - http://mail-archives.apache.org/mod_mbox/tiles-commits/ - - - Tiles Issues List - issues-subscribe@tiles.apache.org - issues-unsubscribe@tiles.apache.org - http://mail-archives.apache.org/mod_mbox/tiles-issues/ - - - Tiles Notifications List - notifications-subscribe@tiles.apache.org - notifications-unsubscribe@tiles.apache.org - http://mail-archives.apache.org/mod_mbox/tiles-notifications/ - - - - - - - Antonio Petrelli - apetrelli - apetrelli at apache.org - - PMC Member - - - - David H. DeWolf - ddewolf - ddewolf at apache.org - - PMC Member - - - - Greg Reddin - greddin - greddin at apache.org - - PMC Chair - - - - Joe Germuska - germuska - germuska at apache.org - - PMC Member - - - - Martin Cooper - martinc - martinc at apache.org - - PMC Member - - - - Nathan Bubna - nbubna - nbubna at apache.org - - PMC Member - - - - Wendy Smoak - wsmoak - wsmoak at apache.org - - PMC Member - - - - Craig McClanahan - craigmcc - craigmcc at apache.org - - PMC Member - - - - Mick Semb Wever - mck - mck at apache.org - http://people.apache.org/~mck - - Committer - - - - - - - Cserveny Tamás - - - Dirk Alexander Schaefer - - - Jacky Chan - - - Joe Pemberton - - - Matthieu Chase Heimer - - - Mike Calmus - - - Neil Aggarwal - - - Niall Pemberton - - - pijmleko - - - Scot Meyer - - - Thom Hehl - - - Zarick Lau - - - - - - - - org.apache.maven.plugins - maven-release-plugin - 2.0 - - - org.apache.maven.plugins - maven-clean-plugin - 2.4.1 - - - org.apache.maven.plugins - maven-install-plugin - 2.3.1 - - - org.apache.maven.plugins - maven-site-plugin - 2.1 - - - org.apache.maven.plugins - maven-antrun-plugin - 1.4 - - - - - - diff --git a/tiles.spec b/tiles.spec deleted file mode 100644 index a9c76fb..0000000 --- a/tiles.spec +++ /dev/null @@ -1,222 +0,0 @@ -%global master_version 3 -Name: tiles -Version: 2.2.2 -Release: 21%{?dist} -Summary: Java templating framework for web application user interfaces -License: ASL 2.0 -Url: http://tiles.apache.org/ -Source0: http://www.apache.org/dist/%{name}/v%{version}/%{name}-%{version}-src.tar.gz - -# remove shale-test and maven-taglib-plugin -# change -# org.codehaus.mojo rat-maven-plugin in org.apache.rat apache-rat-plugin -# org.codehaus.mojo jxr-maven-plugin in org.apache.maven.plugins maven-jxr-plugin -# use tomcat 7.x apis -Patch0: %{name}-%{version}-fix-build.patch -# replace ognl ognl 2.7.3 with apache-commons-ognl -Patch1: %{name}-%{version}-commons-ognl.patch -# add tiles-master relativePath -Patch2: %{name}-%{version}-parent-pom.patch -# build fix fot tomcat 8.x apis -Patch3: %{name}-%{version}-servlet3.1.patch - -BuildRequires: mvn(commons-digester:commons-digester) -BuildRequires: mvn(javax.portlet:portlet-api) -BuildRequires: mvn(org.apache.commons:commons-ognl) -BuildRequires: mvn(org.apache.tomcat:tomcat-el-api) -BuildRequires: mvn(org.apache.tomcat:tomcat-jasper-el) -BuildRequires: mvn(org.apache.tomcat:tomcat-jsp-api) -BuildRequires: mvn(org.apache.tomcat:tomcat-servlet-api) -BuildRequires: mvn(org.apache.velocity:velocity-tools) -BuildRequires: mvn(org.freemarker:freemarker) -BuildRequires: mvn(org.mvel:mvel2) -BuildRequires: mvn(org.slf4j:jcl-over-slf4j) -BuildRequires: mvn(org.slf4j:slf4j-jdk14) -BuildRequires: slf4j -BuildRequires: tomcat-lib - -# test deps -%if 0 -BuildRequires: mvn(org.easymock:easymockclassextension) >= 2.4 -BuildRequires: mvn(org.apache.shale:shale-test) >= 1.0.5 -%endif -BuildRequires: mvn(junit:junit) - -BuildRequires: maven-local -BuildRequires: maven-plugin-bundle -BuildRequires: maven-resources-plugin - -# requires by remote-resources-plugin -BuildRequires: mvn(org.apache.maven.shared:maven-artifact-resolver) -BuildRequires: mvn(org.apache.maven.shared:maven-shared-components:pom:) - -BuildArch: noarch - -%description -Apache Tiles is a templating framework built to simplify the -development of web application user interfaces. Tiles allows -authors to define page fragments which can be assembled into -a complete page at runtime. These fragments, or tiles, can -be used as simple includes in order to reduce the duplication -of common page elements or embedded within other tiles to -develop a series of reusable templates. These templates -streamline the development of a consistent look and feel -across an entire application. Tiles grew in popularity as a -component of the popular Struts framework. It has since been -extracted from Struts and is now integrated with various -frameworks, such as Struts 2 and Shale. - -%package javadoc -Summary: Javadoc for %{name} - -%description javadoc -This package contains javadoc for %{name}. - -%prep -%setup -q -n %{name}-%{version} -%patch0 -p1 -%patch1 -p1 -%patch2 -p0 -%patch3 -p1 - - -# require org.springframework spring-webmvc-portlet 2.5.6 -%pom_disable_module tiles-portlet-wildcard src/pom.xml -# org.springframework spring-web 2.5.6 -%pom_disable_module tiles-servlet-wildcard src/pom.xml -# depends on previous artifacts -%pom_disable_module tiles-extras src/pom.xml -%pom_disable_module assembly src/pom.xml - -sed -i "s|jasper-el|tomcat-jasper-el|" src/tiles-el/pom.xml - -sed -i "s|javax.servlet|org.apache.tomcat|" src/tiles-core/pom.xml \ - src/tiles-api/pom.xml \ - src/tiles-velocity/pom.xml \ - src/tiles-servlet/pom.xml \ - src/tiles-compat/pom.xml \ - src/tiles-portlet/pom.xml \ - src/tiles-jsp/pom.xml \ - src/tiles-extras/pom.xml \ - src/tiles-freemarker/pom.xml \ - src/tiles-el/pom.xml \ - src/tiles-servlet-wildcard/pom.xml - -sed -i "s|servlet-api|tomcat-servlet-api|" src/tiles-core/pom.xml \ - src/tiles-api/pom.xml \ - src/tiles-velocity/pom.xml \ - src/tiles-servlet/pom.xml \ - src/tiles-compat/pom.xml \ - src/tiles-portlet/pom.xml \ - src/tiles-jsp/pom.xml \ - src/tiles-extras/pom.xml \ - src/tiles-freemarker/pom.xml \ - src/tiles-el/pom.xml \ - src/tiles-servlet-wildcard/pom.xml - - -%pom_remove_parent src -#cp -p %%{SOURCE1} pom.xml - -%build - -cd src -# TODO -# extras -# portlet-wildcard -# servlet-wildcard -%mvn_file :%{name}-api %{name}/api -%mvn_file :%{name}-compat %{name}/compat -%mvn_file :%{name}-core %{name}/core -%mvn_file :%{name}-el %{name}/el -%mvn_file :%{name}-freemarker %{name}/freemarker -%mvn_file :%{name}-jsp %{name}/jsp -%mvn_file :%{name}-mvel %{name}/mvel -%mvn_file :%{name}-ognl %{name}/ognl -%mvn_file :%{name}-portlet %{name}/portlet -%mvn_file :%{name}-servlet %{name}/servlet -%mvn_file :%{name}-template %{name}/template -%mvn_file :%{name}-velocity %{name}/velocity - -# test skip for unavailable deps -%mvn_build -f - -%install - -( -cd src -%mvn_install -) - -%files -f src/.mfiles -%dir %{_javadir}/%{name} -%license LICENSE.txt NOTICE.txt - -%files javadoc -f src/.mfiles-javadoc -%license LICENSE.txt NOTICE.txt - -%changelog -* Sat Jul 27 2019 Fedora Release Engineering - 2.2.2-21 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sun Feb 03 2019 Fedora Release Engineering - 2.2.2-20 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sat Jul 14 2018 Fedora Release Engineering - 2.2.2-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri Feb 09 2018 Fedora Release Engineering - 2.2.2-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 2.2.2-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 2.2.2-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Fri Feb 05 2016 Fedora Release Engineering - 2.2.2-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Jun 19 2015 Fedora Release Engineering - 2.2.2-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Wed Mar 04 2015 gil cattaneo 2.2.2-13 -- use servlet 3.1, el 3.0, jsp 2.3 - -* Fri Feb 13 2015 gil cattaneo 2.2.2-12 -- introduce license macro - -* Sun Jun 08 2014 Fedora Release Engineering - 2.2.2-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Fri Mar 28 2014 Michael Simacek - 2.2.2-10 -- Use Requires: java-headless rebuild (#1067528) - -* Sun Aug 04 2013 Fedora Release Engineering - 2.2.2-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Wed Jul 24 2013 Alexander Kurtakov 2.2.2-8 -- Drop easymock2 BR - not needed. - -* Wed Jul 10 2013 gil cattaneo 2.2.2-7 -- switch to XMvn -- minor changes to adapt to current guideline - -* Tue Feb 19 2013 gil cattaneo 2.2.2-6 -- added maven-artifact-resolver and maven-shared-components as BR - -* Fri Feb 15 2013 Fedora Release Engineering - 2.2.2-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Wed Feb 06 2013 Java SIG - 2.2.2-4 -- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild -- Replace maven BuildRequires with maven-local - -* Sat Jul 21 2012 Fedora Release Engineering - 2.2.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Mon Jul 09 2012 gil cattaneo 2.2.2-2 -- Fixed list of files in the main package - -* Sat May 26 2012 gil cattaneo 2.2.2-1 -- initial rpm