[pkg-java] r7673 - in trunk: . maven-doxia-tools maven-doxia-tools/debian maven-doxia-tools/debian/patches

twerner at alioth.debian.org twerner at alioth.debian.org
Mon Dec 15 21:20:32 UTC 2008


Author: twerner
Date: 2008-12-15 21:20:32 +0000 (Mon, 15 Dec 2008)
New Revision: 7673

Added:
   trunk/maven-doxia-tools/
   trunk/maven-doxia-tools/debian/
   trunk/maven-doxia-tools/debian/changelog
   trunk/maven-doxia-tools/debian/compat
   trunk/maven-doxia-tools/debian/control
   trunk/maven-doxia-tools/debian/copyright
   trunk/maven-doxia-tools/debian/orig-tar.sh
   trunk/maven-doxia-tools/debian/patches/
   trunk/maven-doxia-tools/debian/patches/plexus-interpolation.diff
   trunk/maven-doxia-tools/debian/patches/pom.diff
   trunk/maven-doxia-tools/debian/patches/series
   trunk/maven-doxia-tools/debian/rules
   trunk/maven-doxia-tools/debian/watch
Log:
new package maven-doxia-tools


Added: trunk/maven-doxia-tools/debian/changelog
===================================================================
--- trunk/maven-doxia-tools/debian/changelog	                        (rev 0)
+++ trunk/maven-doxia-tools/debian/changelog	2008-12-15 21:20:32 UTC (rev 7673)
@@ -0,0 +1,6 @@
+maven-doxia-tools (1.0.1-1) unstable; urgency=low
+
+  UNRELEASED
+  * Initial release. (Closes: #)
+
+ -- Torsten Werner <twerner at debian.org>  Mon, 15 Dec 2008 22:15:13 +0100

Added: trunk/maven-doxia-tools/debian/compat
===================================================================
--- trunk/maven-doxia-tools/debian/compat	                        (rev 0)
+++ trunk/maven-doxia-tools/debian/compat	2008-12-15 21:20:32 UTC (rev 7673)
@@ -0,0 +1 @@
+5

Added: trunk/maven-doxia-tools/debian/control
===================================================================
--- trunk/maven-doxia-tools/debian/control	                        (rev 0)
+++ trunk/maven-doxia-tools/debian/control	2008-12-15 21:20:32 UTC (rev 7673)
@@ -0,0 +1,32 @@
+Source: maven-doxia-tools
+Section: libs
+Priority: optional
+Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Uploaders: Torsten Werner <twerner at debian.org>
+Build-Depends: debhelper (>= 5), cdbs, openjdk-6-jdk, quilt, maven-debian-helper
+Standards-Version: 3.8.0
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/maven-doxia-tools
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/maven-doxia-tools/
+Homepage: http://maven.apache.org/shared/maven-doxia-tools/
+
+Package: libmaven-doxia-tools-java
+Architecture: all
+Depends: ${misc:Depends}, default-java | java2-runtime
+Description: utilities for integrating Doxia in Maven
+ Maven is a software project management and comprehension tool. Based on the
+ concept of a project object model (POM), Maven can manage a project's build,
+ reporting and documentation from a central piece of information.
+ .
+ Maven's primary goal is to allow a developer to comprehend the complete
+ state of a development effort in the shortest period of time. In order to
+ attain this goal there are several areas of concern that Maven attempts
+ to deal with:
+ .
+    * Making the build process easy
+    * Providing a uniform build system
+    * Providing quality project information
+    * Providing guidelines for best practices development
+    * Allowing transparent migration to new features
+ .
+ This shared component has some utilities that are useful when integrating
+ Doxia in Maven, mainly for site generation and report creation.

Added: trunk/maven-doxia-tools/debian/copyright
===================================================================
--- trunk/maven-doxia-tools/debian/copyright	                        (rev 0)
+++ trunk/maven-doxia-tools/debian/copyright	2008-12-15 21:20:32 UTC (rev 7673)
@@ -0,0 +1,35 @@
+This package was debianized by Torsten Werner <twerner at debian.org>.
+
+The Debian packaging is Copyright (c) 2008 Torsten Werner and is
+licensed under the GNU General Public License version 3. On Debian
+systems, the complete text of the GNU General Public License can be
+found in '/usr/share/common-licenses/GPL'.
+
+The package was downloaded from
+<http://maven.apache.org/shared/maven-doxia-tools>.
+
+FIXME
+
+Copyright: 2005-2008 The Apache Software Foundation.
+
+License:
+
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+ 
+    http://www.apache.org/licenses/LICENSE-2.0
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+
+The full text of the license can be found in
+`/usr/share/common-licenes/Apache-2.0'.

Added: trunk/maven-doxia-tools/debian/orig-tar.sh
===================================================================
--- trunk/maven-doxia-tools/debian/orig-tar.sh	                        (rev 0)
+++ trunk/maven-doxia-tools/debian/orig-tar.sh	2008-12-15 21:20:32 UTC (rev 7673)
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+set -e
+
+TAR=../maven-doxia-tools_$2.orig.tar.gz
+DIR=maven-doxia-tools-$2
+TAG=maven-doxia-tools-$2
+
+svn export http://svn.apache.org/repos/asf/maven/shared/tags/$TAG $DIR
+tar -c -z -f $TAR $DIR
+rm -rf $DIR ../$TAG
+
+# move to directory 'tarballs'
+if [ -r .svn/deb-layout ]; then
+  . .svn/deb-layout
+  mv $TAR $origDir
+  echo "moved $TAR to $origDir"
+fi


Property changes on: trunk/maven-doxia-tools/debian/orig-tar.sh
___________________________________________________________________
Name: svn:executable
   + 

Added: trunk/maven-doxia-tools/debian/patches/plexus-interpolation.diff
===================================================================
--- trunk/maven-doxia-tools/debian/patches/plexus-interpolation.diff	                        (rev 0)
+++ trunk/maven-doxia-tools/debian/patches/plexus-interpolation.diff	2008-12-15 21:20:32 UTC (rev 7673)
@@ -0,0 +1,29 @@
+diff --git a/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java b/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
+index 841918e..4bdbb8a 100644
+--- a/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
++++ b/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
+@@ -45,6 +45,7 @@ import org.codehaus.plexus.logging.AbstractLogEnabled;
+ import org.codehaus.plexus.util.IOUtil;
+ import org.codehaus.plexus.util.ReaderFactory;
+ import org.codehaus.plexus.util.StringUtils;
++import org.codehaus.plexus.interpolation.InterpolationException;
+ import org.codehaus.plexus.util.interpolation.EnvarBasedValueSource;
+ import org.codehaus.plexus.util.interpolation.MapBasedValueSource;
+ import org.codehaus.plexus.util.interpolation.ObjectBasedValueSource;
+@@ -664,7 +665,15 @@ public class DefaultSiteTool
+ 
+         interpolator.addValueSource( new MapBasedValueSource( project.getProperties() ) );
+ 
+-        siteDescriptorContent = interpolator.interpolate( siteDescriptorContent, "project" );
++	try
++	{
++            siteDescriptorContent = interpolator.interpolate( siteDescriptorContent, "project" );
++	}
++	catch ( InterpolationException e )
++	{
++	     throw new SiteToolException( "IOException: cannot interpolate siteDescriptorContent: " + e.getMessage(),
++                                         e );
++	}
+ 
+         props.put( "inputEncoding", inputEncoding );
+ 

Added: trunk/maven-doxia-tools/debian/patches/pom.diff
===================================================================
--- trunk/maven-doxia-tools/debian/patches/pom.diff	                        (rev 0)
+++ trunk/maven-doxia-tools/debian/patches/pom.diff	2008-12-15 21:20:32 UTC (rev 7673)
@@ -0,0 +1,99 @@
+diff --git a/pom.xml b/pom.xml
+index fb4915c..59b9165 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -22,12 +22,14 @@
+ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+   <modelVersion>4.0.0</modelVersion>
+ 
++  <!--
+   <parent>
+     <groupId>org.apache.maven.shared</groupId>
+     <artifactId>maven-shared-components</artifactId>
+     <version>9</version>
+     <relativePath>../pom.xml</relativePath>
+   </parent>
++  -->
+ 
+   <groupId>org.apache.maven.shared</groupId>
+   <artifactId>maven-doxia-tools</artifactId>
+@@ -55,6 +57,7 @@
+       <plugin>
+         <groupId>org.codehaus.plexus</groupId>
+         <artifactId>plexus-maven-plugin</artifactId>
++	<version>${org.codehaus.plexus.plexus-maven-plugin.version}</version>
+         <executions>
+           <execution>
+             <id>create-component-descriptor</id>
+@@ -72,12 +75,22 @@
+       <groupId>commons-io</groupId>
+       <artifactId>commons-io</artifactId>
+       <version>1.4</version>
++      <scope>system</scope>
++      <systemPath>/usr/share/java/commons-io.jar</systemPath>
+     </dependency>
+ 
+     <!-- maven -->
+     <dependency>
+       <groupId>org.apache.maven</groupId>
+       <artifactId>maven-project</artifactId>
++      <version>2.0.9</version>
++      <scope>system</scope>
++      <systemPath>/usr/share/java/maven2.jar</systemPath>
++    </dependency>
++    <!--
++    <dependency>
++      <groupId>org.apache.maven</groupId>
++      <artifactId>maven-project</artifactId>
+       <version>2.0</version>
+     </dependency>
+     <dependency>
+@@ -100,12 +113,15 @@
+       <artifactId>maven-reporting-api</artifactId>
+       <version>2.0.4</version>
+     </dependency>
++    -->
+ 
+     <!-- doxia-sitetools -->
+     <dependency>
+       <groupId>org.apache.maven.doxia</groupId>
+       <artifactId>doxia-decoration-model</artifactId>
+       <version>${doxia-sitetools.version}</version>
++      <scope>system</scope>
++      <systemPath>/usr/share/java/doxia-decoration-model.jar</systemPath>
+     </dependency>
+ 
+     <!-- Plexus -->
+@@ -113,11 +129,15 @@
+       <groupId>org.codehaus.plexus</groupId>
+       <artifactId>plexus-container-default</artifactId>
+       <version>1.0-alpha-9</version>
++      <scope>system</scope>
++      <systemPath>/usr/share/java/plexus-container-default-1.0.jar</systemPath>
+     </dependency>
+     <dependency>
+       <groupId>org.codehaus.plexus</groupId>
+       <artifactId>plexus-i18n</artifactId>
+       <version>1.0-beta-7</version>
++      <scope>system</scope>
++      <systemPath>/usr/share/java/plexus-i18n.jar</systemPath>
+       <exclusions>
+         <exclusion>
+           <groupId>org.codehaus.plexus</groupId>
+@@ -127,9 +147,16 @@
+     </dependency>
+     <dependency>
+       <groupId>org.codehaus.plexus</groupId>
++      <artifactId>plexus-interpolation</artifactId>
++      <version>${org.codehaus.plexus.plexus-interpolation.version}</version>
++    </dependency>
++    <!--
++    <dependency>
++      <groupId>org.codehaus.plexus</groupId>
+       <artifactId>plexus-utils</artifactId>
+       <version>1.4.5</version>
+     </dependency>
++    -->
+ 
+     <!-- test -->
+     <dependency>

Added: trunk/maven-doxia-tools/debian/patches/series
===================================================================
--- trunk/maven-doxia-tools/debian/patches/series	                        (rev 0)
+++ trunk/maven-doxia-tools/debian/patches/series	2008-12-15 21:20:32 UTC (rev 7673)
@@ -0,0 +1,2 @@
+pom.diff
+plexus-interpolation.diff

Added: trunk/maven-doxia-tools/debian/rules
===================================================================
--- trunk/maven-doxia-tools/debian/rules	                        (rev 0)
+++ trunk/maven-doxia-tools/debian/rules	2008-12-15 21:20:32 UTC (rev 7673)
@@ -0,0 +1,10 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/maven.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+
+JAVA_HOME := /usr/lib/jvm/java-6-openjdk
+
+get-orig-source:
+	uscan --force-download --rename


Property changes on: trunk/maven-doxia-tools/debian/rules
___________________________________________________________________
Name: svn:executable
   + 

Added: trunk/maven-doxia-tools/debian/watch
===================================================================
--- trunk/maven-doxia-tools/debian/watch	                        (rev 0)
+++ trunk/maven-doxia-tools/debian/watch	2008-12-15 21:20:32 UTC (rev 7673)
@@ -0,0 +1,3 @@
+version=3
+http://svn.apache.org/repos/asf/maven/shared/tags/ \
+  maven-doxia-tools-(.*)/ debian debian/orig-tar.sh




More information about the pkg-java-commits mailing list