rpms/plexus-bsh-factory/devel plexus-bsh-factory-build.xml, NONE, 1.1 plexus-bsh-factory-encodingfix.patch, NONE, 1.1 plexus-bsh-factory-jpp-depmap.xml, NONE, 1.1 plexus-bsh-factory.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Deepak Bhole (dbhole)
fedora-extras-commits at redhat.com
Tue Mar 13 21:31:28 UTC 2007
Author: dbhole
Update of /cvs/extras/rpms/plexus-bsh-factory/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11245/devel
Modified Files:
.cvsignore sources
Added Files:
plexus-bsh-factory-build.xml
plexus-bsh-factory-encodingfix.patch
plexus-bsh-factory-jpp-depmap.xml plexus-bsh-factory.spec
Log Message:
auto-import plexus-bsh-factory-1.0-0.1.a7s.2jpp.1 on branch devel from plexus-bsh-factory-1.0-0.1.a7s.2jpp.1.src.rpm
--- NEW FILE plexus-bsh-factory-build.xml ---
<project name="plexus-bsh-factory" 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-bsh-factory-1.0-alpha-7"/>
<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"/>
<path id="build.classpath">
<fileset dir="lib">
<include name="plexus_utils.jar"/>
<include name="plexus_container-default.jar"/>
<include name="classworlds.jar"/>
<include name="bsh.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'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="/home/dbhole/DIST/plexus-bsh-factory/plexus-bsh-factory/org/codehaus/plexus/plexus-utils/1.0.4"/>
<get src="http://snapshots.maven.codehaus.org/maven2//org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
<get src="http://snapshots.maven.codehaus.org/maven2/org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
<get src="http://repo1.maven.org/maven2/org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4.jar" usetimestamp="true" ignoreerrors="true"/>
<mkdir dir="/home/dbhole/DIST/plexus-bsh-factory/plexus-bsh-factory/org/codehaus/plexus/plexus-container-default/1.0-alpha-8"/>
<get src="http://snapshots.maven.codehaus.org/maven2//org/codehaus/plexus/plexus-container-default/1.0-alpha-8/plexus-container-default-1.0-alpha-8.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-container-default/1.0-alpha-8/plexus-container-default-1.0-alpha-8.jar" usetimestamp="true" ignoreerrors="true"/>
<get src="http://snapshots.maven.codehaus.org/maven2/org/codehaus/plexus/plexus-container-default/1.0-alpha-8/plexus-container-default-1.0-alpha-8.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-container-default/1.0-alpha-8/plexus-container-default-1.0-alpha-8.jar" usetimestamp="true" ignoreerrors="true"/>
<get src="http://repo1.maven.org/maven2/org/codehaus/plexus/plexus-container-default/1.0-alpha-8/plexus-container-default-1.0-alpha-8.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-container-default/1.0-alpha-8/plexus-container-default-1.0-alpha-8.jar" usetimestamp="true" ignoreerrors="true"/>
<mkdir dir="/home/dbhole/DIST/plexus-bsh-factory/plexus-bsh-factory/classworlds/classworlds/1.1-alpha-2"/>
<get src="http://snapshots.maven.codehaus.org/maven2//classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.jar" dest="${maven.repo.local}/classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.jar" usetimestamp="true" ignoreerrors="true"/>
<get src="http://snapshots.maven.codehaus.org/maven2/classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.jar" dest="${maven.repo.local}/classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.jar" usetimestamp="true" ignoreerrors="true"/>
<get src="http://repo1.maven.org/maven2/classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.jar" dest="${maven.repo.local}/classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.jar" usetimestamp="true" ignoreerrors="true"/>
<mkdir dir="/home/dbhole/DIST/plexus-bsh-factory/plexus-bsh-factory/bsh/bsh/1.3.0"/>
<get src="http://snapshots.maven.codehaus.org/maven2//bsh/bsh/1.3.0/bsh-1.3.0.jar" dest="${maven.repo.local}/bsh/bsh/1.3.0/bsh-1.3.0.jar" usetimestamp="true" ignoreerrors="true"/>
<get src="http://snapshots.maven.codehaus.org/maven2/bsh/bsh/1.3.0/bsh-1.3.0.jar" dest="${maven.repo.local}/bsh/bsh/1.3.0/bsh-1.3.0.jar" usetimestamp="true" ignoreerrors="true"/>
<get src="http://repo1.maven.org/maven2/bsh/bsh/1.3.0/bsh-1.3.0.jar" dest="${maven.repo.local}/bsh/bsh/1.3.0/bsh-1.3.0.jar" usetimestamp="true" ignoreerrors="true"/>
</target>
</project>
plexus-bsh-factory-encodingfix.patch:
--- NEW FILE plexus-bsh-factory-encodingfix.patch ---
--- ./release-pom.xml.sav 2006-09-12 14:19:08.000000000 -0400
+++ ./release-pom.xml 2006-09-12 14:19:13.000000000 -0400
@@ -112,7 +112,7 @@
</developer>
<developer>
<id>trygvis</id>
- <name>Trygve Laugstøl</name>
+ <name>Trygve Laugstol</name>
<email>trygvis at codehaus.org</email>
<roles>
<role>Developer</role>
--- NEW FILE plexus-bsh-factory-jpp-depmap.xml ---
<dependencies>
<dependency>
<maven>
<groupId>bsh</groupId>
<artifactId>bsh</artifactId>
<version>1.3.0</version>
</maven>
<jpp>
<groupId>JPP</groupId>
<artifactId>bsh</artifactId>
<version>1.3.0</version>
</jpp>
</dependency>
<dependency>
<maven>
<groupId>classworlds</groupId>
<artifactId>classworlds</artifactId>
<version>1.1-alpha-2</version>
</maven>
<jpp>
<groupId>JPP</groupId>
<artifactId>classworlds</artifactId>
<version>1.1-alpha-2</version>
</jpp>
</dependency>
<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.0.4</version>
</jpp>
</dependency>
<dependency>
<maven>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
</maven>
<jpp>
<groupId>JPP</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
</jpp>
</dependency>
<dependency>
<maven>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
<version>1.0-alpha-8</version>
</maven>
<jpp>
<groupId>JPP/plexus</groupId>
<artifactId>container-default</artifactId>
<version>1.0-alpha-8</version>
</jpp>
</dependency>
<dependency>
<maven>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-factories</artifactId>
<version>1.0-alpha-5</version>
</maven>
<jpp>
<groupId>JPP/plexus</groupId>
<artifactId>component-factories</artifactId>
<version>1.0-alpha-5</version>
</jpp>
</dependency>
<dependency>
<maven>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-bsh-factory</artifactId>
<version>1.0-alpha-7</version>
</maven>
<jpp>
<groupId>JPP/plexus</groupId>
<artifactId>bsh-factory</artifactId>
<version>1.0-alpha-7</version>
</jpp>
</dependency>
</dependencies>
--- NEW FILE plexus-bsh-factory.spec ---
# Copyright (c) 2000-2005, 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 _with_gcj_support 1
%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
%define _without_maven 1
%define with_maven %{!?_without_maven:1}%{?_without_maven:0}
%define without_maven %{?_without_maven:1}%{!?_without_maven:0}
%define parent plexus
%define subname bsh-factory
Name: %{parent}-%{subname}
Version: 1.0
Release: 0.1.a7s.2jpp.1%{?dist}
Epoch: 0
Summary: Plexus Bsh component factory
License: MIT-Style
Group: Development/Java
URL: http://plexus.codehaus.org/
Source0: %{name}-src.tar.gz
# svn export svn://svn.plexus.codehaus.org/plexus/tags/plexus-bsh-factory-1.0-alpha-7-SNAPSHOT plexus-bsh-factory/
# tar czf plexus-bsh-factory-src.tar.gz plexus-bsh-factory/
Source1: %{name}-jpp-depmap.xml
Source2: %{name}-build.xml
Patch1: %{name}-encodingfix.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if ! %{gcj_support}
BuildArch: noarch
%endif
BuildRequires: jpackage-utils >= 0:1.7.2
%if %{with_maven}
BuildRequires: maven2 >= 2.0.4-9
BuildRequires: maven2-plugin-compiler
BuildRequires: maven2-plugin-install
BuildRequires: maven2-plugin-jar
BuildRequires: maven2-plugin-javadoc
BuildRequires: maven2-plugin-release
BuildRequires: maven2-plugin-resources
BuildRequires: maven2-plugin-surefire
BuildRequires: maven2-common-poms >= 1.0-2
%else
BuildRequires: ant
%endif
BuildRequires: bsh
BuildRequires: classworlds
BuildRequires: plexus-container-default
BuildRequires: plexus-utils
Requires: bsh
Requires: classworlds
Requires: plexus-container-default
Requires: plexus-utils
Requires(post): jpackage-utils >= 0:1.7.2
Requires(postun): jpackage-utils >= 0:1.7.2
%if %{gcj_support}
BuildRequires: java-gcj-compat-devel
Requires(post): java-gcj-compat
Requires(postun): java-gcj-compat
%endif
%description
Bsh component class creator for Plexus.
%if %{with_maven}
%package javadoc
Summary: Javadoc for %{name}
Group: Documentation
%description javadoc
Javadoc for %{name}.
%endif
%prep
%setup -q -n %{name}
%patch1 -b .sav
%if %{without_maven}
cp -p %{SOURCE2} build.xml
%endif
%build
%if %{with_maven}
export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
mkdir -p $MAVEN_REPO_LOCAL
mvn-jpp \
-e \
-Dmaven.repo.local=$MAVEN_REPO_LOCAL \
install javadoc:javadoc
%else
mkdir lib
build-jar-repository \
-s -p \
lib bsh classworlds \
plexus/container-default \
plexus/utils
ant -Dmaven.mode.offline=true
%endif
%install
rm -rf $RPM_BUILD_ROOT
# jars
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/plexus
install -pm 644 target/*.jar \
$RPM_BUILD_ROOT%{_javadir}/%{parent}/%{subname}-%{version}.jar
%add_to_maven_depmap org.codehaus.plexus %{name} 1.0-alpha-7 JPP/%{parent} %{subname}
(cd $RPM_BUILD_ROOT%{_javadir}/%{parent} && for jar in *-%{version}*; \
do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
# pom
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
install -pm 644 \
pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{parent}-%{subname}.pom
# javadoc
%if %{with_maven}
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
cp -pr target/site/apidocs/* \
$RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/
ln -s %{name}-%{version} \
$RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
%endif
%if %{gcj_support}
%{_bindir}/aot-compile-rpm
%endif
%clean
rm -rf $RPM_BUILD_ROOT
%post
%if %{gcj_support}
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
fi
%endif
%update_maven_depmap
%postun
%if %{gcj_support}
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
fi
%endif
%update_maven_depmap
%files
%defattr(-,root,root,-)
%dir %{_javadir}/plexus
%{_javadir}/plexus
%{_datadir}/maven2
%{_mavendepmapfragdir}
%config(noreplace) /etc/maven/fragments/plexus-bsh-factory
%if %{gcj_support}
%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
%attr(-,root,root) %{_libdir}/gcj/%{name}/bsh-factory-1.0.jar.*
%endif
%if %{with_maven}
%files javadoc
%defattr(-,root,root,-)
%doc %{_javadocdir}/*
%endif
%changelog
* Fri Feb 23 2007 Tania Bento <tbento at redhat.com> 0:1.0-0.1.a7s.2jpp.1
- Fixed %%Release.
- Fixed %%BuildRoot.
- Fixed %%Vendor.
- Fixed %%Distribution.
- Fixed instructions on how to generate source drop.
- Removed %%post and %%postun sections for javadoc.
- Made sure lines had less than 80 characters.
- Changed to use cp -p to preserve timestamps.
* Tue Oct 17 2006 Deepak Bhole <dbhole at redhat.com> 1.0-0.a7s.2jpp
- Update for maven2 9jpp
* Thu Sep 07 2006 Deepak Bhole <dbhole at redhat.com> 1.0-0.a7s.1jpp
- Initial build
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/plexus-bsh-factory/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 13 Mar 2007 03:59:42 -0000 1.1
+++ .cvsignore 13 Mar 2007 21:30:56 -0000 1.2
@@ -0,0 +1 @@
+plexus-bsh-factory-src.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/plexus-bsh-factory/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 13 Mar 2007 03:59:42 -0000 1.1
+++ sources 13 Mar 2007 21:30:56 -0000 1.2
@@ -0,0 +1 @@
+4a5b732b354d26a8932f5fa18e810de3 plexus-bsh-factory-src.tar.gz
More information about the scm-commits
mailing list