March 2015 - java-sig-commits - Fedora Mailing-Lists

[javapackages] [pom_editor] Support non-utf-8 documents (rhbz#1198120)

by Michael Šimáček

commit b78fc88f3a3ce4ea7d86c6a946773a79c9be3077 Author: Michael Simacek <msimacek(a)redhat.com> Date: Thu Mar 5 15:15:00 2015 +0100 [pom_editor] Support non-utf-8 documents (rhbz#1198120) java-utils/pom_editor.py | 5 +++-- test/data/pom_macros/pom_non_unicode.xml | 14 ++++++++++++++ test/data/pom_macros/pom_non_unicode.xml-want | 14 ++++++++++++++ test/pom_macros_test.py | 13 ++++++++++--- 4 files changed, 41 insertions(+), 5 deletions(-) --- diff --git a/java-utils/pom_editor.py b/java-utils/pom_editor.py index 50cdb47..3f8db58 100644 --- a/java-utils/pom_editor.py +++ b/java-utils/pom_editor.py @@ -207,12 +207,13 @@ class XmlFile(object): def __init__(self, xmlpath): self.xmlpath = xmlpath - with io.open(self.xmlpath, encoding='UTF-8') as raw_xml: + encoding = etree.parse(xmlpath).docinfo.encoding + with io.open(self.xmlpath, encoding=encoding) as raw_xml: raw_xml = raw_xml.read() raw_xml = self._preprocess_raw(raw_xml) self.xml_declaration = re.match(r'\<\?xml\s[^?]*\?\>', raw_xml) tmpfile = self.xmlpath + '.tmp' - with io.open(tmpfile, 'w', encoding='UTF-8') as prepared: + with io.open(tmpfile, 'w', encoding=encoding) as prepared: prepared.write(raw_xml) self.document = etree.parse(tmpfile) self.tab = get_indent(self.root) diff --git a/test/data/pom_macros/pom_non_unicode.xml b/test/data/pom_macros/pom_non_unicode.xml new file mode 100644 index 0000000..1d8b103 --- /dev/null +++ b/test/data/pom_macros/pom_non_unicode.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<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"> + <parent> + <groupId>org.apache.commons</groupId> + <artifactId>commons-parent</artifactId> + <version>17</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.6</version> + <name>C�mm�ns L�ng</name> + +</project> diff --git a/test/data/pom_macros/pom_non_unicode.xml-want b/test/data/pom_macros/pom_non_unicode.xml-want new file mode 100644 index 0000000..37960df --- /dev/null +++ b/test/data/pom_macros/pom_non_unicode.xml-want @@ -0,0 +1,14 @@ +<?xml version='1.0' encoding='ISO-8859-1'?> +<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"> + <parent> + <groupId>org.apache.commons</groupId> + <artifactId>commons-parent</artifactId> + <version>17</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.7</version> + <name>C�mm�ns L�ng</name> + +</project> diff --git a/test/pom_macros_test.py b/test/pom_macros_test.py index 4f8c4c9..08dedb4 100644 --- a/test/pom_macros_test.py +++ b/test/pom_macros_test.py @@ -37,12 +37,12 @@ def check_result(pom_path): res = not report return report, res -def get_result_literally(pom_path): - with io.open(pom_path, 'r', encoding='UTF-8') as gotfile: +def get_result_literally(pom_path, encoding='UTF-8'): + with io.open(pom_path, 'r', encoding=encoding) as gotfile: got = gotfile.read().split('\n') wantpath = '{pom}-want'.format(pom=os.path.basename(pom_path)) - with io.open(wantpath, 'r', encoding='UTF-8') as wantfile: + with io.open(wantpath, 'r', encoding=encoding) as wantfile: want = wantfile.read().split('\n') return got, want @@ -554,6 +554,13 @@ class PomMacrosTest(unittest.TestCase): got, want = get_result_literally(pom_path) self.assertEqual(got, want) + @exec_macro("pom_xpath_set pom:project/pom:version 2.7", "pom_non_unicode.xml") + def test_non_unicode(self, stdin, stderr, returncode, pom_path): + self.assertEqual(returncode, 0, stderr) + + got, want = get_result_literally(pom_path, encoding='ISO-8859-1') + self.assertEqual(got, want) + @exec_macro("pom_remove_parent", "unparsable_xml.pom") def test_unparsable_xml(self, stdin, stderr, returncode, pom_path): self.assertEqual(returncode, 1, stderr)

9 years, 3 months

1
0
0 / 0

[cargo-resources] fix Requires

by gil

commit c372aa26231adc36585c319d1461c7835d7adae3 Author: gil <puntogil(a)libero.it> Date: Thu Mar 5 14:42:08 2015 +0100 fix Requires cargo-resources.spec | 2 -- 1 file changed, 2 deletions(-) --- diff --git a/cargo-resources.spec b/cargo-resources.spec index e114d31..6978af8 100644 --- a/cargo-resources.spec +++ b/cargo-resources.spec @@ -26,12 +26,10 @@ BuildRequires: maven-enforcer-plugin BuildRequires: maven-plugin-bundle BuildRequires: maven-war-plugin -Requires: felix-osgi-core Requires: geronimo-ejb Requires: javamail Requires: glassfish-servlet-api -Requires: java-headless BuildArch: noarch %description

9 years, 3 months

1
0
0 / 0

[cargo-resources] manual installation .ear and .war artifacts

by gil

commit 784b8e5e1e704dd2df163d4b6da9d9264f7d6ad2 Author: gil <puntogil(a)libero.it> Date: Thu Mar 5 14:39:16 2015 +0100 manual installation .ear and .war artifacts cargo-resources.spec | 36 +++++++++++------------------------- 1 file changed, 11 insertions(+), 25 deletions(-) --- diff --git a/cargo-resources.spec b/cargo-resources.spec index 788f20e..e114d31 100644 --- a/cargo-resources.spec +++ b/cargo-resources.spec @@ -60,23 +60,22 @@ This package contains javadoc for %{name}. %pom_xpath_set "pom:dependencies/pom:dependency[pom:artifactId = 'org.osgi.core']/pom:version" 1.4.0 testdata/simple-bundle %pom_xpath_set "pom:dependencies/pom:dependency[pom:groupId = 'org.apache.geronimo.specs']/pom:artifactId" geronimo-ejb_3.1_spec testdata/simple-ejb +%mvn_file :simple-bundle %{oname}/simple-bundle +%mvn_file :simple-ejb %{oname}/simple-ejb +%mvn_file :simple-jar %{oname}/simple-jar +%mvn_file :empty-jar %{oname}/empty-jar +%mvn_file :cargo-build-tools %{oname}/cargo-build-tools + +# Do manually +%mvn_package "::war:" __noinstall +%mvn_package "::ear:" __noinstall + %build %mvn_build %install - -mkdir -p %{buildroot}%{_javadir}/%{oname} -mkdir -p %{buildroot}%{_mavenpomdir} -install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{oname}-%{name}.pom -%add_maven_depmap JPP.%{oname}-%{name}.pom - -install -m 644 build-tools/target/%{oname}-build-tools-%{version}.jar %{buildroot}%{_javadir}/%{oname}/%{oname}-build-tools.jar -install -pm 644 build-tools/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{oname}-%{oname}-build-tools.pom -%add_maven_depmap JPP.%{oname}-%{oname}-build-tools.pom %{oname}/%{oname}-build-tools.jar - -install -pm 644 testdata/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{oname}-cargo-samples-testdata.pom -%add_maven_depmap JPP.%{oname}-cargo-samples-testdata.pom +%mvn_install # jetty-6-and-earlier-deployer # jetty-7-and-onwards-deployer @@ -91,15 +90,6 @@ for m in empty-ear \ %add_maven_depmap JPP.%{oname}-${m}.pom %{oname}/${m}.ear done -for m in empty-jar \ - simple-bundle \ - simple-ejb \ - simple-jar; do - install -m 644 testdata/${m}/target/${m}-%{version}.jar %{buildroot}%{_javadir}/%{oname}/${m}.jar - install -pm 644 testdata/${m}/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{oname}-${m}.pom -%add_maven_depmap JPP.%{oname}-${m}.pom %{oname}/${m}.jar -done - # datasource-cmt-local-war for m in authentication-war \ classpath-war \ @@ -119,10 +109,6 @@ install -m 644 testdata/tomcat-context/target/tomcatcontext-war-%{version}.war % install -pm 644 testdata/tomcat-context/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{oname}-tomcatcontext-war.pom %add_maven_depmap JPP.%{oname}-tomcatcontext-war.pom %{oname}/tomcatcontext-war.war - -mkdir -p %{buildroot}%{_javadocdir}/%{name} -cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name} - cp -p build-tools/LICENSE . cp -p build-tools/NOTICE .

9 years, 3 months

1
0
0 / 0

[maven-ejb-plugin] Regenerate BR

by Michal Srb

commit c94a6b153d62eca16bf8aa7da493ac502a8ca9cc Author: Michal Srb <msrb(a)redhat.com> Date: Thu Mar 5 13:47:27 2015 +0100 Regenerate BR maven-ejb-plugin.spec | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) --- diff --git a/maven-ejb-plugin.spec b/maven-ejb-plugin.spec index 21a1967..63f405a 100644 --- a/maven-ejb-plugin.spec +++ b/maven-ejb-plugin.spec @@ -1,24 +1,24 @@ Name: maven-ejb-plugin Version: 2.3 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Maven EJB Plugin License: ASL 2.0 URL: http://maven.apache.org/plugins/maven-ejb-plugin/ Source0: http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}... -BuildArch: noarch - BuildRequires: maven-local -BuildRequires: mvn(org.apache.maven.plugins:maven-plugins) -BuildRequires: mvn(org.apache.maven.shared:maven-filtering) BuildRequires: mvn(org.apache.maven:maven-archiver) BuildRequires: mvn(org.apache.maven:maven-artifact) BuildRequires: mvn(org.apache.maven:maven-plugin-api) BuildRequires: mvn(org.apache.maven:maven-project) +BuildRequires: mvn(org.apache.maven.plugins:maven-plugins:pom:) +BuildRequires: mvn(org.apache.maven.shared:maven-filtering) +BuildRequires: mvn(org.apache.maven.shared:maven-plugin-testing-harness) BuildRequires: mvn(org.codehaus.plexus:plexus-archiver) BuildRequires: mvn(org.codehaus.plexus:plexus-utils) +BuildArch: noarch Obsoletes: maven2-plugin-ejb <= 0:2.0.8 Provides: maven2-plugin-ejb = 0:%{version}-%{release} @@ -53,6 +53,9 @@ API documentation for %{name}. %doc LICENSE NOTICE %changelog +* Thu Mar 05 2015 Michal Srb <msrb(a)redhat.com> - 2.3-12 +- Regenerate BR + * Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.3-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild

9 years, 3 months

1
0
0 / 0

[Bug 1195136] New: groovy package with insufficient dependencies

by Red Hat Bugzilla

https://bugzilla.redhat.com/show_bug.cgi?id=1195136 Bug ID: 1195136 Summary: groovy package with insufficient dependencies Product: Fedora Version: 21 Component: groovy Assignee: msrb(a)redhat.com Reporter: akostadi(a)redhat.com QA Contact: extras-qa(a)fedoraproject.org CC: java-sig-commits(a)lists.fedoraproject.org, mizdebsk(a)redhat.com, msrb(a)redhat.com Description of problem: Once `groovy` package is installed that's not operational. One needs to also install the groovy18 package. I believe installing groovy should make the system with groovy operational. Version-Release number of selected component (if applicable): groovy-1.8.9-15.fc21.noarch How reproducible: always Steps to Reproduce: 1. yum install groovy 2. groovy -version Actual results: [avalon@koTapaH scripts]$ groovy -version /usr/bin/build-classpath: Could not find objectweb-asm3 Java extension for this JVM /usr/bin/build-classpath: Could not find objectweb-asm3 Java extension for this JVM /usr/bin/build-classpath: Could not find objectweb-asm3 Java extension for this JVM /usr/bin/build-classpath: Could not find objectweb-asm3 Java extension for this JVM /usr/bin/build-classpath: error: Some specified jars were not found java.lang.reflect.InvocationTargetException at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:483) at org.codehaus.groovy.tools.GroovyStarter.rootLoader(GroovyStarter.java:108) at org.codehaus.groovy.tools.GroovyStarter.main(GroovyStarter.java:130) Caused by: java.lang.NoClassDefFoundError: org/objectweb/asm/Opcodes at java.lang.ClassLoader.defineClass1(Native Method) at java.lang.ClassLoader.defineClass(ClassLoader.java:760) at java.security.SecureClassLoader.defineClass(SecureClassLoader.java:142) at java.net.URLClassLoader.defineClass(URLClassLoader.java:455) at java.net.URLClassLoader.access$100(URLClassLoader.java:73) at java.net.URLClassLoader$1.run(URLClassLoader.java:367) at java.net.URLClassLoader$1.run(URLClassLoader.java:361) at java.security.AccessController.doPrivileged(Native Method) at java.net.URLClassLoader.findClass(URLClassLoader.java:360) at java.lang.ClassLoader.loadClass(ClassLoader.java:424) at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:308) at java.lang.ClassLoader.loadClass(ClassLoader.java:357) at java.lang.Class.getDeclaredConstructors0(Native Method) at java.lang.Class.privateGetDeclaredConstructors(Class.java:2663) at java.lang.Class.getConstructor0(Class.java:3067) at java.lang.Class.newInstance(Class.java:408) at org.codehaus.groovy.vmplugin.VMPluginFactory.<clinit>(VMPluginFactory.java:51) at org.codehaus.groovy.runtime.metaclass.MetaClassRegistryImpl.<init>(MetaClassRegistryImpl.java:89) at org.codehaus.groovy.runtime.metaclass.MetaClassRegistryImpl.<init>(MetaClassRegistryImpl.java:61) at groovy.lang.GroovySystem.<clinit>(GroovySystem.java:29) at groovy.ui.GroovyMain.processArgs(GroovyMain.java:114) at groovy.ui.GroovyMain.main(GroovyMain.java:100) ... 6 more Caused by: java.lang.ClassNotFoundException: org.objectweb.asm.Opcodes at java.net.URLClassLoader$1.run(URLClassLoader.java:372) at java.net.URLClassLoader$1.run(URLClassLoader.java:361) at java.security.AccessController.doPrivileged(Native Method) at java.net.URLClassLoader.findClass(URLClassLoader.java:360) at java.lang.ClassLoader.loadClass(ClassLoader.java:424) at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:308) at java.lang.ClassLoader.loadClass(ClassLoader.java:357) ... 28 more Expected results: Groovy Version: 1.8.9 JVM: 1.8.0_31 Vendor: Oracle Corporation OS: Linux -- You are receiving this mail because: You are on the CC list for the bug. Unsubscribe from this bug https://bugzilla.redhat.com/token.cgi?t=AXiI8ClmB9&a=cc_unsubscribe

9 years, 3 months

1
10
0 / 0

[cargo-resources] use servlet api 3.1

by gil

commit 7de74c6fae80e3f01d126d462843b918728694ac Author: gil <puntogil(a)libero.it> Date: Thu Mar 5 12:07:43 2015 +0100 use servlet api 3.1 cargo-resources-1.2.2-depmap | 14 ---- cargo-resources-1.4.2-servlet.patch | 154 ++++++++++++++++++++++++++++++++++++ cargo-resources.spec | 31 ++++---- 3 files changed, 170 insertions(+), 29 deletions(-) --- diff --git a/cargo-resources-1.4.2-servlet.patch b/cargo-resources-1.4.2-servlet.patch new file mode 100644 index 0000000..eb10929 --- /dev/null +++ b/cargo-resources-1.4.2-servlet.patch @@ -0,0 +1,154 @@ +diff -Nru cargo-resources-1.4.2/jetty-6-and-earlier-deployer/pom.xml cargo-resources-1.4.2.servlet/jetty-6-and-earlier-deployer/pom.xml +--- cargo-resources-1.4.2/jetty-6-and-earlier-deployer/pom.xml 2013-05-27 20:58:20.000000000 +0200 ++++ cargo-resources-1.4.2.servlet/jetty-6-and-earlier-deployer/pom.xml 2015-03-05 11:33:06.525223153 +0100 +@@ -31,8 +31,8 @@ + <dependencies> + <dependency> + <groupId>javax.servlet</groupId> +- <artifactId>servlet-api</artifactId> +- <version>2.4</version> ++ <artifactId>javax.servlet-api</artifactId> ++ <version>3.1.0</version> + <scope>provided</scope> + </dependency> + <dependency> +diff -Nru cargo-resources-1.4.2/jetty-7-and-onwards-deployer/pom.xml cargo-resources-1.4.2.servlet/jetty-7-and-onwards-deployer/pom.xml +--- cargo-resources-1.4.2/jetty-7-and-onwards-deployer/pom.xml 2013-05-27 20:58:20.000000000 +0200 ++++ cargo-resources-1.4.2.servlet/jetty-7-and-onwards-deployer/pom.xml 2015-03-05 11:33:06.519223480 +0100 +@@ -31,8 +31,8 @@ + <dependencies> + <dependency> + <groupId>javax.servlet</groupId> +- <artifactId>servlet-api</artifactId> +- <version>2.4</version> ++ <artifactId>javax.servlet-api</artifactId> ++ <version>3.1.0</version> + <scope>provided</scope> + </dependency> + <dependency> +diff -Nru cargo-resources-1.4.2/testdata/authentication-war/pom.xml cargo-resources-1.4.2.servlet/testdata/authentication-war/pom.xml +--- cargo-resources-1.4.2/testdata/authentication-war/pom.xml 2013-05-27 20:58:20.000000000 +0200 ++++ cargo-resources-1.4.2.servlet/testdata/authentication-war/pom.xml 2015-03-05 11:33:06.524223207 +0100 +@@ -29,8 +29,8 @@ + <dependencies> + <dependency> + <groupId>javax.servlet</groupId> +- <artifactId>servlet-api</artifactId> +- <version>2.4</version> ++ <artifactId>javax.servlet-api</artifactId> ++ <version>3.1.0</version> + <scope>provided</scope> + </dependency> + </dependencies> +diff -Nru cargo-resources-1.4.2/testdata/classpath-war/pom.xml cargo-resources-1.4.2.servlet/testdata/classpath-war/pom.xml +--- cargo-resources-1.4.2/testdata/classpath-war/pom.xml 2013-05-27 20:58:20.000000000 +0200 ++++ cargo-resources-1.4.2.servlet/testdata/classpath-war/pom.xml 2015-03-05 11:33:06.524223207 +0100 +@@ -29,8 +29,8 @@ + <dependencies> + <dependency> + <groupId>javax.servlet</groupId> +- <artifactId>servlet-api</artifactId> +- <version>2.4</version> ++ <artifactId>javax.servlet-api</artifactId> ++ <version>3.1.0</version> + <scope>provided</scope> + </dependency> + </dependencies> +diff -Nru cargo-resources-1.4.2/testdata/datasource-cmt-local-war/pom.xml cargo-resources-1.4.2.servlet/testdata/datasource-cmt-local-war/pom.xml +--- cargo-resources-1.4.2/testdata/datasource-cmt-local-war/pom.xml 2013-05-27 20:58:20.000000000 +0200 ++++ cargo-resources-1.4.2.servlet/testdata/datasource-cmt-local-war/pom.xml 2015-03-05 11:33:06.523223262 +0100 +@@ -29,8 +29,8 @@ + <dependencies> + <dependency> + <groupId>javax.servlet</groupId> +- <artifactId>servlet-api</artifactId> +- <version>2.4</version> ++ <artifactId>javax.servlet-api</artifactId> ++ <version>3.1.0</version> + <scope>provided</scope> + </dependency> + <dependency> +diff -Nru cargo-resources-1.4.2/testdata/datasource-war/pom.xml cargo-resources-1.4.2.servlet/testdata/datasource-war/pom.xml +--- cargo-resources-1.4.2/testdata/datasource-war/pom.xml 2013-05-27 20:58:20.000000000 +0200 ++++ cargo-resources-1.4.2.servlet/testdata/datasource-war/pom.xml 2015-03-05 11:33:06.519223480 +0100 +@@ -29,8 +29,8 @@ + <dependencies> + <dependency> + <groupId>javax.servlet</groupId> +- <artifactId>servlet-api</artifactId> +- <version>2.4</version> ++ <artifactId>javax.servlet-api</artifactId> ++ <version>3.1.0</version> + <scope>provided</scope> + </dependency> + </dependencies> +diff -Nru cargo-resources-1.4.2/testdata/mailsession-war/pom.xml cargo-resources-1.4.2.servlet/testdata/mailsession-war/pom.xml +--- cargo-resources-1.4.2/testdata/mailsession-war/pom.xml 2013-05-27 20:58:20.000000000 +0200 ++++ cargo-resources-1.4.2.servlet/testdata/mailsession-war/pom.xml 2015-03-05 11:33:06.520223425 +0100 +@@ -29,8 +29,8 @@ + <dependencies> + <dependency> + <groupId>javax.servlet</groupId> +- <artifactId>servlet-api</artifactId> +- <version>2.4</version> ++ <artifactId>javax.servlet-api</artifactId> ++ <version>3.1.0</version> + <scope>provided</scope> + </dependency> + <dependency> +diff -Nru cargo-resources-1.4.2/testdata/systemproperty-war/pom.xml cargo-resources-1.4.2.servlet/testdata/systemproperty-war/pom.xml +--- cargo-resources-1.4.2/testdata/systemproperty-war/pom.xml 2013-05-27 20:58:20.000000000 +0200 ++++ cargo-resources-1.4.2.servlet/testdata/systemproperty-war/pom.xml 2015-03-05 11:33:06.521223371 +0100 +@@ -29,8 +29,8 @@ + <dependencies> + <dependency> + <groupId>javax.servlet</groupId> +- <artifactId>servlet-api</artifactId> +- <version>2.4</version> ++ <artifactId>javax.servlet-api</artifactId> ++ <version>3.1.0</version> + <scope>provided</scope> + </dependency> + </dependencies> +diff -Nru cargo-resources-1.4.2/testdata/tomcat-context/pom.xml cargo-resources-1.4.2.servlet/testdata/tomcat-context/pom.xml +--- cargo-resources-1.4.2/testdata/tomcat-context/pom.xml 2013-05-27 20:58:20.000000000 +0200 ++++ cargo-resources-1.4.2.servlet/testdata/tomcat-context/pom.xml 2015-03-05 11:33:06.523223262 +0100 +@@ -29,8 +29,8 @@ + <dependencies> + <dependency> + <groupId>javax.servlet</groupId> +- <artifactId>servlet-api</artifactId> +- <version>2.4</version> ++ <artifactId>javax.servlet-api</artifactId> ++ <version>3.1.0</version> + <scope>provided</scope> + </dependency> + </dependencies> +diff -Nru cargo-resources-1.4.2/testdata/two-datasources-war/pom.xml cargo-resources-1.4.2.servlet/testdata/two-datasources-war/pom.xml +--- cargo-resources-1.4.2/testdata/two-datasources-war/pom.xml 2013-05-27 20:58:20.000000000 +0200 ++++ cargo-resources-1.4.2.servlet/testdata/two-datasources-war/pom.xml 2015-03-05 11:33:06.519223480 +0100 +@@ -13,8 +13,8 @@ + <dependencies> + <dependency> + <groupId>javax.servlet</groupId> +- <artifactId>servlet-api</artifactId> +- <version>2.4</version> ++ <artifactId>javax.servlet-api</artifactId> ++ <version>3.1.0</version> + <scope>provided</scope> + </dependency> + </dependencies> +diff -Nru cargo-resources-1.4.2/testdata/xadatasource-war/pom.xml cargo-resources-1.4.2.servlet/testdata/xadatasource-war/pom.xml +--- cargo-resources-1.4.2/testdata/xadatasource-war/pom.xml 2013-05-27 20:58:20.000000000 +0200 ++++ cargo-resources-1.4.2.servlet/testdata/xadatasource-war/pom.xml 2015-03-05 11:33:06.522223316 +0100 +@@ -29,8 +29,8 @@ + <dependencies> + <dependency> + <groupId>javax.servlet</groupId> +- <artifactId>servlet-api</artifactId> +- <version>2.4</version> ++ <artifactId>javax.servlet-api</artifactId> ++ <version>3.1.0</version> + <scope>provided</scope> + </dependency> + </dependencies> diff --git a/cargo-resources.spec b/cargo-resources.spec index c54b78c..788f20e 100644 --- a/cargo-resources.spec +++ b/cargo-resources.spec @@ -1,13 +1,14 @@ %global oname cargo Name: cargo-resources Version: 1.4.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Cargo Shared Resources License: ASL 2.0 Url: http://cargo.codehaus.org/ # svn export http://svn.codehaus.org/cargo/resources/tags/cargo-resources-1.4.2 # tar czf cargo-resources-1.4.2-src-svn.tar.gz cargo-resources-1.4.2 Source0: %{name}-%{version}-src-svn.tar.gz +Patch0: cargo-resources-1.4.2-servlet.patch BuildRequires: cargo-parent BuildRequires: java-devel @@ -15,9 +16,8 @@ BuildRequires: java-devel BuildRequires: felix-osgi-core BuildRequires: geronimo-ejb BuildRequires: geronimo-parent-poms -#BuildRequires: mvn(org.apache.geronimo.specs:specs) BuildRequires: javamail -BuildRequires: tomcat-servlet-3.0-api +BuildRequires: glassfish-servlet-api BuildRequires: maven-local BuildRequires: maven-ear-plugin @@ -29,7 +29,7 @@ BuildRequires: maven-war-plugin Requires: felix-osgi-core Requires: geronimo-ejb Requires: javamail -Requires: tomcat-servlet-3.0-api +Requires: glassfish-servlet-api Requires: java-headless BuildArch: noarch @@ -45,6 +45,7 @@ This package contains javadoc for %{name}. %prep %setup -q +%patch0 -p1 %pom_disable_module jetty-6-and-earlier-deployer %pom_disable_module jetty-7-and-onwards-deployer @@ -55,17 +56,13 @@ This package contains javadoc for %{name}. %pom_disable_module simple-aop testdata/pom.xml %pom_disable_module simple-har testdata/pom.xml -sed -i "s|<groupId>org.osgi</groupId>|<groupId>org.apache.felix</groupId>|" testdata/simple-bundle/pom.xml -sed -i "s|<version>4.0.0</version>|<version>1.4.0</version>|" testdata/simple-bundle/pom.xml -sed -i "s|<artifactId>geronimo-j2ee_1.4_spec|<artifactId>geronimo-ejb_3.1_spec|" testdata/simple-ejb/pom.xml - -# force tomcat 7.x apis use -sed -i "s|<groupId>javax.servlet</groupId>|<groupId>org.apache.tomcat</groupId>|" $(find . -name "pom.xml") -sed -i "s|<artifactId>servlet-api</artifactId>|<artifactId>tomcat-servlet-api</artifactId>|" $(find . -name "pom.xml") +%pom_xpath_set "pom:dependencies/pom:dependency[pom:artifactId = 'org.osgi.core']/pom:groupId" org.apache.felix testdata/simple-bundle +%pom_xpath_set "pom:dependencies/pom:dependency[pom:artifactId = 'org.osgi.core']/pom:version" 1.4.0 testdata/simple-bundle +%pom_xpath_set "pom:dependencies/pom:dependency[pom:groupId = 'org.apache.geronimo.specs']/pom:artifactId" geronimo-ejb_3.1_spec testdata/simple-ejb %build -mvn-rpmbuild package javadoc:aggregate +%mvn_build %install @@ -78,11 +75,12 @@ install -m 644 build-tools/target/%{oname}-build-tools-%{version}.jar %{buildroo install -pm 644 build-tools/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{oname}-%{oname}-build-tools.pom %add_maven_depmap JPP.%{oname}-%{oname}-build-tools.pom %{oname}/%{oname}-build-tools.jar +install -pm 644 testdata/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{oname}-cargo-samples-testdata.pom +%add_maven_depmap JPP.%{oname}-cargo-samples-testdata.pom + # jetty-6-and-earlier-deployer # jetty-7-and-onwards-deployer - # testdata - # simple-aop # simple-har @@ -137,6 +135,9 @@ cp -p build-tools/NOTICE . %license LICENSE NOTICE %changelog +* Thu Mar 05 2015 gil cattaneo <puntogil(a)libero.it> 1.4.2-6 +- use servlet api 3.1 + * Fri Jan 30 2015 gil cattaneo <puntogil(a)libero.it> 1.4.2-5 - introduce license macro @@ -175,4 +176,4 @@ cp -p build-tools/NOTICE . - Update to 1.2.2 * Mon May 14 2012 gil cattaneo <puntogil(a)libero.it> 1.2.1-1 -- initial rpm \ No newline at end of file +- initial rpm

9 years, 3 months

1
0
0 / 0

[javapackages] Fix irritating "block comment should start with '# '" pylint warning

by Michal Srb

commit 40eb597856101f3a22a7584a632ae46c1ce5563a Author: Michal Srb <msrb(a)redhat.com> Date: Thu Mar 5 07:43:01 2015 +0100 Fix irritating "block comment should start with '# '" pylint warning java-utils/builddep.py | 2 +- java-utils/maven_depmap.py | 2 +- java-utils/mvn_alias.py | 2 +- java-utils/mvn_artifact.py | 2 +- java-utils/mvn_build.py | 2 +- java-utils/mvn_compat_version.py | 2 +- java-utils/mvn_config.py | 2 +- java-utils/mvn_file.py | 2 +- java-utils/mvn_package.py | 2 +- java-utils/pom_editor.py | 2 +- python/javapackages/__init__.py | 2 +- python/javapackages/cache/cache.py | 2 +- python/javapackages/cache/metadata.py | 2 +- python/javapackages/cache/osgi.py | 2 +- python/javapackages/common/binding.py | 2 +- python/javapackages/common/config.py | 2 +- python/javapackages/common/exception.py | 2 +- python/javapackages/common/manifest.py | 2 +- python/javapackages/common/osgi.py | 2 +- python/javapackages/common/util.py | 2 +- python/javapackages/ivy/ivyfile.py | 2 +- python/javapackages/maven/artifact.py | 2 +- python/javapackages/maven/dependency.py | 2 +- python/javapackages/maven/exclusion.py | 2 +- python/javapackages/maven/extension.py | 2 +- python/javapackages/maven/plugin.py | 2 +- python/javapackages/xmvn/xmvn_config.py | 2 +- python/javapackages/xmvn/xmvn_resolve.py | 2 +- test/run_tests.py | 2 +- 29 files changed, 29 insertions(+), 29 deletions(-) --- diff --git a/java-utils/builddep.py b/java-utils/builddep.py index 2d41dee..5424cb5 100644 --- a/java-utils/builddep.py +++ b/java-utils/builddep.py @@ -1,4 +1,4 @@ -#- +# # Copyright (c) 2014, Red Hat, Inc. # All rights reserved. # diff --git a/java-utils/maven_depmap.py b/java-utils/maven_depmap.py index 4605666..b06f479 100644 --- a/java-utils/maven_depmap.py +++ b/java-utils/maven_depmap.py @@ -1,4 +1,4 @@ -#- +# # Copyright (c) 2014, Red Hat, Inc. # All rights reserved. # diff --git a/java-utils/mvn_alias.py b/java-utils/mvn_alias.py index 31e251f..4979a17 100644 --- a/java-utils/mvn_alias.py +++ b/java-utils/mvn_alias.py @@ -1,4 +1,4 @@ -#- +# # Copyright (c) 2014, Red Hat, Inc. # All rights reserved. # diff --git a/java-utils/mvn_artifact.py b/java-utils/mvn_artifact.py index 2b57b6a..7bc95e5 100644 --- a/java-utils/mvn_artifact.py +++ b/java-utils/mvn_artifact.py @@ -1,4 +1,4 @@ -#- +# # Copyright (c) 2014, Red Hat, Inc. # All rights reserved. # diff --git a/java-utils/mvn_build.py b/java-utils/mvn_build.py index 71d9055..6e64478 100644 --- a/java-utils/mvn_build.py +++ b/java-utils/mvn_build.py @@ -1,4 +1,4 @@ -#- +# # Copyright (c) 2014, Red Hat, Inc. # All rights reserved. # diff --git a/java-utils/mvn_compat_version.py b/java-utils/mvn_compat_version.py index f80e923..e4afdbd 100644 --- a/java-utils/mvn_compat_version.py +++ b/java-utils/mvn_compat_version.py @@ -1,4 +1,4 @@ -#- +# # Copyright (c) 2014, Red Hat, Inc. # All rights reserved. # diff --git a/java-utils/mvn_config.py b/java-utils/mvn_config.py index 4222613..7597761 100644 --- a/java-utils/mvn_config.py +++ b/java-utils/mvn_config.py @@ -1,4 +1,4 @@ -#- +# # Copyright (c) 2014, Red Hat, Inc. # All rights reserved. # diff --git a/java-utils/mvn_file.py b/java-utils/mvn_file.py index 4fe4870..39d1348 100644 --- a/java-utils/mvn_file.py +++ b/java-utils/mvn_file.py @@ -1,4 +1,4 @@ -#- +# # Copyright (c) 2014, Red Hat, Inc. # All rights reserved. # diff --git a/java-utils/mvn_package.py b/java-utils/mvn_package.py index 2a657cf..b74da12 100644 --- a/java-utils/mvn_package.py +++ b/java-utils/mvn_package.py @@ -1,4 +1,4 @@ -#- +# # Copyright (c) 2014, Red Hat, Inc. # All rights reserved. # diff --git a/java-utils/pom_editor.py b/java-utils/pom_editor.py index 99c1465..50cdb47 100644 --- a/java-utils/pom_editor.py +++ b/java-utils/pom_editor.py @@ -1,4 +1,4 @@ -#- +# from __future__ import print_function import inspect diff --git a/python/javapackages/__init__.py b/python/javapackages/__init__.py index 2e88ffc..317e103 100644 --- a/python/javapackages/__init__.py +++ b/python/javapackages/__init__.py @@ -1,4 +1,4 @@ -#- +# # Copyright (c) 2013, Red Hat, Inc # All rights reserved. # diff --git a/python/javapackages/cache/cache.py b/python/javapackages/cache/cache.py index d50f9ba..3d13e32 100644 --- a/python/javapackages/cache/cache.py +++ b/python/javapackages/cache/cache.py @@ -1,4 +1,4 @@ -#- +# # Copyright (c) 2014, Red Hat, Inc. # # All rights reserved. diff --git a/python/javapackages/cache/metadata.py b/python/javapackages/cache/metadata.py index ae6ed70..864b400 100644 --- a/python/javapackages/cache/metadata.py +++ b/python/javapackages/cache/metadata.py @@ -1,4 +1,4 @@ -#- +# # Copyright (c) 2014, Red Hat, Inc. # # All rights reserved. diff --git a/python/javapackages/cache/osgi.py b/python/javapackages/cache/osgi.py index c5832f3..cf4534c 100644 --- a/python/javapackages/cache/osgi.py +++ b/python/javapackages/cache/osgi.py @@ -1,4 +1,4 @@ -#- +# # Copyright (c) 2014, Red Hat, Inc. # # All rights reserved. diff --git a/python/javapackages/common/binding.py b/python/javapackages/common/binding.py index 001574e..f946adf 100644 --- a/python/javapackages/common/binding.py +++ b/python/javapackages/common/binding.py @@ -1,4 +1,4 @@ -#- +# # Copyright (c) 2015, Red Hat, Inc. # All rights reserved. # diff --git a/python/javapackages/common/config.py b/python/javapackages/common/config.py index 3d92297..aaa6138 100644 --- a/python/javapackages/common/config.py +++ b/python/javapackages/common/config.py @@ -1,4 +1,4 @@ -#- +# # Copyright (c) 2014, Red Hat, Inc. # # All rights reserved. diff --git a/python/javapackages/common/exception.py b/python/javapackages/common/exception.py index 90be216..548ce4a 100644 --- a/python/javapackages/common/exception.py +++ b/python/javapackages/common/exception.py @@ -1,4 +1,4 @@ -#- +# # Copyright (c) 2014, Red Hat, Inc. # # All rights reserved. diff --git a/python/javapackages/common/manifest.py b/python/javapackages/common/manifest.py index 83265a6..5830d80 100644 --- a/python/javapackages/common/manifest.py +++ b/python/javapackages/common/manifest.py @@ -1,4 +1,4 @@ -#- +# # Copyright (c) 2014, Red Hat, Inc. # # All rights reserved. diff --git a/python/javapackages/common/osgi.py b/python/javapackages/common/osgi.py index 9ea5eb0..6e8ff26 100644 --- a/python/javapackages/common/osgi.py +++ b/python/javapackages/common/osgi.py @@ -1,4 +1,4 @@ -#- +# # Copyright (c) 2014, Red Hat, Inc. # # All rights reserved. diff --git a/python/javapackages/common/util.py b/python/javapackages/common/util.py index 0cb96f1..f31d5ee 100644 --- a/python/javapackages/common/util.py +++ b/python/javapackages/common/util.py @@ -1,4 +1,4 @@ -#- +# # Copyright (c) 2014, Red Hat, Inc. # # All rights reserved. diff --git a/python/javapackages/ivy/ivyfile.py b/python/javapackages/ivy/ivyfile.py index a8844f6..530cfa0 100644 --- a/python/javapackages/ivy/ivyfile.py +++ b/python/javapackages/ivy/ivyfile.py @@ -1,4 +1,4 @@ -#- +# # Copyright (c) 2014, Red Hat, Inc. # # All rights reserved. diff --git a/python/javapackages/maven/artifact.py b/python/javapackages/maven/artifact.py index f74cd65..50264ba 100644 --- a/python/javapackages/maven/artifact.py +++ b/python/javapackages/maven/artifact.py @@ -1,4 +1,4 @@ -#- +# # Copyright (c) 2014, Red Hat, Inc. # # All rights reserved. diff --git a/python/javapackages/maven/dependency.py b/python/javapackages/maven/dependency.py index 36e5b2a..0ab517d 100644 --- a/python/javapackages/maven/dependency.py +++ b/python/javapackages/maven/dependency.py @@ -1,4 +1,4 @@ -#- +# # Copyright (c) 2014, Red Hat, Inc. # # All rights reserved. diff --git a/python/javapackages/maven/exclusion.py b/python/javapackages/maven/exclusion.py index 531a7ff..df4078a 100644 --- a/python/javapackages/maven/exclusion.py +++ b/python/javapackages/maven/exclusion.py @@ -1,4 +1,4 @@ -#- +# # Copyright (c) 2014, Red Hat, Inc. # # All rights reserved. diff --git a/python/javapackages/maven/extension.py b/python/javapackages/maven/extension.py index f0f1808..5d9aeea 100644 --- a/python/javapackages/maven/extension.py +++ b/python/javapackages/maven/extension.py @@ -1,4 +1,4 @@ -#- +# # Copyright (c) 2014, Red Hat, Inc. # # All rights reserved. diff --git a/python/javapackages/maven/plugin.py b/python/javapackages/maven/plugin.py index d7dd946..2c8744b 100644 --- a/python/javapackages/maven/plugin.py +++ b/python/javapackages/maven/plugin.py @@ -1,4 +1,4 @@ -#- +# # Copyright (c) 2014, Red Hat, Inc. # # All rights reserved. diff --git a/python/javapackages/xmvn/xmvn_config.py b/python/javapackages/xmvn/xmvn_config.py index 9868dae..66d1134 100644 --- a/python/javapackages/xmvn/xmvn_config.py +++ b/python/javapackages/xmvn/xmvn_config.py @@ -1,4 +1,4 @@ -#- +# # Copyright (c) 2014, Red Hat, Inc. # All rights reserved. # diff --git a/python/javapackages/xmvn/xmvn_resolve.py b/python/javapackages/xmvn/xmvn_resolve.py index d939d25..6e90ed1 100644 --- a/python/javapackages/xmvn/xmvn_resolve.py +++ b/python/javapackages/xmvn/xmvn_resolve.py @@ -1,4 +1,4 @@ -#- +# # Copyright (c) 2014, Red Hat, Inc. # All rights reserved. # diff --git a/test/run_tests.py b/test/run_tests.py index 08c7a80..cf3989a 100755 --- a/test/run_tests.py +++ b/test/run_tests.py @@ -1,4 +1,4 @@ -#- +# # Copyright (c) 2014, Red Hat, Inc. # All rights reserved. #

9 years, 3 months

1
0
0 / 0

Broken dependencies: cargo-resources

by Fedora Koji Build System

cargo-resources has broken dependencies in the rawhide tree: On x86_64: cargo-resources-1.4.2-5.fc22.noarch requires tomcat-servlet-3.0-api On i386: cargo-resources-1.4.2-5.fc22.noarch requires tomcat-servlet-3.0-api On armhfp: cargo-resources-1.4.2-5.fc22.noarch requires tomcat-servlet-3.0-api Please resolve this as soon as possible.

9 years, 3 months

1
0
0 / 0

Broken dependencies: cas-client

by Fedora Koji Build System

cas-client has broken dependencies in the rawhide tree: On x86_64: cas-client-3.3.3-2.fc22.noarch requires tomcat-servlet-3.0-api On i386: cas-client-3.3.3-2.fc22.noarch requires tomcat-servlet-3.0-api On armhfp: cas-client-3.3.3-2.fc22.noarch requires tomcat-servlet-3.0-api Please resolve this as soon as possible.

9 years, 3 months

1
0
0 / 0

[tiles/f22] use servlet 3.0

by gil

commit f03afde373219343ef507dce9fe79b717c3cc99d Author: gil <puntogil(a)libero.it> Date: Wed Mar 4 18:38:43 2015 +0100 use servlet 3.0 tiles-2.2.2-jsp-servlet30.patch | 153 +++++++++++++++++ tiles-2.2.2-servlet-servlet30.patch | 170 ++++++++++++++++++ tiles-2.2.2-servlet3.1.patch | 332 ------------------------------------ tiles.spec | 11 +- 4 files changed, 329 insertions(+), 337 deletions(-) --- 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-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.spec b/tiles.spec index c2ed561..d542e30 100644 --- a/tiles.spec +++ b/tiles.spec @@ -17,8 +17,9 @@ Patch0: %{name}-%{version}-fix-build.patch 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 +# build fix fot tomcat 7.x apis +Patch3: %{name}-%{version}-servlet-servlet30.patch +Patch4: %{name}-%{version}-jsp-servlet30.patch BuildRequires: mvn(commons-digester:commons-digester) BuildRequires: mvn(javax.portlet:portlet-api) @@ -77,8 +78,8 @@ This package contains javadoc for %{name}. %patch0 -p1 %patch1 -p1 %patch2 -p0 -%patch3 -p1 - +%patch3 -p0 +%patch4 -p0 # require org.springframework spring-webmvc-portlet 2.5.6 %pom_disable_module tiles-portlet-wildcard src/pom.xml @@ -157,7 +158,7 @@ cd src %changelog * Wed Mar 04 2015 gil cattaneo <puntogil(a)libero.it> 2.2.2-13 -- use servlet 3.1, el 3.0, jsp 2.3 +- use servlet 3.0 * Fri Feb 13 2015 gil cattaneo <puntogil(a)libero.it> 2.2.2-12 - introduce license macro

9 years, 3 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

java-sig-commits March 2015