From d8f64f3c7e5e544a6b19648e556bd006b3bddb5bd5171730cc837ea45c2bb4f4 Mon Sep 17 00:00:00 2001 From: Michal Vyskocil Date: Tue, 3 Jan 2012 11:18:49 +0000 Subject: [PATCH] Accepting request 96950 from home:Ignotusp:eclipse OBS-URL: https://build.opensuse.org/request/show/96950 OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-commons-logging?expand=0&rev=1 --- .gitattributes | 23 ++ .gitignore | 1 + apache-commons-logging.spec | 254 +++++++++++++++++++++ build.xml.patch | 11 + commons-logging-1.1.1-src.tar.gz | 3 + commons-logging-api-1.1.pom | 165 +++++++++++++ commons-logging-eclipse-manifest.patch | 15 ++ commons-logging-maven-release-plugin.patch | 33 +++ commons-logging.depmap | 36 +++ 9 files changed, 541 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 apache-commons-logging.spec create mode 100644 build.xml.patch create mode 100644 commons-logging-1.1.1-src.tar.gz create mode 100644 commons-logging-api-1.1.pom create mode 100644 commons-logging-eclipse-manifest.patch create mode 100644 commons-logging-maven-release-plugin.patch create mode 100644 commons-logging.depmap diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57affb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.osc diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec new file mode 100644 index 0000000..e2cdd3f --- /dev/null +++ b/apache-commons-logging.spec @@ -0,0 +1,254 @@ +# Copyright (c) 2000-2007, JPackage Project +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the +# distribution. +# 3. Neither the name of the JPackage Project nor the names of its +# contributors may be used to endorse or promote products derived +# from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + + +%define base_name logging +%define short_name commons-%{base_name} +%define with_maven 0 +%define _mavenpomdir %{_datadir}/maven2/poms + +Name: apache-%{short_name} +Version: 1.1.1 +Release: 0 +License: Apache-2.0 +Summary: Apache Commons Logging +Url: http://commons.apache.org/%{base_name} +Group: Development/Libraries/Java +Source0: http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz +Source1: %{short_name}.depmap +Source2: http://mirrors.ibiblio.org/pub/mirrors/maven2/%{short_name}/%{short_name}-api/1.1/%{short_name}-api-1.1.pom +Patch1: %{short_name}-eclipse-manifest.patch +Patch0: %{short_name}-maven-release-plugin.patch +Patch2: build.xml.patch +BuildRequires: ant +BuildRequires: ant-junit +BuildRequires: apache-commons-parent +BuildRequires: avalon-framework +BuildRequires: avalon-logkit +BuildRequires: java-devel >= 1.6.0 +BuildRequires: jpackage-utils >= 1.6 +BuildRequires: junit +%if %{with_maven} +BuildRequires: maven-plugin-build-helper +BuildRequires: maven-site-plugin +%endif +BuildRequires: servlet25 +BuildArch: noarch +BuildRoot: %{_tmppath}/%{name}-%{version}-build + +Requires: java >= 1.6.0 +Requires: jpackage-utils >= 1.6 +Requires(post): jpackage-utils +Requires(postun):jpackage-utils + +# This should go away with F-17 +Provides: jakarta-%{short_name} = %{version}-%{release} +Obsoletes: jakarta-%{short_name} <= 1.0.4 + +%description +The commons-logging package provides a simple, component oriented +interface (org.apache.commons.logging.Log) together with wrappers for +logging systems. The user can choose at runtime which system they want +to use. In addition, a small number of basic implementations are +provided to allow users to use the package standalone. +commons-logging was heavily influenced by Avalon's Logkit and Log4J. The +commons-logging abstraction is meant to minimize the differences between +the two, and to allow a developer to not tie himself to a particular +logging implementation. + +%if %{with_maven} +%package javadoc +Summary: API documentation for %{name} +Group: Documentation +Requires: jpackage-utils + +Obsoletes: jakarta-%{short_name}-javadoc <= 1.0.4 + +%description javadoc +API documentation for %{name}. +%endif +# ----------------------------------------------------------------------------- + +%prep +%setup -q -n %{short_name}-%{version}-src +%patch0 -p1 -b .rhbug_588142 +%patch1 +%patch2 + +sed -i 's/\r//' RELEASE-NOTES.txt LICENSE.txt + +# ----------------------------------------------------------------------------- + +%build +export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository +mkdir -p $MAVEN_REPO_LOCAL + +# fails with recent surefire for some reason +rm src/test/org/apache/commons/logging/logkit/StandardTestCase.java +rm src/test/org/apache/commons/logging/servlet/BasicServletTestCase.java + +%if %{with_maven} +mvn-jpp -e -Dmaven2.jpp.depmap.file="%{SOURCE1}" \ + -Dmaven.repo.local=$MAVEN_REPO_LOCAL \ + install javadoc:javadoc +%else +export CLASSPATH=$(build-classpath \ + plexus/ \ + junit \ + ):target/classes:target/test-classes +ant -Dmaven.mode.offline=true dist \ + -lib /usr/share/java +%endif +# ----------------------------------------------------------------------------- + +%install +# jars +install -d -m 755 %{buildroot}%{_javadir} +install -p -m 644 target/%{short_name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar +install -p -m 644 target/%{short_name}-api-%{version}.jar %{buildroot}%{_javadir}/%{name}-api.jar +install -p -m 644 target/%{short_name}-adapters-%{version}.jar %{buildroot}%{_javadir}/%{name}-adapters.jar + +pushd %{buildroot}%{_javadir} +for jar in %{name}*; do + ln -sf ${jar} `echo $jar| sed "s|apache-||g"` +done +popd + +# pom +install -d -m 755 %{buildroot}%{_mavenpomdir} +install -pm 644 pom.xml %{buildroot}/%{_mavenpomdir}/JPP-%{short_name}.pom +install -pm 644 %{SOURCE2} %{buildroot}/%{_mavenpomdir}/JPP-%{short_name}-api.pom + +%add_to_maven_depmap org.apache.commons %{short_name} %{version} JPP %{short_name} +%add_to_maven_depmap org.apache.commons %{short_name}-api %{version} JPP %{short_name}-api +%add_to_maven_depmap org.apache.commons %{short_name}-adapters %{version} JPP %{short_name}-adapters + +# following lines are only for backwards compatibility. New packages +# should use proper groupid org.apache.commons and also artifactid +%add_to_maven_depmap %{short_name} %{short_name} %{version} JPP %{short_name} +%add_to_maven_depmap %{short_name} %{short_name}-api %{version} JPP %{short_name}-api +%add_to_maven_depmap %{short_name} %{short_name}-adapters %{version} JPP %{short_name}-adapters + +%if %{with_maven} +# javadoc +install -d -m 755 %{buildroot}%{_javadocdir}/%{name} +cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name} +# ----------------------------------------------------------------------------- +%endif +%post +%update_maven_depmap + +%postun +%update_maven_depmap + +%if %{with_maven} +%pre javadoc +# workaround for rpm bug, can be removed in F-17 +[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \ +rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || : +%endif + +# ----------------------------------------------------------------------------- + +%files +%defattr(0644,root,root,0755) +%doc PROPOSAL.html STATUS.html LICENSE.txt RELEASE-NOTES.txt +%{_javadir}/* +%{_mavenpomdir}/JPP-%{short_name}.pom +%{_mavenpomdir}/JPP-%{short_name}-api.pom +%config %{_mavendepmapfragdir}/* + + +%if %{with_maven} +%files javadoc +%defattr(0644,root,root,0755) +%doc LICENSE.txt +%{_javadocdir}/%{name} +%endif + +# ----------------------------------------------------------------------------- + +%changelog +* Sun Dec 18 2011 Minh Ngo 1.1.1-15 +- Fixing the license for openSUSE packages + +* Thu Dec 16 2010 Alexander Kurtakov 1.1.1-14 +- Bring back commons-logging* symlinks. + +* Thu Dec 16 2010 Stanislav Ochotnicky - 1.1.1-13 +- Replace tomcat6 BR with servlet25 only +- Cleanups according to new packaging guidelines +- Install maven metadata for -api jar +- Versionless jars/javadocs + +* Tue Nov 9 2010 Stanislav Ochotnicky - 1.1.1-12 +- Add depmaps for api and adapters subpackages +- Use apache-commons-parent BR instead of maven-* +- Replace tomcat5 BR with tomcat6 +- Reenable tests + +* Thu Jul 8 2010 Stanislav Ochotnicky - 1.1.1-11 +- Add license to javadoc subpackage + +* Wed Jun 9 2010 Alexander Kurtakov 1.1.1-10 +- Add osgi manifest entries. + +* Fri May 21 2010 Stanislav Ochotnicky - 1.1.1-9 +- Correct depmap filename for backward compatibility + +* Mon May 17 2010 Stanislav Ochotnicky - 1.1.1-8 +- Fix wrong depmap JPP name to short_name +- Add obsoletes to javadoc subpackage + +* Wed May 12 2010 Stanislav Ochotnicky - 1.1.1-7 +- Fix symlink problems introduced previously in r5 + +* Tue May 11 2010 Stanislav Ochotnicky - 1.1.1-6 +- Add one more add_to_maven_depmap for backward compatibility + +* Mon May 10 2010 Stanislav Ochotnicky - 1.1.1-5 +- Fix up add_to_maven_depmap +- Add jpackage-utils Requires for javadoc +- Cleanup install a bit + +* Fri May 7 2010 Stanislav Ochotnicky - 1.1.1-4 +- Fix provides + +* Thu May 6 2010 Stanislav Ochotnicky - 1.1.1-3 +- Revert to using default permissions +- Drop "Package" from summary, improve javadoc summary text + +* Thu May 6 2010 Stanislav Ochotnicky - 1.1.1-2 +- Fix EOLs on docs +- Create javadoc symlinks during install +- Use version macro in Source0 URL, use _mavenpomdir macro + +* Thu May 6 2010 Stanislav Ochotnicky - 1.1.1-1 +- Rename and rebase from jakarta-commons-logging diff --git a/build.xml.patch b/build.xml.patch new file mode 100644 index 0000000..9fb2caf --- /dev/null +++ b/build.xml.patch @@ -0,0 +1,11 @@ +--- build.xml.orig 2011-01-27 00:54:12.000000000 -0700 ++++ build.xml 2011-01-27 00:54:18.000000000 -0700 +@@ -94,7 +94,7 @@ + + + +- ++ + + + diff --git a/commons-logging-1.1.1-src.tar.gz b/commons-logging-1.1.1-src.tar.gz new file mode 100644 index 0000000..5adab37 --- /dev/null +++ b/commons-logging-1.1.1-src.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b49a79fa78ebfae15dc46ae6f0144fee6b94ab608a25518c54609d3419909eb2 +size 190670 diff --git a/commons-logging-api-1.1.pom b/commons-logging-api-1.1.pom new file mode 100644 index 0000000..c0b8f67 --- /dev/null +++ b/commons-logging-api-1.1.pom @@ -0,0 +1,165 @@ + + 4.0.0 + commons-logging + commons-logging-api + Logging + 1.1 + Commons Logging is a thin adapter allowing configurable bridging to other, + well known logging systems. + http://jakarta.apache.org/commons/logging/ + + http://issues.apache.org/jira/browse/LOGGING + + + + + +
commons-dev@jakarta.apache.org
+ + + + + 2001 + + + Commons Dev List + commons-dev-subscribe@jakarta.apache.org + commons-dev-unsubscribe@jakarta.apache.org + http://mail-archives.apache.org/mod_mbox/jakarta-commons-dev/ + + + Commons User List + commons-user-subscribe@jakarta.apache.org + commons-user-unsubscribe@jakarta.apache.org + http://mail-archives.apache.org/mod_mbox/jakarta-commons-user/ + + + + + morgand + Morgan Delagrange + morgand at apache dot org + Apache + + Java Developer + + + + rwaldhoff + Rodney Waldhoff + rwaldhoff at apache org + Apache Software Foundation + + + craigmcc + Craig McClanahan + craigmcc at apache org + Apache Software Foundation + + + sanders + Scott Sanders + sanders at apache dot org + Apache Software Foundation + + + rdonkin + Robert Burrell Donkin + rdonkin at apache dot org + Apache Software Foundation + + + donaldp + Peter Donald + donaldp at apache dot org + + + + costin + Costin Manolache + costin at apache dot org + Apache Software Foundation + + + rsitze + Richard Sitze + rsitze at apache dot org + Apache Software Foundation + + + baliuka + Juozas Baliuka + baliuka@apache.org + + + Java Developer + + + + skitching + Simon Kitching + skitching@apache.org + Apache Software Foundation + + + dennisl + Dennis Lundberg + dennisl@apache.org + Apache Software Foundation + + + bstansberry + Brian Stansberry + + + + + The Apache Software License, Version 2.0 + /LICENSE.txt + + + + scm:svn:http://svn.apache.org/repos/asf/jakarta/commons/proper/logging/trunk/ + http://svn.apache.org/repos/asf/jakarta/commons/proper/logging/trunk/ + + + The Apache Software Foundation + http://jakarta.apache.org + + + src/java + src/test + + + maven-xdoc-plugin + 1.9.2 + + true + <strong>Site Only</strong> - v1.9.2 (minimum) + + + + + + + junit + junit + 3.8.1 + test + true + + + + + default + Default Repository + file:///www/jakarta.apache.org/builds/jakarta-commons/logging/ + + + default + Default Site + scp://people.apache.org//www/jakarta.apache.org/commons/logging/ + + converted + + \ No newline at end of file diff --git a/commons-logging-eclipse-manifest.patch b/commons-logging-eclipse-manifest.patch new file mode 100644 index 0000000..14c0ab0 --- /dev/null +++ b/commons-logging-eclipse-manifest.patch @@ -0,0 +1,15 @@ +--- src/conf/MANIFEST.MF.orig 2007-11-22 01:27:52.000000000 +0200 ++++ src/conf/MANIFEST.MF 2010-06-09 21:04:06.532857757 +0300 +@@ -6,3 +6,12 @@ Implementation-Title: Commons Logging + Implementation-Vendor-Id: org.apache + Implementation-Vendor: Apache Software Foundation + Implementation-Version: 1.1.1 ++Bundle-ManifestVersion: 2 ++Export-Package: org.apache.commons.logging;version="1.1.1",org.apache. ++ commons.logging.impl;version="1.1.1" ++Bundle-Version: 1.1.1.v20080605-1930 ++Bundle-SymbolicName: org.apache.commons.logging ++Bundle-Name: Apache Commons Logging Plug-in ++Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3 ++Bundle-Localization: plugin ++Bundle-Vendor: Apache Software Foundation diff --git a/commons-logging-maven-release-plugin.patch b/commons-logging-maven-release-plugin.patch new file mode 100644 index 0000000..3a7a4a3 --- /dev/null +++ b/commons-logging-maven-release-plugin.patch @@ -0,0 +1,33 @@ +diff --git a/pom.xml b/pom.xml +index 8efaf6d..4b3e8f9 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -308,21 +308,6 @@ under the License. + + + +- org.apache.maven.plugins +- maven-release-plugin +- 2.0-beta-6 +- +- +- site deploy +- +- -Prelease +- +- +- +- +