Compare commits
27 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
38eab5ebb3 | ||
|
|
1c2d3b2f94 | ||
|
|
2163d480c3 | ||
|
|
8472b9c6d0 | ||
|
|
0b4f8f8fe6 | ||
|
|
8f8f6defd4 | ||
|
|
9da05085e3 | ||
|
|
254ab4c4b3 | ||
|
|
c5c945d31b | ||
|
|
44ec5b07c7 | ||
|
|
2e06ff26c6 | ||
|
|
d321f999d7 | ||
|
|
ff20e50d0c | ||
|
|
4fa2279f0d | ||
|
|
fcd37d9bb8 | ||
|
|
fb8e8f66a7 | ||
|
|
8185a91d8a | ||
|
|
259bee0748 | ||
|
|
dc51818b40 | ||
|
|
ade1882da5 | ||
|
|
bd0ec70777 | ||
|
|
c89b0ddb10 | ||
|
|
f0c8c47382 | ||
|
|
fc3d0b1db1 | ||
|
|
fb22e8e528 | ||
|
|
9ff82cf316 | ||
|
|
e735dc366d |
7 changed files with 1 additions and 332 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -1 +0,0 @@
|
|||
commons-discovery-0.4-src.tar.gz
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
--- pom.xml 2006-12-03 07:27:17.000000000 +0100
|
||||
+++ pom.xml-gil 2012-05-17 08:53:48.291516910 +0200
|
||||
@@ -129,14 +129,6 @@
|
||||
</includes>
|
||||
</configuration>
|
||||
</plugin>
|
||||
- <plugin>
|
||||
- <artifactId>maven-xdoc-plugin</artifactId>
|
||||
- <version>1.9.2</version>
|
||||
- <configuration>
|
||||
- <comment><strong>Site Only</strong> - v1.9.2 (minimum)
|
||||
- required for building the Site documentation.</comment>
|
||||
- </configuration>
|
||||
- </plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
<dependencies>
|
||||
|
|
@ -1,25 +0,0 @@
|
|||
--- src/conf/MANIFEST.MF.orig 2006-11-30 00:15:55.000000000 +0100
|
||||
+++ src/conf/MANIFEST.MF 2009-05-27 23:35:42.000000000 +0200
|
||||
@@ -6,4 +6,22 @@ Specification-Vendor: The Apache Softwar
|
||||
Implementation-Title: @package@
|
||||
Implementation-Vendor: The Apache Software Foundation
|
||||
Implementation-Version: @version@
|
||||
+Bundle-ManifestVersion: 2
|
||||
+Bundle-Name: Jakarta-Commons Discovery
|
||||
+Specification-Version: 1.0
|
||||
+Bundle-SymbolicName: org.apache.commons.discovery
|
||||
+Bundle-Version: 0.2.0.qualifier
|
||||
+Bundle-Vendor: Eclipse.org
|
||||
+Bundle-Localization: plugin
|
||||
+Bundle-RequiredExecutionEnvironment: J2SE-1.4
|
||||
+Export-Package: org.apache.commons.discovery,
|
||||
+ org.apache.commons.discovery.ant,
|
||||
+ org.apache.commons.discovery.jdk,
|
||||
+ org.apache.commons.discovery.log,
|
||||
+ org.apache.commons.discovery.resource,
|
||||
+ org.apache.commons.discovery.resource.classes,
|
||||
+ org.apache.commons.discovery.resource.names,
|
||||
+ org.apache.commons.discovery.tools
|
||||
+Require-Bundle: org.junit;bundle-version="[3.8.0,4.0.0)";resolution:=optional
|
||||
+Import-Package: org.apache.commons.logging;version="[1.0.4,2.0.0)"
|
||||
|
||||
|
|
@ -1,120 +0,0 @@
|
|||
|
||||
%global base_name discovery
|
||||
%global short_name commons-%{base_name}
|
||||
|
||||
Name: apache-%{short_name}
|
||||
Version: 0.4
|
||||
Release: 7%{?dist}
|
||||
Epoch: 2
|
||||
Summary: Apache Commons Discovery
|
||||
License: ASL 2.0
|
||||
Group: Development/Libraries
|
||||
URL: http://commons.apache.org/%{base_name}
|
||||
Source0: http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
|
||||
Source1: http://repo1.maven.org/maven2/%{short_name}/%{short_name}/%{version}/%{short_name}-%{version}.pom
|
||||
Patch0: %{name}-addosgimanifest.patch
|
||||
# removed maven-xdoc-plugin
|
||||
Patch1: %{name}-%{version}-pom.patch
|
||||
BuildArch: noarch
|
||||
BuildRequires: java-devel >= 1:1.6.0
|
||||
BuildRequires: jpackage-utils >= 0:1.6
|
||||
BuildRequires: ant
|
||||
BuildRequires: junit >= 0:3.7
|
||||
BuildRequires: apache-commons-logging >= 1.1.1
|
||||
Requires: apache-commons-logging >= 1.1.1
|
||||
|
||||
|
||||
# This should go away with F-17
|
||||
Provides: jakarta-%{short_name} = %{epoch}:%{version}-%{release}
|
||||
Obsoletes: jakarta-%{short_name} <= 1:0.4
|
||||
|
||||
%description
|
||||
The Discovery component is about discovering, or finding, implementations for
|
||||
pluggable interfaces. Pluggable interfaces are specified with the intent that
|
||||
multiple implementations are, or will be, available to provide the service
|
||||
described by the interface. Discovery provides facilities for finding and
|
||||
instantiating classes, and for lifecycle management of singleton (factory)
|
||||
classes.
|
||||
|
||||
%package javadoc
|
||||
Group: Documentation
|
||||
Summary: API documentation for %{name}
|
||||
Requires: jpackage-utils
|
||||
|
||||
Obsoletes: jakarta-%{short_name}-javadoc <= 1:0.4
|
||||
|
||||
%description javadoc
|
||||
%{summary}.
|
||||
|
||||
%prep
|
||||
%setup -q -n %{short_name}-%{version}-src
|
||||
%patch0
|
||||
cp -p %{SOURCE1} pom.xml
|
||||
%patch1
|
||||
|
||||
%build
|
||||
ant \
|
||||
-Djunit.jar=%(find-jar junit) \
|
||||
-Dlogger.jar=%(find-jar commons-logging) \
|
||||
test.discovery dist
|
||||
|
||||
%install
|
||||
|
||||
# jar
|
||||
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
|
||||
install -p -m 644 dist/%{short_name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
|
||||
|
||||
pushd $RPM_BUILD_ROOT%{_javadir}
|
||||
ln -s %{name}.jar %{short_name}.jar
|
||||
popd # come back from javadir
|
||||
|
||||
mkdir -p $RPM_BUILD_ROOT%{_mavenpomdir}
|
||||
install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{short_name}.pom
|
||||
%add_maven_depmap JPP-%{short_name}.pom %{short_name}.jar
|
||||
|
||||
# javadoc
|
||||
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
|
||||
cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
|
||||
|
||||
%files
|
||||
%doc LICENSE.txt NOTICE.txt RELEASE-NOTES.txt
|
||||
%{_javadir}/%{name}.jar
|
||||
%{_javadir}/%{short_name}.jar
|
||||
%{_mavenpomdir}/JPP-%{short_name}.pom
|
||||
%{_mavendepmapfragdir}/%{name}
|
||||
|
||||
%pre javadoc
|
||||
[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
|
||||
rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
|
||||
|
||||
%files javadoc
|
||||
%doc %{_javadocdir}/%{name}
|
||||
%doc LICENSE.txt NOTICE.txt
|
||||
|
||||
%changelog
|
||||
* Thu May 17 2012 gil cattaneo <puntogil@libero.it> - 2:0.4-7
|
||||
- add maven pom
|
||||
- adapt to current guideline
|
||||
- add %%pre javadoc script
|
||||
- remove BR ant-nodeps
|
||||
|
||||
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2:0.4-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
||||
|
||||
* Thu Jul 8 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 2:0.4-5
|
||||
- Add license to javadoc subpackage
|
||||
- Fix jar symlink installation
|
||||
|
||||
* Wed May 12 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 2:0.4-4
|
||||
- Add obsoletes to javadoc subpackage
|
||||
- Add proper symlinks for unversioned jar files
|
||||
|
||||
* Fri May 7 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 2:0.4-3
|
||||
- Add jpackage-utils as dep for -javadoc subpackage
|
||||
|
||||
* Fri May 7 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 2:0.4-2
|
||||
- Fix provides
|
||||
|
||||
* Thu May 6 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0.4-1
|
||||
- Rename and cleanup of jakarta-commons-discovery
|
||||
|
||||
|
|
@ -1,168 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?><project>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>commons-discovery</groupId>
|
||||
<artifactId>commons-discovery</artifactId>
|
||||
<name>Discovery</name>
|
||||
<version>0.4</version>
|
||||
<description>Commons Discovery</description>
|
||||
<url>http://jakarta.apache.org/commons/${pom.artifactId.substring(8)}/</url>
|
||||
<issueManagement>
|
||||
<url>http://issues.apache.org/jira/</url>
|
||||
</issueManagement>
|
||||
<ciManagement>
|
||||
<notifiers>
|
||||
<notifier>
|
||||
<configuration>
|
||||
<address>commons-dev@jakarta.apache.org</address>
|
||||
</configuration>
|
||||
</notifier>
|
||||
</notifiers>
|
||||
</ciManagement>
|
||||
<inceptionYear>2002</inceptionYear>
|
||||
<mailingLists>
|
||||
<mailingList>
|
||||
<name>Commons Dev List</name>
|
||||
<subscribe>commons-dev-subscribe@jakarta.apache.org</subscribe>
|
||||
<unsubscribe>commons-dev-unsubscribe@jakarta.apache.org</unsubscribe>
|
||||
<archive>http://mail-archives.apache.org/mod_mbox/jakarta-commons-dev/</archive>
|
||||
</mailingList>
|
||||
<mailingList>
|
||||
<name>Commons User List</name>
|
||||
<subscribe>commons-user-subscribe@jakarta.apache.org</subscribe>
|
||||
<unsubscribe>commons-user-unsubscribe@jakarta.apache.org</unsubscribe>
|
||||
<archive>http://mail-archives.apache.org/mod_mbox/jakarta-commons-user/</archive>
|
||||
</mailingList>
|
||||
</mailingLists>
|
||||
<developers>
|
||||
<developer>
|
||||
<id>rsitze</id>
|
||||
<name>Richard Sitze</name>
|
||||
<email></email>
|
||||
<organization></organization>
|
||||
</developer>
|
||||
<developer>
|
||||
<id>craigmcc</id>
|
||||
<name>Craig R. McClanahan</name>
|
||||
<email></email>
|
||||
<organization></organization>
|
||||
</developer>
|
||||
<developer>
|
||||
<id>costin</id>
|
||||
<name>Costin Manolache</name>
|
||||
<email></email>
|
||||
<organization></organization>
|
||||
</developer>
|
||||
<developer>
|
||||
<id>jstrachan</id>
|
||||
<name>James Strachan</name>
|
||||
<email>jstrachan@apache.org</email>
|
||||
<organization>SpiritSoft, Inc.</organization>
|
||||
</developer>
|
||||
<developer>
|
||||
<id>matth</id>
|
||||
<name>Matthew Hawthorne</name>
|
||||
<email>matth@apache.org</email>
|
||||
</developer>
|
||||
<developer>
|
||||
<id>dims</id>
|
||||
<name>Davanum Srinivas</name>
|
||||
<email>dims@apache.org</email>
|
||||
</developer>
|
||||
<developer>
|
||||
<id>rwinston</id>
|
||||
<name>Rory Winston</name>
|
||||
<email>rwinston@eircom.net</email>
|
||||
</developer>
|
||||
<developer>
|
||||
<id>rdonkin</id>
|
||||
<name>Robert Burrell Donkin</name>
|
||||
<email>rdonkin@apache.org</email>
|
||||
</developer>
|
||||
</developers>
|
||||
<licenses>
|
||||
<license>
|
||||
<name>The Apache Software License, Version 2.0</name>
|
||||
<url>/LICENSE.txt</url>
|
||||
</license>
|
||||
</licenses>
|
||||
<scm>
|
||||
<connection>scm:svn:http://svn.apache.org/repos/asf/jakarta/commons/proper/${pom.artifactId.substring(8)}/trunk</connection>
|
||||
<url>http://svn.apache.org/repos/asf/jakarta/commons/proper/${pom.artifactId.substring(8)}/trunk</url>
|
||||
</scm>
|
||||
<organization>
|
||||
<name>The Apache Software Foundation</name>
|
||||
<url>http://jakarta.apache.org</url>
|
||||
</organization>
|
||||
<build>
|
||||
<sourceDirectory>src/java</sourceDirectory>
|
||||
<testSourceDirectory>src/test</testSourceDirectory>
|
||||
<resources>
|
||||
<resource>
|
||||
<targetPath>META-INF</targetPath>
|
||||
<directory>${basedir}</directory>
|
||||
<includes>
|
||||
<include>NOTICE.txt</include>
|
||||
</includes>
|
||||
</resource>
|
||||
</resources>
|
||||
<testResources>
|
||||
<testResource>
|
||||
<directory>${basedir}/src</directory>
|
||||
<includes>
|
||||
<include>**/testResource</include>
|
||||
</includes>
|
||||
</testResource>
|
||||
<testResource>
|
||||
<directory>${basedir}/src/test</directory>
|
||||
<includes>
|
||||
<include>**/*.properties</include>
|
||||
<include>META-INF/**</include>
|
||||
</includes>
|
||||
</testResource>
|
||||
</testResources>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<artifactId>maven-surefire-plugin</artifactId>
|
||||
<configuration>
|
||||
<includes>
|
||||
<include>**/TestAll.java</include>
|
||||
</includes>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<artifactId>maven-xdoc-plugin</artifactId>
|
||||
<version>1.9.2</version>
|
||||
<configuration>
|
||||
<comment><strong>Site Only</strong> - v1.9.2 (minimum)
|
||||
required for building the Site documentation.</comment>
|
||||
</configuration>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>commons-logging</groupId>
|
||||
<artifactId>commons-logging</artifactId>
|
||||
<version>1.0.4</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>junit</groupId>
|
||||
<artifactId>junit</artifactId>
|
||||
<version>3.7</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
<distributionManagement>
|
||||
<repository>
|
||||
<id>default</id>
|
||||
<name>Default Repository</name>
|
||||
<url>file:///www/jakarta.apache.org/builds/jakarta-commons/${pom.artifactId.substring(8)}/</url>
|
||||
</repository>
|
||||
<site>
|
||||
<id>default</id>
|
||||
<name>Default Site</name>
|
||||
<url>scp://people.apache.org//www/jakarta.apache.org/commons/${pom.artifactId.substring(8)}/</url>
|
||||
</site>
|
||||
<status>converted</status>
|
||||
</distributionManagement>
|
||||
</project>
|
||||
1
dead.package
Normal file
1
dead.package
Normal file
|
|
@ -0,0 +1 @@
|
|||
Orphaned for 6+ weeks
|
||||
1
sources
1
sources
|
|
@ -1 +0,0 @@
|
|||
1275ad4c6ce54b9323269e30dc42dd0e commons-discovery-0.4-src.tar.gz
|
||||
Reference in a new issue