[Jpackage-commits] dist/plexus-maven-plugin/devel .cvsignore, 1.1, 1.2 plexus-maven-plugin-jpp-depmap.xml, NONE, 1.1 plexus-maven-plugin-maven-doxia.patch, NONE, 1.1 plexus-maven-plugin.spec, NONE, 1.1 sources, 1.1, 1.2

jpackage jpackage at ryu.zarb.org
Wed May 28 21:35:07 CEST 2008


Update of /home/projects/jpackage/cvs/dist/plexus-maven-plugin/devel
In directory ryu.zarb.org:/tmp/cvs-serv5880/devel

Modified Files:
	.cvsignore sources 
Added Files:
	plexus-maven-plugin-jpp-depmap.xml 
	plexus-maven-plugin-maven-doxia.patch plexus-maven-plugin.spec 
Log Message:
Import from JPP 5.0

--- NEW FILE: plexus-maven-plugin-maven-doxia.patch ---
--- src/main/java/org/codehaus/plexus/maven/plugin/PlexusComponentsReport.java.sav0	2007-11-22 18:04:28.000000000 +0100
+++ src/main/java/org/codehaus/plexus/maven/plugin/PlexusComponentsReport.java	2007-11-22 18:04:42.000000000 +0100
@@ -27,8 +27,8 @@
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.reporting.AbstractMavenReport;
 import org.apache.maven.reporting.MavenReportException;
-import org.codehaus.doxia.sink.Sink;
-import org.codehaus.doxia.site.renderer.SiteRenderer;
+import org.apache.maven.doxia.sink.Sink;
+import org.apache.maven.doxia.siterenderer.Renderer;
 import org.codehaus.plexus.maven.plugin.report.ComponentSet;
 import org.jdom.Document;
 import org.jdom.JDOMException;
@@ -62,9 +62,9 @@
     private MavenProject project;
 
     /**
-     * @component org.codehaus.doxia.site.renderer.SiteRenderer
+     * @component org.apache.maven.doxia.siterenderer.Renderer
      */
-    private SiteRenderer siteRenderer;
+    private Renderer siteRenderer;
 
     /**
      * @parameter expression="${project.reporting.outputDirectory}
@@ -114,7 +114,7 @@
         return project;
     }
 
-    protected SiteRenderer getSiteRenderer()
+    protected Renderer getSiteRenderer()
     {
         return siteRenderer;
     }
--- src/main/java/org/codehaus/plexus/maven/plugin/report/ComponentSet.java.sav1	2007-11-22 18:18:16.000000000 +0100
+++ src/main/java/org/codehaus/plexus/maven/plugin/report/ComponentSet.java	2007-11-22 18:19:05.000000000 +0100
@@ -17,7 +17,7 @@
  */
 import java.util.List;
 
-import org.codehaus.doxia.sink.Sink;
+import org.apache.maven.doxia.sink.Sink;
 import org.jdom.Element;
 
 /**
--- src/main/java/org/codehaus/plexus/maven/plugin/report/Components.java.sav0	2007-11-22 18:21:17.000000000 +0100
+++ src/main/java/org/codehaus/plexus/maven/plugin/report/Components.java	2007-11-22 18:21:49.000000000 +0100
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import org.codehaus.doxia.sink.Sink;
+import org.apache.maven.doxia.sink.Sink;
 import org.jdom.Element;
 
 import java.util.ArrayList;
--- src/main/java/org/codehaus/plexus/maven/plugin/report/Component.java.sav0	2007-11-22 18:25:57.000000000 +0100
+++ src/main/java/org/codehaus/plexus/maven/plugin/report/Component.java	2007-11-22 18:26:46.000000000 +0100
@@ -17,7 +17,7 @@
  */
 
 import org.jdom.Element;
-import org.codehaus.doxia.sink.Sink;
+import org.apache.maven.doxia.sink.Sink;
 import org.codehaus.plexus.util.StringUtils;
 
 import java.util.Iterator;
--- src/main/java/org/codehaus/plexus/maven/plugin/report/Configuration.java.sav0	2007-11-22 18:29:44.000000000 +0100
+++ src/main/java/org/codehaus/plexus/maven/plugin/report/Configuration.java	2007-11-22 18:30:22.000000000 +0100
@@ -25,7 +25,7 @@
 package org.codehaus.plexus.maven.plugin.report;
 
 import org.jdom.Element;
-import org.codehaus.doxia.sink.Sink;
+import org.apache.maven.doxia.sink.Sink;
 
 /**
  * @author <a href="mailto:trygvis at inamo.no">Trygve Laugstøl</a>
--- src/main/java/org/codehaus/plexus/maven/plugin/report/Requirements.java.sav0	2007-11-22 18:31:57.000000000 +0100
+++ src/main/java/org/codehaus/plexus/maven/plugin/report/Requirements.java	2007-11-22 18:32:14.000000000 +0100
@@ -25,7 +25,7 @@
 package org.codehaus.plexus.maven.plugin.report;
 
 import org.jdom.Element;
-import org.codehaus.doxia.sink.Sink;
+import org.apache.maven.doxia.sink.Sink;
 
 import java.util.Iterator;
 import java.util.List;
--- src/main/java/org/codehaus/plexus/maven/plugin/report/Requirement.java.sav0	2007-11-22 18:34:25.000000000 +0100
+++ src/main/java/org/codehaus/plexus/maven/plugin/report/Requirement.java	2007-11-22 18:34:45.000000000 +0100
@@ -25,7 +25,7 @@
 package org.codehaus.plexus.maven.plugin.report;
 
 import org.jdom.Element;
-import org.codehaus.doxia.sink.Sink;
+import org.apache.maven.doxia.sink.Sink;
 import org.codehaus.plexus.util.StringUtils;
 
 /**

Index: sources
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/plexus-maven-plugin/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** sources	28 May 2008 19:34:51 -0000	1.1
--- sources	28 May 2008 19:35:04 -0000	1.2
***************
*** 0 ****
--- 1 ----
+ f94f11fb20d6ee96ce1f25502b7ef501  plexus-maven-plugin-src.tar.gz

--- NEW FILE: plexus-maven-plugin.spec ---
# Copyright (c) 2000-2008, 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 section     free

%define parent plexus
%define subname maven-plugin

%define maven_settings_file %{_builddir}/%{name}/settings.xml

Name:           %{parent}-%{subname}
Version:        1.3.5
Release:        2jpp
Epoch:          0
Summary:        Plexus Maven Plugin
License:        Apache Software License
Group:          Development/Java
Vendor:         JPackage Project
Distribution:   JPackage
URL:            http://plexus.codehaus.org/
Source0:        %{name}-src.tar.gz
# svn export http://svn.codehaus.org/plexus/plexus-maven-plugin/tags/plexus-maven-plugin-1.3.5

Source1:        %{name}-jpp-depmap.xml

Patch0:         %{name}-maven-doxia.patch

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

BuildArch:      noarch
BuildRequires:  jpackage-utils >= 0:1.7.4
BuildRequires:  java-devel = 0:1.5.0
BuildRequires:  jmock
BuildRequires:  maven2 >= 0:2.0.4
BuildRequires:  maven2-plugin-compiler
BuildRequires:  maven2-plugin-install
BuildRequires:  maven2-plugin-jar
BuildRequires:  maven2-plugin-javadoc
BuildRequires:  maven2-plugin-plugin
BuildRequires:  maven2-plugin-release
BuildRequires:  maven2-plugin-resources
BuildRequires:  maven2-plugin-surefire
BuildRequires:  maven2-common-poms >= 0:1.0
BuildRequires:  plexus-appserver >= 0:1.0-0.a5.3
BuildRequires:  plexus-cdc >= 0:1.0
BuildRequires:  plexus-container-default
BuildRequires:  plexus-runtime-builder >= 0:1.0-0.a9.2
Requires:       java >= 0:1.5.0
Requires:       maven2-bootstrap >= 0:2.0.4
Requires:       maven2-common-poms >= 0:1.0
Requires:       plexus-appserver >= 0:1.0-0.a5.3
Requires:       plexus-cdc >= 0:1.0
Requires:       plexus-container-default
Requires:       plexus-runtime-builder >= 0:1.0-0.a9.2

Requires(post):    jpackage-utils >= 0:1.7.4
Requires(postun):  jpackage-utils >= 0:1.7.4

%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
%patch0 -b .sav0

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

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


%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.2 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
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

%clean
rm -rf $RPM_BUILD_ROOT

%post
%update_maven_depmap

%postun
%update_maven_depmap

%post javadoc
rm -f %{_javadocdir}/%{name}
ln -s %{name}-%{version} %{_javadocdir}/%{name}

%postun javadoc
if [ "$1" = "0" ]; then
  rm -f %{_javadocdir}/%{name}
fi

%files
%defattr(-,root,root,-)
%{_javadir}/plexus
%{_datadir}/maven2/poms/*
%{_mavendepmapfragdir}

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

%changelog
* Thu Feb 07 2008 Ralph Apel <r.apel at r-apel.de> 0:1.3.5-2jpp
- (B)R java5
- Require maven2-bootstrap instead of full maven2

* Mon Nov 26 2007 Ralph Apel <r.apel at r-apel.de> 1.3.5-1jpp
- Update to 1.3.5

* Tue Oct 17 2006 Deepak Bhole <dbhole at redhat.com> 1.2-2jpp
- Update for maven2 9jpp.

* Mon Jun 12 2006 Deepak Bhole <dbhole at redhat.com> - 0:1.2-1jpp
- Initial build

Index: .cvsignore
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/plexus-maven-plugin/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** .cvsignore	28 May 2008 19:34:51 -0000	1.1
--- .cvsignore	28 May 2008 19:35:04 -0000	1.2
***************
*** 0 ****
--- 1 ----
+ plexus-maven-plugin-src.tar.gz

--- NEW FILE: plexus-maven-plugin-jpp-depmap.xml ---
<dependencies>
  <dependency>
	<maven>
	  <groupId>org.apache.maven</groupId>
	  <artifactId>maven-plugin-api</artifactId>
	  <version>2.0</version>
	</maven>
	<jpp>
	  <groupId>JPP/maven2</groupId>
	  <artifactId>plugin-api</artifactId>
	  <version>2.0</version>
	</jpp>
  </dependency>

  <dependency>
	<maven>
	  <groupId>org.codehaus.plexus</groupId>
	  <artifactId>plexus-runtime-builder</artifactId>
	  <version>1.0-alpha-9</version>
	</maven>
	<jpp>
	  <groupId>JPP/plexus</groupId>
	  <artifactId>runtime-builder</artifactId>
	  <version>1.0-alpha-9</version>
	</jpp>
  </dependency>

  <dependency>
	<maven>
	  <groupId>org.codehaus.plexus</groupId>
	  <artifactId>plexus-container-default</artifactId>
	  <version>1.0-alpha-9</version>
	</maven>
	<jpp>
	  <groupId>JPP/plexus</groupId>
	  <artifactId>container-default</artifactId>
	  <version>1.0-alpha-9</version>
	</jpp>
  </dependency>

  <dependency>
	<maven>
	  <groupId>org.codehaus.plexus</groupId>
	  <artifactId>plexus-appserver</artifactId>
	  <version>1.0-alpha-5</version>
	</maven>
	<jpp>
	  <groupId>JPP/plexus</groupId>
	  <artifactId>appserver</artifactId>
	  <version>1.0-alpha-5</version>
	</jpp>
  </dependency>

  <dependency>
	<maven>
	  <groupId>org.codehaus.plexus</groupId>
	  <artifactId>plexus-cdc</artifactId>
	  <version>1.0-alpha-4</version>
	</maven>
	<jpp>
	  <groupId>JPP/plexus</groupId>
	  <artifactId>cdc</artifactId>
	  <version>1.0-alpha-4</version>
	</jpp>
  </dependency>

  <dependency>
	<maven>
	  <groupId>org.codehaus.plexus</groupId>
	  <artifactId>plexus</artifactId>
	  <version>1.0.4</version>
	</maven>
	<jpp>
	  <groupId>JPP/plexus</groupId>
	  <artifactId>plexus</artifactId>
	  <version>1.0.4</version>
	</jpp>
  </dependency>

  <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>org.codehaus.plexus</groupId>
	  <artifactId>plexus-maven-plugin</artifactId>
	  <version>1.2</version>
	</maven>
	<jpp>
	  <groupId>JPP/plexus</groupId>
	  <artifactId>maven-plugin</artifactId>
	  <version>1.2</version>
	</jpp>
  </dependency>

  <dependency>
    <maven>
      <groupId>xmlrpc</groupId>
      <artifactId>xmlrpc</artifactId>
      <version>1.2</version>
    </maven>
    <jpp>
      <groupId>JPP</groupId>
      <artifactId>xmlrpc</artifactId>
      <version>1.2</version>
     </jpp>
  </dependency>

  <dependency>
    <maven>
      <groupId>org.codehaus.plexus</groupId>
      <artifactId>plexus-xmlrpc</artifactId>
      <version>1.0-beta-4</version>
    </maven>
    <jpp>
      <groupId>JPP/plexus</groupId>
      <artifactId>xmlrpc</artifactId>
      <version>1.0-beta-4</version>
    </jpp>
  </dependency>

  <dependency>
    <maven>
      <groupId>javax.servlet</groupId>
      <artifactId>servlet-api</artifactId>
      <version>2.3</version>
    </maven>
    <jpp>
      <groupId>JPP</groupId>
      <artifactId>servlet_2_4_api</artifactId>
      <version>2.4</version>
    </jpp>
  </dependency>

</dependencies>




More information about the JPackage-commits mailing list