java-sig-commits July 2012

java-sig-commits@lists.fedoraproject.org

18 participants
566 discussions

[Bug 652183] Java SIG tracker bug
by Red Hat Bugzilla 11 Jul '12

11 Jul '12

https://bugzilla.redhat.com/show_bug.cgi?id=652183 Patryk Obara <pobara(a)redhat.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Depends On|826645 | -- You are receiving this mail because: You are the QA Contact for the bug. You are the assignee for the bug.

1 0

[Bug 652183] Java SIG tracker bug
by Red Hat Bugzilla 11 Jul '12

11 Jul '12

https://bugzilla.redhat.com/show_bug.cgi?id=652183 Patryk Obara <pobara(a)redhat.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Depends On|820548 | -- You are receiving this mail because: You are the QA Contact for the bug. You are the assignee for the bug.

1 0

[Bug 652183] Java SIG tracker bug
by Red Hat Bugzilla 11 Jul '12

11 Jul '12

https://bugzilla.redhat.com/show_bug.cgi?id=652183 Patryk Obara <pobara(a)redhat.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Depends On|825750 | -- You are receiving this mail because: You are the QA Contact for the bug. You are the assignee for the bug.

1 0

[Bug 652183] Java SIG tracker bug
by Red Hat Bugzilla 11 Jul '12

11 Jul '12

https://bugzilla.redhat.com/show_bug.cgi?id=652183 Marek Goldmann <mgoldman(a)redhat.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Depends On|823835 | -- You are receiving this mail because: You are the QA Contact for the bug. You are the assignee for the bug.

1 0

[tiles/f17] Initial import (#825750)
by gil 11 Jul '12

11 Jul '12

Summary of changes: da81d5c... Initial import (#825750) (*) (*) This commit already existed in another branch; no separate mail sent

1 0

[sslext/f17] Initial import (#826647)
by gil 11 Jul '12

11 Jul '12

Summary of changes: b2d68c0... Initial import (#826647) (*) (*) This commit already existed in another branch; no separate mail sent

1 0

[jasperreports/f17] Initial import (#820548)
by gil 11 Jul '12

11 Jul '12

Summary of changes: 4b2f7c4... Initial import (#820548) (*) (*) This commit already existed in another branch; no separate mail sent

1 0

[tiles] Initial import (#825750)
by gil 11 Jul '12

11 Jul '12

commit da81d5c4bb7e8aab67875d0501b8302535f2cc4e Author: gil <puntogil(a)libero.it> Date: Wed Jul 11 12:09:17 2012 +0200 Initial import (#825750) .gitignore | 1 + sources | 1 + tiles-2.2.2-2-depmap | 51 +++++ tiles-2.2.2-commons-ognl.patch | 144 ++++++++++++++ tiles-2.2.2-fix-build.patch | 355 +++++++++++++++++++++++++++++++++++ tiles-2.2.2-jsp-servlet30.patch | 153 +++++++++++++++ tiles-2.2.2-parent-pom.patch | 10 + tiles-2.2.2-servlet-servlet30.patch | 170 +++++++++++++++++ tiles-master-3-pom.xml | 238 +++++++++++++++++++++++ tiles.spec | 174 +++++++++++++++++ 10 files changed, 1297 insertions(+), 0 deletions(-) --- diff --git a/.gitignore b/.gitignore index e69de29..d11485a 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +/tiles-2.2.2-src.tar.gz diff --git a/sources b/sources index e69de29..adcd710 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +2415ccad008fca7a7b1ccc4c24523a58 tiles-2.2.2-src.tar.gz diff --git a/tiles-2.2.2-2-depmap b/tiles-2.2.2-2-depmap new file mode 100644 index 0000000..c7103cc --- /dev/null +++ b/tiles-2.2.2-2-depmap @@ -0,0 +1,51 @@ +<dependencies> +<dependency> + <maven> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>7.0.27</version> + </maven> + <jpp> + <groupId>JPP</groupId> + <artifactId>tomcat-servlet-3.0-api</artifactId> + <version>7.0.27</version> + </jpp> +</dependency> +<dependency> + <maven> + <groupId>org.apache.tomcat</groupId> + <artifactId>tomcat-jsp-api</artifactId> + <version>7.0.27</version> + </maven> + <jpp> + <groupId>JPP</groupId> + <artifactId>tomcat-jsp-2.2-api</artifactId> + <version>7.0.27</version> + </jpp> +</dependency> +<dependency> + <maven> + <groupId>org.apache.tomcat</groupId> + <artifactId>tomcat-el-api</artifactId> + <version>7.0.27</version> + </maven> + <jpp> + <groupId>JPP</groupId> + <artifactId>tomcat-el-2.2-api</artifactId> + <version>7.0.27</version> + </jpp> +</dependency> +<dependency> + <maven> + <groupId>org.apache.tomcat</groupId> + <artifactId>jasper-el</artifactId> + <version>6.0.20</version> + </maven> + <jpp> + <groupId>JPP/tomcat</groupId> + <artifactId>jasper-el</artifactId> + <version>7.0.27</version> + </jpp> +</dependency> + +</dependencies> \ No newline at end of file diff --git a/tiles-2.2.2-commons-ognl.patch b/tiles-2.2.2-commons-ognl.patch new file mode 100644 index 0000000..edaa878 --- /dev/null +++ b/tiles-2.2.2-commons-ognl.patch @@ -0,0 +1,144 @@ +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 @@ + <scope>test</scope> + </dependency> + <dependency> +- <groupId>ognl</groupId> +- <artifactId>ognl</artifactId> +- <version>2.7.3</version> ++ <groupId>org.apache.commons</groupId> ++ <artifactId>commons-ognl</artifactId> ++ <version>4.0-incubating-SNAPSHOT</version> + </dependency> + </dependencies> + +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 new file mode 100644 index 0000000..53f3a77 --- /dev/null +++ b/tiles-2.2.2-fix-build.patch @@ -0,0 +1,355 @@ +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 @@ + <module>tiles-compat</module> + <module>tiles-extras</module> + <module>assembly</module> +- <module>tiles-test-pom</module> ++  + </modules> + + <distributionManagement> +@@ -85,6 +85,7 @@ + </configuration> + </plugin> + <plugin> ++ <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> +@@ -161,9 +162,11 @@ + <artifactId>maven-project-info-reports-plugin</artifactId> + </plugin> + <plugin> ++ <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-report-plugin</artifactId> + </plugin> + <plugin> ++ <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-checkstyle-plugin</artifactId> + <configuration> + <configLocation>http://svn.eu.apache.org/repos/asf/tiles/maven/trunk/build/tiles_checks.xml +@@ -171,8 +174,8 @@ + </configuration> + </plugin> + <plugin> +- <groupId>org.codehaus.mojo</groupId> +- <artifactId>jxr-maven-plugin</artifactId> ++ <groupId>org.apache.maven.plugins</groupId> ++ <artifactId>maven-jxr-plugin</artifactId> + </plugin> + <plugin> + <artifactId>maven-pmd-plugin</artifactId> +@@ -215,9 +218,9 @@ + </reportSets> + </plugin> + <plugin> +- <groupId>org.codehaus.mojo</groupId> +- <artifactId>rat-maven-plugin</artifactId> +- <version>1.0-alpha-3</version> ++ <groupId>org.apache.rat</groupId> ++ <artifactId>apache-rat-plugin</artifactId> ++ <version>0.8-SNAPSHOT</version> + <configuration> + <includes> + <include>pom.xml</include> +@@ -233,8 +236,8 @@ + </reporting> + + <properties> +- <tiles.osgi.symbolicName>org.apache.${artifactId}</tiles.osgi.symbolicName> +- <tiles.osgi.export>org.apache.tiles.*;version=${pom.version}</tiles.osgi.export> ++ <tiles.osgi.symbolicName>org.apache.${project.artifactId}</tiles.osgi.symbolicName> ++ <tiles.osgi.export>org.apache.tiles.*;version=${project.version}</tiles.osgi.export> + <tiles.osgi.import>*</tiles.osgi.import> + <tiles.osgi.dynamicImport /> + <tiles.osgi.private /> +@@ -255,6 +258,7 @@ + <build> + <plugins> + <plugin> ++ <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-install-plugin</artifactId> + <configuration> + <createChecksum>true</createChecksum> +@@ -298,9 +302,9 @@ + </executions> + </plugin> + <plugin> +- <groupId>org.codehaus.mojo</groupId> +- <artifactId>rat-maven-plugin</artifactId> +- <version>1.0-alpha-3</version> ++ <groupId>org.apache.rat</groupId> ++ <artifactId>apache-rat-plugin</artifactId> ++ <version>0.8-SNAPSHOT</version> + <executions> + <execution> + <phase>verify</phase> +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 @@ + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> +- <version>2.5</version> ++ <version>7.0.27</version> + <scope>test</scope> + </dependency> + +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 @@ + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> +- <version>2.5</version> ++ <version>7.0.27</version> + <scope>test</scope> + </dependency> + +@@ -125,12 +125,12 @@ + <scope>test</scope> + </dependency> + +- <dependency> ++  + + </dependencies> + +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 @@ + <scope>test</scope> + </dependency> + +- <dependency> ++  + + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> +- <version>2.5</version> ++ <version>7.0.27</version> + <scope>test</scope> + </dependency> + +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 @@ + </dependency> + + <dependency> +- <groupId>javax.el</groupId> +- <artifactId>el-api</artifactId> +- <version>1.0</version> ++ <groupId>org.apache.tomcat</groupId> ++ <artifactId>tomcat-el-api</artifactId> ++ <version>7.0.27</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> +- <version>2.5</version> ++ <version>7.0.27</version> + <scope>provided</scope> + </dependency> + <dependency> +- <groupId>javax.servlet.jsp</groupId> +- <artifactId>jsp-api</artifactId> +- <version>2.1</version> ++ <groupId>org.apache.tomcat</groupId> ++ <artifactId>tomcat-jsp-api</artifactId> ++ <version>7.0.27</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.apache.tomcat</groupId> + <artifactId>jasper-el</artifactId> +- <version>6.0.20</version> ++ <version>7.0.27</version> + <scope>compile</scope> + <optional>true</optional> + <exclusions> +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 @@ + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> +- <version>2.5</version> ++ <version>7.0.27</version> + <scope>provided</scope> + </dependency> + + <dependency> +- <groupId>javax.servlet.jsp</groupId> +- <artifactId>jsp-api</artifactId> +- <version>2.1</version> ++ <groupId>org.apache.tomcat</groupId> ++ <artifactId>tomcat-jsp-api</artifactId> ++ <version>7.0.27</version> + <scope>provided</scope> + </dependency> + +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 @@ + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> +- <version>2.5</version> ++ <version>7.0.27</version> + <scope>provided</scope> + </dependency> + +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 @@ + + </build> + +- <reporting> +- <plugins> +- <plugin> +- <groupId>net.sourceforge.maven-taglib</groupId> +- <artifactId>maven-taglib-plugin</artifactId> +- <configuration> +- <parseHtml>true</parseHtml> +- </configuration> +- </plugin> +- </plugins> +- </reporting> +- +- + <dependencies> + <dependency> + <groupId>org.apache.tiles</groupId> +@@ -117,13 +104,13 @@ + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> +- <version>2.5</version> ++ <version>7.0.27</version> + <scope>provided</scope> + </dependency> + <dependency> +- <groupId>javax.servlet.jsp</groupId> +- <artifactId>jsp-api</artifactId> +- <version>2.1</version> ++ <groupId>org.apache.tomcat</groupId> ++ <artifactId>tomcat-jsp-api</artifactId> ++ <version>7.0.27</version> + <scope>provided</scope> + </dependency> + <dependency> +@@ -144,12 +131,12 @@ + <version>2.4</version> + <scope>test</scope> + </dependency> +- <dependency> ++  + + </dependencies> + +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 @@ + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> +- <version>2.5</version> ++ <version>7.0.27</version> + <scope>test</scope> + </dependency> + +- <dependency> ++  + + </dependencies> + +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 @@ + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> +- <version>2.5</version> ++ <version>7.0.27</version> + <scope>provided</scope> + </dependency> + <dependency> +@@ -132,12 +132,12 @@ + <version>2.4</version> + <scope>test</scope> + </dependency> +- <dependency> ++  + + </dependencies> + +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 @@ + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> +- <version>2.5</version> ++ <version>7.0.27</version> + <scope>provided</scope> + </dependency> + +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 @@ + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> +- <version>2.5</version> ++ <version>7.0.27</version> + <scope>provided</scope> + </dependency> + <dependency> diff --git a/tiles-2.2.2-jsp-servlet30.patch b/tiles-2.2.2-jsp-servlet30.patch new file mode 100644 index 0000000..6c10a96 --- /dev/null +++ b/tiles-2.2.2-jsp-servlet30.patch @@ -0,0 +1,153 @@ +--- src/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/InitContainerTag.java 2010-06-17 20:31:46.000000000 +0200 ++++ src/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/InitContainerTag.java-gil 2012-06-13 17:05:50.559336962 +0200 +@@ -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,107 @@ + 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 extends EventListener> T createListener(java.lang.Class<T> c) throws ServletException { ++ // TODO ++ throw new UnsupportedOperationException("Not supported."); ++ } ++ public <T extends EventListener> 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<? extends EventListener> listenerClass) { ++ // TODO ++ throw new UnsupportedOperationException("Not supported."); ++ } ++ public Set<SessionTrackingMode> getEffectiveSessionTrackingModes() { ++ // TODO ++ throw new UnsupportedOperationException("Not supported."); ++ } ++ public Set<SessionTrackingMode> getDefaultSessionTrackingModes() { ++ // TODO ++ throw new UnsupportedOperationException("Not supported."); ++ } ++ public void setSessionTrackingModes(Set<SessionTrackingMode> sessionTrackingModes) throws IllegalStateException, IllegalArgumentException { ++ // TODO ++ throw new UnsupportedOperationException("Not supported."); ++ } ++ public SessionCookieConfig getSessionCookieConfig() { ++ // TODO ++ throw new UnsupportedOperationException("Not supported."); ++ } ++ public Map<String,? extends FilterRegistration> getFilterRegistrations() { ++ // TODO ++ throw new UnsupportedOperationException("Not supported."); ++ } ++ public FilterRegistration getFilterRegistration(String filterName) { ++ // TODO ++ throw new UnsupportedOperationException("Not supported."); ++ } ++ public <T extends Filter> T createFilter(Class<T> c) throws ServletException { ++ // TODO ++ throw new UnsupportedOperationException("Not supported."); ++ } ++ public FilterRegistration.Dynamic addFilter(String filterName, Class<? extends Filter> 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<String,? extends ServletRegistration> getServletRegistrations() { ++ // TODO ++ throw new UnsupportedOperationException("Not supported."); ++ } ++ public ServletRegistration getServletRegistration(String servletName) { ++ // TODO ++ throw new UnsupportedOperationException("Not supported."); ++ } ++ public <T extends Servlet> T createServlet(Class<T> 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<? extends Servlet> 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."); ++ } + } + + } diff --git a/tiles-2.2.2-parent-pom.patch b/tiles-2.2.2-parent-pom.patch new file mode 100644 index 0000000..a7cffeb --- /dev/null +++ b/tiles-2.2.2-parent-pom.patch @@ -0,0 +1,10 @@ +--- 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 @@ + <groupId>org.apache.tiles</groupId> + <artifactId>tiles-master</artifactId> + <version>3</version> ++ <relativePath>../pom.xml</relativePath> + </parent> + + <modelVersion>4.0.0</modelVersion> diff --git a/tiles-2.2.2-servlet-servlet30.patch b/tiles-2.2.2-servlet-servlet30.patch new file mode 100644 index 0000000..dfd26b8 --- /dev/null +++ b/tiles-2.2.2-servlet-servlet30.patch @@ -0,0 +1,170 @@ +--- src/tiles-servlet/src/main/java/org/apache/tiles/web/util/ServletContextAdapter.java 2010-06-17 20:31:44.000000000 +0200 ++++ src/tiles-servlet/src/main/java/org/apache/tiles/web/util/ServletContextAdapter.java-gil 2012-06-06 19:18:12.755263369 +0200 +@@ -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,135 @@ + 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 extends EventListener> T createListener(Class<T> c) throws ServletException { ++ // TODO ++ throw new UnsupportedOperationException("Not supported."); ++ } ++ ++ public <T extends EventListener> 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<? extends EventListener> listenerClass) { ++ // TODO ++ throw new UnsupportedOperationException("Not supported."); ++ } ++ ++ public Set<SessionTrackingMode> getEffectiveSessionTrackingModes() { ++ // TODO ++ throw new UnsupportedOperationException("Not supported."); ++ } ++ ++ public Set<SessionTrackingMode> getDefaultSessionTrackingModes() { ++ // TODO ++ throw new UnsupportedOperationException("Not supported."); ++ } ++ ++ public void setSessionTrackingModes(Set<SessionTrackingMode> sessionTrackingModes) throws IllegalStateException, IllegalArgumentException { ++ // TODO ++ throw new UnsupportedOperationException("Not supported."); ++ } ++ ++ public SessionCookieConfig getSessionCookieConfig() { ++ // TODO ++ throw new UnsupportedOperationException("Not supported."); ++ } ++ ++ public Map<String,? extends FilterRegistration> getFilterRegistrations() { ++ // TODO ++ throw new UnsupportedOperationException("Not supported."); ++ } ++ ++ public FilterRegistration getFilterRegistration(String filterName) { ++ // TODO ++ throw new UnsupportedOperationException("Not supported."); ++ } ++ ++ public <T extends Filter> T createFilter(Class<T> c) throws ServletException { ++ // TODO ++ throw new UnsupportedOperationException("Not supported."); ++ } ++ ++ public FilterRegistration.Dynamic addFilter(String filterName, Class<? extends Filter> 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<String,? extends ServletRegistration> getServletRegistrations() { ++ // TODO ++ throw new UnsupportedOperationException("Not supported."); ++ } ++ ++ public ServletRegistration getServletRegistration(String servletName) { ++ // TODO ++ throw new UnsupportedOperationException("Not supported."); ++ } ++ ++ public <T extends Servlet> T createServlet(Class<T> 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<? extends Servlet> 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."); ++ } ++ + } diff --git a/tiles-master-3-pom.xml b/tiles-master-3-pom.xml new file mode 100644 index 0000000..096858a --- /dev/null +++ b/tiles-master-3-pom.xml @@ -0,0 +1,238 @@ +<?xml version="1.0" encoding="UTF-8"?> + +  + +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache</groupId> + <artifactId>apache</artifactId> + <version>7</version> + </parent> + <groupId>org.apache.tiles</groupId> + <artifactId>tiles-master</artifactId> + <version>3</version> + <packaging>pom</packaging> + <name>Apache Tiles (Master POM)</name> + + <scm> + <connection>scm:svn:http://svn.apache.org/repos/asf/tiles/maven/tags/tiles-master-3</connection> + <developerConnection>scm:svn:https://svn.apache.org/repos/asf/tiles/maven/tags/tiles-master-3</developerConnection> + <url>http://svn.apache.org/repos/asf/tiles/maven/tags/tiles-master-3</url> + </scm> + + <description> + The Apache Tiles project. This master pom provides the default values for + common maven configuration throughout the Tiles project. + </description> + <url>http://tiles.apache.org/</url> + <inceptionYear>2001</inceptionYear> + + <organization> + <name>Apache Software Foundation</name> + <url>http://www.apache.org</url> + </organization> + + <issueManagement> + <system>JIRA</system> + <url>https://issues.apache.org/jira/browse/TILES</url> + </issueManagement> + + <mailingLists> + <mailingList> + <name>Tiles User List</name> + <subscribe>users-subscribe(a)tiles.apache.org</subscribe> + <unsubscribe>users-unsubscribe(a)tiles.apache.org</unsubscribe> + <post>users(a)tiles.apache.org</post> + <archive>http://mail-archives.apache.org/mod_mbox/tiles-users/</archive> + </mailingList> + <mailingList> + <name>Tiles Development List</name> + <subscribe>dev-subscribe(a)tiles.apache.org</subscribe> + <unsubscribe>dev-unsubscribe(a)tiles.apache.org</unsubscribe> + <post>dev(a)tiles.apache.org</post> + <archive>http://mail-archives.apache.org/mod_mbox/tiles-dev/</archive> + </mailingList> + <mailingList> + <name>Tiles Commits List</name> + <subscribe>commits-subscribe(a)tiles.apache.org</subscribe> + <unsubscribe>commits-unsubscribe(a)tiles.apache.org</unsubscribe> + <archive>http://mail-archives.apache.org/mod_mbox/tiles-commits/</archive> + </mailingList> + <mailingList> + <name>Tiles Issues List</name> + <subscribe>issues-subscribe(a)tiles.apache.org</subscribe> + <unsubscribe>issues-unsubscribe(a)tiles.apache.org</unsubscribe> + <archive>http://mail-archives.apache.org/mod_mbox/tiles-issues/</archive> + </mailingList> + <mailingList> + <name>Tiles Notifications List</name> + <subscribe>notifications-subscribe(a)tiles.apache.org</subscribe> + <unsubscribe>notifications-unsubscribe(a)tiles.apache.org</unsubscribe> + <archive>http://mail-archives.apache.org/mod_mbox/tiles-notifications/</archive> + </mailingList> + </mailingLists> + + <developers> + + <developer> + <name>Antonio Petrelli</name> + <id>apetrelli</id> + <email>apetrelli at apache.org</email> + <roles> + <role>PMC Member</role> + </roles> + </developer> + <developer> + <name>David H. DeWolf</name> + <id>ddewolf</id> + <email>ddewolf at apache.org</email> + <roles> + <role>PMC Member</role> + </roles> + </developer> + <developer> + <name>Greg Reddin</name> + <id>greddin</id> + <email>greddin at apache.org</email> + <roles> + <role>PMC Chair</role> + </roles> + </developer> + <developer> + <name>Joe Germuska</name> + <id>germuska</id> + <email>germuska at apache.org</email> + <roles> + <role>PMC Member</role> + </roles> + </developer> + <developer> + <name>Martin Cooper</name> + <id>martinc</id> + <email>martinc at apache.org</email> + <roles> + <role>PMC Member</role> + </roles> + </developer> + <developer> + <name>Nathan Bubna</name> + <id>nbubna</id> + <email>nbubna at apache.org</email> + <roles> + <role>PMC Member</role> + </roles> + </developer> + <developer> + <name>Wendy Smoak</name> + <id>wsmoak</id> + <email>wsmoak at apache.org</email> + <roles> + <role>PMC Member</role> + </roles> + </developer> + <developer> + <name>Craig McClanahan</name> + <id>craigmcc</id> + <email>craigmcc at apache.org</email> + <roles> + <role>PMC Member</role> + </roles> + </developer> + <developer> + <name>Mick Semb Wever</name> + <id>mck</id> + <email>mck at apache.org</email> + <url>http://people.apache.org/~mck</url> + <roles> + <role>Committer</role> + </roles> + </developer> + </developers> + + <contributors> + <contributor> + <name>Cserveny Tamás</name> + </contributor> + <contributor> + <name>Dirk Alexander Schaefer</name> + </contributor> + <contributor> + <name>Jacky Chan</name> + </contributor> + <contributor> + <name>Joe Pemberton</name> + </contributor> + <contributor> + <name>Matthieu Chase Heimer</name> + </contributor> + <contributor> + <name>Mike Calmus</name> + </contributor> + <contributor> + <name>Neil Aggarwal</name> + </contributor> + <contributor> + <name>Niall Pemberton</name> + </contributor> + <contributor> + <name>pijmleko</name> + </contributor> + <contributor> + <name>Scot Meyer</name> + </contributor> + <contributor> + <name>Thom Hehl</name> + </contributor> + <contributor> + <name>Zarick Lau</name> + </contributor> + </contributors> + + <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-release-plugin</artifactId> + <version>2.0</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-clean-plugin</artifactId> + <version>2.4.1</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-install-plugin</artifactId> + <version>2.3.1</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-site-plugin</artifactId> + <version>2.1</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <version>1.4</version> + </plugin> + </plugins> + </pluginManagement> + </build> + +</project> diff --git a/tiles.spec b/tiles.spec new file mode 100644 index 0000000..11aeae3 --- /dev/null +++ b/tiles.spec @@ -0,0 +1,174 @@ +%global master_version 3 +Name: tiles +Version: 2.2.2 +Release: 2%{?dist} +Summary: Java templating framework for web application user interfaces +Group: Development/Libraries +License: ASL 2.0 +Url: http://tiles.apache.org/ +Source0: http://www.apache.org/dist/%{name}/v%{version}/%{name}-%{version}-src.tar.gz +# wget -O tiles-master-3-pom.xml http://svn.apache.org/repos/asf/tiles/maven/tags/tiles-master-3/pom.xml +Source1: %{name}-master-%{master_version}-pom.xml +# force tomcat 7.x apis use +Source2: %{name}-%{version}-2-depmap +# 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 7.x apis +Patch3: %{name}-%{version}-servlet-servlet30.patch +Patch4: %{name}-%{version}-jsp-servlet30.patch + +BuildRequires: java-devel +BuildRequires: jpackage-utils + +BuildRequires: apache-commons-digester +BuildRequires: apache-commons-ognl +BuildRequires: freemarker +BuildRequires: mvel +BuildRequires: portlet-2.0-api +BuildRequires: slf4j +BuildRequires: tomcat-lib +BuildRequires: tomcat-el-2.2-api +BuildRequires: tomcat-jsp-2.2-api +BuildRequires: tomcat-servlet-3.0-api + +# test deps +# org.easymock easymockclassextension 2.4 +# org.apache.shale shale-test 1.0.5 +BuildRequires: easymock2 +BuildRequires: junit4 + +BuildRequires: maven +BuildRequires: maven-compiler-plugin +BuildRequires: maven-install-plugin +BuildRequires: maven-jar-plugin +BuildRequires: maven-javadoc-plugin +BuildRequires: maven-plugin-bundle +BuildRequires: maven-resources-plugin +BuildRequires: maven-surefire-plugin + +Requires: apache-commons-digester +Requires: apache-commons-ognl +Requires: freemarker +Requires: mvel +Requires: portlet-2.0-api +Requires: slf4j +Requires: tomcat-lib +Requires: tomcat-el-2.2-api +Requires: tomcat-jsp-2.2-api +Requires: tomcat-servlet-3.0-api + +Requires: java +Requires: jpackage-utils +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 +Group: Documentation +Summary: Javadoc for %{name} +Requires: jpackage-utils + +%description javadoc +This package contains javadoc for %{name}. + +%prep +%setup -q -n %{name}-%{version} +%patch0 -p1 +%patch1 -p1 +%patch2 -p0 + +%patch3 -p0 +%patch4 -p0 + +# require org.springframework spring-webmvc-portlet 2.5.6 +sed -i "s|<module>tiles-portlet-wildcard</module>||" src/pom.xml +# org.springframework spring-web 2.5.6 +sed -i "s|<module>tiles-servlet-wildcard</module>||" src/pom.xml +# require org.apache.velocity velocity-tools 2.0 +sed -i "s|<module>tiles-velocity</module>||" src/pom.xml +# depends on previous artifacts +sed -i "s|<module>tiles-extras</module>||" src/pom.xml + +sed -i "s|<module>assembly</module>||" src/pom.xml + +cp -p %{SOURCE1} pom.xml + +%build + +cd src +# test skip for unavailable deps: +mvn-rpmbuild \ + -Dmaven.test.skip=true \ + -Dmaven.local.depmap.file="%{SOURCE2}" \ + install javadoc:aggregate + +%install + +mkdir -p %{buildroot}%{_mavenpomdir} +install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-master.pom +%add_maven_depmap JPP.%{name}-master.pom + +install -pm 644 src/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-parent.pom +%add_maven_depmap JPP.%{name}-parent.pom + +# TODO +# extras +# portlet-wildcard +# servlet-wildcard +# velocity +mkdir -p %{buildroot}%{_javadir}/%{name} +for m in api \ + compat \ + core \ + el \ + freemarker \ + jsp \ + mvel \ + ognl \ + portlet \ + servlet \ + template; do + install -pm 644 src/%{name}-${m}/target/%{name}-${m}-%{version}.jar %{buildroot}%{_javadir}/%{name}/${m}.jar + install -pm 644 src/%{name}-${m}/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-${m}.pom + %add_maven_depmap JPP.%{name}-${m}.pom %{name}/${m}.jar +done + +mkdir -p %{buildroot}%{_javadocdir}/%{name} +cp -pr src/target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name} + +%files +%{_javadir}/%{name} +%{_mavenpomdir}/JPP.%{name}-*.pom +%{_mavendepmapfragdir}/%{name} +%doc LICENSE.txt NOTICE.txt + +%files javadoc +%{_javadocdir}/%{name} +%doc LICENSE.txt NOTICE.txt + +%changelog +* Mon Jul 09 2012 gil cattaneo <puntogil(a)libero.it> 2.2.2-2 +- Fixed list of files in the main package + +* Sat May 26 2012 gil cattaneo <puntogil(a)libero.it> 2.2.2-1 +- initial rpm \ No newline at end of file

1 0

File tiles-2.2.2-src.tar.gz uploaded to lookaside cache by gil
by gil 11 Jul '12

11 Jul '12

A file has been added to the lookaside cache for tiles: 2415ccad008fca7a7b1ccc4c24523a58 tiles-2.2.2-src.tar.gz

1 0

[sslext] Initial import (#826647)
by gil 11 Jul '12

11 Jul '12

commit b2d68c0771bae8f1db19fd9faaba585575f453d9 Author: gil <puntogil(a)libero.it> Date: Wed Jul 11 12:07:36 2012 +0200 Initial import (#826647) .gitignore | 1 + sources | 1 + sslext-1.2-0.pom | 25 ++++++++ sslext-1.2-SecureRequestUtils.patch | 29 +++++++++ sslext-1.2-build.patch | 39 ++++++++++++ sslext-1.2-javadocs.patch | 46 +++++++++++++++ sslext-1.2-pom.patch | 26 ++++++++ sslext.spec | 109 +++++++++++++++++++++++++++++++++++ 8 files changed, 276 insertions(+), 0 deletions(-) --- diff --git a/.gitignore b/.gitignore index e69de29..1e024cd 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +/sslext-1.2-realclean-src-cvs.tar.gz diff --git a/sources b/sources index e69de29..6773e3f 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +2b5457d0e0a58446ba54cb1490107acc sslext-1.2-realclean-src-cvs.tar.gz diff --git a/sslext-1.2-0.pom b/sslext-1.2-0.pom new file mode 100644 index 0000000..08d4d04 --- /dev/null +++ b/sslext-1.2-0.pom @@ -0,0 +1,25 @@ +<project> + <modelVersion>4.0.0</modelVersion> + <groupId>sslext</groupId> + <artifactId>sslext</artifactId> + <name>sslext</name> + <version>1.2-0</version> + <licenses> + <license> + <name>Apache Software License, Version 1.1</name> + <url>http://www.apache.org/licenses/LICENSE-1.1</url> + <comments></comments> + </license> + </licenses> + <organization> + <name>Steve Ditlinger</name> + <url>http://sslext.sourceforge.net/</url> + </organization> + <dependencies> + <dependency> + <groupId>struts</groupId> + <artifactId>struts</artifactId> + <version>1.2.7</version> + </dependency> + </dependencies> +</project> \ No newline at end of file diff --git a/sslext-1.2-SecureRequestUtils.patch b/sslext-1.2-SecureRequestUtils.patch new file mode 100644 index 0000000..f48af2d --- /dev/null +++ b/sslext-1.2-SecureRequestUtils.patch @@ -0,0 +1,29 @@ +--- src/org/apache/struts/util/SecureRequestUtils.java 2004-09-27 02:02:23.000000000 +0200 ++++ src/org/apache/struts/util/SecureRequestUtils.java-gil 2011-09-10 11:25:12.260719716 +0200 +@@ -358,10 +358,10 @@ + return false; + } + +- Enumeration enum = aRequest.getAttributeNames(); ++ Enumeration mune = aRequest.getAttributeNames(); + Map map = new HashMap(); +- while (enum.hasMoreElements()) { +- String name = (String) enum.nextElement(); ++ while (mune.hasMoreElements()) { ++ String name = (String) mune.nextElement(); + map.put(name, aRequest.getAttribute(name)); + } + aRequest.getSession().setAttribute(STOWED_REQUEST_ATTRIBS, map); +@@ -534,9 +534,9 @@ + */ + private static Map getParameterMap(HttpServletRequest request) { + Map map = new HashMap(); +- Enumeration enum = request.getParameterNames(); +- while (enum.hasMoreElements()) { +- String name = (String) enum.nextElement(); ++ Enumeration mune = request.getParameterNames(); ++ while (mune.hasMoreElements()) { ++ String name = (String) mune.nextElement(); + String[] values = request.getParameterValues(name); + map.put(name, values); + } diff --git a/sslext-1.2-build.patch b/sslext-1.2-build.patch new file mode 100644 index 0000000..8227780 --- /dev/null +++ b/sslext-1.2-build.patch @@ -0,0 +1,39 @@ +--- build.xml 2004-09-18 21:56:33.000000000 +0200 ++++ build.xml-gil 2012-06-06 11:11:15.937687091 +0200 +@@ -5,14 +5,24 @@ + <property name="classes" value="${web-inf}/classes"/> + <property name="lib" value="${web-inf}/lib"/> +  +- <property name="j2ee.lib" value="../lib/j2ee12.jar"/> ++ <property name="j2ee.lib" value="/usr/share/java/tomcat-servlet-3.0-api.jar"/> + <property file="buildsslext.properties"/> + + <path id="class.path"> + <pathelement path="${src}"/> + <pathelement path="${j2ee.lib}"/> +- <fileset dir="${lib}"> +- <include name="**/*.jar"/> ++ <fileset dir="/usr/share/java/"> ++ <include name="commons-beanutils.jar"/> ++ <include name="commons-collections.jar"/> ++ <include name="commons-digester.jar"/> ++ <include name="commons-fileupload.jar"/> ++ <include name="commons-logging.jar"/> ++ <include name="commons-validator.jar"/> ++ <include name="oro.jar"/> ++ <include name="struts/core.jar"/> ++ <include name="struts/taglib.jar"/> ++ <include name="struts/tiles.jar"/> ++ <include name="tomcat-jsp-2.2-api.jar"/> + </fileset> + </path> + +@@ -26,6 +36,8 @@ + destdir="${classes}" + classpathref="class.path" + debug="on" ++ source="1.5" ++ target="1.5" + /> + </target> + diff --git a/sslext-1.2-javadocs.patch b/sslext-1.2-javadocs.patch new file mode 100644 index 0000000..60bc5d0 --- /dev/null +++ b/sslext-1.2-javadocs.patch @@ -0,0 +1,46 @@ +--- build.xml 2012-07-09 17:55:25.669707599 +0200 ++++ build.xml-gil 2012-07-09 17:55:37.292140796 +0200 +@@ -26,6 +26,14 @@ + </fileset> + </path> + ++ <path id="javadoc.classpath"> ++ <path refid="class.path"/> ++ <pathelement location="${classes}/**"/> ++ <fileset dir="${lib}"> ++ <include name="sslext.jar"/> ++ </fileset> ++ </path> ++ + <target name="init"> + <tstamp/> + </target> +@@ -144,6 +152,28 @@ + /> + </target> + ++ <target name="javadoc" description="generates javadocs"> ++ <mkdir dir="docs"/> ++ <tstamp> ++ <format property="year" pattern="yyyy" /> ++ </tstamp> ++  ++ <javadoc ++ packagenames="*" ++ Locale="en_US" ++ sourcepath="${src}" ++ destdir="docs" ++ author="true" ++ version="true" ++ private="false" ++ use="true" ++ windowtitle="Struts SSL Switching Extension"> ++ <doctitle><![CDATA[<h2>Struts SSL Switching Extension</h2>]]></doctitle> ++ <bottom><![CDATA[<i>Copyright 1999, ${year} The Apache Software Foundation, All Rights Reserved</i>]]></bottom> ++ <classpath refid="javadoc.classpath"/> ++ </javadoc> ++ </target> ++ + <target name="make-bin-zips" depends="make-jar, make-bin-tar, make-bin-zip"> + </target> + diff --git a/sslext-1.2-pom.patch b/sslext-1.2-pom.patch new file mode 100644 index 0000000..6f90e4a --- /dev/null +++ b/sslext-1.2-pom.patch @@ -0,0 +1,26 @@ +--- pom.xml 2005-11-08 22:53:43.000000000 +0100 ++++ pom.xml-gil 2012-05-27 05:19:18.277207739 +0200 +@@ -17,9 +17,19 @@ + </organization> + <dependencies> + <dependency> +- <groupId>struts</groupId> +- <artifactId>struts</artifactId> +- <version>1.2.7</version> ++ <groupId>org.apache.struts</groupId> ++ <artifactId>struts-core</artifactId> ++ <version>1.3.10</version> ++ </dependency> ++ <dependency> ++ <groupId>org.apache.struts</groupId> ++ <artifactId>struts-taglib</artifactId> ++ <version>1.3.10</version> ++ </dependency> ++ <dependency> ++ <groupId>org.apache.struts</groupId> ++ <artifactId>struts-tiles</artifactId> ++ <version>1.3.10</version> + </dependency> + </dependencies> + </project> +\ Manca newline alla fine del file diff --git a/sslext.spec b/sslext.spec new file mode 100644 index 0000000..51230d5 --- /dev/null +++ b/sslext.spec @@ -0,0 +1,109 @@ +Name: sslext +Version: 1.2 +Release: 2%{?dist} +Summary: Struts SSL Switching Extension +Group: Development/Libraries +License: ASL 1.1 +Url: http://sslext.sourceforge.net/ +#cvs -d:pserver:anonymous@sslext.cvs.sourceforge.net:/cvsroot/sslext login +#cvs -z3 -d:pserver:anonymous@sslext.cvs.sourceforge.net:/cvsroot/sslext export -r Release1_2_1 sslext120 +#rm -rf sslext120/web/WEB-INF/lib/*.jar +#rm -rf sslext120/sslext-struts1.2-*.* +#rm -rf $(find sslext120 -name "CVS") +#rm -rf $(find sslext120 -name "*.class") +#rm -rf $(find sslext120 -name "*.bak") +# non free +# rm -rf sslext120/web/WEB-INF/web-app_2_3.dtd +#mv sslext120 sslext-1.2 +#tar czf sslext-1.2-realclean-src-cvs.tar.gz sslext-1.2 +Source0: %{name}-%{version}-realclean-src-cvs.tar.gz +Source1: http://repo1.maven.org/maven2/%{name}/%{name}/%{version}-0/%{name}-%{versio… +Patch0: %{name}-%{version}-build.patch +# fix build java5+ +Patch1: %{name}-%{version}-SecureRequestUtils.patch +# update struts reference +Patch2: %{name}-%{version}-pom.patch +# build apis documentation +Patch3: %{name}-%{version}-javadocs.patch + +BuildRequires: java-devel +BuildRequires: jpackage-utils + +BuildRequires: ant +BuildRequires: apache-commons-beanutils +BuildRequires: apache-commons-collections +BuildRequires: apache-commons-digester +BuildRequires: apache-commons-fileupload +BuildRequires: apache-commons-logging +BuildRequires: apache-commons-validator +BuildRequires: jakarta-oro +BuildRequires: struts +BuildRequires: tomcat-jsp-2.2-api +BuildRequires: tomcat-servlet-3.0-api + +Requires: apache-commons-digester +Requires: apache-commons-logging +Requires: struts +Requires: tomcat-servlet-3.0-api +Requires: tomcat-jsp-2.2-api + +Requires: java +Requires: jpackage-utils +BuildArch: noarch + +%description +Extension to the Struts framework that allows developers to configure web +applications to automatically switch between the HTTP and HTTPS protocols. +Configuration is performed within the Struts config XML file. + +%package javadoc +Group: Documentation +Summary: Javadoc for %{name} +Requires: jpackage-utils + +%description javadoc +This package contains javadoc for %{name}. + +%prep +%setup -q +mkdir -p web/WEB-INF/classes +%patch0 -p0 +%patch1 -p0 +cp -p %{SOURCE1} pom.xml +%patch2 -p0 +%patch3 -p0 + +%build + +export CLASSPATH=$(build-classpath tomcat-jsp-2.2-api tomcat-servlet-3.0-api) +%ant compile make-jar javadoc + +%install + +mkdir -p %{buildroot}%{_javadir} +install -m 644 web/WEB-INF/lib/%{name}.jar %{buildroot}%{_javadir}/ + +mkdir -p %{buildroot}%{_mavenpomdir} +install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom +%add_maven_depmap JPP-%{name}.pom %{name}.jar + +mkdir -p %{buildroot}%{_javadocdir}/%{name} +cp -pr docs/* %{buildroot}%{_javadocdir}/%{name} + +%files +%{_javadir}/%{name}.jar +%{_mavenpomdir}/JPP-%{name}.pom +%{_mavendepmapfragdir}/%{name} + +%files javadoc +%{_javadocdir}/%{name} + +%changelog +* Mon Jul 09 2012 gil cattaneo <puntogil(a)libero.it> 1.2-2 +- removed non-free file +- fixed spelling errors in description +- added missing dependencies +- added javadoc sub package + +* Sun May 27 2012 gil cattaneo <puntogil(a)libero.it> 1.2-1 +- initial rpm \ No newline at end of file

1 0

← Newer
1
...
48
49
50
51
52
53
54
...
57
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

java-sig-commits July 2012