rpms/plexus-resources
6
0
Fork 0
Code Issues Pull Requests Releases Activity

- Update to alpha 7.

Browse Source 
- Apply patch to fix rhbz#621714.
- Use global instead of define.
- Drop ant build - broken after update.
This commit is contained in:
Alexander Kurtakov 2010-08-25 21:26:41 +03:00
parent 848305f25a
commit b634807962
7 changed files with 52 additions and 257 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1 +1,2 @@
plexus-resources-1.0-alpha-4-src.tar.gz plexus-resources-1.0-alpha-4-src.tar.gz
plexus-resources-1.0-alpha-7-src.tar.xz

25
0001-Add-default-role-hint-to-DefaultResourceManager.patch Normal file
View File

@ -0,0 +1,25 @@
From af71610068c086c03272c63716745fae519af96a Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky@redhat.com>
Date: Fri, 6 Aug 2010 15:25:23 +0200
Subject: [PATCH] Add default role-hint to DefaultResourceManager
---
.../plexus/resource/DefaultResourceManager.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/codehaus/plexus/resource/DefaultResourceManager.java b/src/main/java/org/codehaus/plexus/resource/DefaultResourceManager.java
index 8d840f9..5a464f3 100644
--- a/src/main/java/org/codehaus/plexus/resource/DefaultResourceManager.java
+++ b/src/main/java/org/codehaus/plexus/resource/DefaultResourceManager.java
@@ -44,7 +44,7 @@ import java.util.Map;
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
* @author Jason van Zyl
* @version $Id: DefaultResourceManager.java 8647 2010-02-15 00:08:07Z olamy $
- * @plexus.component instantiation-strategy="per-lookup"
+ * @plexus.component instantiation-strategy="per-lookup" role-hint="default"
*/
public class DefaultResourceManager
extends AbstractLogEnabled
--
1.7.2.1

122
plexus-resources-1.0-build.xml
View File

@ -1,122 +0,0 @@
<project name="plexus-resources" default="jar" basedir=".">
<property file="${user.home}/.m2/maven.properties"/>
<property name="maven.build.output" value="target/classes"/>
<property name="maven.build.directory" value="target"/>
<property name="maven.build.final.name" value="plexus-resources-1.0-alpha-4"/>
<property name="maven.test.reports" value="${maven.build.directory}/test-reports"/>
<property name="maven.test.output" value="target/test-classes"/>
<property name="maven.repo.local" value="${user.home}/.m2/repository"/>
<property name="javadocdir" value="target/site/apidocs"></property>
<path id="build.classpath">
<fileset dir="target/lib">
<include name="plexus_utils.jar"/>
<include name="plexus_container-default.jar"/>
<include name="classworlds.jar"/>
</fileset>
</path>
<target name="clean" description="Clean the output directory">
<delete dir="${maven.build.directory}"/>
</target>
<target name="compile" depends="get-deps" description="Compile the code">
<mkdir dir="${maven.build.output}"/>
<javac destdir="${maven.build.output}" excludes="**/package.html" debug="true" deprecation="true" optimize="false">
<src>
<pathelement location="src/main/java"/>
</src>
<classpath refid="build.classpath"/>
</javac>
<copy todir="${maven.build.output}">
<fileset dir="src/main/resources"/>
</copy>
</target>
<target name="jar" depends="compile,test" description="Clean the JAR">
<jar jarfile="${maven.build.directory}/${maven.build.final.name}.jar" basedir="${maven.build.output}" excludes="**/package.html"/>
</target>
<target name="compile-tests" depends="junit-present, compile" description="Compile the test code" if="junit.present">
<mkdir dir="${maven.test.output}"/>
<javac destdir="${maven.test.output}" excludes="**/package.html" debug="true" deprecation="true" optimize="false">
<src>
<pathelement location="src/test/java"/>
</src>
<classpath>
<path refid="build.classpath"/>
<pathelement location="${maven.build.output}"/>
</classpath>
</javac>
<copy todir="${maven.test.output}">
<fileset dir="src/test/resources"/>
</copy>
</target>
<target name="test" depends="junit-present, compile-tests" if="junit.present" description="Run the test cases">
<mkdir dir="${maven.test.reports}"/>
<junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
<sysproperty key="basedir" value="."/>
<formatter type="xml"/>
<formatter type="plain" usefile="false"/>
<classpath>
<path refid="build.classpath"/>
<pathelement location="${maven.build.output}"/>
<pathelement location="${maven.test.output}"/>
</classpath>
<batchtest todir="${maven.test.reports}">
<fileset dir="src/test/java">
<include name="**/*Test.java"/>
<exclude name="**/*Abstract*Test.java"/>
</fileset>
</batchtest>
</junit>
</target>
<target name="test-junit-present">
<available classname="junit.framework.Test" property="junit.present"/>
</target>
<target name="junit-present" depends="test-junit-present" unless="junit.present">
<echo>================================= WARNING ================================</echo>
<echo> Junit isn&apos;t present in your $ANT_HOME/lib directory. Tests not executed. </echo>
<echo>==========================================================================</echo>
</target>
<target name="test-offline">
<condition property="maven.mode.offline">
<equals arg1="${build.sysclasspath}" arg2="only"/>
</condition>
</target>
<target name="get-deps" depends="test-offline" description="Download all dependencies" unless="maven.mode.offline">
<mkdir dir="${maven.repo.local}"/>
<mkdir dir="/var/home/jpp/rebuild/free/BUILD/plexus-resources-1.0-alpha-4/org/codehaus/plexus/plexus-utils/1.2"/>
<get src="file:///var/home/jpp/rebuild/free/BUILD/plexus-resources-1.0-alpha-4/.m2/repository/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" usetimestamp="true" ignoreerrors="true"/>
<get src="file:///var/home/jpp/rebuild/free/BUILD/plexus-resources-1.0-alpha-4/external_repo/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" usetimestamp="true" ignoreerrors="true"/>
<get src="file:///var/home/jpp/rebuild/free/BUILD/plexus-resources-1.0-alpha-4/.m2/repository/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" usetimestamp="true" ignoreerrors="true"/>
<get src="http://snapshots.maven.codehaus.org/maven2/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" usetimestamp="true" ignoreerrors="true"/>
<get src="file:///usr/share/maven2/repository/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" usetimestamp="true" ignoreerrors="true"/>
<get src="http://repo1.maven.org/maven2/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" usetimestamp="true" ignoreerrors="true"/>
<mkdir dir="/var/home/jpp/rebuild/free/BUILD/plexus-resources-1.0-alpha-4/org/codehaus/plexus/plexus-container-default/1.0"/>
<get src="file:///var/home/jpp/rebuild/free/BUILD/plexus-resources-1.0-alpha-4/.m2/repository/org/codehaus/plexus/plexus-container-default/1.0/plexus-container-default-1.0.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-container-default/1.0/plexus-container-default-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
<get src="file:///var/home/jpp/rebuild/free/BUILD/plexus-resources-1.0-alpha-4/external_repo/org/codehaus/plexus/plexus-container-default/1.0/plexus-container-default-1.0.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-container-default/1.0/plexus-container-default-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
<get src="file:///var/home/jpp/rebuild/free/BUILD/plexus-resources-1.0-alpha-4/.m2/repository/org/codehaus/plexus/plexus-container-default/1.0/plexus-container-default-1.0.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-container-default/1.0/plexus-container-default-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
<get src="http://snapshots.maven.codehaus.org/maven2/org/codehaus/plexus/plexus-container-default/1.0/plexus-container-default-1.0.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-container-default/1.0/plexus-container-default-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
<get src="file:///usr/share/maven2/repository/org/codehaus/plexus/plexus-container-default/1.0/plexus-container-default-1.0.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-container-default/1.0/plexus-container-default-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
<get src="http://repo1.maven.org/maven2/org/codehaus/plexus/plexus-container-default/1.0/plexus-container-default-1.0.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-container-default/1.0/plexus-container-default-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
<mkdir dir="/var/home/jpp/rebuild/free/BUILD/plexus-resources-1.0-alpha-4/classworlds/classworlds/1.4"/>
<get src="file:///var/home/jpp/rebuild/free/BUILD/plexus-resources-1.0-alpha-4/.m2/repository/classworlds/classworlds/1.4/classworlds-1.4.jar" dest="${maven.repo.local}/classworlds/classworlds/1.4/classworlds-1.4.jar" usetimestamp="true" ignoreerrors="true"/>
<get src="file:///var/home/jpp/rebuild/free/BUILD/plexus-resources-1.0-alpha-4/external_repo/classworlds/classworlds/1.4/classworlds-1.4.jar" dest="${maven.repo.local}/classworlds/classworlds/1.4/classworlds-1.4.jar" usetimestamp="true" ignoreerrors="true"/>
<get src="file:///var/home/jpp/rebuild/free/BUILD/plexus-resources-1.0-alpha-4/.m2/repository/classworlds/classworlds/1.4/classworlds-1.4.jar" dest="${maven.repo.local}/classworlds/classworlds/1.4/classworlds-1.4.jar" usetimestamp="true" ignoreerrors="true"/>
<get src="http://snapshots.maven.codehaus.org/maven2/classworlds/classworlds/1.4/classworlds-1.4.jar" dest="${maven.repo.local}/classworlds/classworlds/1.4/classworlds-1.4.jar" usetimestamp="true" ignoreerrors="true"/>
<get src="file:///usr/share/maven2/repository/classworlds/classworlds/1.4/classworlds-1.4.jar" dest="${maven.repo.local}/classworlds/classworlds/1.4/classworlds-1.4.jar" usetimestamp="true" ignoreerrors="true"/>
<get src="http://repo1.maven.org/maven2/classworlds/classworlds/1.4/classworlds-1.4.jar" dest="${maven.repo.local}/classworlds/classworlds/1.4/classworlds-1.4.jar" usetimestamp="true" ignoreerrors="true"/>
</target>
<target name="javadoc" description="o Generate javadoc" depends="get-deps">
<mkdir dir="${javadocdir}"></mkdir>
<tstamp>
<format pattern="-yyyy" property="year"></format>
</tstamp>
<property name="copyright" value="Copyright &amp;copy; . All Rights Reserved."></property>
<property name="title" value="Plexus Resources Component 1.0-alpha-4 API"></property>
<javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/main/java" packagenames="org.codehaus.plexus.resource.*">
<classpath>
<path refid="build.classpath"></path>
</classpath>
</javadoc>
</target>
</project>

39
plexus-resources-1.0-components.xml
View File

@ -1,39 +0,0 @@
<component-set>
<components>
<component>
<role>org.codehaus.plexus.resource.ResourceManager</role>
<implementation>org.codehaus.plexus.resource.DefaultResourceManager</implementation>
<description></description>
<requirements>
<requirement>
<role>org.codehaus.plexus.resource.loader.ResourceLoader</role>
<field-name>resourceLoaders</field-name>
</requirement>
</requirements>
</component>
<component>
<role>org.codehaus.plexus.resource.loader.ResourceLoader</role>
<role-hint>file</role-hint>
<implementation>org.codehaus.plexus.resource.loader.FileResourceLoader</implementation>
<description></description>
</component>
<component>
<role>org.codehaus.plexus.resource.loader.ResourceLoader</role>
<role-hint>jar</role-hint>
<implementation>org.codehaus.plexus.resource.loader.JarResourceLoader</implementation>
<description></description>
</component>
<component>
<role>org.codehaus.plexus.resource.loader.ResourceLoader</role>
<role-hint>classloader</role-hint>
<implementation>org.codehaus.plexus.resource.loader.ThreadContextClasspathResourceLoader</implementation>
<description></description>
</component>
<component>
<role>org.codehaus.plexus.resource.loader.ResourceLoader</role>
<role-hint>url</role-hint>
<implementation>org.codehaus.plexus.resource.loader.URLResourceLoader</implementation>
<description></description>
</component>
</components>
</component-set>

49
plexus-resources-1.0-jpp-depmap.xml
View File

@ -1,16 +1,4 @@
<dependencies> <dependencies>
<dependency>
<maven>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
<version>1.0.4</version>
</maven>
<jpp>
<groupId>JPP/plexus</groupId>
<artifactId>utils</artifactId>
<version>1.2</version>
</jpp>
</dependency>
<dependency> <dependency>
<maven> <maven>
<groupId>org.codehaus.plexus</groupId> <groupId>org.codehaus.plexus</groupId>
@ -23,41 +11,4 @@
<version>1.0-alpha-8</version> <version>1.0-alpha-8</version>
</jpp> </jpp>
</dependency> </dependency>
<dependency>
<maven>
<groupId>com.thoughtworks.qdox</groupId>
<artifactId>qdox</artifactId>
<version>1.6.3</version>
</maven>
<jpp>
<groupId>JPP</groupId>
<artifactId>qdox</artifactId>
<version>1.6.3</version>
</jpp>
</dependency>
<dependency>
<maven>
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-site-renderer</artifactId>
<version>1.0-alpha-7</version>
</maven>
<jpp>
<groupId>JPP/maven-doxia</groupId>
<artifactId>site-renderer</artifactId>
<version>1.0-alpha-7</version>
</jpp>
</dependency>
<dependency>
<maven>
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-decoration-model</artifactId>
<version>1.0-alpha-7</version>
</maven>
<jpp>
<groupId>JPP/maven-doxia</groupId>
<artifactId>decoration-model</artifactId>
<version>1.0-alpha-7</version>
</jpp>
</dependency>
</dependencies> </dependencies>

71
plexus-resources.spec
View File

@ -28,26 +28,23 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# #
%define with_maven 0 %global parent plexus
%global subname resources
%define parent plexus %global namedversion 1.0-alpha-7
%define subname resources
%define namedversion 1.0-alpha-4
Name: %{parent}-%{subname} Name: %{parent}-%{subname}
Version: 1.0 Version: 1.0
Release: 0.2.a4%{?dist} Release: 0.3.a7%{?dist}
Summary: Plexus Resource Manager Summary: Plexus Resource Manager
License: MIT License: MIT
Group: Development/Tools Group: Development/Tools
URL: http://plexus.codehaus.org/ URL: http://plexus.codehaus.org/
# svn export http://svn.codehaus.org/plexus/tags/plexus-resources-1.0-alpha-4/ # svn export http://svn.codehaus.org/plexus/plexus-components/tags/plexus-resources-1.0-alpha-7/
# tar czf plexus-resources-1.0-alpha-4-src.tar.gz plexus-resources-1.0-alpha-4 # tar caf plexus-resources-1.0-alpha-7-src.tar.xz plexus-resources-1.0-alpha-7
Source0: %{name}-%{version}-alpha-4-src.tar.gz Source0: %{name}-%{version}-alpha-7-src.tar.xz
Source1: plexus-resources-1.0-build.xml
Source2: plexus-resources-1.0-components.xml
Source3: plexus-resources-settings.xml Source3: plexus-resources-settings.xml
Source4: plexus-resources-1.0-jpp-depmap.xml Source4: plexus-resources-1.0-jpp-depmap.xml
Patch0: 0001-Add-default-role-hint-to-DefaultResourceManager.patch
Requires: classworlds >= 0:1.1 Requires: classworlds >= 0:1.1
Requires: plexus-container-default Requires: plexus-container-default
Requires: plexus-utils Requires: plexus-utils
@ -57,27 +54,18 @@ Requires(postun): jpackage-utils >= 0:1.7.3
BuildRequires: jpackage-utils >= 0:1.7.3 BuildRequires: jpackage-utils >= 0:1.7.3
BuildRequires: java-devel >= 0:1.5.0 BuildRequires: java-devel >= 0:1.5.0
BuildRequires: ant >= 0:1.6 BuildRequires: ant >= 0:1.6
%if %{with_maven}
BuildRequires: maven2 BuildRequires: maven2
BuildRequires: maven2-plugin-compiler BuildRequires: maven-compiler-plugin
BuildRequires: maven2-plugin-install BuildRequires: maven-install-plugin
BuildRequires: maven2-plugin-jar BuildRequires: maven-jar-plugin
BuildRequires: maven2-plugin-javadoc BuildRequires: maven-javadoc-plugin
BuildRequires: maven2-plugin-release BuildRequires: maven-release-plugin
BuildRequires: maven2-plugin-resources BuildRequires: maven-resources-plugin
BuildRequires: maven2-plugin-surefire = 2.3 BuildRequires: maven-surefire-maven-plugin
BuildRequires: maven-surefire-provider-junit = 2.3 BuildRequires: maven-surefire-provider-junit
BuildRequires: maven-doxia BuildRequires: maven-doxia
BuildRequires: maven-doxia-sitetools BuildRequires: maven-doxia-sitetools
BuildRequires: plexus-maven-plugin >= 1.3.5 BuildRequires: plexus-maven-plugin >= 1.3.5
BuildRequires: qdox >= 1.5
BuildRequires: tomcat5
BuildRequires: tomcat5-servlet-2.4-api
BuildRequires: avalon-logkit
BuildRequires: avalon-framework
%endif
BuildRequires: classworlds >= 0:1.1
BuildRequires: plexus-container-default BuildRequires: plexus-container-default
BuildRequires: plexus-utils BuildRequires: plexus-utils
@ -100,14 +88,11 @@ Group: Documentation
API documentation for %{name}. API documentation for %{name}.
%prep %prep
%setup -q -n %{name}-%{version}-alpha-4 %setup -q -n %{name}-%{namedversion}
cp -p %{SOURCE1} build.xml
mkdir -p target/classes/META-INF/plexus
cp -p %{SOURCE2} target/classes/./META-INF/plexus/components.xml
cp -p %{SOURCE3} settings.xml cp -p %{SOURCE3} settings.xml
%patch0 -p1
%build %build
%if %{with_maven}
sed -i -e "s|<url>__JPP_URL_PLACEHOLDER__</url>|<url>file://`pwd`/.m2/repository</url>|g" settings.xml sed -i -e "s|<url>__JPP_URL_PLACEHOLDER__</url>|<url>file://`pwd`/.m2/repository</url>|g" settings.xml
sed -i -e "s|<url>__JAVADIR_PLACEHOLDER__</url>|<url>file://`pwd`/external_repo</url>|g" settings.xml sed -i -e "s|<url>__JAVADIR_PLACEHOLDER__</url>|<url>file://`pwd`/external_repo</url>|g" settings.xml
sed -i -e "s|<url>__MAVENREPO_DIR_PLACEHOLDER__</url>|<url>file://`pwd`/.m2/repository</url>|g" settings.xml sed -i -e "s|<url>__MAVENREPO_DIR_PLACEHOLDER__</url>|<url>file://`pwd`/.m2/repository</url>|g" settings.xml
@ -128,18 +113,6 @@ mvn-jpp \
-Dmaven.repo.local=$MAVEN_REPO_LOCAL \ -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
install javadoc:javadoc install javadoc:javadoc
%else
export CLASSPATH=
export OPT_JAR_LIST=:
mkdir -p target/lib
build-jar-repository -s -p target/lib \
classworlds \
plexus/container-default \
plexus/utils \
ant -Dmaven.mode.offline=true jar javadoc
%endif
%install %install
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
# jars # jars
@ -172,7 +145,7 @@ rm -rf $RPM_BUILD_ROOT
%files %files
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_javadir}/%{parent}/* %{_javadir}/%{parent}/*
%{_datadir}/maven2/poms/* %{_mavenpomdir}/*
%{_mavendepmapfragdir}/* %{_mavendepmapfragdir}/*
%files javadoc %files javadoc
@ -181,6 +154,12 @@ rm -rf $RPM_BUILD_ROOT
%{_javadocdir}/%{name} %{_javadocdir}/%{name}
%changelog %changelog
* Wed Aug 25 2010 Alexander Kurtakov <akurtako@redhat.com> 1.0-0.3.a7
- Update to alpha 7.
- Apply patch to fix rhbz#621714.
- Use global instead of define.
- Drop ant build - broken after update.
* Wed Aug 26 2009 Andrew Overholt <overholt@redhat.com> 1.0-0.2.a4 * Wed Aug 26 2009 Andrew Overholt <overholt@redhat.com> 1.0-0.2.a4
- Fix release and defattr - Fix release and defattr
- Make -javadoc description better - Make -javadoc description better

2
sources
View File

@ -1 +1 @@
be22d0c00541a8333f80e7ec512929d4 plexus-resources-1.0-alpha-4-src.tar.gz f6ac346f9856c1517590c78cc98b737e plexus-resources-1.0-alpha-7-src.tar.xz