[Jpackage-commits] dist/plexus-utils/JPP-6 Makefile, NONE, 1.1 plexus-utils-1.5.8-build.xml, NONE, 1.1 plexus-utils-1.5.8-jpp-depmap.xml, NONE, 1.1 plexus-utils.spec, NONE, 1.1 sources, NONE, 1.1

jpackage jpackage at ryu.zarb.org
Fri Dec 3 10:10:40 CET 2010


Update of /home/projects/jpackage/cvs/dist/plexus-utils/JPP-6
In directory ryu.zarb.org:/tmp/cvs-serv15006/JPP-6

Added Files:
	Makefile plexus-utils-1.5.8-build.xml 
	plexus-utils-1.5.8-jpp-depmap.xml plexus-utils.spec sources 
Log Message:
Import plexus-utils into JPP-6

--- NEW FILE: sources ---
8b3790a7a68c5a02e6bd0e4e7e1cd057  plexus-utils-1.5.8.tar.gz

--- NEW FILE: plexus-utils-1.5.8-build.xml ---
<project name="plexus-utils" 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-utils-1.4.5"/>
  <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="${basedir}/.m2/repository"/>
  <property name="javadocdir" value="target/site/apidocs"></property>
  <path id="build.classpath">
    <fileset dir="${maven.repo.local}"/>
  </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>
  </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}"/>
  </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 &copy;  . All Rights Reserved."></property>
    <property name="title" value="Plexus Common Utilities 1.4.5 API"></property>    <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/main/java" packagenames="org.codehaus.plexus.util.*">
      <classpath>
        <path refid="build.classpath"></path>
      </classpath>
    </javadoc>
  </target>
</project>

--- NEW FILE: Makefile ---
# Makefile for source rpm: plexus-utils
# $Id: Makefile,v 1.1 2010/12/03 09:10:38 jpackage Exp $
NAME := plexus-utils
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)

--- NEW FILE: plexus-utils-1.5.8-jpp-depmap.xml ---
<dependencies>
	<dependency>
		<maven>
			<groupId>servletapi</groupId>
			<artifactId>servletapi</artifactId>
			<version>2.3</version>
		</maven>
		<jpp>
			<groupId>JPP</groupId>
			<artifactId>servletapi5</artifactId>
			<version>2.4</version>
		</jpp>
	</dependency>

	<dependency>
		<maven>
			<groupId>jetty</groupId>
			<artifactId>jetty</artifactId>
			<version>4.2.10</version>
		</maven>
		<jpp>
			<groupId>JPP/jetty5</groupId>
			<artifactId>jetty5</artifactId>
			<version>5.1.12</version>
		</jpp>
	</dependency>

	<dependency>
		<maven>
			<groupId>joda-time</groupId>
			<artifactId>joda-time</artifactId>
			<version>1.2.1</version>
		</maven>
		<jpp>
			<groupId>JPP</groupId>
			<artifactId>joda-time</artifactId>
			<version>1.2.1</version>
		</jpp>
	</dependency>

	<dependency>
		<maven>
			<groupId>xom</groupId>
			<artifactId>xom</artifactId>
			<version>1.1</version>
		</maven>
		<jpp>
			<groupId>JPP</groupId>
			<artifactId>xom</artifactId>
			<version>1.0</version>
		</jpp>
	</dependency>

	<dependency>
		<maven>
			<groupId>xpp3</groupId>
			<artifactId>xpp3</artifactId>
			<version>1.1.3.4.O</version>
		</maven>
		<jpp>
			<groupId>JPP</groupId>
			<artifactId>xpp3</artifactId>
			<version>1.1.3.8</version>
		</jpp>
	</dependency>
	<dependency>
		<maven>
			<groupId>xpp3</groupId>
			<artifactId>xpp3_min</artifactId>
			<version>1.1.3.4.O</version>
		</maven>
		<jpp>
			<groupId>JPP</groupId>
			<artifactId>xpp3</artifactId>
			<version>1.1.3.8</version>
		</jpp>
	</dependency>

	<dependency>
		<maven>
			<groupId>cglib</groupId>
			<artifactId>cglib-nodep</artifactId>
			<version>2.1_3</version>
		</maven>
		<jpp>
			<groupId>JPP</groupId>
			<artifactId>cglib-nodep</artifactId>
			<version>2.1.3</version>
		</jpp>
	</dependency>

	<dependency>
		<maven>
			<groupId>com.megginson.sax</groupId>
			<artifactId>xml-writer</artifactId>
			<version>0.2</version>
		</maven>
		<jpp>
			<groupId>JPP</groupId>
			<artifactId>xom</artifactId>
			<version>1.0</version>
		</jpp>
	</dependency>

	<dependency>
		<maven>
			<groupId>stax</groupId>
			<artifactId>stax</artifactId>
			<version>1.2.0</version>
		</maven>
		<jpp>
			<groupId>JPP</groupId>
			<artifactId>bea-stax-ri</artifactId>
			<version>1.2.0</version>
		</jpp>
	</dependency>
	<dependency>
		<maven>
			<groupId>stax</groupId>
			<artifactId>stax-api</artifactId>
			<version>1.0.1</version>
		</maven>
		<jpp>
			<groupId>JPP</groupId>
			<artifactId>bea-stax-api</artifactId>
			<version>1.0.1</version>
		</jpp>
	</dependency>

	<dependency>
		<maven>
			<groupId>plexus</groupId>
			<artifactId>plexus-utils</artifactId>
			<version>1.2</version>
		</maven>
		<jpp>
			<groupId>JPP/plexus</groupId>
			<artifactId>utils</artifactId>
			<version>1.2</version>
		</jpp>
	</dependency>

	<dependency>
		<maven>
			<groupId>org.codehaus.xsite</groupId>
			<artifactId>xsite-maven-plugin</artifactId>
			<version>1.0-beta-5</version>
		</maven>
		<jpp>
			<groupId>JPP</groupId>
			<artifactId>xsite-maven-plugin</artifactId>
			<version>1.0</version>
		</jpp>
	</dependency>

	<dependency>
		<maven>
			<groupId>org.nanocontainer</groupId>
			<artifactId>nanocontainer</artifactId>
			<version>1.1</version>
		</maven>
		<jpp>
			<groupId>JPP/nanocontainer</groupId>
			<artifactId>container</artifactId>
			<version>1.1</version>
		</jpp>
	</dependency>

	<dependency>
		<maven>
			<groupId>opensymphony</groupId>
			<artifactId>sitemesh</artifactId>
			<version>2.3</version>
		</maven>
		<jpp>
			<groupId>JPP</groupId>
			<artifactId>sitemesh</artifactId>
			<version>2.3</version>
		</jpp>
	</dependency>

	<dependency>
		<maven>
			<groupId>freemarker</groupId>
			<artifactId>freemarker</artifactId>
			<version>2.3.9</version>
		</maven>
		<jpp>
			<groupId>JPP</groupId>
			<artifactId>freemarker</artifactId>
			<version>2.3.6</version>
		</jpp>
	</dependency>

        <dependency>
                <maven>
                        <groupId>asm</groupId>
                        <artifactId>asm</artifactId>
                        <version>2.2.3</version>
                </maven>
                <jpp>
                        <groupId>JPP/objectweb-asm</groupId>
                        <artifactId>asm</artifactId>
                        <version>3.2</version>
                </jpp>
        </dependency>
        <dependency>
                <maven>
                        <groupId>asm</groupId>
                        <artifactId>asm-common</artifactId>
                        <version>2.2.3</version>
                </maven>
                <jpp>
                        <groupId>JPP/objectweb-asm</groupId>
                        <artifactId>asm-common</artifactId>
                        <version>3.2</version>
                </jpp>
        </dependency>
        <dependency>
                <maven>
                        <groupId>asm</groupId>
                        <artifactId>asm-tree</artifactId>
                        <version>2.2.3</version>
                </maven>
                <jpp>
                        <groupId>JPP/objectweb-asm</groupId>
                        <artifactId>asm-tree</artifactId>
                        <version>3.2</version>
                </jpp>
        </dependency>
        <dependency>
                <maven>
                        <groupId>asm</groupId>
                        <artifactId>asm-util</artifactId>
                        <version>2.2.3</version>
                </maven>
                <jpp>
                        <groupId>JPP/objectweb-asm</groupId>
                        <artifactId>asm-util</artifactId>
                        <version>3.2</version>
                </jpp>
        </dependency>
        <dependency>
                <maven>
                        <groupId>xalan</groupId>
                        <artifactId>xalan-serializer</artifactId>
                        <version>2.7.0</version>
                </maven>
                <jpp>
                        <groupId>JPP</groupId>
                        <artifactId>xalan-j2-serializer</artifactId>
                        <version>2.7.0</version>
                </jpp>
        </dependency>
        <dependency>
                <maven>
                        <groupId>slide</groupId>
                        <artifactId>slide-webdavlib</artifactId>
                        <version>2.1</version>
                </maven>
                <jpp>
                        <groupId>JPP/slide</groupId>
                        <artifactId>slide-webdavclient-webdavlib</artifactId>
                        <version>2.1</version>
                </jpp>
        </dependency>

</dependencies>

--- NEW FILE: plexus-utils.spec ---
# Copyright (c) 2000-2010, 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 gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}

# If you don't want to build with maven, and use straight ant instead,
# give rpmbuild option '--without maven'

%define with_maven %{!?_without_maven:1}%{?_without_maven:0}
%define without_maven %{?_without_maven:1}%{!?_without_maven:0}

%define section free
%define parent plexus
%define subname utils

Name:           plexus-utils
Version:        1.5.8
Release:        1%{?dist}
Epoch:          0
Summary:        Plexus Common Utilities
License:        Apache Software License 2.0
Group:          Development/Java
URL:            http://plexus.codehaus.org/
Source0:        plexus-utils-1.5.8.tar.gz
# svn export http://svn.codehaus.org/plexus/plexus-utils/tags/plexus-utils-1.5.8/
Source1:        plexus-utils-1.5.8-build.xml
Source2:        plexus-utils-1.5.8-jpp-depmap.xml

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%if %{gcj_support}
BuildRequires:    java-gcj-compat-devel
Requires(post):   java-gcj-compat
Requires(postun): java-gcj-compat
%endif


%if ! %{gcj_support}
BuildArch:      noarch
%endif

BuildRequires:  jpackage-utils >= 0:1.7.5
BuildRequires:  java-devel >= 0:1.6.0
BuildRequires:  ant

%if %{with_maven}
BuildRequires:  maven2 >= 2.0.8
BuildRequires:  maven2-plugin-compiler
BuildRequires:  maven2-plugin-install
BuildRequires:  maven2-plugin-jar
BuildRequires:  maven2-plugin-javadoc
BuildRequires:  maven2-plugin-resources
BuildRequires:  maven2-plugin-shade
BuildRequires:  maven-surefire-maven-plugin
BuildRequires:  maven-surefire-provider-junit
BuildRequires:  maven-doxia
BuildRequires:  maven-doxia-sitetools
BuildRequires:  maven2-common-poms >= 1.0
BuildRequires:  mojo-maven2-plugin-shade
%endif
BuildRequires:  plexus-interpolation

Requires:       java >= 0:1.6.0
Requires:       plexus-interpolation
Requires(post):    jpackage-utils >= 0:1.7.5
Requires(postun):  jpackage-utils >= 0:1.7.5

%description
The Plexus project seeks to create end-to-end developer tools for 
writing applications. At the core is the container, which can be 
embedded or for a full scale application server. There are many 
reusable components for hibernate, form processing, jndi, i18n, 
velocity, etc. Plexus also includes an application server which 
is like a J2EE application server, without all the baggage.

%package javadoc
Summary:        Javadoc for %{name}
Group:          Development/Documentation

%description javadoc
Javadoc for %{name}.

%prep
%setup -q -n %{name}-%{version}
cp %{SOURCE1} build.xml

%build
%if %{with_maven}
export MAVEN_REPO_LOCAL=`pwd`/.m2/repository

mvn-jpp -e \
    -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
    -Dmaven2.jpp.depmap.file=%{SOURCE2} \
    -Dmaven.test.failure.ignore=true \
    install javadoc:javadoc


%else
export CLASSPATH=$(build-classpath plexus/interpolation):target/classes:target/test-classes
ant -Dbuild.sysclasspath=only jar javadoc
%endif


%install
rm -rf $RPM_BUILD_ROOT
# jars
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/plexus
install -m 644 target/%{name}-%{version}.jar \
  $RPM_BUILD_ROOT%{_javadir}/plexus/%{subname}-%{version}.jar
%add_to_maven_depmap org.codehaus.plexus %{name} %{version} JPP/%{parent} %{subname}
(cd $RPM_BUILD_ROOT%{_javadir}/plexus && 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 -m 644 target/dependency-reduced-pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{parent}-%{subname}.pom

# javadoc
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
cp -pr target/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink

%if %{gcj_support}
export CLASSPATH=$(build-classpath gnu-crypto)
%{_bindir}/aot-compile-rpm
%endif

%clean
rm -rf $RPM_BUILD_ROOT

%post
%update_maven_depmap
%if %{gcj_support}
if [ -x %{_bindir}/rebuild-gcj-db ]
then
  %{_bindir}/rebuild-gcj-db
fi
%endif

%postun
%update_maven_depmap
%if %{gcj_support}
if [ -x %{_bindir}/rebuild-gcj-db ]
then
  %{_bindir}/rebuild-gcj-db
fi
%endif

%files
%defattr(-,root,root,-)
%dir %{_javadir}/%{parent}
%{_javadir}/%{parent}/*.jar
%{_datadir}/maven2/poms/*
%{_mavendepmapfragdir}/*
%if %{gcj_support}
%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
%attr(-,root,root) %{_libdir}/gcj/%{name}/%{subname}-%{version}.jar.*
%endif

%files javadoc
%defattr(-,root,root,-)
%doc %{_javadocdir}/%{name}-%{version}
%doc %{_javadocdir}/%{name}

%changelog
* Mon Nov 29 2010 Ralph Apel <r.apel at r-apel.de> 0:1.5.8-1
- 1.5.8

* Tue Apr 28 2009 Yong Yang <yyang at redhat.com> 0:1.4.5-5
- Add BRs maven2-plugin-surfire*, maven-doxia*
- Rebuild with maven2-2.0.8 built in non-bootstrap mode

* Mon Mar 16 2009 Yong Yang <yyang at redhat.com> 0:1.4.5-4
- rebuild with new maven2 2.0.8 built in bootstrap mode

* Thu Jan 22 2009 Yong Yang <yyang at redhat.com> - 0:1.4.5-3jpp.2
- BR maven-surefire-plugin, instead of maven2-plugin-surefire

* Tue Jan 13 2009 Yong Yang <yyang at redhat.com> - 0:1.4.5-3jpp.1
- re-build with maven

* Tue Jan 06 2009 Yong Yang <yyang at redhat.com> - 0:1.4.5-2jpp.1
- Imported into devel from dbhole's maven 2.0.8 packages

* Thu Aug 23 2007 Ralph Apel <r.apel at r-apel.de> - 0:1.4.5-1jpp
- Upgrade to 1.4.5
- Now build with maven2 by default

* Wed Mar 21 2007 Ralph Apel <r.apel at r-apel.de> - 0:1.2-2jpp
- Fix build classpath
- Optionally build with maven2
- Add gcj_support option

* Fri Jun 16 2006 Ralph Apel <r.apel at r-apel.de> - 0:1.2-1jpp
- Upgrade to 1.2

* Wed Jan 04 2006 Fernando Nasser <fnasser at redhat.com> - 0:1.0.4-2jpp
- First JPP 1.7 build

* Mon Nov 07 2005 Ralph Apel <r.apel at r-apel.de> - 0:1.0.4-1jpp
- First JPackage build





More information about the JPackage-commits mailing list