Author: ludovicc-guest
Date: 2009-06-11 14:44:49 +0000 (Thu, 11 Jun 2009)
New Revision: 8464
Added:
trunk/plexus-component-factories/debian/
trunk/plexus-component-factories/debian/build.properties
trunk/plexus-component-factories/debian/build.xml
trunk/plexus-component-factories/debian/changelog
trunk/plexus-component-factories/debian/compat
trunk/plexus-component-factories/debian/control
trunk/plexus-component-factories/debian/copyright
trunk/plexus-component-factories/debian/libplexus-component-factories-java.poms
trunk/plexus-component-factories/debian/orig-tar.sh
trunk/plexus-component-factories/debian/patches/
trunk/plexus-component-factories/debian/patches/logger.patch
trunk/plexus-component-factories/debian/patches/series
trunk/plexus-component-factories/debian/rules
trunk/plexus-component-factories/debian/watch
Log:
[svn-inject] Applying Debian modifications to trunk
Property changes on: trunk/plexus-component-factories/debian
___________________________________________________________________
Added: mergeWithUpstream
+ 1
Added: trunk/plexus-component-factories/debian/build.properties
===================================================================
--- trunk/plexus-component-factories/debian/build.properties
(rev 0)
+++ trunk/plexus-component-factories/debian/build.properties 2009-06-11
14:44:49 UTC (rev 8464)
@@ -0,0 +1 @@
+maven.test.skip=true
Added: trunk/plexus-component-factories/debian/build.xml
===================================================================
--- trunk/plexus-component-factories/debian/build.xml
(rev 0)
+++ trunk/plexus-component-factories/debian/build.xml 2009-06-11 14:44:49 UTC
(rev 8464)
@@ -0,0 +1,49 @@
+<?xml version="1.0"?>
+
+<project name="pkg-java" default="package" basedir="..">
+
+ <property file="debian/build.properties"/>
+ <property name="maven.test.skip" value="true"/>
+ <property file="/usr/share/maven-ant-helper/maven-defaults.properties"/>
+
+ <macrodef name="cleanmodule">
+ <attribute name="dir"/>
+ <sequential>
+ <ant target="clean"
+ antfile="/usr/share/maven-ant-helper/maven-build.xml"
dir="@{dir}"/>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="packagemodule">
+ <attribute name="dir"/>
+ <attribute name="artifactId"/>
+ <sequential>
+ <ant target="package"
+ antfile="/usr/share/maven-ant-helper/maven-build.xml"
dir="@{dir}">
+ <property name="artifactId" value="@{artifactId}"/>
+ </ant>
+ </sequential>
+ </macrodef>
+
+ <target name="clean">
+ <delete dir="build"/>
+ <cleanmodule dir="plexus-ant-factory"/>
+ <cleanmodule dir="plexus-bsh-factory"/>
+ <cleanmodule dir="plexus-groovy-factory"/>
+ </target>
+
+ <target name="package">
+ <packagemodule dir="plexus-ant-factory"
artifactId="plexus-ant-factory"/>
+ <packagemodule dir="plexus-bsh-factory"
artifactId="plexus-bsh-factory"/>
+ <packagemodule dir="plexus-groovy-factory"
artifactId="plexus-groovy-factory"/>
+ </target>
+
+ <target name="javadoc">
+ <javadoc destdir="${javadoc.dir}">
+ <packageset dir="plexus-ant-factory/src/main/java/"/>
+ <packageset dir="plexus-bsh-factory/src/main/java/"/>
+ <packageset dir="plexus-groovy-factory/src/main/java/"/>
+ </javadoc>
+ </target>
+
+</project>
Added: trunk/plexus-component-factories/debian/changelog
===================================================================
--- trunk/plexus-component-factories/debian/changelog
(rev 0)
+++ trunk/plexus-component-factories/debian/changelog 2009-06-11 14:44:49 UTC
(rev 8464)
@@ -0,0 +1,5 @@
+plexus-component-factories (1.0~alpha11-0ubuntu1~ppa1) jaunty; urgency=low
+
+ * Initial release. (Closes: #XXXXX)
+
+ -- Ludovic Claude <[email protected]> Sat, 28 Mar 2009 22:01:14
+0000
Added: trunk/plexus-component-factories/debian/compat
===================================================================
--- trunk/plexus-component-factories/debian/compat
(rev 0)
+++ trunk/plexus-component-factories/debian/compat 2009-06-11 14:44:49 UTC
(rev 8464)
@@ -0,0 +1 @@
+6
Added: trunk/plexus-component-factories/debian/control
===================================================================
--- trunk/plexus-component-factories/debian/control
(rev 0)
+++ trunk/plexus-component-factories/debian/control 2009-06-11 14:44:49 UTC
(rev 8464)
@@ -0,0 +1,23 @@
+Source: plexus-component-factories
+Section: java
+Priority: optional
+Maintainer: Debian Java Maintainers
<[email protected]>
+Uploaders: Ludovic Claude <[email protected]>
+Build-Depends: debhelper (>= 6), cdbs, quilt, default-jdk
+Build-Depends-Indep: maven-ant-helper, maven-repo-helper, ant,
libplexus-containers-java,
+ bsh, groovy
+Standards-Version: 3.8.1
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/plexus-component-factories
+Vcs-Browser:
http://svn.debian.org/wsvn/pkg-java/trunk/plexus-component-factories/
+Homepage: http://plexus.codehaus.org/
+
+Package: libplexus-component-factories-java
+Architecture: all
+Depends: ${misc:Depends}, libplexus-containers-java
+Recommends: bsh, groovy, ant
+Description: Plexus Component Factories
+ The Plexus project provides a full software stack for creating and
+ executing software projects. Based on the Plexus container, the applications
+ can utilise component-oriented programming to build modular, reusable
+ components that can easily be assembled and reused.
+
Added: trunk/plexus-component-factories/debian/copyright
===================================================================
--- trunk/plexus-component-factories/debian/copyright
(rev 0)
+++ trunk/plexus-component-factories/debian/copyright 2009-06-11 14:44:49 UTC
(rev 8464)
@@ -0,0 +1,16 @@
+Format-Specification: http://dep.debian.net/deps/dep5/
+Name: Plexus Component Factories
+Maintainer: Codehaus Foundation
+Source: http://plexus.codehaus.org/
+
+Files: *
+Copyright: 2001-2009, Codehaus Foundation.
+License: Apache-2.0
+
+Files: debian/*
+Copyright: 2009, Ludovic Claude <[email protected]>
+License: Apache-2.0
+
+License: Apache-2.0
+ On Debian GNU/Linux system you can find the complete text of the
+ Apache 2.0 license in '/usr/share/common-licenses/Apache-2.0'.
Added:
trunk/plexus-component-factories/debian/libplexus-component-factories-java.poms
===================================================================
---
trunk/plexus-component-factories/debian/libplexus-component-factories-java.poms
(rev 0)
+++
trunk/plexus-component-factories/debian/libplexus-component-factories-java.poms
2009-06-11 14:44:49 UTC (rev 8464)
@@ -0,0 +1,4 @@
+pom.xml --no-parent
+plexus-bsh-factory/pom.xml
+plexus-ant-factory/pom.xml
+plexus-groovy-factory/pom.xml
Added: trunk/plexus-component-factories/debian/orig-tar.sh
===================================================================
--- trunk/plexus-component-factories/debian/orig-tar.sh
(rev 0)
+++ trunk/plexus-component-factories/debian/orig-tar.sh 2009-06-11 14:44:49 UTC
(rev 8464)
@@ -0,0 +1,17 @@
+#!/bin/sh -e
+
+VERSION=$2
+TAR=../plexus-component-factories_$VERSION.orig.tar.gz
+DIR=plexus-component-factories-$VERSION
+TAG=$(echo "plexus-component-factories-$VERSION" | sed
's,~\(alpha\|beta\),-\1-,')
+
+svn export
http://svn.codehaus.org/plexus/plexus-component-factories/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
Added: trunk/plexus-component-factories/debian/patches/logger.patch
===================================================================
--- trunk/plexus-component-factories/debian/patches/logger.patch
(rev 0)
+++ trunk/plexus-component-factories/debian/patches/logger.patch
2009-06-11 14:44:49 UTC (rev 8464)
@@ -0,0 +1,28 @@
+---
a/plexus-bsh-factory/src/main/java/org/codehaus/plexus/component/factory/bsh/BshComponentFactory.java
++++
b/plexus-bsh-factory/src/main/java/org/codehaus/plexus/component/factory/bsh/BshComponentFactory.java
+@@ -6,6 +6,8 @@
+ import org.codehaus.plexus.component.factory.ComponentInstantiationException;
+ import org.codehaus.plexus.component.repository.ComponentDescriptor;
+ import org.codehaus.plexus.util.IOUtil;
++import org.codehaus.plexus.logging.LoggerManager;
++import
org.codehaus.plexus.component.repository.exception.ComponentLookupException;
+
+ import java.io.FileNotFoundException;
+ import java.io.IOException;
+@@ -72,9 +74,13 @@
+ }
+ catch ( EvalError evalError )
+ {
+- container.getLoggerManager()
+- .getLoggerForComponent( getClass().getName() )
+- .info( "Error text: " + evalError.getErrorText() );
++
++ try {
++ LoggerManager loggerManager = (LoggerManager)
container.lookup( LoggerManager.ROLE );
++ loggerManager
++ .getLoggerForComponent( getClass().getName() )
++ .info( "Error text: " + evalError.getErrorText() );
++ } catch (ComponentLookupException e) {}
+
+ throw new ComponentInstantiationException( "Cannot build
component for: " +
+ componentDescriptor.getHumanReadableKey() + "; unable to read
BeanShell script", evalError );
Added: trunk/plexus-component-factories/debian/patches/series
===================================================================
--- trunk/plexus-component-factories/debian/patches/series
(rev 0)
+++ trunk/plexus-component-factories/debian/patches/series 2009-06-11
14:44:49 UTC (rev 8464)
@@ -0,0 +1 @@
+logger.patch
Added: trunk/plexus-component-factories/debian/rules
===================================================================
--- trunk/plexus-component-factories/debian/rules
(rev 0)
+++ trunk/plexus-component-factories/debian/rules 2009-06-11 14:44:49 UTC
(rev 8464)
@@ -0,0 +1,28 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/ant.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+
+PACKAGE := $(DEB_SOURCE_PACKAGE)
+VERSION := $(DEB_UPSTREAM_VERSION)
+JAVA_HOME := /usr/lib/jvm/default-java
+DEB_JARS := plexus-container-default plexus-classworlds
plexus-utils bsh groovy
+DEB_ANT_BUILD_TARGET := package
+DEB_ANT_BUILDFILE := debian/build.xml
+DEB_ANT_ARGS := -Dpackage=$(PACKAGE) -Dversion=$(VERSION)
+
+get-orig-source:
+ uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download
--rename
+
+binary-post-install/lib$(PACKAGE)-java::
+ mh_installpoms -plib$(PACKAGE)-java
+ mh_installjar -plib$(PACKAGE)-java -l plexus-ant-factory/pom.xml
plexus-ant-factory/build/plexus-ant-factory-$(VERSION).jar
+ mh_installjar -plib$(PACKAGE)-java -l plexus-bsh-factory/pom.xml
plexus-bsh-factory/build/plexus-bsh-factory-$(VERSION).jar
+ mh_installjar -plib$(PACKAGE)-java -l plexus-groovy-factory/pom.xml
plexus-groovy-factory/build/plexus-groovy-factory-$(VERSION).jar
+ #mh_installjar -plib$(PACKAGE)-java -l plexus-jruby-factory/pom.xml
plexus-jruby-factory/build/plexus-jruby-factory-$(VERSION).jar
+ #mh_installjar -plib$(PACKAGE)-java -l plexus-marmalade-factory/pom.xml
plexus-marmalade-factory/build/plexus-marmalade-factory-$(VERSION).jar
+
+clean::
+ -rm -rf debian/tmp
+
Property changes on: trunk/plexus-component-factories/debian/rules
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/plexus-component-factories/debian/watch
===================================================================
--- trunk/plexus-component-factories/debian/watch
(rev 0)
+++ trunk/plexus-component-factories/debian/watch 2009-06-11 14:44:49 UTC
(rev 8464)
@@ -0,0 +1,5 @@
+version=3
+opts="uversionmangle=s{-(alpha|beta)-}{~$1}" \
+ http://svn.codehaus.org/plexus/plexus-component-factories/tags/ \
+ plexus-component-factories-([0-9].*)/ debian debian/orig-tar.sh
+
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
