[Jpackage-commits] dist/plexus-tools/devel .cvsignore, 1.1, 1.2 plexus-tools-cdc-DefaultComponentDescriptorWriterTest.patch, NONE, 1.1 plexus-tools-cdc-anno-pom.patch, NONE, 1.1 plexus-tools-cli-pom.patch, NONE, 1.1 plexus-tools-jpp-depmap.xml, NONE, 1.1 plexus-tools-pom.patch, NONE, 1.1 plexus-tools.spec, NONE, 1.1 sources, 1.1, 1.2

jpackage jpackage at ryu.zarb.org
Sun Feb 8 19:20:42 CET 2009


Update of /home/projects/jpackage/cvs/dist/plexus-tools/devel
In directory ryu.zarb.org:/tmp/cvs-serv6847/devel

Modified Files:
	.cvsignore sources 
Added Files:
	plexus-tools-cdc-DefaultComponentDescriptorWriterTest.patch 
	plexus-tools-cdc-anno-pom.patch plexus-tools-cli-pom.patch 
	plexus-tools-jpp-depmap.xml plexus-tools-pom.patch 
	plexus-tools.spec 
Log Message:
Import plexus-tools into devel

--- NEW FILE: plexus-tools-pom.patch ---
--- pom.xml.sav	2008-06-09 16:48:58.000000000 +0200
+++ pom.xml	2008-06-09 16:49:17.000000000 +0200
@@ -13,7 +13,7 @@
   <dependencies>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-container-default</artifactId>
+      <artifactId>plexus-containers-container-default</artifactId>
       <version>1.0-alpha-43</version>
     </dependency>
   </dependencies>
@@ -31,4 +31,4 @@
     <developerConnection>scm:svn:https://svn.codehaus.org/plexus/plexus-tools/tags/plexus-tools-1.0.10</developerConnection> 
     <url>http://fisheye.codehaus.org/browse/plexus/plexus-tools/tags/plexus-tools-1.0.10</url>
   </scm>
-</project>
\ No newline at end of file
+</project>

Index: .cvsignore
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/plexus-tools/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** .cvsignore	8 Feb 2009 18:19:44 -0000	1.1
--- .cvsignore	8 Feb 2009 18:20:39 -0000	1.2
***************
*** 0 ****
--- 1 ----
+ plexus-tools-1.0.10.tar.gz

--- NEW FILE: plexus-tools-cdc-DefaultComponentDescriptorWriterTest.patch ---
--- plexus-cdc/src/test/java/org/codehaus/plexus/cdc/DefaultComponentDescriptorWriterTest.java.sav	2008-06-09 14:51:21.000000000 +0200
+++ plexus-cdc/src/test/java/org/codehaus/plexus/cdc/DefaultComponentDescriptorWriterTest.java	2008-06-09 14:52:12.000000000 +0200
@@ -39,7 +39,7 @@
     protected void setUp() throws Exception {
         super.setUp();
 
-        descriptorWriter = (DefaultComponentDescriptorWriter) lookup(ComponentDescriptorWriter.class);
+        descriptorWriter = (DefaultComponentDescriptorWriter) lookup("org.codehaus.plexus.cdc.ComponentDescriptorWriter");
         assertNotNull(descriptorWriter);
     }
 

--- NEW FILE: plexus-tools-jpp-depmap.xml ---
<dependencies>
<!--
	<dependency>
	  <maven>
		<groupId>org.codehaus.plexus</groupId>
		<artifactId>plexus-tools</artifactId>
		<version>1.0.5</version>
	  </maven>
	  <jpp>
		<groupId>JPP/plexus</groupId>
		<artifactId>tools</artifactId>
		<version>1.0.5</version>
	  </jpp>
	</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.1</version>
	  </jpp>
	</dependency>

</dependencies>

--- NEW FILE: plexus-tools.spec ---
# Copyright (c) 2000-2009, 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}}}

%define section     free

%define parent plexus
%define subname tools
%define cdc-version 1.0.10
%define cli-version 1.4

Name:           plexus-tools
Version:        1.0.10
Release:        1%{dist}
Epoch:          0
Summary:        Plexus Component Descriptor Creator
License:        Apache Software License
Group:          Development/Java
URL:            http://plexus.codehaus.org/
Source0:        %{name}-%{version}.tar.gz
# svn export http://svn.codehaus.org/plexus/plexus-tools/tags/plexus-tools-1.0.10/

Source1:        %{name}-jpp-depmap.xml
Patch0:         plexus-tools-cdc-DefaultComponentDescriptorWriterTest.patch
Patch1:         plexus-tools-cli-pom.patch
Patch2:         plexus-tools-pom.patch
Patch3:         plexus-tools-cdc-anno-pom.patch

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot

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

BuildRequires:  jpackage-utils >= 0:1.7.5
BuildRequires:  java-devel >= 0:1.5.0
BuildRequires:  ant >= 0:1.6.5
BuildRequires:  maven2 >= 0:2.0.7
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 >= 0:1.0

BuildRequires:  jdom
BuildRequires:  jakarta-commons-cli
BuildRequires:  plexus-cdc
BuildRequires:  plexus-classworlds
BuildRequires:  plexus-component-annotations
BuildRequires:  plexus-container-default
BuildRequires:  plexus-utils
BuildRequires:  qdox
BuildRequires:  slf4j
%if %{gcj_support}
BuildRequires:    gnu-crypto
BuildRequires:    java-gcj-compat-devel
Requires(post):   java-gcj-compat
Requires(postun): java-gcj-compat
%endif

Requires:       java >= 0:1.5.0
Requires:       jakarta-commons-cli
Requires:       jdom
Requires:       plexus-cdc
Requires:       plexus-classworlds
Requires:       plexus-component-annotations
Requires:       plexus-container-default
Requires:       plexus-utils
Requires:       qdox
Requires:       slf4j

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
%{summary}.

%prep
%setup -q 

%patch0 -b .sav0
%patch1 -b .sav1
%patch2 -b .sav2
%patch3 -b .sav3

%build
mkdir external_repo
ln -s %{_javadir} external_repo/JPP

export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
mkdir -p $MAVEN_REPO_LOCAL

mvn-jpp \
        -e \
        -Dmaven2.jpp.depmap.file=%{SOURCE1} \
        -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
        install javadoc:javadoc

%install
rm -rf $RPM_BUILD_ROOT
# jars
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/plexus
install -pm 644 plexus-cdc-anno/target/*.jar \
          $RPM_BUILD_ROOT%{_javadir}/%{parent}/tools-cdc-anno-%{version}.jar
%add_to_maven_depmap org.codehaus.plexus plexus-cdc-anno 1.0-alpha-3 JPP/%{parent} tools-cdc-anno
install -pm 644 plexus-cdc/target/*.jar \
          $RPM_BUILD_ROOT%{_javadir}/%{parent}/tools-cdc-%{version}.jar
%add_to_maven_depmap org.codehaus.plexus plexus-cdc 1.0-alpha-13 JPP/%{parent} tools-cdc
install -pm 644 plexus-cli/target/*.jar \
          $RPM_BUILD_ROOT%{_javadir}/%{parent}/tools-cli-1.4.jar
%add_to_maven_depmap org.codehaus.plexus plexus-cli 1.4 JPP/%{parent} tools-cli

(cd $RPM_BUILD_ROOT%{_javadir}/%{parent} && for jar in *-%{cdc-version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{cdc-version}||g"`; done)
(cd $RPM_BUILD_ROOT%{_javadir}/%{parent} && for jar in *-%{cli-version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{cli-version}||g"`; done)

# pom
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
install -m 644 plexus-cdc-anno/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{parent}-tools-cdc-anno.pom
install -m 644 plexus-cdc/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{parent}-tools-cdc.pom
install -m 644 plexus-cli/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{parent}-tools-cli.pom

# javadoc
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}

install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/tools-cdc-anno
cp -pr plexus-cdc-anno/target/site/apidocs/* \
                $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/tools-cdc-anno/
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/tools-cdc
cp -pr plexus-cdc/target/site/apidocs/* \
                $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/tools-cdc/
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/tools-cli
cp -pr plexus-cli/target/site/apidocs/* \
                $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/tools-cli/

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,-)
%{_javadir}/plexus/*
%{_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 Feb 09 2008 Ralph Apel <r.apel at r-apel.de> 0:1.0.10-1.jpp5
- 1.0.10


Index: sources
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/plexus-tools/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** sources	8 Feb 2009 18:19:44 -0000	1.1
--- sources	8 Feb 2009 18:20:39 -0000	1.2
***************
*** 0 ****
--- 1 ----
+ 8d21bf66cee0bb53feaf5f86470c2d37  plexus-tools-1.0.10.tar.gz

--- NEW FILE: plexus-tools-cli-pom.patch ---
--- plexus-cli/pom.xml.sav	2008-06-09 16:37:50.000000000 +0200
+++ plexus-cli/pom.xml	2008-06-09 16:38:14.000000000 +0200
@@ -14,7 +14,7 @@
   <dependencies>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-container-default</artifactId>
+      <artifactId>plexus-containers-container-default</artifactId>
       <version>1.0-alpha-34</version>
     </dependency>
     <dependency>

--- NEW FILE: plexus-tools-cdc-anno-pom.patch ---
--- plexus-cdc-anno/pom.xml.sav	2008-08-15 15:03:05.000000000 +0200
+++ plexus-cdc-anno/pom.xml	2008-08-15 15:03:13.000000000 +0200
@@ -27,6 +27,12 @@
         
         <dependency>
             <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>1.4.3</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
             <version>1.4.3</version>
             <scope>test</scope>




More information about the JPackage-commits mailing list