January 2012 - java-sig-commits - Fedora Mailing-Lists

File commons-daemon-1.0.8-src.tar.gz uploaded to lookaside cache by sochotni

by Stanislav Ochotnicky

A file has been added to the lookaside cache for apache-commons-daemon: 323a0bd9e2786256f02c5aed4e887fed commons-daemon-1.0.8-src.tar.gz

12 years, 4 months

1
0
0 / 0

[maven2] Stip down maven 2 to bare minimum

by Stanislav Ochotnicky

commit d5056b3cbfabef27904189307c77f312d95ff46e Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com> Date: Wed Jan 25 17:48:05 2012 +0100 Stip down maven 2 to bare minimum - Remove scripts and most of home maven2.spec | 269 +++------------------------------------------------------- 1 files changed, 14 insertions(+), 255 deletions(-) --- diff --git a/maven2.spec b/maven2.spec index 94fabf1..bd4af8f 100644 --- a/maven2.spec +++ b/maven2.spec @@ -3,7 +3,7 @@ Name: maven2 Version: 2.2.1 -Release: 31%{?dist} +Release: 32%{?dist} Summary: Java project management and project comprehension tool Group: Development/Build Tools @@ -62,8 +62,6 @@ Patch6: %{name}-%{version}-strip-jackrabbit-dep.patch Patch7: %{name}-%{version}-classworlds.patch BuildRequires: java-devel >= 1.6.0 -BuildRequires: classworlds -BuildRequires: jdom %if %{bootstrap} BuildRequires: ant @@ -79,152 +77,18 @@ BuildRequires: jakarta-commons-httpclient BuildRequires: apache-commons-io BuildRequires: apache-commons-lang BuildRequires: apache-commons-logging -%if ! (0%{?fedora} > 14 || 0%{?rhel} > 6) -BuildRequires: jakarta-commons-cli -BuildRequires: jakarta-commons-collections -%else BuildRequires: apache-commons-cli BuildRequires: apache-commons-collections BuildRequires: apache-commons-parent -%endif -BuildRequires: easymock -BuildRequires: junit -BuildRequires: nekohtml -BuildRequires: ant -BuildRequires: maven-doxia -BuildRequires: jetty -BuildRequires: maven-archiver -BuildRequires: maven-assembly-plugin -BuildRequires: maven-doxia-tools -BuildRequires: maven-enforcer-api +BuildRequires: maven BuildRequires: maven-enforcer-plugin BuildRequires: maven-shade-plugin -BuildRequires: maven-clean-plugin -BuildRequires: maven-compiler-plugin -BuildRequires: maven-resources-plugin -BuildRequires: maven-install-plugin -BuildRequires: maven-jar-plugin -BuildRequires: maven-plugin-testing-harness -BuildRequires: maven-pmd-plugin -BuildRequires: maven-shared-file-management -BuildRequires: maven-shared-common-artifact-filters -BuildRequires: maven-shared-dependency-tree -BuildRequires: maven-shared-repository-builder -BuildRequires: maven-shared-io -BuildRequires: maven-shared-downloader -BuildRequires: maven-shared-filtering -BuildRequires: maven-shared-reporting-api -BuildRequires: maven-site-plugin -BuildRequires: maven-surefire-maven-plugin -BuildRequires: maven-surefire-provider-junit -BuildRequires: maven-scm -BuildRequires: maven-wagon -BuildRequires: modello -BuildRequires: multithreadedtc -BuildRequires: plexus-active-collections -BuildRequires: plexus-ant-factory -BuildRequires: plexus-archiver -BuildRequires: plexus-cipher -BuildRequires: plexus-bsh-factory -BuildRequires: plexus-build-api -BuildRequires: plexus-classworlds -BuildRequires: plexus-compiler -BuildRequires: plexus-component-api -BuildRequires: plexus-containers-container-default -BuildRequires: plexus-container-default -BuildRequires: plexus-i18n -BuildRequires: plexus-interactivity -BuildRequires: plexus-interpolation -BuildRequires: plexus-io -BuildRequires: plexus-resources -BuildRequires: plexus-sec-dispatcher -BuildRequires: plexus-utils -BuildRequires: plexus-velocity -BuildRequires: regexp -BuildRequires: forge-parent -BuildRequires: spice-parent -BuildRequires: jakarta-oro -BuildRequires: regexp -BuildRequires: slf4j -BuildRequires: velocity -BuildRequires: maven -# this is only to temp fix problems in other packages -BuildRequires: maven2 %endif Requires: classworlds Requires: jdom %if !%{bootstrap} -Requires: apache-resource-bundles -Requires: objectweb-asm -Requires: backport-util-concurrent -Requires: bsh -Requires: jsch -Requires: apache-commons-codec -Requires: jakarta-commons-httpclient -Requires: apache-commons-io -Requires: apache-commons-lang -Requires: apache-commons-logging -%if ! (0%{?fedora} > 14 || 0%{?rhel} > 6) -Requires: jakarta-commons-cli -Requires: jakarta-commons-collections -%else -Requires: apache-commons-cli -Requires: apache-commons-collections -Requires: apache-commons-parent -%endif -Requires: easymock -Requires: junit -Requires: nekohtml -Requires: ant -Requires: maven-doxia -Requires: jetty -Requires: maven-archiver -Requires: maven-doxia-tools -Requires: maven-enforcer-api -Requires: maven-enforcer-plugin -Requires: maven-plugin-testing-harness -Requires: maven-shared-file-management -Requires: maven-shared-common-artifact-filters -Requires: maven-shared-dependency-tree -Requires: maven-shared-repository-builder -Requires: maven-shared-io -Requires: maven-shared-downloader -Requires: maven-shared-filtering -Requires: maven-shared-reporting-api -Requires: maven-surefire-provider-junit -Requires: maven-scm -Requires: maven-wagon -Requires: modello -Requires: multithreadedtc -Requires: jakarta-oro -Requires: plexus-active-collections -Requires: plexus-ant-factory -Requires: plexus-archiver -Requires: plexus-cipher -Requires: plexus-bsh-factory -Requires: plexus-build-api -Requires: plexus-classworlds -Requires: plexus-compiler -Requires: plexus-component-api -Requires: plexus-containers-container-default -Requires: plexus-container-default -Requires: plexus-i18n -Requires: plexus-interactivity -Requires: plexus-interpolation -Requires: plexus-io -Requires: plexus-resources -Requires: plexus-sec-dispatcher -Requires: plexus-utils -Requires: plexus-velocity -Requires: regexp -Requires: forge-parent -Requires: spice-parent -Requires: jakarta-oro -Requires: regexp -Requires: slf4j -Requires: velocity Requires: maven-artifact-manager = %{version}-%{release} Requires: maven-error-diagnostics = %{version}-%{release} Requires: maven-model = %{version}-%{release} @@ -311,6 +175,7 @@ Requires: jpackage-utils Requires: maven-artifact-manager Requires: maven-profile Requires: maven-plugin-registry +Requires: maven-model Requires: plexus-interpolation Requires: plexus-utils Requires: plexus-containers-container-default @@ -421,20 +286,16 @@ ant -Dmaven.repo.local=$M2_REPO/cache # FIXME: These tests fail when building with maven for an unknown reason rm -f maven-core/src/test/java/org/apache/maven/WagonSelectorTest.java rm -f maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java -mvn-rpmbuild -Dmaven.test.skip=true -P all-models -Dmaven.repo.local=$M2_REPO/cache -Dmaven.local.depmap.file=%{SOURCE103} install +for nobuild in apache-maven maven-artifact-test \ + maven-compat maven-core maven-plugin-api \ + maven-plugin-parameter-documenter maven-reporting \ + maven-script;do + sed -i "s:<module>$nobuild</module>::" pom.xml +done +mvn-rpmbuild -X -Dmaven.test.skip=true -P all-models -Dmaven.repo.local=$(pwd)/.m2 -Dmaven.local.depmap.file=%{SOURCE103} install %endif %install -rm -rf $RPM_BUILD_ROOT - -export M2_HOME=$(pwd)/installation/apache-maven-%{version} - -rm -rf $M2_HOME - -mkdir -p $(pwd)/installation/ -(cd $(pwd)/installation/ -tar jxf ../apache-maven/target/*bz2 -) # maven2 directory in /usr/share/java install -dm 755 $RPM_BUILD_ROOT%{_javadir}/%{name} @@ -444,42 +305,6 @@ install -dm 755 $RPM_BUILD_ROOT%{_javadir}/%{name} ########### install -dm 755 $RPM_BUILD_ROOT%{_datadir}/%{name} -############### -# M2_HOME/bin # -############### -install -dm 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/bin -cp -a $M2_HOME/bin/* $RPM_BUILD_ROOT%{_datadir}/%{name}/bin - -# Remove unnecessary batch scripts -rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/bin/*.bat - -# Update conf file for unversioned jar names -sed -i -e s:'-classpath "${M2_HOME}"/boot/classworlds-\*.jar':'-classpath "${M2_HOME}"/boot/classworlds.jar':g \ - $RPM_BUILD_ROOT%{_datadir}/%{name}/bin/mvn $RPM_BUILD_ROOT%{_datadir}/%{name}/bin/mvnDebug - -################ -# M2_HOME/boot # -################ -install -dm 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/boot -%if %{bootstrap} -cp -a $M2_HOME/boot/* $RPM_BUILD_ROOT%{_datadir}/%{name}/boot/ -%endif - -################ -# M2_HOME/conf # -################ -install -dm 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/conf -cp -a $M2_HOME/conf/* $RPM_BUILD_ROOT%{_datadir}/%{name}/conf/ - -############### -# M2_HOME/lib # -############### -install -dm 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/lib - -install -p -m 644 $M2_HOME/lib/maven-%{version}-uber.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/uber-%{version}.jar -ln -s uber-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/uber.jar -ln -s %{_javadir}/%{name}/uber.jar $RPM_BUILD_ROOT%{_datadir}/%{name}/lib/maven-%{version}-uber.jar - ################ # M2_HOME/poms # #*############## @@ -515,13 +340,6 @@ install -dm 755 $RPM_BUILD_ROOT%{_bindir} install -m 644 %{SOURCE104} $RPM_BUILD_ROOT%{_datadir}/%{name}/poms/JPP.maven2-empty-dep.pom install -m 644 %{SOURCE105} $RPM_BUILD_ROOT%{_javadir}/%{name}/empty-dep.jar -# Wrappers -/bin/cp -af %{SOURCE200} $RPM_BUILD_ROOT%{_bindir}/mvn2 -/bin/cp -af %{SOURCE201} $RPM_BUILD_ROOT%{_bindir}/mvn-jpp - -%if %{bootstrap} - cp -af `pwd`/.m2/repository $RPM_BUILD_ROOT%{_datadir}/%{name}/bootstrap_repo -%endif ################### # Individual jars # @@ -542,41 +360,6 @@ done -for file in \ - maven-script/maven-script-ant/target/maven-script-ant-%{version}.jar \ - maven-script/maven-script-beanshell/target/maven-script-beanshell-%{version}.jar \ - apache-maven/target/apache-maven-%{version}.jar \ - maven-artifact-test/target/maven-artifact-test-%{version}.jar \ - maven-settings/target/maven-settings-%{version}.jar \ - maven-plugin-parameter-documenter/target/maven-plugin-parameter-documenter-%{version}.jar \ - maven-artifact/target/maven-artifact-%{version}.jar \ - maven-repository-metadata/target/maven-repository-metadata-%{version}.jar \ - maven-plugin-api/target/maven-plugin-api-%{version}.jar \ - maven-compat/target/maven-compat-%{version}.jar \ - maven-core/target/maven-core-%{version}.jar \ - maven-plugin-descriptor/target/maven-plugin-descriptor-%{version}.jar; do \ - - FNAME=`basename $file` - FNAME_NO_EXT=`basename $file .jar` - DIR=`dirname $file` - UNVER_NAME=`basename $file | sed -e s:-%{version}::g` - UNVER_NAME_WITH_NO_EXT=`echo $FNAME_NO_EXT | sed -e s:-%{version}::g` - ARTIFACT=`basename \`dirname $DIR\`` - - - pushd $DIR - install -m 644 $FNAME $RPM_BUILD_ROOT%{_javadir}/%{name}/$UNVER_NAME - install -m 644 ../pom.xml $RPM_BUILD_ROOT%{_datadir}/%{name}/poms/JPP.%{name}-$UNVER_NAME_WITH_NO_EXT.pom - %add_to_maven_depmap org.apache.maven $ARTIFACT %{version} JPP/%{name} $UNVER_NAME_WITH_NO_EXT - popd -done - -# maven-reporting-api -install -m 644 maven-reporting/maven-reporting-api/target/maven-reporting-api-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/ -ln -s maven-reporting-api-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/maven-reporting-api.jar -install -m 644 maven-reporting/maven-reporting-api/pom.xml $RPM_BUILD_ROOT%{_datadir}/%{name}/poms/JPP.%{name}-maven-reporting-api.pom -%add_to_maven_depmap org.apache.maven.reporting maven-reporting-api %{version} JPP/%{name} maven-reporting-api - # maven-reporting pom install -m 644 maven-reporting/pom.xml $RPM_BUILD_ROOT%{_datadir}/%{name}/poms/JPP.%{name}-maven-reporting.pom %add_to_maven_depmap org.apache.maven.reporting maven-reporting %{version} JPP/%{name} maven-reporting @@ -585,32 +368,9 @@ install -m 644 maven-reporting/pom.xml $RPM_BUILD_ROOT%{_datadir}/%{name}/poms/J install -m 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/%{name}/poms/JPP.%{name}-maven.pom %add_to_maven_depmap org.apache.maven maven %{version} JPP/%{name} maven -# create dangling symlinks but fix bz#613866 -(cd $RPM_BUILD_ROOT%{_datadir}/%{name}/lib - build-jar-repository -s -p . jdom -) - -(cd $RPM_BUILD_ROOT%{_datadir}/%{name}/boot - build-jar-repository -s -p . classworlds -) - -%if ! %{bootstrap} -(cd $RPM_BUILD_ROOT%{_datadir}/%{name}/lib - build-jar-repository -s -p . backport-util-concurrent jsch commons-cli commons-httpclient commons-codec nekohtml maven-shared/reporting-api maven-doxia/logging-api maven-doxia/sink-api maven-wagon/file maven-wagon/http maven-wagon/http-lightweight maven-wagon/http-shared maven-wagon/provider-api maven-wagon/ssh maven-wagon/ssh-common maven-wagon/ssh-external plexus/container-default plexus/interactivity-api plexus/interpolation plexus/utils slf4j/jcl-over-slf4j slf4j/api slf4j/jdk14 slf4j/nop plexus/plexus-cipher plexus/plexus-sec-dispatcher xerces-j2 xml-commons-apis -) -%endif %files -%attr(0755,root,root) %{_bindir}/mvn2 -%attr(0755,root,root) %{_bindir}/mvn-jpp %dir %{_datadir}/%{name} -%dir %{_datadir}/%{name}/bin -%config(noreplace) %{_datadir}/%{name}/bin/*.conf -%attr(0755,root,root) %{_datadir}/%{name}/bin/mvn -%attr(0755,root,root) %{_datadir}/%{name}/bin/mvnDebug -%{_datadir}/%{name}/boot -%{_datadir}/%{name}/conf -%{_datadir}/%{name}/lib %{_datadir}/%{name}/poms %exclude %{_datadir}/%{name}/poms/JPP.%{name}-maven-artifact-manager.pom %exclude %{_datadir}/%{name}/poms/JPP.%{name}-maven-error-diagnostics.pom @@ -635,11 +395,6 @@ install -m 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/%{name}/poms/JPP.%{name}-maven %exclude %{_javadir}/%{name}/maven-plugin-descriptor.jar -%if %{bootstrap} -%{_datadir}/%{name}/bootstrap_repo -%endif -%doc - %files -n maven-artifact-manager %{_mavendepmapfragdir}/maven-artifact-manager %{_javadir}/%{name}/maven-artifact-manager.jar @@ -687,6 +442,10 @@ install -m 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/%{name}/poms/JPP.%{name}-maven %changelog +* Wed Jan 25 2012 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 2.2.1-32 +- Stip down maven 2 to bare minimum +- Remove scripts and most of home + * Mon Jan 23 2012 Tomas Radej <tradej(a)redhat.com> - 2.2.1-31 - Fixed Requires for plugin-descriptor

12 years, 4 months

1
0
0 / 0

[jetty] Update to rc5

by Stanislav Ochotnicky

commit 2f2b3620ea42be71bc286ecb6526885fd05ad9ff Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com> Date: Wed Jan 25 12:13:13 2012 +0100 Update to rc5 - Remove symbolic name patch (not needed after bundle plugin fix) .gitignore | 1 + 0001-Add-proper-symbolic-names-into-bundles.patch | 24 -------- ...on.patch => 0001-Remove-javadoc-execution.patch | 8 +- ...ch => 0002-Cleaup-distribution-generation.patch | 6 +- ...acts.patch => 0003-Disable-test-artifacts.patch | 10 ++-- ...4-Change-servelt-groupId-to-javax.servlet.patch | 6 +- ...dencies.patch => 0005-Modify-dependencies.patch | 8 +- ...md-plugin.patch => 0006-Remove-pmd-plugin.patch | 6 +- disable-modules.patch | 62 -------------------- jetty-util-pom.patch | 12 ---- jetty.spec | 50 ++++++++-------- sources | 2 +- 12 files changed, 50 insertions(+), 145 deletions(-) --- diff --git a/.gitignore b/.gitignore index 66613eb..1b592e8 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ jetty-6.1.21-src.zip jetty-6.1.24-src.zip jetty-6.1.26-src.zip /jetty-8.1.0.RC4.tar.bz2 +/jetty-8.1.0.RC5.tar.bz2 diff --git a/0002-Remove-javadoc-execution.patch b/0001-Remove-javadoc-execution.patch similarity index 89% rename from 0002-Remove-javadoc-execution.patch rename to 0001-Remove-javadoc-execution.patch index e6e0026..78051b6 100644 --- a/0002-Remove-javadoc-execution.patch +++ b/0001-Remove-javadoc-execution.patch @@ -1,7 +1,7 @@ -From 8ccf2fbee3fdb514aa132c7a0c7f0c4688a3f836 Mon Sep 17 00:00:00 2001 +From 8509de87ff274653abd2f89f8a09c2ebf1840b36 Mon Sep 17 00:00:00 2001 From: Stanislav Ochotnicky <sochotnicky(a)redhat.com> Date: Tue, 24 Jan 2012 10:33:17 +0100 -Subject: [PATCH 2/7] Remove javadoc execution +Subject: [PATCH 1/6] Remove javadoc execution We generate javadoc as a separate step --- @@ -10,7 +10,7 @@ We generate javadoc as a separate step 2 files changed, 0 insertions(+), 20 deletions(-) diff --git a/jetty-aggregate/jetty-all/pom.xml b/jetty-aggregate/jetty-all/pom.xml -index aafeebd..bb4d76e 100644 +index d0675a7..40f2a91 100644 --- a/jetty-aggregate/jetty-all/pom.xml +++ b/jetty-aggregate/jetty-all/pom.xml @@ -73,19 +73,6 @@ @@ -34,7 +34,7 @@ index aafeebd..bb4d76e 100644 </build> diff --git a/jetty-distribution/pom.xml b/jetty-distribution/pom.xml -index 1c2c1a9..c9bcc69 100644 +index 105e166..13560e3 100644 --- a/jetty-distribution/pom.xml +++ b/jetty-distribution/pom.xml @@ -379,12 +379,5 @@ diff --git a/0003-Cleaup-distribution-generation.patch b/0002-Cleaup-distribution-generation.patch similarity index 97% rename from 0003-Cleaup-distribution-generation.patch rename to 0002-Cleaup-distribution-generation.patch index abaa68e..17ee218 100644 --- a/0003-Cleaup-distribution-generation.patch +++ b/0002-Cleaup-distribution-generation.patch @@ -1,7 +1,7 @@ -From 144b86fe0d9492b514b6a51fa4a91c400d53b790 Mon Sep 17 00:00:00 2001 +From 18d40c0909309f145fd36e2b35f009484787829f Mon Sep 17 00:00:00 2001 From: Stanislav Ochotnicky <sochotnicky(a)redhat.com> Date: Tue, 24 Jan 2012 10:37:20 +0100 -Subject: [PATCH 3/7] Cleaup distribution generation +Subject: [PATCH 2/6] Cleaup distribution generation We recreate distribution package anyway, this just complicated things --- @@ -9,7 +9,7 @@ We recreate distribution package anyway, this just complicated things 1 files changed, 0 insertions(+), 46 deletions(-) diff --git a/jetty-distribution/pom.xml b/jetty-distribution/pom.xml -index c9bcc69..2323e4c 100644 +index 13560e3..70677a9 100644 --- a/jetty-distribution/pom.xml +++ b/jetty-distribution/pom.xml @@ -64,71 +64,25 @@ diff --git a/0004-Disable-test-artifacts.patch b/0003-Disable-test-artifacts.patch similarity index 87% rename from 0004-Disable-test-artifacts.patch rename to 0003-Disable-test-artifacts.patch index a642b38..e93ca0c 100644 --- a/0004-Disable-test-artifacts.patch +++ b/0003-Disable-test-artifacts.patch @@ -1,7 +1,7 @@ -From c8bec5a205912decf48c4f7cd1d224e5940bf0bf Mon Sep 17 00:00:00 2001 +From 6bebe830eada634485c7c872a1038a3a0a5e06f2 Mon Sep 17 00:00:00 2001 From: Stanislav Ochotnicky <sochotnicky(a)redhat.com> Date: Tue, 24 Jan 2012 11:09:27 +0100 -Subject: [PATCH 4/7] Disable test artifacts +Subject: [PATCH 3/6] Disable test artifacts - they need more dependencies then we have time for right now :-) --- @@ -10,7 +10,7 @@ Subject: [PATCH 4/7] Disable test artifacts 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/jetty-osgi/pom.xml b/jetty-osgi/pom.xml -index 5027022..3049e2b 100644 +index 91bcb2e..2529824 100644 --- a/jetty-osgi/pom.xml +++ b/jetty-osgi/pom.xml @@ -25,7 +25,6 @@ @@ -22,10 +22,10 @@ index 5027022..3049e2b 100644 <build> <resources> diff --git a/pom.xml b/pom.xml -index 89919de..c67484d 100644 +index 6bcfc31..7be01ea 100644 --- a/pom.xml +++ b/pom.xml -@@ -353,17 +353,12 @@ +@@ -352,17 +352,12 @@ <module>jetty-nested</module> <module>jetty-overlay-deployer</module> <module>jetty-osgi</module> diff --git a/0005-Change-servelt-groupId-to-javax.servlet.patch b/0004-Change-servelt-groupId-to-javax.servlet.patch similarity index 82% rename from 0005-Change-servelt-groupId-to-javax.servlet.patch rename to 0004-Change-servelt-groupId-to-javax.servlet.patch index 1ac54b9..f43b66b 100644 --- a/0005-Change-servelt-groupId-to-javax.servlet.patch +++ b/0004-Change-servelt-groupId-to-javax.servlet.patch @@ -1,14 +1,14 @@ -From f8fecce79522a135af1d3ed908605a74882c4998 Mon Sep 17 00:00:00 2001 +From b27a862cd8edd2f82a488bba3e4ae43544592ce2 Mon Sep 17 00:00:00 2001 From: Stanislav Ochotnicky <sochotnicky(a)redhat.com> Date: Tue, 24 Jan 2012 11:10:12 +0100 -Subject: [PATCH 5/7] Change servelt groupId to javax.servlet +Subject: [PATCH 4/6] Change servelt groupId to javax.servlet --- pom.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/pom.xml b/pom.xml -index c67484d..13d35d0 100644 +index 7be01ea..e556e89 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ diff --git a/0006-Modify-dependencies.patch b/0005-Modify-dependencies.patch similarity index 89% rename from 0006-Modify-dependencies.patch rename to 0005-Modify-dependencies.patch index afab9b1..ab9741d 100644 --- a/0006-Modify-dependencies.patch +++ b/0005-Modify-dependencies.patch @@ -1,7 +1,7 @@ -From ec29eb222cbe1eff0ce5d06fdd68e8702ece7d30 Mon Sep 17 00:00:00 2001 +From 968ec2b8f92311ef6c5e3d17dba2f9bd3bd4df68 Mon Sep 17 00:00:00 2001 From: Stanislav Ochotnicky <sochotnicky(a)redhat.com> Date: Tue, 24 Jan 2012 11:13:25 +0100 -Subject: [PATCH 6/7] Modify dependencies +Subject: [PATCH 5/6] Modify dependencies - remove sun httpserver - add tomcat-jasper @@ -11,7 +11,7 @@ Subject: [PATCH 6/7] Modify dependencies 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/jetty-http-spi/pom.xml b/jetty-http-spi/pom.xml -index 07b6ce6..0142146 100644 +index dd64b1f..3df3312 100644 --- a/jetty-http-spi/pom.xml +++ b/jetty-http-spi/pom.xml @@ -17,12 +17,6 @@ @@ -28,7 +28,7 @@ index 07b6ce6..0142146 100644 <artifactId>jetty-server</artifactId> <version>${project.version}</version> diff --git a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml -index 7c72a98..6e1d432 100644 +index 9bc544b..2417dd5 100644 --- a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml +++ b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml @@ -53,6 +53,11 @@ diff --git a/0007-Remove-pmd-plugin.patch b/0006-Remove-pmd-plugin.patch similarity index 91% rename from 0007-Remove-pmd-plugin.patch rename to 0006-Remove-pmd-plugin.patch index 161ee6a..8427468 100644 --- a/0007-Remove-pmd-plugin.patch +++ b/0006-Remove-pmd-plugin.patch @@ -1,7 +1,7 @@ -From 9142fd1a0383891a1dd6fbc411d74251c87c694c Mon Sep 17 00:00:00 2001 +From d390cf8cbd2ef711a59196534134a12c31057a2d Mon Sep 17 00:00:00 2001 From: Stanislav Ochotnicky <sochotnicky(a)redhat.com> Date: Tue, 24 Jan 2012 11:15:56 +0100 -Subject: [PATCH 7/7] Remove pmd plugin +Subject: [PATCH 6/6] Remove pmd plugin - prevents problem with "Reporting mojo's can only be called from ReportDocumentRender". Investigate proper fix some other time? @@ -10,7 +10,7 @@ Subject: [PATCH 7/7] Remove pmd plugin 1 files changed, 0 insertions(+), 29 deletions(-) diff --git a/pom.xml b/pom.xml -index 13d35d0..f43c979 100644 +index e556e89..6e5a47e 100644 --- a/pom.xml +++ b/pom.xml @@ -152,35 +152,6 @@ diff --git a/jetty.spec b/jetty.spec index 91456f5..8231d53 100644 --- a/jetty.spec +++ b/jetty.spec @@ -42,24 +42,23 @@ Name: jetty Version: 8.1.0 -Release: 0.1.rc4%{?dist} +Release: 0.1.rc5%{?dist} Summary: Java Webserver and Servlet Container Group: Applications/Internet License: ASL 2.0 URL: http://jetty.mortbay.org/jetty/ -Source0: http://git.eclipse.org/c/jetty/org.eclipse.jetty.project.git/snapshot/jet... +Source0: http://git.eclipse.org/c/jetty/org.eclipse.jetty.project.git/snapshot/jet... Source1: djetty.script Source2: jetty.init Source3: jetty.logrotate Source4: %{name}-depmap.xml -Patch0: 0001-Add-proper-symbolic-names-into-bundles.patch -Patch1: 0002-Remove-javadoc-execution.patch -Patch2: 0003-Cleaup-distribution-generation.patch -Patch3: 0004-Disable-test-artifacts.patch -Patch4: 0005-Change-servelt-groupId-to-javax.servlet.patch -Patch5: 0006-Modify-dependencies.patch -Patch6: 0007-Remove-pmd-plugin.patch +Patch0: 0001-Remove-javadoc-execution.patch +Patch1: 0002-Cleaup-distribution-generation.patch +Patch2: 0003-Disable-test-artifacts.patch +Patch3: 0004-Change-servelt-groupId-to-javax.servlet.patch +Patch4: 0005-Modify-dependencies.patch +Patch5: 0006-Remove-pmd-plugin.patch BuildRequires: java-devel >= 1:1.7.0 BuildRequires: tomcat-lib @@ -140,7 +139,7 @@ Requires: %{name} = %{version} %{summary}. %prep -%setup -q -n %{jettyname}-%{version}.RC4 +%setup -q -n %{jettyname}-%{version}.RC5 for f in $(find . -name "*.?ar"); do rm $f; done find . -name "*.class" -exec rm {} \; @@ -150,7 +149,6 @@ find . -name "*.class" -exec rm {} \; %patch3 -p1 -b .sav %patch4 -p1 -b .sav %patch5 -p1 -b .sav -%patch6 -p1 -b .sav cp %{SOURCE1} djetty @@ -164,7 +162,7 @@ mv LICENSE-CONTRIBUTOR/CDDLv1.0.txt{.con,} %build #rm -rf ./* -#ln -sf ~/temp/jetty/jetty-8.1.0.RC4.copy/* . +#ln -sf ~/temp/jetty/jetty-8.1.0.RC5.copy/* . #exit 0 # remove previous lines! sed -i -e "s|/usr/share|%{_datadir}|g" djetty @@ -190,9 +188,9 @@ install -dm 755 %{buildroot}%{rundir} install -dm 755 %{buildroot}%{tempdir} install -dm 755 %{buildroot}%{appdir} # main pkg -tar xvf jetty-distribution/target/%{name}-distribution-%{version}.RC4.tar.gz -C %{buildroot}%{homedir} -mv %{buildroot}%{homedir}/%{name}-distribution-%{version}.RC4/* %{buildroot}%{homedir}/ -rmdir %{buildroot}%{homedir}/%{name}-distribution-%{version}.RC4 +tar xvf jetty-distribution/target/%{name}-distribution-%{version}.RC5.tar.gz -C %{buildroot}%{homedir} +mv %{buildroot}%{homedir}/%{name}-distribution-%{version}.RC5/* %{buildroot}%{homedir}/ +rmdir %{buildroot}%{homedir}/%{name}-distribution-%{version}.RC5 chmod +x %{buildroot}%{homedir}/bin/jetty-xinetd.sh chmod +x djetty @@ -211,10 +209,10 @@ for module in jetty-ajp jetty-annotations jetty-client jetty-continuation \ jetty-rewrite jetty-security jetty-server jetty-servlet \ jetty-servlets jetty-util jetty-webapp jetty-websocket \ jetty-xml; do - mv %{buildroot}%{homedir}/lib/$module-%{version}.RC4.jar \ + mv %{buildroot}%{homedir}/lib/$module-%{version}.RC5.jar \ %{buildroot}%{_javadir}/%{name}/$module.jar ln -s %{_javadir}/%{name}/$module.jar \ - %{buildroot}%{homedir}/lib/$module-%{version}.RC4.jar + %{buildroot}%{homedir}/lib/$module-%{version}.RC5.jar install -pm 644 $module/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-$module.pom %add_maven_depmap JPP.%{name}-$module.pom %{name}/$module.jar done @@ -222,7 +220,7 @@ done # modules used during build and other jars not included in the # distribution tarball for module in jetty-http-spi jetty-jaspi jetty-nested jetty-nosql;do - install $module/target/$module-%{version}.RC4.jar \ + install $module/target/$module-%{version}.RC5.jar \ %{buildroot}%{_javadir}/%{name}/$module.jar install -pm 644 $module/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-$module.pom %add_maven_depmap JPP.%{name}-$module.pom %{name}/$module.jar @@ -233,7 +231,7 @@ pushd jetty-osgi %add_maven_depmap JPP.%{name}-jetty-osgi.pom for submod in boot boot-jsp boot-warurl;do module=jetty-osgi-$submod - install $module/target/$module-%{version}.RC4.jar \ + install $module/target/$module-%{version}.RC5.jar \ %{buildroot}%{_javadir}/%{name}/$module.jar install -pm 644 $module/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-$module.pom %add_maven_depmap JPP.%{name}-$module.pom %{name}/$module.jar @@ -241,7 +239,7 @@ pushd jetty-osgi #httpservice is a bit special (for no good reason) module=jetty-httpservice - install jetty-osgi-httpservice/target/$module-%{version}.RC4.jar \ + install jetty-osgi-httpservice/target/$module-%{version}.RC5.jar \ %{buildroot}%{_javadir}/%{name}/$module.jar install -pm 644 jetty-osgi-httpservice/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-$module.pom %add_maven_depmap JPP.%{name}-$module.pom %{name}/$module.jar @@ -269,10 +267,10 @@ done ln -sf $(build-classpath geronimo-jta) \ %{buildroot}%{homedir}/lib/jta/ -mv %{buildroot}%{homedir}/lib/monitor/jetty-monitor-%{version}.RC4.jar \ +mv %{buildroot}%{homedir}/lib/monitor/jetty-monitor-%{version}.RC5.jar \ %{buildroot}%{_javadir}/%{name}/jetty-monitor.jar ln -s %{_javadir}/%{name}/jetty-monitor.jar \ - %{buildroot}%{homedir}/lib/monitor/jetty-monitor-%{version}.RC4.jar + %{buildroot}%{homedir}/lib/monitor/jetty-monitor-%{version}.RC5.jar install -pm 644 jetty-monitor/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-jetty-monitor.pom %add_maven_depmap JPP.%{name}-jetty-monitor.pom %{name}/jetty-monitor.jar @@ -372,8 +370,12 @@ fi %doc %{_javadocdir}/%{name} %changelog -* Wed Jan 25 2012 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 8.1.0-0.1.rc4 -- Major update to 8.0.0 rc4 +* Wed Jan 25 2012 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 8.1.0-0.1.rc5 +- Update to rc5 +- Remove symbolic name patch (not needed after bundle plugin fix) + +* Wed Jan 25 2012 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 8.1.0-0.1.RC4 +- Major update to 8.1.0 RC4 - Removed manual subpackage (was empty anyway) * Fri Jan 13 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 6.1.26-9 diff --git a/sources b/sources index 2fb5505..6257040 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8875a3e970ed79d4f187ab3e6a81850b jetty-8.1.0.RC4.tar.bz2 +c8cdac9d0d2706d597edf64315068dbf jetty-8.1.0.RC5.tar.bz2

12 years, 4 months

1
0
0 / 0

File jetty-8.1.0.RC5.tar.bz2 uploaded to lookaside cache by sochotni

by Stanislav Ochotnicky

A file has been added to the lookaside cache for jetty: c8cdac9d0d2706d597edf64315068dbf jetty-8.1.0.RC5.tar.bz2

12 years, 4 months

1
0
0 / 0

[jetty] Added sources

by Stanislav Ochotnicky

commit 804efe5275082f01ca77a8a5ce96b58d44755e1b Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com> Date: Wed Jan 25 11:44:40 2012 +0100 Added sources .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) --- diff --git a/.gitignore b/.gitignore index 3e7a6ed..66613eb 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ jetty-6.1.20-src.zip jetty-6.1.21-src.zip jetty-6.1.24-src.zip jetty-6.1.26-src.zip +/jetty-8.1.0.RC4.tar.bz2 diff --git a/sources b/sources index 83409a4..2fb5505 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4980757517064efbf655e025d005a0b8 jetty-6.1.26-src.zip +8875a3e970ed79d4f187ab3e6a81850b jetty-8.1.0.RC4.tar.bz2

12 years, 4 months

1
0
0 / 0

File jetty-8.1.0.RC4.tar.bz2 uploaded to lookaside cache by sochotni

by Stanislav Ochotnicky

A file has been added to the lookaside cache for jetty: 8875a3e970ed79d4f187ab3e6a81850b jetty-8.1.0.RC4.tar.bz2

12 years, 4 months

1
0
0 / 0

[jetty] Major update to 8.0.0 rc4

by Stanislav Ochotnicky

commit 2c3ce1f3420a31bf8cc19fce27ee71b8de6e6cfd Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com> Date: Wed Jan 25 11:28:01 2012 +0100 Major update to 8.0.0 rc4 - Removed manual subpackage (was empty anyway) - Jetty as a server needs to be fixed still (TODO) - few packages will need to be fixed 0001-Add-proper-symbolic-names-into-bundles.patch | 24 + 0002-Remove-javadoc-execution.patch | 55 +++ 0003-Cleaup-distribution-generation.patch | 89 ++++ 0004-Disable-test-artifacts.patch | 50 ++ 0005-Change-servelt-groupId-to-javax.servlet.patch | 25 + 0006-Modify-dependencies.patch | 48 ++ 0007-Remove-pmd-plugin.patch | 54 +++ jetty-depmap.xml | 353 +++++++-------- jetty.spec | 479 ++++++++++---------- 9 files changed, 754 insertions(+), 423 deletions(-) --- diff --git a/0001-Add-proper-symbolic-names-into-bundles.patch b/0001-Add-proper-symbolic-names-into-bundles.patch new file mode 100644 index 0000000..8db0e97 --- /dev/null +++ b/0001-Add-proper-symbolic-names-into-bundles.patch @@ -0,0 +1,24 @@ +From 596b93168c80a5398bd3aa42a35802652d3d12d1 Mon Sep 17 00:00:00 2001 +From: Stanislav Ochotnicky <sochotnicky(a)redhat.com> +Date: Thu, 19 Jan 2012 15:10:04 +0100 +Subject: [PATCH 1/7] Add proper symbolic names into bundles + +--- + pom.xml | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/pom.xml b/pom.xml +index db76477..89919de 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -226,6 +226,7 @@ + <Bundle-Vendor>Eclipse Jetty Project</Bundle-Vendor> + <Bundle-Localization>plugin</Bundle-Localization> + <Bundle-Classpath>.</Bundle-Classpath> ++ <Bundle-SymbolicName>${bundle-symbolic-name}</Bundle-SymbolicName> + <Export-Package>${bundle-symbolic-name}.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}"</Export-Package> + <Bundle-Copyright>Copyright (c) 2008-2009 Mort Bay Consulting Pty. Ltd.</Bundle-Copyright> + <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy> +-- +1.7.6.2 + diff --git a/0002-Remove-javadoc-execution.patch b/0002-Remove-javadoc-execution.patch new file mode 100644 index 0000000..e6e0026 --- /dev/null +++ b/0002-Remove-javadoc-execution.patch @@ -0,0 +1,55 @@ +From 8ccf2fbee3fdb514aa132c7a0c7f0c4688a3f836 Mon Sep 17 00:00:00 2001 +From: Stanislav Ochotnicky <sochotnicky(a)redhat.com> +Date: Tue, 24 Jan 2012 10:33:17 +0100 +Subject: [PATCH 2/7] Remove javadoc execution + +We generate javadoc as a separate step +--- + jetty-aggregate/jetty-all/pom.xml | 13 ------------- + jetty-distribution/pom.xml | 7 ------- + 2 files changed, 0 insertions(+), 20 deletions(-) + +diff --git a/jetty-aggregate/jetty-all/pom.xml b/jetty-aggregate/jetty-all/pom.xml +index aafeebd..bb4d76e 100644 +--- a/jetty-aggregate/jetty-all/pom.xml ++++ b/jetty-aggregate/jetty-all/pom.xml +@@ -73,19 +73,6 @@ + </execution> + </executions> + </plugin> +- <plugin> +- <groupId>org.apache.maven.plugins</groupId> +- <artifactId>maven-javadoc-plugin</artifactId> +- <executions> +- <execution> +- <id>javadoc-jar</id> +- <phase>compile</phase> +- <goals> +- <goal>jar</goal> +- </goals> +- </execution> +- </executions> +- </plugin> + </plugins> + </build> + +diff --git a/jetty-distribution/pom.xml b/jetty-distribution/pom.xml +index 1c2c1a9..c9bcc69 100644 +--- a/jetty-distribution/pom.xml ++++ b/jetty-distribution/pom.xml +@@ -379,12 +379,5 @@ + <artifactId>jetty-overlay-deployer</artifactId> + <version>${project.version}</version> + </dependency> +- <dependency> +- <groupId>org.eclipse.jetty.aggregate</groupId> +- <artifactId>jetty-all</artifactId> +- <classifier>javadoc</classifier> +- <type>jar</type> +- <version>${project.version}</version> +- </dependency> + </dependencies> + </project> +-- +1.7.6.2 + diff --git a/0003-Cleaup-distribution-generation.patch b/0003-Cleaup-distribution-generation.patch new file mode 100644 index 0000000..abaa68e --- /dev/null +++ b/0003-Cleaup-distribution-generation.patch @@ -0,0 +1,89 @@ +From 144b86fe0d9492b514b6a51fa4a91c400d53b790 Mon Sep 17 00:00:00 2001 +From: Stanislav Ochotnicky <sochotnicky(a)redhat.com> +Date: Tue, 24 Jan 2012 10:37:20 +0100 +Subject: [PATCH 3/7] Cleaup distribution generation + +We recreate distribution package anyway, this just complicated things +--- + jetty-distribution/pom.xml | 46 -------------------------------------------- + 1 files changed, 0 insertions(+), 46 deletions(-) + +diff --git a/jetty-distribution/pom.xml b/jetty-distribution/pom.xml +index c9bcc69..2323e4c 100644 +--- a/jetty-distribution/pom.xml ++++ b/jetty-distribution/pom.xml +@@ -64,71 +64,25 @@ +  + +  +- <property name="orbit-cache" value="${user.home}/.m2/eclipse-orbit" /> + +- <mkdir dir="${orbit-cache}" /> +- <get dest="${orbit-cache}" verbose="true" skipexisting="true"> +- <url url="${jetty-orbit-url}/javax.servlet_${orbit-javax-servlet-version}.jar" /> +- <url url="${jetty-orbit-url}/javax.activation_${orbit-javax-activation-version}.jar" /> +- <url url="${jetty-orbit-url}/javax.annotation_${orbit-javax-annotation-version}.jar" /> +- <url url="${jetty-orbit-url}/javax.mail.glassfish_${orbit-javax-mail-glassfish-version}.jar" /> +- <url url="${jetty-orbit-url}/javax.el_${orbit-javax-el-version}.jar" /> +- <url url="${jetty-orbit-url}/javax.servlet.jsp_${orbit-javax-servlet-jsp-version}.jar" /> +- <url url="${jetty-orbit-url}/javax.servlet.jsp.jstl_${orbit-javax-servlet-jsp-jstl-version}.jar" /> +- <url url="${jetty-orbit-url}/com.sun.el_${orbit-com-sun-el-version}.jar" /> +- <url url="${jetty-orbit-url}/org.apache.jasper.glassfish_${orbit-org-apache-jasper-version}.jar" /> +- <url url="${jetty-orbit-url}/org.apache.taglibs.standard.glassfish_${orbit-org-apache-taglibs-standard-version}.jar" /> +- <url url="${jetty-orbit-url}/org.objectweb.asm_${orbit-org-objectweb-asm-version}.jar" /> +- <url url="${jetty-orbit-url}/javax.transaction_${orbit-javax-transaction-version}.jar" /> +- <url url="${jetty-orbit-url}/ecj-${eclipse-ecj-version}.jar" /> +- </get> + +  + +  + <mkdir dir="${assembly-directory}/lib" /> +- <copy file="${orbit-cache}/javax.servlet_${orbit-javax-servlet-version}.jar" tofile="${assembly-directory}/lib/servlet-api-3.0.jar" /> + + +  + <mkdir dir="${assembly-directory}/lib/annotations" /> +- <copy todir="${assembly-directory}/lib/annotations"> +- <fileset dir="${orbit-cache}"> +- <include name="javax.annotation_${orbit-javax-annotation-version}.jar" /> +- <include name="org.objectweb.asm_${orbit-org-objectweb-asm-version}.jar" /> +- </fileset> +- </copy> + +  + <mkdir dir="${assembly-directory}/lib/jndi" /> +- <copy todir="${assembly-directory}/lib/jndi"> +- <fileset dir="${orbit-cache}"> +- <include name="javax.activation_${orbit-javax-activation-version}.jar" /> +- <include name="javax.mail.glassfish_${orbit-javax-mail-glassfish-version}.jar" /> +- </fileset> +- </copy> + +  + <mkdir dir="${assembly-directory}/lib/jta" /> +- <copy todir="${assembly-directory}/lib/jta"> +- <fileset dir="${orbit-cache}"> +- <include name="javax.transaction_${orbit-javax-transaction-version}.jar" /> +- </fileset> +- </copy> + +  + <mkdir dir="${assembly-directory}/lib/jsp" /> +- <copy todir="${assembly-directory}/lib/jsp"> +- <fileset dir="${orbit-cache}"> +- <include name="javax.el_${orbit-javax-el-version}.jar" /> +- <include name="javax.servlet.jsp_${orbit-javax-servlet-jsp-version}.jar" /> +- <include name="javax.servlet.jsp.jstl_${orbit-javax-servlet-jsp-jstl-version}.jar" /> +- <include name="com.sun.el_${orbit-com-sun-el-version}.jar" /> +- <include name="org.apache.jasper.glassfish_${orbit-org-apache-jasper-version}.jar" /> +- <include name="org.apache.taglibs.standard.glassfish_${orbit-org-apache-taglibs-standard-version}.jar" /> +- <include name="ecj-${eclipse-ecj-version}.jar" /> +- </fileset> +- </copy> + <chmod dir="${assembly-directory}/bin" perm="755" includes="**/*.sh" /> + </tasks> + </configuration> +-- +1.7.6.2 + diff --git a/0004-Disable-test-artifacts.patch b/0004-Disable-test-artifacts.patch new file mode 100644 index 0000000..a642b38 --- /dev/null +++ b/0004-Disable-test-artifacts.patch @@ -0,0 +1,50 @@ +From c8bec5a205912decf48c4f7cd1d224e5940bf0bf Mon Sep 17 00:00:00 2001 +From: Stanislav Ochotnicky <sochotnicky(a)redhat.com> +Date: Tue, 24 Jan 2012 11:09:27 +0100 +Subject: [PATCH 4/7] Disable test artifacts + +- they need more dependencies then we have time for right now :-) +--- + jetty-osgi/pom.xml | 1 - + pom.xml | 9 ++------- + 2 files changed, 2 insertions(+), 8 deletions(-) + +diff --git a/jetty-osgi/pom.xml b/jetty-osgi/pom.xml +index 5027022..3049e2b 100644 +--- a/jetty-osgi/pom.xml ++++ b/jetty-osgi/pom.xml +@@ -25,7 +25,6 @@ + <module>jetty-osgi-boot-jsp</module> + <module>jetty-osgi-boot-warurl</module> + <module>jetty-osgi-httpservice</module> +- <module>test-jetty-osgi</module> + </modules> + <build> + <resources> +diff --git a/pom.xml b/pom.xml +index 89919de..c67484d 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -353,17 +353,12 @@ + <module>jetty-nested</module> + <module>jetty-overlay-deployer</module> + <module>jetty-osgi</module> +- <module>jetty-nosql</module> +- <module>jetty-http-spi</module> + <module>jetty-distribution</module> +- <module>test-continuation</module> +-  +- <module>test-jetty-servlet</module> + <module>test-jetty-webapp</module> +- <module>test-jetty-nested</module> ++ <module>jetty-nosql</module> ++ <module>jetty-http-spi</module> + <module>example-jetty-embedded</module> + <module>example-async-rest</module> +- <module>tests</module> + </modules> + <dependencyManagement> + <dependencies> +-- +1.7.6.2 + diff --git a/0005-Change-servelt-groupId-to-javax.servlet.patch b/0005-Change-servelt-groupId-to-javax.servlet.patch new file mode 100644 index 0000000..1ac54b9 --- /dev/null +++ b/0005-Change-servelt-groupId-to-javax.servlet.patch @@ -0,0 +1,25 @@ +From f8fecce79522a135af1d3ed908605a74882c4998 Mon Sep 17 00:00:00 2001 +From: Stanislav Ochotnicky <sochotnicky(a)redhat.com> +Date: Tue, 24 Jan 2012 11:10:12 +0100 +Subject: [PATCH 5/7] Change servelt groupId to javax.servlet + +--- + pom.xml | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/pom.xml b/pom.xml +index c67484d..13d35d0 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -18,7 +18,7 @@ + <junit-version>4.8.1</junit-version> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <slf4j-version>1.6.1</slf4j-version> +- <servlet.spec.groupId>org.mortbay.jetty</servlet.spec.groupId> ++ <servlet.spec.groupId>javax.servlet</servlet.spec.groupId> + <servlet.spec.artifactId>servlet-api</servlet.spec.artifactId> + <servlet.spec.version>3.0.20100224</servlet.spec.version> + <build-support-version>1.1</build-support-version> +-- +1.7.6.2 + diff --git a/0006-Modify-dependencies.patch b/0006-Modify-dependencies.patch new file mode 100644 index 0000000..afab9b1 --- /dev/null +++ b/0006-Modify-dependencies.patch @@ -0,0 +1,48 @@ +From ec29eb222cbe1eff0ce5d06fdd68e8702ece7d30 Mon Sep 17 00:00:00 2001 +From: Stanislav Ochotnicky <sochotnicky(a)redhat.com> +Date: Tue, 24 Jan 2012 11:13:25 +0100 +Subject: [PATCH 6/7] Modify dependencies + +- remove sun httpserver +- add tomcat-jasper +--- + jetty-http-spi/pom.xml | 6 ------ + jetty-osgi/jetty-osgi-boot-jsp/pom.xml | 5 +++++ + 2 files changed, 5 insertions(+), 6 deletions(-) + +diff --git a/jetty-http-spi/pom.xml b/jetty-http-spi/pom.xml +index 07b6ce6..0142146 100644 +--- a/jetty-http-spi/pom.xml ++++ b/jetty-http-spi/pom.xml +@@ -17,12 +17,6 @@ + <scope>test</scope> + </dependency> + <dependency> +- <groupId>com.sun.net.httpserver</groupId> +- <artifactId>http</artifactId> +- <version>20070405</version> +- <scope>provided</scope> +- </dependency> +- <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-server</artifactId> + <version>${project.version}</version> +diff --git a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml +index 7c72a98..6e1d432 100644 +--- a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml ++++ b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml +@@ -53,6 +53,11 @@ + <version>2.2</version> + </dependency> + <dependency> ++ <groupId>org.apache.tomcat</groupId> ++ <artifactId>tomcat-jasper</artifactId> ++ <version>7.0.23</version> ++ </dependency> ++ <dependency> + <groupId>${servlet.spec.groupId}</groupId> + <artifactId>${servlet.spec.artifactId}</artifactId> + </dependency> +-- +1.7.6.2 + diff --git a/0007-Remove-pmd-plugin.patch b/0007-Remove-pmd-plugin.patch new file mode 100644 index 0000000..161ee6a --- /dev/null +++ b/0007-Remove-pmd-plugin.patch @@ -0,0 +1,54 @@ +From 9142fd1a0383891a1dd6fbc411d74251c87c694c Mon Sep 17 00:00:00 2001 +From: Stanislav Ochotnicky <sochotnicky(a)redhat.com> +Date: Tue, 24 Jan 2012 11:15:56 +0100 +Subject: [PATCH 7/7] Remove pmd plugin + +- prevents problem with "Reporting mojo's can only be called from + ReportDocumentRender". Investigate proper fix some other time? +--- + pom.xml | 29 ----------------------------- + 1 files changed, 0 insertions(+), 29 deletions(-) + +diff --git a/pom.xml b/pom.xml +index 13d35d0..f43c979 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -152,35 +152,6 @@ + </dependency> + </dependencies> + </plugin> +- <plugin> +- <groupId>org.apache.maven.plugins</groupId> +- <artifactId>maven-pmd-plugin</artifactId> +- <executions> +- <execution> +- <id>named-logging-enforcement</id> +- <phase>compile</phase> +- <goals> +- <goal>check</goal> +- </goals> +- <configuration> +- <verbose>true</verbose> +- </configuration> +- </execution> +- </executions> +- <configuration> +- <targetJdk>1.6</targetJdk> +- <rulesets> +- <ruleset>jetty/pmd_logging_ruleset.xml</ruleset> +- </rulesets> +- </configuration> +- <dependencies> +- <dependency> +- <groupId>org.eclipse.jetty.toolchain</groupId> +- <artifactId>jetty-build-support</artifactId> +- <version>${build-support-version}</version> +- </dependency> +- </dependencies> +- </plugin> + </plugins> + <pluginManagement> + <plugins> +-- +1.7.6.2 + diff --git a/jetty-depmap.xml b/jetty-depmap.xml index a888a31..b2c4219 100644 --- a/jetty-depmap.xml +++ b/jetty-depmap.xml @@ -1,193 +1,166 @@ <dependencies> -<dependency> - <maven> - <groupId>asm</groupId> - <artifactId>asm</artifactId> - <version>3.1</version> - </maven> - <jpp> - <groupId>JPP/objectweb-asm</groupId> - <artifactId>asm</artifactId> - <version>3.1</version> - </jpp> +<dependency> + <maven> + <groupId>org.apache.tomcat</groupId> + <artifactId>tomcat-util</artifactId> + <version>3.0</version> + </maven> + <jpp> + <groupId>JPP/tomcat</groupId> + <artifactId>tomcat-util</artifactId> + <version>3.0</version> + </jpp> +</dependency> +<dependency> + <maven> + <groupId>org.apache.tomcat</groupId> + <artifactId>tomcat-api</artifactId> + <version>3.0</version> + </maven> + <jpp> + <groupId>JPP/tomcat</groupId> + <artifactId>tomcat-api</artifactId> + <version>3.0</version> + </jpp> +</dependency> +<dependency> + <maven> + <groupId>org.eclipse</groupId> + <artifactId>org.eclipse.eclipse</artifactId> + <version>3.3.0</version> + </maven> +</dependency> +<dependency> + <maven> + <groupId>org.eclipse.core</groupId> + <artifactId>resources</artifactId> + <version>3.3.0</version> + </maven> +</dependency> + +<dependency> + <maven> + <groupId>javax.servlet</groupId> + <artifactId>jstl</artifactId> + <version>3.0</version> + </maven> + <jpp> + <groupId>JPP</groupId> + <artifactId>taglibs-core</artifactId> + <version>3.0</version> + </jpp> +</dependency> + +<dependency> + <maven> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>3.0</version> + </maven> + <jpp> + <groupId>JPP</groupId> + <artifactId>tomcat-servlet-3.0-api</artifactId> + <version>3.0</version> + </jpp> +</dependency> + +<dependency> + <maven> + <groupId>org.mortbay.jetty</groupId> + <artifactId>servlet-api</artifactId> + <version>3.0</version> + </maven> + <jpp> + <groupId>JPP</groupId> + <artifactId>tomcat-servlet-3.0-api</artifactId> + <version>3.0</version> + </jpp> +</dependency> + +<dependency> + <maven> + <groupId>javax.servlet.jsp</groupId> + <artifactId>jsp-api</artifactId> + <version>3.0</version> + </maven> + <jpp> + <groupId>JPP</groupId> + <artifactId>tomcat-jsp-api</artifactId> + <version>3.0</version> + </jpp> +</dependency> + +<dependency> + <maven> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jsp-2.1-glassfish</artifactId> + <version>3.0</version> + </maven> + <jpp> + <groupId>JPP</groupId> + <artifactId>tomcat-jsp-api</artifactId> + <version>3.0</version> + </jpp> +</dependency> + +<dependency> + <maven> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty-jsp</artifactId> + <version>3.0</version> + </maven> + <jpp> + <groupId>JPP</groupId> + <artifactId>tomcat-jsp-api</artifactId> + <version>3.0</version> + </jpp> +</dependency> + +<dependency> + <maven> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + <version>2.2</version> + </maven> + <jpp> + <groupId>JPP</groupId> + <artifactId>tomcat-el-api</artifactId> + <version>7.0.23</version> + </jpp> +</dependency> + +<dependency> + <maven> + <groupId>org.eclipse.jdt.core.compiler</groupId> + <artifactId>ecj</artifactId> + <version>2.2</version> + </maven> + <jpp> + <groupId>JPP</groupId> + <artifactId>ecj</artifactId> + <version>7.0.23</version> + </jpp> +</dependency> + +<dependency> + <maven> + <groupId>javax.activation</groupId> + <artifactId>activation</artifactId> + <version>3.0</version> + </maven> +</dependency> +<dependency> + <maven> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty-util</artifactId> + <version>3.0</version> + </maven> +</dependency> +<dependency> + <maven> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty</artifactId> + <version>3.0</version> + </maven> </dependency> - <dependency> - <maven> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jsp-2.1-glassfish</artifactId> - <version>9.1.1.B60.25.p2</version> - </maven> - <jpp> - <groupId>JPP</groupId> - <artifactId>tomcat6-jsp-2.1-api</artifactId> - <version>6.0.18</version> - </jpp> - </dependency> - <dependency> - <maven> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jsp-api-2.1-glassfish</artifactId> - <version>9.1.1.B60.25.p2</version> - </maven> - <jpp> - <groupId>JPP</groupId> - <artifactId>tomcat6-jsp-2.1-api</artifactId> - <version>6.0.18</version> - </jpp> - </dependency> - <dependency> - <maven> - <groupId>javax.servlet.jsp</groupId> - <artifactId>jsp-api</artifactId> - <version>2.1</version> - </maven> - <jpp> - <groupId>JPP</groupId> - <artifactId>tomcat6-jsp-2.1-api</artifactId> - <version>6.0.18</version> - </jpp> - </dependency> - <dependency> - <maven> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jsp-2.1-jetty</artifactId> - <version>9.1.1.B60.25.p2</version> - </maven> - <jpp> - <groupId>JPP</groupId> - <artifactId>tomcat6-jsp-2.1-api</artifactId> - <version>6.0.18</version> - </jpp> - </dependency> - <dependency> - <maven> - <groupId>ant</groupId> - <artifactId>ant</artifactId> - </maven> - <jpp> - <groupId>JPP</groupId> - <artifactId>ant</artifactId> - <version>1.6</version> - </jpp> - </dependency> - <dependency> - <maven> - <groupId>tomcat</groupId> - <artifactId>jasper-compiler-jdt</artifactId> - </maven> - <jpp> - <groupId>JPP/tomcat6</groupId> - <artifactId>jasper-jdt</artifactId> - <version>6.0.18</version> - </jpp> - </dependency> - <dependency> - <maven> - <groupId>tomcat</groupId> - <artifactId>jasper-compiler</artifactId> - </maven> - <jpp> - <groupId>JPP/tomcat6</groupId> - <artifactId>jasper</artifactId> - <version>6.0.26</version> - </jpp> - </dependency> - <dependency> - <maven> - <groupId>tomcat</groupId> - <artifactId>jasper-runtime</artifactId> - </maven> - <jpp> - <groupId>JPP/tomcat6</groupId> - <artifactId>jasper</artifactId> - <version>6.0.26</version> - </jpp> - </dependency> - <dependency> - <maven> - <groupId>mx4j</groupId> - <artifactId>mx4j</artifactId> - <version>3.0.1</version> - </maven> - <jpp> - <groupId>JPP/mx4j</groupId> - <artifactId>mx4j</artifactId> - <version>1.0</version> - </jpp> - </dependency> - <dependency> - <maven> - <groupId>mx4j</groupId> - <artifactId>mx4j-tools</artifactId> - <version>3.0.1</version> - </maven> - <jpp> - <groupId>JPP/mx4j</groupId> - <artifactId>mx4j-tools</artifactId> - <version>1.0</version> - </jpp> - </dependency> - <dependency> - <maven> - <groupId>geronimo-spec</groupId> - <artifactId>geronimo-spec-jta</artifactId> - <version>1.0.1B-rc4</version> - </maven> - <jpp> - <groupId>JPP</groupId> - <artifactId>jta</artifactId> - <version>1.0</version> - </jpp> - </dependency> - <dependency> - <maven> - <groupId>org.apache.maven</groupId> - <artifactId>maven-plugin-tools-api</artifactId> - <version>2.0</version> - </maven> - <jpp> - <groupId>JPP/maven-plugin-tools</groupId> - <artifactId>api</artifactId> - <version>2.7</version> - </jpp> - </dependency> - <dependency> - <maven> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-apacheds</artifactId> - <version>1.0-alpha-1</version> - </maven> - </dependency> - <dependency> - <maven> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-annotation_1.0_spec</artifactId> - <version>1.0</version> - </maven> - </dependency> - <dependency> - <maven> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty-annotations</artifactId> - <version>6.1.20</version> - </maven> - </dependency> - <dependency> - <maven> - <groupId>javax.activation</groupId> - <artifactId>activation</artifactId> - <version>1.1</version> - </maven> - </dependency> - <dependency> - <maven> - <groupId>org.apache.maven</groupId> - <artifactId>maven-plugin-descriptor</artifactId> - <version>2.0.6</version> - </maven> - <jpp> - <groupId>JPP/maven</groupId> - <artifactId>maven-compat</artifactId> - </jpp> - </dependency> </dependencies> diff --git a/jetty.spec b/jetty.spec index b649025..91456f5 100644 --- a/jetty.spec +++ b/jetty.spec @@ -41,86 +41,95 @@ %global appdir %{jettylibdir}/webapps Name: jetty -Version: 6.1.26 -Release: 9%{?dist} -Summary: The Jetty Webserver and Servlet Container +Version: 8.1.0 +Release: 0.1.rc4%{?dist} +Summary: Java Webserver and Servlet Container Group: Applications/Internet License: ASL 2.0 URL: http://jetty.mortbay.org/jetty/ -Source0: http://dist.codehaus.org/%{name}/%{name}-%{version}/%{name}-%{version}-sr... -Source1: djetty.script +Source0: http://git.eclipse.org/c/jetty/org.eclipse.jetty.project.git/snapshot/jet... +Source1: djetty.script Source2: jetty.init Source3: jetty.logrotate Source4: %{name}-depmap.xml -Patch0: disable-modules.patch -Patch1: jetty-util-pom.patch +Patch0: 0001-Add-proper-symbolic-names-into-bundles.patch +Patch1: 0002-Remove-javadoc-execution.patch +Patch2: 0003-Cleaup-distribution-generation.patch +Patch3: 0004-Disable-test-artifacts.patch +Patch4: 0005-Change-servelt-groupId-to-javax.servlet.patch +Patch5: 0006-Modify-dependencies.patch +Patch6: 0007-Remove-pmd-plugin.patch + +BuildRequires: java-devel >= 1:1.7.0 +BuildRequires: tomcat-lib +BuildRequires: tomcat-servlet-3.0-api +BuildRequires: tomcat-jsp-2.2-api +BuildRequires: tomcat-servlet-3.0-api +BuildRequires: tomcat-el-2.2-api +BuildRequires: maven +BuildRequires: maven-enforcer-plugin +BuildRequires: maven-dependency-plugin +BuildRequires: maven-war-plugin +BuildRequires: geronimo-jaspic-spec +BuildRequires: geronimo-jta +BuildRequires: geronimo-annotation +BuildRequires: eclipse-rcp +BuildRequires: eclipse-platform +BuildRequires: jakarta-taglibs-standard +BuildRequires: mongo-java-driver >= 2.6.5-4 +BuildRequires: objectweb-asm + +# we want javamail not classpathx-javamail +BuildRequires: %{_javadir}/javamail/mail.jar +BuildRequires: jetty-parent +BuildRequires: jetty-distribution-remote-resources +BuildRequires: jetty-parent +BuildRequires: jetty-build-support +BuildRequires: jetty-version-maven-plugin +BuildRequires: jetty-toolchain +BuildRequires: jetty-assembly-descriptors +BuildRequires: jetty-test-policy +BuildRequires: jetty-artifact-remote-resources + BuildArch: noarch -BuildRequires: fedora-usermgmt-devel -%{?FE_USERADD_REQ} -BuildRequires: jpackage-utils >= 0:1.6 -# build only -BuildRequires: maven-antrun-plugin -BuildRequires: apache-commons-parent -BuildRequires: maven-compiler-plugin -BuildRequires: maven-enforcer-plugin -BuildRequires: maven-install-plugin -BuildRequires: maven-jar-plugin -BuildRequires: maven-plugin-plugin -BuildRequires: maven-resources-plugin -BuildRequires: maven-site-plugin -BuildRequires: maven-source-plugin -BuildRequires: maven-project-info-reports-plugin -BuildRequires: maven-dependency-plugin -BuildRequires: maven-assembly-plugin -BuildRequires: maven-remote-resources-plugin -BuildRequires: maven-war-plugin -BuildRequires: maven-plugin-bundle -BuildRequires: maven-release-plugin -BuildRequires: maven-surefire-plugin -BuildRequires: maven-shared-dependency-tree -BuildRequires: servlet25 -BuildRequires: jsp21 -BuildRequires: slf4j -BuildRequires: objectweb-asm -BuildRequires: apache-commons-el -BuildRequires: apache-commons-daemon -BuildRequires: geronimo-jta -BuildRequires: geronimo-parent-poms -BuildRequires: apache-commons-parent -BuildRequires: derby -BuildRequires: tomcat6-lib -BuildRequires: maven-skins - -Requires: chkconfig -Requires: jpackage-utils >= 0:1.6 -Requires: ant >= 0:1.6 -Requires: apache-commons-el -Requires: apache-commons-logging -Requires: mx4j >= 0:3.0 -Requires: servlet25 -Requires: jsp21 -Requires: slf4j -Requires: javamail -Requires: xerces-j2 >= 0:2.7 -Requires: xml-commons-apis -Provides: group(%username) = %jtuid -Provides: user(%username) = %jtuid + +Requires: chkconfig +Requires: jpackage-utils >= 0:1.6 +Requires: tomcat-servlet-3.0-api +Requires: jsp22 +Requires: slf4j +Requires: javamail +Requires: xerces-j2 >= 0:2.7 +Requires: xml-commons-apis +Requires: tomcat-lib +Requires: tomcat-servlet-3.0-api +Requires: tomcat-jsp-2.2-api +Requires: tomcat-servlet-3.0-api +Requires: tomcat-el-2.2-api +Requires: geronimo-jta +Requires: jakarta-taglibs-standard +Requires: objectweb-asm + +Provides: group(%username) = %jtuid +Provides: user(%username) = %jtuid + +Obsoletes: %{name}-manual < %{version}-%{release} %description -Jetty is a 100% Java HTTP Server and Servlet Container. -This means that you do not need to configure and run a -separate web server (like Apache) in order to use java, -servlets and JSPs to generate dynamic content. Jetty is -a fully featured web server for static and dynamic content. -Unlike separate server/container solutions, this means -that your web server and web application run in the same -process, without interconnection overheads and complications. -Furthermore, as a pure java component, Jetty can be simply -included in your application for demonstration, distribution -or deployment. Jetty is available on all Java supported -platforms. +Jetty is a 100% Java HTTP Server and Servlet Container. +This means that you do not need to configure and run a +separate web server (like Apache) in order to use java, +servlets and JSPs to generate dynamic content. Jetty is +a fully featured web server for static and dynamic content. +Unlike separate server/container solutions, this means +that your web server and web application run in the same +process, without interconnection overheads and complications. +Furthermore, as a pure java component, Jetty can be simply +included in your application for demonstration, distribution +or deployment. Jetty is available on all Java supported +platforms. %package javadoc Summary: Javadoc for %{name} @@ -130,112 +139,151 @@ Requires: %{name} = %{version} %description javadoc %{summary}. -%package manual -Summary: Documents for %{name} -Group: Documentation -Requires: %{name} = %{version} - -%description manual -%{summary}. - %prep -%setup -q -n %{jettyname}-%{version} +%setup -q -n %{jettyname}-%{version}.RC4 for f in $(find . -name "*.?ar"); do rm $f; done find . -name "*.class" -exec rm {} \; -%patch0 -b .sav -%patch1 -b .sav +%patch0 -p1 -b .sav +%patch1 -p1 -b .sav +%patch2 -p1 -b .sav +%patch3 -p1 -b .sav +%patch4 -p1 -b .sav +%patch5 -p1 -b .sav +%patch6 -p1 -b .sav cp %{SOURCE1} djetty -#remove glassfish specific file -rm -fr modules/jsp-2.1/src/main/java/com/sun/org/apache/commons/logging/impl/JettyLog.java - -sed -i "s|<groupId>org.codehaus.mojo</groupId>||g" modules/management/pom.xml -sed -i "s|dependency-maven-plugin|maven-dependency-plugin|g" modules/management/pom.xml -sed -i "s|<groupId>org.codehaus.mojo</groupId>||g" modules/jsp-2.0/pom.xml -sed -i "s|<groupId>ant</groupId>|<groupId>org.apache.ant</groupId>|g" modules/jsp-2.0/pom.xml -sed -i "s|dependency-maven-plugin|maven-dependency-plugin|g" modules/jsp-2.0/pom.xml -sed -i "s|<groupId>org.codehaus.mojo</groupId>||g" modules/naming/pom.xml -sed -i "s|dependency-maven-plugin|maven-dependency-plugin|g" modules/naming/pom.xml -sed -i "s|<groupId>org.codehaus.mojo</groupId>||g" modules/annotations/pom.xml -sed -i "s|dependency-maven-plugin|maven-dependency-plugin|g" modules/annotations/pom.xml -sed -i "s|jcl104-over-slf4j|slf4j-jcl|g" modules/jsp-2.0/pom.xml - -sed -i "s|mvn|mvn-rpmbuild|g" distribution/jetty-assembly/pom.xml +# this needs jetty6 things, so just remove it +# shouldn't cause any trouble since it handled only in loadClass elsewhere +rm jetty-continuation/src/main/java/org/eclipse/jetty/continuation/Jetty6Continuation.java -sed -i "s|zip \$D/\$N|zip \$D/\$N/\$N|g" bin/build_release_bundles.sh - -sed -i "s|# look for JETTY_HOME|export JETTY_HOME=/usr/share/jetty|g" bin/jetty-xinetd.sh +iconv -f iso-8859-1 -t utf-8 LICENSE-CONTRIBUTOR/CDDLv1.0.txt > \ + LICENSE-CONTRIBUTOR/CDDLv1.0.txt.con +mv LICENSE-CONTRIBUTOR/CDDLv1.0.txt{.con,} %build +#rm -rf ./* +#ln -sf ~/temp/jetty/jetty-8.1.0.RC4.copy/* . +#exit 0 +# remove previous lines! sed -i -e "s|/usr/share|%{_datadir}|g" djetty -mvn-rpmbuild \ - -e \ +mvn-rpmbuild -e \ -Dmaven.local.depmap.file=%{SOURCE4} \ -Dmaven.test.skip=true \ - -DupdateReleaseInfo=true \ - install - -#pushd distribution/jetty-assembly -# mvn-jpp \ -# -e \ -# -s $(pwd)/settings.xml \ -# -Dmaven.repo.local=$MAVEN_REPO_LOCAL \ -# -Dmaven2.jpp.depmap.file=%{SOURCE4} \ -# -Dmaven.test.skip=true \ -# install -#popd - -sh bin/build_release_bundles.sh . + install javadoc:aggregate %install # dirs -install -dm 755 $RPM_BUILD_ROOT%{_bindir} -install -dm 755 $RPM_BUILD_ROOT%{_initrddir} -install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d -install -dm 755 $RPM_BUILD_ROOT%{_javadir}/%{name} - -install -dm 755 $RPM_BUILD_ROOT%{_mavenpomdir} -install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-jetty.pom -install -pm 644 modules/jetty/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.jetty-jetty.pom -install -pm 644 modules/util/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.jetty-jetty-util.pom -install -pm 644 modules/util5/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.jetty-jetty-util5.pom -install -pm 644 extras/client/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.jetty-jetty-client.pom -install -pm 644 extras/sslengine/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.jetty-jetty-sslengine.pom - -install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name} -install -dm 755 $RPM_BUILD_ROOT%{confdir} -install -dm 755 $RPM_BUILD_ROOT%{homedir} -install -dm 755 $RPM_BUILD_ROOT%{logdir} -install -dm 755 $RPM_BUILD_ROOT%{rundir} -install -dm 755 $RPM_BUILD_ROOT%{tempdir} -install -dm 755 $RPM_BUILD_ROOT%{appdir} +install -dm 755 %{buildroot}%{_bindir} +install -dm 755 %{buildroot}%{_initrddir} +install -dm 755 %{buildroot}%{_sysconfdir}/logrotate.d +install -dm 755 %{buildroot}%{_javadir}/%{name} + + +install -dm 755 %{buildroot}%{_javadocdir}/%{name} +install -dm 755 %{buildroot}%{confdir} +install -dm 755 %{buildroot}%{homedir} +install -dm 755 %{buildroot}%{logdir} +install -dm 755 %{buildroot}%{rundir} +install -dm 755 %{buildroot}%{tempdir} +install -dm 755 %{buildroot}%{appdir} # main pkg -unzip -q %{name}-%{version}.zip -d $RPM_BUILD_ROOT%{homedir} -mv $RPM_BUILD_ROOT%{homedir}/%{name}-%{version}/* $RPM_BUILD_ROOT%{homedir}/ -rm -fr $RPM_BUILD_ROOT%{homedir}/%{name}-%{version} +tar xvf jetty-distribution/target/%{name}-distribution-%{version}.RC4.tar.gz -C %{buildroot}%{homedir} +mv %{buildroot}%{homedir}/%{name}-distribution-%{version}.RC4/* %{buildroot}%{homedir}/ +rmdir %{buildroot}%{homedir}/%{name}-distribution-%{version}.RC4 -chmod +x $RPM_BUILD_ROOT%{homedir}/bin/jetty-xinetd.sh +chmod +x %{buildroot}%{homedir}/bin/jetty-xinetd.sh chmod +x djetty -mv djetty $RPM_BUILD_ROOT%{_bindir}/djetty -ln -s %{homedir}/bin/jetty.sh $RPM_BUILD_ROOT%{_bindir}/%{name} -install -pm 755 %{SOURCE2} $RPM_BUILD_ROOT%{_initrddir}/%{name} -install -pm 755 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/%{name} -echo '# Placeholder configuration file. No default is provided.' > $RPM_BUILD_ROOT%{confdir}/jetty.conf -ln -s %{homedir}/lib/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}.jar -ln -s %{homedir}/lib/%{name}-util-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-util.jar -ln -s %{homedir}/lib/jre1.5/%{name}-util5-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-util5.jar -ln -s %{homedir}/lib/ext/%{name}-client-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-client.jar -ln -s %{homedir}/lib/ext/%{name}-sslengine-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-sslengine.jar - -%add_maven_depmap JPP-jetty.pom -%add_maven_depmap JPP.jetty-jetty.pom %{name}/%{name}.jar -%add_maven_depmap JPP.jetty-jetty-util.pom %{name}/%{name}-util.jar -%add_maven_depmap JPP.jetty-jetty-util5.pom %{name}/%{name}-util5.jar -%add_maven_depmap JPP.jetty-jetty-client.pom %{name}/%{name}-client.jar -%add_maven_depmap JPP.jetty-jetty-sslengine.pom %{name}/%{name}-sslengine.jar +mv djetty %{buildroot}%{_bindir}/djetty +ln -s %{homedir}/bin/jetty.sh %{buildroot}%{_bindir}/%{name} +install -pm 755 %{SOURCE2} %{buildroot}%{_initrddir}/%{name} +install -pm 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/logrotate.d/%{name} +echo '# Placeholder configuration file. No default is provided.' > \ + %{buildroot}%{confdir}/jetty.conf + + +install -dm 755 %{buildroot}%{_mavenpomdir} +for module in jetty-ajp jetty-annotations jetty-client jetty-continuation \ + jetty-deploy jetty-http jetty-io jetty-jmx jetty-jndi \ + jetty-overlay-deployer jetty-plus jetty-policy \ + jetty-rewrite jetty-security jetty-server jetty-servlet \ + jetty-servlets jetty-util jetty-webapp jetty-websocket \ + jetty-xml; do + mv %{buildroot}%{homedir}/lib/$module-%{version}.RC4.jar \ + %{buildroot}%{_javadir}/%{name}/$module.jar + ln -s %{_javadir}/%{name}/$module.jar \ + %{buildroot}%{homedir}/lib/$module-%{version}.RC4.jar + install -pm 644 $module/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-$module.pom + %add_maven_depmap JPP.%{name}-$module.pom %{name}/$module.jar +done + +# modules used during build and other jars not included in the +# distribution tarball +for module in jetty-http-spi jetty-jaspi jetty-nested jetty-nosql;do + install $module/target/$module-%{version}.RC4.jar \ + %{buildroot}%{_javadir}/%{name}/$module.jar + install -pm 644 $module/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-$module.pom + %add_maven_depmap JPP.%{name}-$module.pom %{name}/$module.jar +done + +pushd jetty-osgi + install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-jetty-osgi.pom + %add_maven_depmap JPP.%{name}-jetty-osgi.pom + for submod in boot boot-jsp boot-warurl;do + module=jetty-osgi-$submod + install $module/target/$module-%{version}.RC4.jar \ + %{buildroot}%{_javadir}/%{name}/$module.jar + install -pm 644 $module/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-$module.pom + %add_maven_depmap JPP.%{name}-$module.pom %{name}/$module.jar + done + + #httpservice is a bit special (for no good reason) + module=jetty-httpservice + install jetty-osgi-httpservice/target/$module-%{version}.RC4.jar \ + %{buildroot}%{_javadir}/%{name}/$module.jar + install -pm 644 jetty-osgi-httpservice/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-$module.pom + %add_maven_depmap JPP.%{name}-$module.pom %{name}/$module.jar + +popd + +install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-project.pom +%add_maven_depmap JPP.%{name}-project.pom + +# recreat tarball structure in lib +ln -sf $(build-classpath tomcat-servlet-3.0-api) %{buildroot}%{homedir}/lib + +ln -sf $(build-classpath objectweb-asm/asm-all) \ + %{buildroot}%{homedir}/lib/annotations/ + +ln -sf $(build-classpath javamail/mail) \ + %{buildroot}%{homedir}/lib/jndi/ + +for jar in tomcat-el-2.2-api taglibs-core taglibs-standard \ + tomcat/jasper tomcat/jasper-el eclipse-ecj; do + ln -sf $(build-classpath $jar) \ + %{buildroot}%{homedir}/lib/jsp/ +done + +ln -sf $(build-classpath geronimo-jta) \ + %{buildroot}%{homedir}/lib/jta/ + +mv %{buildroot}%{homedir}/lib/monitor/jetty-monitor-%{version}.RC4.jar \ + %{buildroot}%{_javadir}/%{name}/jetty-monitor.jar +ln -s %{_javadir}/%{name}/jetty-monitor.jar \ + %{buildroot}%{homedir}/lib/monitor/jetty-monitor-%{version}.RC4.jar +install -pm 644 jetty-monitor/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-jetty-monitor.pom +%add_maven_depmap JPP.%{name}-jetty-monitor.pom %{name}/jetty-monitor.jar + +mv %{buildroot}%{homedir}/start.jar \ + %{buildroot}%{_javadir}/%{name}/jetty-start.jar +ln -s %{_javadir}/%{name}/jetty-start.jar \ + %{buildroot}%{homedir}/start.jar +install -pm 644 jetty-start/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-jetty-start.pom +%add_maven_depmap JPP.%{name}-jetty-start.pom %{name}/jetty-start.jar + + ( cat << EO_RC JAVA_HOME=/usr/lib/jvm/java JAVA_OPTIONS= @@ -245,72 +293,37 @@ JETTY_PORT=8080 JETTY_RUN=%{_localstatedir}/run/%{name} JETTY_PID=\$JETTY_RUN/jetty.pid EO_RC -) > $RPM_BUILD_ROOT%{homedir}/.jettyrc - -# javadoc -mv $RPM_BUILD_ROOT%{homedir}/jxr/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} - -# manual -install -dm 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} - -rm -fr $RPM_BUILD_ROOT%{homedir}/logs -ln -s %{logdir} $RPM_BUILD_ROOT%{homedir}/logs - -mv $RPM_BUILD_ROOT%{homedir}/etc/* $RPM_BUILD_ROOT/%{confdir} -rm -fr $RPM_BUILD_ROOT%{homedir}/etc -ln -s %{confdir} $RPM_BUILD_ROOT%{homedir}/etc - -mv $RPM_BUILD_ROOT%{homedir}/webapps/* $RPM_BUILD_ROOT/%{appdir} -rm -fr $RPM_BUILD_ROOT%{homedir}/webapps -ln -s %{appdir} $RPM_BUILD_ROOT%{homedir}/webapps - -rm -fr $RPM_BUILD_ROOT%{homedir}/contrib -rm -fr $RPM_BUILD_ROOT%{homedir}/distribution -rm -fr $RPM_BUILD_ROOT%{homedir}/examples -rm -fr $RPM_BUILD_ROOT%{homedir}/extras -rm -fr $RPM_BUILD_ROOT%{homedir}/modules -rm -fr $RPM_BUILD_ROOT%{homedir}/patches -rm -fr $RPM_BUILD_ROOT%{homedir}/jxr -rm -fr $RPM_BUILD_ROOT%{homedir}/project-website -rm -fr $RPM_BUILD_ROOT%{homedir}/LICENSES -rm -fr $RPM_BUILD_ROOT%{homedir}/bin/jetty-service.conf -rm -fr $RPM_BUILD_ROOT%{homedir}/bin/Jetty-Service.exe -rm -fr $RPM_BUILD_ROOT%{homedir}/bin/README.jetty-cygwin.txt.txt -rm -fr $RPM_BUILD_ROOT%{homedir}/bin/build_release_bundles.sh -rm -fr $RPM_BUILD_ROOT%{homedir}/bin/jetty-cygwin.sh -rm -fr $RPM_BUILD_ROOT%{homedir}/*.txt -rm -fr $RPM_BUILD_ROOT%{homedir}/pom.* -rm -fr $RPM_BUILD_ROOT%{homedir}/*.zip - -#use system jars -pushd $RPM_BUILD_ROOT%{homedir}/lib/jsp-2.0 -rm -fr *.jar -build-jar-repository . ant -build-jar-repository . commons-el -build-jar-repository . tomcat6/jasper -build-jar-repository . slf4j/jcl-over-slf4j -build-jar-repository . slf4j/api -build-jar-repository . slf4j/simple -build-jar-repository . xerces-j2 -build-jar-repository . xml-commons-apis -build-jar-repository . tomcat6-jsp-2.1-api -popd +) > %{buildroot}%{homedir}/.jettyrc -pushd $RPM_BUILD_ROOT%{homedir}/lib/management/mx4j -rm -fr *.jar -build-jar-repository . mx4j/mx4j -build-jar-repository . mx4j/mx4j-tools -popd +mkdir -p %{buildroot}%{_sysconfdir}/tmpfiles.d +( cat << EOF +D /var/run/%{name} 0755 %username %{username} - +EOF +) > %{buildroot}%{_sysconfdir}/tmpfiles.d/%{name}.conf -pushd $RPM_BUILD_ROOT%{homedir}/lib/naming -build-jar-repository . javamail -rm -fr mail-*.jar -popd +rm -fr %{buildroot}%{homedir}/logs +ln -s %{logdir} %{buildroot}%{homedir}/logs + +mv %{buildroot}%{homedir}/etc/* %{buildroot}/%{confdir} +rm -fr %{buildroot}%{homedir}/etc +ln -s %{confdir} %{buildroot}%{homedir}/etc + +mv %{buildroot}%{homedir}/webapps/* %{buildroot}/%{appdir} +rm -fr %{buildroot}%{homedir}/webapps +ln -s %{appdir} %{buildroot}%{homedir}/webapps + +rm %{buildroot}%{homedir}/*.txt %{buildroot}%{homedir}/*.html + +# following seem like config directories +for cdir in overlays resources;do + mv %{buildroot}%{homedir}/$cdir %{buildroot}/%{confdir}/$cdir + ln -s %{confdir}/$cdir %{buildroot}%{homedir}/$cdir +done + +# javadocs +install -dm 755 %{buildroot}%{_javadocdir}/%{name} +cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/ -pushd $RPM_BUILD_ROOT%{homedir}/lib -build-jar-repository . tomcat6-servlet-2.5-api -rm -fr servlet-api-*.jar -popd %pre # Add the "jetty" user and group @@ -336,33 +349,33 @@ if [ $1 = 0 ]; then fi %files +%doc NOTICE.txt README.txt VERSION.txt LICENSE* +%config(noreplace) %{_sysconfdir}/tmpfiles.d/%{name}.conf +%config(noreplace) %attr(644, root, root) %{_sysconfdir}/logrotate.d/%{name} %{_bindir}/* %dir %{_javadir}/%{name} -%{_javadir}/%{name}/*.jar -%{_mavenpomdir}/* -%{_mavendepmapfragdir}/* +%{_javadir}/%{name} +%{_mavenpomdir}/JPP*pom +%{_mavendepmapfragdir}/%{name} %config(noreplace) %{confdir} %dir %{jettylibdir} %dir %{jettycachedir} %{homedir} -%{appdir} %attr(755, jetty, jetty) %{logdir} %attr(755, jetty, jetty) %{tempdir} -%attr(755, jetty, jetty) %{rundir} -%dir %{appdir} -%doc NOTICE.txt -%doc README.txt -%doc VERSION.txt +%dir %attr(755, jetty, jetty) %{rundir} +%{appdir} %{_initrddir}/%{name} -%{_sysconfdir}/logrotate.d/%{name} %files javadoc +%doc LICENSE* %doc %{_javadocdir}/%{name} -%files manual -%doc %{_docdir}/%{name}-%{version} - %changelog +* Wed Jan 25 2012 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 8.1.0-0.1.rc4 +- Major update to 8.0.0 rc4 +- Removed manual subpackage (was empty anyway) + * Fri Jan 13 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 6.1.26-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild @@ -513,7 +526,7 @@ fi * Mon Aug 06 2007 Ben Konrath <bkonrath(a)redhat.com> 5.1.12-1jpp.1 - Add --excludes to aot-compile-rpm line. -- Inject OSGi manifest into jetty jar. +- Inject OSGi manifest into jetty jar. * Thu Jul 19 2007 Andrew Overholt <overholt(a)redhat.com> 5.1.12-1jpp.1 - Update to 5.1.12 for Fedora. @@ -553,7 +566,7 @@ fi - Don't handle JETTY_PID file in init script: start script takes care - Patch PostFileFilter to remove a (unused) com.sun package import - Explicitly (B)R geronimo-jta-1.0.1B-api instead of any jta -- Add empty file /etc/jetty5/jetty.conf: +- Add empty file /etc/jetty5/jetty.conf: activate contexts manually if desired * Tue Jun 20 2006 Ralph Apel <r.apel(a)r-apel.de> - 0:5.1.2-3jpp

12 years, 4 months

1
0
0 / 0

[c3p0] Added patch for building with JDBC 4.1/Java 7

by Deepak Bhole

commit 8857d9de0b424ee1ec7d76f8a959e9885bf3da63 Author: Deepak Bhole <dbhole(a)redhat.com> Date: Tue Jan 24 12:56:19 2012 -0500 Added patch for building with JDBC 4.1/Java 7 c3p0-build-on-1.7.patch | 260 +++++++++++++++++++++++++++++++++++++++++++++++ c3p0.spec | 11 ++- 2 files changed, 269 insertions(+), 2 deletions(-) --- diff --git a/c3p0-build-on-1.7.patch b/c3p0-build-on-1.7.patch new file mode 100644 index 0000000..1c06bfc --- /dev/null +++ b/c3p0-build-on-1.7.patch @@ -0,0 +1,260 @@ +diff -up ./src/java/com/mchange/v2/c3p0/ComboPooledDataSource.java.sav ./src/java/com/mchange/v2/c3p0/ComboPooledDataSource.java +--- ./src/java/com/mchange/v2/c3p0/ComboPooledDataSource.java.sav 2012-01-24 12:55:18.000000000 -0500 ++++ ./src/java/com/mchange/v2/c3p0/ComboPooledDataSource.java 2012-01-24 12:55:21.000000000 -0500 +@@ -597,6 +597,10 @@ public final class ComboPooledDataSource + throw new SQLException("no object found"); + } + } ++ ++ public java.util.logging.Logger getParentLogger() throws java.sql.SQLFeatureNotSupportedException { ++ throw new java.sql.SQLFeatureNotSupportedException(); ++ } + } + + //now, referenceability happens exactly the same way it does for PoolBackedDataSource +diff -up ./src/java/com/mchange/v2/c3p0/DriverManagerDataSource.java.sav ./src/java/com/mchange/v2/c3p0/DriverManagerDataSource.java +--- ./src/java/com/mchange/v2/c3p0/DriverManagerDataSource.java.sav 2012-01-24 12:55:18.000000000 -0500 ++++ ./src/java/com/mchange/v2/c3p0/DriverManagerDataSource.java 2012-01-24 12:55:21.000000000 -0500 +@@ -271,4 +271,9 @@ public final class DriverManagerDataSour + throw new SQLException("no object found"); + } + } ++ ++ public java.util.logging.Logger getParentLogger() throws java.sql.SQLFeatureNotSupportedException { ++ throw new java.sql.SQLFeatureNotSupportedException(); ++ } ++ + } +diff -up ./src/java/com/mchange/v2/c3p0/impl/C3P0PooledConnection.java.sav ./src/java/com/mchange/v2/c3p0/impl/C3P0PooledConnection.java +--- ./src/java/com/mchange/v2/c3p0/impl/C3P0PooledConnection.java.sav 2012-01-24 12:55:18.000000000 -0500 ++++ ./src/java/com/mchange/v2/c3p0/impl/C3P0PooledConnection.java 2012-01-24 12:55:21.000000000 -0500 +@@ -800,8 +800,18 @@ public final class C3P0PooledConnection + { + throw new RuntimeException(new NoSuchMethodException("stub method")); + } ++ ++ public Object getObject(String columnLabel, Class type) throws java.sql.SQLException { ++ throw new java.sql.SQLFeatureNotSupportedException(); ++ } ++ ++ public Object getObject(int columnNumber, Class type) throws java.sql.SQLException { ++ throw new java.sql.SQLFeatureNotSupportedException(); ++ } ++ + } + ++ + /* + * TODO: factor all this convolution out into + * C3P0Statement +@@ -1245,6 +1255,22 @@ public final class C3P0PooledConnection + { + throw new SQLFeatureNotSupportedException(); + } ++ ++ public void closeOnCompletion() throws java.sql.SQLException { ++ throw new java.sql.SQLFeatureNotSupportedException(); ++ } ++ ++ public boolean isCloseOnCompletion() throws java.sql.SQLException { ++ throw new java.sql.SQLFeatureNotSupportedException(); ++ } ++ ++ public Object getObject(String columnLabel, Class type) throws java.sql.SQLException { ++ throw new java.sql.SQLFeatureNotSupportedException(); ++ } ++ ++ public Object getObject(int columnNumber, Class type) throws java.sql.SQLException { ++ throw new java.sql.SQLFeatureNotSupportedException(); ++ } + } + + return new ProxyCallableStatement((CallableStatement) innerStmt ); +@@ -1408,9 +1434,17 @@ public final class C3P0PooledConnection + public void setRowId( int i, RowId r ) throws SQLFeatureNotSupportedException + { + throw new SQLFeatureNotSupportedException(); +- } + } + ++ public void closeOnCompletion() throws java.sql.SQLException { ++ throw new java.sql.SQLFeatureNotSupportedException(); ++ } ++ ++ public boolean isCloseOnCompletion() throws java.sql.SQLException { ++ throw new java.sql.SQLFeatureNotSupportedException(); ++ } ++ } ++ + return new ProxyPreparedStatement((PreparedStatement) innerStmt ); + } + else +@@ -1477,6 +1511,14 @@ public final class C3P0PooledConnection + // should people be calling unwrap if isWrapperFor returns false? + return null; + } ++ ++ public void closeOnCompletion() throws java.sql.SQLException { ++ throw new java.sql.SQLFeatureNotSupportedException(); ++ } ++ ++ public boolean isCloseOnCompletion() throws java.sql.SQLException { ++ throw new java.sql.SQLFeatureNotSupportedException(); ++ } + } + + return new ProxyStatement( innerStmt ); +@@ -1939,5 +1981,5 @@ public final class C3P0PooledConnection + public void removeStatementEventListener( StatementEventListener listener ) + { + throw new NoSuchMethodError("stub method"); +- } ++ } + } +diff -up ./src/java/com/mchange/v2/c3p0/impl/NullStatementSetManagedResultSet.java.sav ./src/java/com/mchange/v2/c3p0/impl/NullStatementSetManagedResultSet.java +--- ./src/java/com/mchange/v2/c3p0/impl/NullStatementSetManagedResultSet.java.sav 2012-01-24 12:55:18.000000000 -0500 ++++ ./src/java/com/mchange/v2/c3p0/impl/NullStatementSetManagedResultSet.java 2012-01-24 12:55:21.000000000 -0500 +@@ -314,4 +314,12 @@ public int getHoldability() + { + throw new RuntimeException(new NoSuchMethodException("stub method")); + } ++ ++ public Object getObject(String columnLabel, Class type) throws java.sql.SQLException { ++ throw new java.sql.SQLFeatureNotSupportedException(); ++ } ++ ++ public Object getObject(int columnNumber, Class type) throws java.sql.SQLException { ++ throw new java.sql.SQLFeatureNotSupportedException(); ++ } + } +diff -up ./src/java/com/mchange/v2/c3p0/impl/SetManagedDatabaseMetaData.java.sav ./src/java/com/mchange/v2/c3p0/impl/SetManagedDatabaseMetaData.java +--- ./src/java/com/mchange/v2/c3p0/impl/SetManagedDatabaseMetaData.java.sav 2012-01-24 12:55:18.000000000 -0500 ++++ ./src/java/com/mchange/v2/c3p0/impl/SetManagedDatabaseMetaData.java 2012-01-24 12:55:21.000000000 -0500 +@@ -181,4 +181,15 @@ final class SetManagedDatabaseMetaData e + { + throw new RuntimeException(new NoSuchMethodException("stub method")); + } ++ ++ public boolean generatedKeyAlwaysReturned() throws java.sql.SQLException ++ { ++ throw new java.sql.SQLFeatureNotSupportedException(); ++ } ++ ++ public ResultSet getPseudoColumns(String catalog, String schemaPattern, ++ String tableNamePattern, String columnNamePattern) throws java.sql.SQLException ++ { ++ throw new java.sql.SQLFeatureNotSupportedException(); ++ } + } +diff -up ./src/java/com/mchange/v2/c3p0/impl/SnatchFromSetResultSet.java.sav ./src/java/com/mchange/v2/c3p0/impl/SnatchFromSetResultSet.java +--- ./src/java/com/mchange/v2/c3p0/impl/SnatchFromSetResultSet.java.sav 2012-01-24 12:55:18.000000000 -0500 ++++ ./src/java/com/mchange/v2/c3p0/impl/SnatchFromSetResultSet.java 2012-01-24 12:55:21.000000000 -0500 +@@ -310,4 +310,12 @@ final class SnatchFromSetResultSet exten + { + throw new RuntimeException(new NoSuchMethodException("stub method")); + } ++ ++ public Object getObject(String columnLabel, Class type) throws java.sql.SQLException { ++ throw new java.sql.SQLFeatureNotSupportedException(); ++ } ++ ++ public Object getObject(int columnNumber, Class type) throws java.sql.SQLException { ++ throw new java.sql.SQLFeatureNotSupportedException(); ++ } + } +diff -up ./src/java/com/mchange/v2/c3p0/JndiRefConnectionPoolDataSource.java.sav ./src/java/com/mchange/v2/c3p0/JndiRefConnectionPoolDataSource.java +--- ./src/java/com/mchange/v2/c3p0/JndiRefConnectionPoolDataSource.java.sav 2010-05-27 01:01:04.000000000 -0400 ++++ ./src/java/com/mchange/v2/c3p0/JndiRefConnectionPoolDataSource.java 2012-01-24 12:55:22.000000000 -0500 +@@ -307,5 +307,9 @@ public final class JndiRefConnectionPool + sb.append("]"); + return sb.toString(); + } ++ ++ public java.util.logging.Logger getParentLogger() throws java.sql.SQLFeatureNotSupportedException { ++ throw new java.sql.SQLFeatureNotSupportedException(); ++ } + } + +diff -up ./src/java/com/mchange/v2/c3p0/JndiRefForwardingDataSource.java.sav ./src/java/com/mchange/v2/c3p0/JndiRefForwardingDataSource.java +--- ./src/java/com/mchange/v2/c3p0/JndiRefForwardingDataSource.java.sav 2012-01-24 12:55:18.000000000 -0500 ++++ ./src/java/com/mchange/v2/c3p0/JndiRefForwardingDataSource.java 2012-01-24 12:55:22.000000000 -0500 +@@ -185,5 +185,9 @@ final class JndiRefForwardingDataSource + throw new SQLException("no object found"); + } + } ++ ++ public java.util.logging.Logger getParentLogger() throws java.sql.SQLFeatureNotSupportedException { ++ throw new java.sql.SQLFeatureNotSupportedException(); ++ } + } + +diff -up ./src/java/com/mchange/v2/c3p0/PoolBackedDataSource.java.sav ./src/java/com/mchange/v2/c3p0/PoolBackedDataSource.java +--- ./src/java/com/mchange/v2/c3p0/PoolBackedDataSource.java.sav 2012-01-24 12:55:18.000000000 -0500 ++++ ./src/java/com/mchange/v2/c3p0/PoolBackedDataSource.java 2012-01-24 12:55:22.000000000 -0500 +@@ -52,5 +52,9 @@ public final class PoolBackedDataSource + throw new SQLException("no object found"); + } + } ++ ++ public java.util.logging.Logger getParentLogger() throws java.sql.SQLFeatureNotSupportedException { ++ throw new java.sql.SQLFeatureNotSupportedException(); ++ } + } + +diff -up ./src/java/com/mchange/v2/c3p0/test/FreezableDriverManagerDataSource.java.sav ./src/java/com/mchange/v2/c3p0/test/FreezableDriverManagerDataSource.java +--- ./src/java/com/mchange/v2/c3p0/test/FreezableDriverManagerDataSource.java.sav 2012-01-24 12:55:18.000000000 -0500 ++++ ./src/java/com/mchange/v2/c3p0/test/FreezableDriverManagerDataSource.java 2012-01-24 12:55:22.000000000 -0500 +@@ -300,4 +300,8 @@ public final class FreezableDriverManage + throw new SQLException("no object found"); + } + } ++ ++ public java.util.logging.Logger getParentLogger() throws java.sql.SQLFeatureNotSupportedException { ++ throw new java.sql.SQLFeatureNotSupportedException(); ++ } + } +diff -up ./src/java/com/mchange/v2/c3p0/util/CloseReportingConnectionWrapper.java.sav ./src/java/com/mchange/v2/c3p0/util/CloseReportingConnectionWrapper.java +--- ./src/java/com/mchange/v2/c3p0/util/CloseReportingConnectionWrapper.java.sav 2012-01-24 12:55:18.000000000 -0500 ++++ ./src/java/com/mchange/v2/c3p0/util/CloseReportingConnectionWrapper.java 2012-01-24 12:55:22.000000000 -0500 +@@ -107,4 +107,29 @@ public class CloseReportingConnectionWra + { + throw new RuntimeException(new NoSuchMethodException("stub method")); + } ++ ++ public int getNetworkTimeout() throws SQLFeatureNotSupportedException ++ { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setNetworkTimeout(java.util.concurrent.Executor executor, int milliseconds) throws SQLFeatureNotSupportedException ++ { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void abort(java.util.concurrent.Executor executor) throws SQLFeatureNotSupportedException ++ { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public String getSchema() throws SQLFeatureNotSupportedException ++ { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setSchema(String schema) throws SQLFeatureNotSupportedException ++ { ++ throw new SQLFeatureNotSupportedException(); ++ } + } +diff -up ./src/java/com/mchange/v2/c3p0/WrapperConnectionPoolDataSource.java.sav ./src/java/com/mchange/v2/c3p0/WrapperConnectionPoolDataSource.java +--- ./src/java/com/mchange/v2/c3p0/WrapperConnectionPoolDataSource.java.sav 2010-05-27 01:01:04.000000000 -0400 ++++ ./src/java/com/mchange/v2/c3p0/WrapperConnectionPoolDataSource.java 2012-01-24 12:55:22.000000000 -0500 +@@ -283,4 +283,8 @@ public final class WrapperConnectionPool + else + this.connectionTester = C3P0ImplUtils.defaultConnectionTester(); + } ++ ++ public java.util.logging.Logger getParentLogger() throws java.sql.SQLFeatureNotSupportedException { ++ throw new java.sql.SQLFeatureNotSupportedException(); ++ } + } diff --git a/c3p0.spec b/c3p0.spec index a60b7b5..a29ae9f 100644 --- a/c3p0.spec +++ b/c3p0.spec @@ -2,7 +2,7 @@ Name: c3p0 Version: 0.9.2 -Release: 0.6.%{prerel}%{?dist} +Release: 0.7.%{prerel}%{?dist} Summary: JDBC DataSources/Resource Pools License: LGPLv2 URL: http://sourceforge.net/projects/c3p0 @@ -26,6 +26,9 @@ Source1: c3p0.pom # Patch to build on java 1.6 Patch0: %{name}-build-on-1.6.patch +# Patch to build on java 1.7 (intentionally kept separate from above) +Patch1: %{name}-build-on-1.7.patch + BuildArch: noarch %description @@ -46,7 +49,8 @@ Requires: java-javadoc %prep %setup -q -n %{name}-%{version}-%{prerel}.src -%patch0 -p0 -b .orig +%patch0 -p0 -b .java6 +%patch1 -p0 -b .java7 # remove all binary bits find -name '*.class' -exec rm -f '{}' \; @@ -91,6 +95,9 @@ install -pD -m 644 -T %{SOURCE1} \ %{_javadocdir}/%{name} %changelog +* Tue Jan 24 2012 Deepak Bhole <dbhole(a)redhat.com> 0.9.2-0.7.pre1 +- Added patch for building with JDBC 4.1/Java 7 + * Thu Jan 12 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.9.2-0.6.pre1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild

12 years, 4 months

1
0
0 / 0

[Bug 652183] Java SIG tracker bug

by Red Hat Bugzilla

Please do not reply directly to this email. All additional comments should be made in the comments box of this bug. https://bugzilla.redhat.com/show_bug.cgi?id=652183 Marek Goldmann <mgoldman(a)redhat.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Depends on|728504 | -- Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the QA contact for the bug. You are the assignee for the bug.

12 years, 4 months

1
0
0 / 0

[maven-javadoc-plugin] BR java-devel >= 1:1.7.0 because dependencies are already using java 7 class version.

by Alexander Kurtakov

commit d20dacf30eda4dd5636cc4b477589d5176115b99 Author: Alexander Kurtakov <akurtako(a)redhat.com> Date: Tue Jan 24 14:05:31 2012 +0200 BR java-devel >= 1:1.7.0 because dependencies are already using java 7 class version. maven-javadoc-plugin.spec | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) --- diff --git a/maven-javadoc-plugin.spec b/maven-javadoc-plugin.spec index ee6b2fb..23b1cfa 100644 --- a/maven-javadoc-plugin.spec +++ b/maven-javadoc-plugin.spec @@ -29,6 +29,7 @@ BuildRequires: plexus-interactivity BuildRequires: maven-shared-invoker BuildRequires: maven-enforcer-plugin BuildRequires: modello +BuildRequires: java-devel >= 1:1.7.0 %if ! %{bootstrap} BuildRequires: maven-javadoc-plugin %endif

12 years, 4 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

java-sig-commits January 2012