You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by tr...@apache.org on 2005/09/14 16:45:43 UTC
svn commit: r280865 - in /incubator/jackrabbit/trunk: maven.xml modules/
modules/commons/ modules/commons/maven.xml modules/commons/project.xml
Author: tripod
Date: Wed Sep 14 07:45:38 2005
New Revision: 280865
URL: http://svn.apache.org/viewcvs?rev=280865&view=rev
Log:
- adding simple postgoal for building the commons jar
Added:
incubator/jackrabbit/trunk/modules/
incubator/jackrabbit/trunk/modules/commons/ (with props)
incubator/jackrabbit/trunk/modules/commons/maven.xml (with props)
incubator/jackrabbit/trunk/modules/commons/project.xml (with props)
Modified:
incubator/jackrabbit/trunk/maven.xml
Modified: incubator/jackrabbit/trunk/maven.xml
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/maven.xml?rev=280865&r1=280864&r2=280865&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/maven.xml (original)
+++ incubator/jackrabbit/trunk/maven.xml Wed Sep 14 07:45:38 2005
@@ -191,30 +191,31 @@
</goal>
<postGoal name="jar:jar">
- <attainGoal name="commons:jar" />
+ <attainGoal name="jackrabbit:modules-jar" />
</postGoal>
-
<postGoal name="jar:install">
- <attainGoal name="commons:install" />
+ <attainGoal name="jackrabbit:modules-install" />
</postGoal>
-
- <!-- generate the commons jar -->
- <goal name="commons:jar">
- <ant:jar
- jarfile="${maven.build.dir}/jackrabbit-commons-${pom.currentVersion}.jar"
- basedir="${maven.build.dest}"
- excludes="org/apache/jackrabbit/core/**, META-INF/**" />
+ <goal name="jackrabbit:modules-jar">
+ <maven:reactor
+ basedir="${basedir}/modules"
+ includes="*/project.xml"
+ goals="jar:jar"
+ banner="Bulding Module"
+ ignoreFailures="false"
+ />
</goal>
-
- <!-- install the commons jar -->
- <goal name="commons:install">
- <!-- actually, we would like to use artifact:install, but loading the
- pom does not work in maven 1.0.2
- -->
- <ant:mkdir dir="${maven.repo.local}/jackrabbit/jars" />
- <ant:copy
- file="${maven.build.dir}/jackrabbit-commons-${pom.currentVersion}.jar"
- todir="${maven.repo.local}/jackrabbit/jars" />
+
+ <goal name="jackrabbit:modules-install">
+ <maven:reactor
+ basedir="${basedir}/modules"
+ includes="*/project.xml"
+ goals="jar:install"
+ banner="Installing Module"
+ ignoreFailures="false"
+ />
</goal>
+
+
</project>
Propchange: incubator/jackrabbit/trunk/modules/commons/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Sep 14 07:45:38 2005
@@ -0,0 +1 @@
+target
Added: incubator/jackrabbit/trunk/modules/commons/maven.xml
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/modules/commons/maven.xml?rev=280865&view=auto
==============================================================================
--- incubator/jackrabbit/trunk/modules/commons/maven.xml (added)
+++ incubator/jackrabbit/trunk/modules/commons/maven.xml Wed Sep 14 07:45:38 2005
@@ -0,0 +1,36 @@
+<!--
+ Copyright 2004-2005 The Apache Software Foundation or its licensors,
+ as applicable.
+
+ Licensed 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.
+-->
+
+<project
+ default="jar:jar"
+ xmlns:deploy="deploy"
+ xmlns:j="jelly:core"
+ xmlns:ant="jelly:ant"
+ xmlns:maven="jelly:maven">
+
+ <!-- overwrite goals from jackrabbit -->
+ <goal name="jackrabbit:post-javadoc" />
+ <goal name="test:clean" />
+ <goal name="jackrabbit:generate-sql-parser" />
+ <goal name="jackrabbit:generate-xpath-parser" />
+ <goal name="copy-deps" />
+ <goal name="jackrabbit:test-stub" />
+ <goal name="jackrabbit:test-init" />
+ <goal name="jackrabbit:modules-jar" />
+ <goal name="jackrabbit:modules-install" />
+
+</project>
Propchange: incubator/jackrabbit/trunk/modules/commons/maven.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/jackrabbit/trunk/modules/commons/project.xml
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/modules/commons/project.xml?rev=280865&view=auto
==============================================================================
--- incubator/jackrabbit/trunk/modules/commons/project.xml (added)
+++ incubator/jackrabbit/trunk/modules/commons/project.xml Wed Sep 14 07:45:38 2005
@@ -0,0 +1,130 @@
+<?xml version="1.0"?>
+
+<!--
+ Copyright 2004-2005 The Apache Software Foundation or its licensors,
+ as applicable.
+
+ Licensed 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.
+ -->
+
+<project>
+ <!-- ====================================================================== -->
+ <!-- P R O J E C T D E S C R I P T I O N -->
+ <!-- ====================================================================== -->
+ <extend>${basedir}/../../project.xml</extend>
+ <groupId>jackrabbit</groupId>
+ <artifactId>jackrabbit-commons</artifactId>
+ <name>Jackrabbit Commons</name>
+
+ <!-- ====================================================================== -->
+ <!-- D E P E N D E N C I E S -->
+ <!-- ====================================================================== -->
+<!--
+ <dependencies>
+ <dependency>
+ <id>concurrent</id>
+ <version>1.3.4</version>
+ </dependency>
+ <dependency>
+ <id>junit</id>
+ <version>3.8.1</version>
+ </dependency>
+ <dependency>
+ <id>commons-collections</id>
+ <version>3.1</version>
+ </dependency>
+ <dependency>
+ <id>javacc</id>
+ <version>3.2</version>
+ </dependency>
+ <dependency>
+ <groupId>geronimo-spec</groupId>
+ <artifactId>geronimo-spec-jta</artifactId>
+ <version>1.0-M1</version>
+ </dependency>
+ <dependency>
+ <groupId>jsr170</groupId>
+ <artifactId>jcr</artifactId>
+ <version>1.0</version>
+ <url>http://jcp.org/en/jsr/detail?id=170</url>
+ </dependency>
+ <dependency>
+ <id>log4j</id>
+ <version>1.2.8</version>
+ </dependency>
+ <dependency>
+ <groupId>lucene</groupId>
+ <artifactId>lucene</artifactId>
+ <version>1.4.3</version>
+ </dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.6.2</version>
+ </dependency>
+ <dependency>
+ <groupId>xml-apis</groupId>
+ <artifactId>xmlParserAPIs</artifactId>
+ <version>2.0.2</version>
+ </dependency>
+ <dependency>
+ <groupId>cqfs</groupId>
+ <artifactId>cqfs-jackrabbit</artifactId>
+ <version>3.5.6-SNAPSHOT</version>
+ <url>http://www.day.com/maven/cqfs/jars/cqfs-jackrabbit-3.5.6-SNAPSHOT.jar</url>
+ </dependency>
+ <dependency>
+ <groupId>cqfs</groupId>
+ <artifactId>cqfs</artifactId>
+ <version>3.5.6-SNAPSHOT</version>
+ <url>http://www.day.com/maven/cqfs/jars/cqfs-3.5.6-SNAPSHOT.jar</url>
+ </dependency>
+ <dependency>
+ <id>commons-logging</id>
+ <version>1.0</version>
+ </dependency>
+ </dependencies>
+-->
+ <!-- ====================================================================== -->
+ <!-- B U I L D D E S C R I P T I O N -->
+ <!-- ====================================================================== -->
+ <build>
+ <sourceDirectory>${basedir}/../../src/java</sourceDirectory>
+ <sourceModifications>
+ <sourceModification>
+ <className>dummy</className>
+ <directory>${basedir}/../../src/java</directory>
+ <excludes>
+ <exclude>org/apache/jackrabbit/core/**</exclude>
+ </excludes>
+ </sourceModification>
+ </sourceModifications>
+
+ <!-- J A R R E S O U R C E S -->
+ <!-- Resources that are packaged up inside the JAR file -->
+ <resources>
+ <resource>
+ <directory>src/java</directory>
+ <includes>
+ <include>**/*.xml</include>
+ <include>**/*.properties</include>
+ <include>**/*.TextFilterService</include>
+ </includes>
+ <excludes>
+ <exclude>org/apache/jackrabbit/core/**</exclude>
+ </excludes>
+ </resource>
+ </resources>
+ </build>
+
+</project>
Propchange: incubator/jackrabbit/trunk/modules/commons/project.xml
------------------------------------------------------------------------------
svn:eol-style = native