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/08/27 13:57:30 UTC

svn commit: r240408 - in /incubator/jackrabbit/trunk/contrib/jcr-server: client/maven.xml maven.xml server/maven.xml webapp/maven.xml webapp/project.properties webdav/maven.xml

Author: tripod
Date: Sat Aug 27 04:57:24 2005
New Revision: 240408

URL: http://svn.apache.org/viewcvs?rev=240408&view=rev
Log:
- fixing maven goals

Modified:
    incubator/jackrabbit/trunk/contrib/jcr-server/client/maven.xml
    incubator/jackrabbit/trunk/contrib/jcr-server/maven.xml
    incubator/jackrabbit/trunk/contrib/jcr-server/server/maven.xml
    incubator/jackrabbit/trunk/contrib/jcr-server/webapp/maven.xml
    incubator/jackrabbit/trunk/contrib/jcr-server/webapp/project.properties
    incubator/jackrabbit/trunk/contrib/jcr-server/webdav/maven.xml

Modified: incubator/jackrabbit/trunk/contrib/jcr-server/client/maven.xml
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-server/client/maven.xml?rev=240408&r1=240407&r2=240408&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-server/client/maven.xml (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-server/client/maven.xml Sat Aug 27 04:57:24 2005
@@ -16,8 +16,18 @@
    limitations under the License.
 -->
 <project default="jar">
-
-    <goal name="server-dist">
+    <!--
+        build the jar and intall it to the local repository
+    -->
+    <goal name="multiproject:artifact">
         <attainGoal name="jar:install" />
     </goal>
+    <!--
+        the 'clean' goal is already redefined in the maven.xml
+        of the parent project. we need to redefine it here
+        again to 'maven clean' works.
+    -->
+    <goal name="clean">
+  	    <attainGoal name="clean:clean"/>
+  	</goal>
 </project>

Modified: incubator/jackrabbit/trunk/contrib/jcr-server/maven.xml
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-server/maven.xml?rev=240408&r1=240407&r2=240408&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-server/maven.xml (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-server/maven.xml Sat Aug 27 04:57:24 2005
@@ -16,26 +16,18 @@
    limitations under the License.
 -->
 <project
-    default="all"
+    default="multiproject:artifact"
     xmlns:ant="jelly:ant"
     xmlns:m="jelly:maven"
 >
-
-	<goal name="all">
-      	<m:reactor 
-            basedir="${basedir}"
-            includes="*/project.xml"
-            goals="server-dist"
-            banner="Building"
-            ignoreFailures="false"
-        />
-	</goal>
-	
-	<goal name="clean">
-	    <attainGoal name="multiproject:clean"/>
-	</goal>
-
+    <!--
+        redefine some common goals
+    -->
+    <goal name="clean">
+        <attainGoal name="multiproject:clean"/>
+    </goal>
+    
     <goal name="idea">
-	    <attainGoal name="idea:multiproject"/>
+        <attainGoal name="idea:multiproject"/>
     </goal>
 </project>

Modified: incubator/jackrabbit/trunk/contrib/jcr-server/server/maven.xml
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-server/server/maven.xml?rev=240408&r1=240407&r2=240408&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-server/server/maven.xml (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-server/server/maven.xml Sat Aug 27 04:57:24 2005
@@ -16,8 +16,18 @@
    limitations under the License.
 -->
 <project default="jar">
-
-    <goal name="server-dist">
+    <!--
+        build the jar and intall it to the local repository
+    -->
+    <goal name="multiproject:artifact">
         <attainGoal name="jar:install" />
     </goal>
+    <!--
+        the 'clean' goal is already redefined in the maven.xml
+        of the parent project. we need to redefine it here
+        again to 'maven clean' works.
+    -->
+    <goal name="clean">
+  	    <attainGoal name="clean:clean"/>
+  	</goal>
 </project>

Modified: incubator/jackrabbit/trunk/contrib/jcr-server/webapp/maven.xml
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-server/webapp/maven.xml?rev=240408&r1=240407&r2=240408&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-server/webapp/maven.xml (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-server/webapp/maven.xml Sat Aug 27 04:57:24 2005
@@ -15,13 +15,19 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<project
-    default="war"
-    xmlns:ant="jelly:ant"
-    xmlns:m="jelly:maven"
->
-
-    <goal name="server-dist">
-        <attainGoal name="war"/>
+<project default="war">
+    <!--
+        build the war and intall it to the local repository
+    -->
+    <goal name="multiproject:artifact">
+        <attainGoal name="war:install" />
     </goal>
+    <!--
+        the 'clean' goal is already redefined in the maven.xml
+        of the parent project. we need to redefine it here
+        again to 'maven clean' works.
+    -->
+    <goal name="clean">
+  	    <attainGoal name="clean:clean"/>
+  	</goal>
 </project>

Modified: incubator/jackrabbit/trunk/contrib/jcr-server/webapp/project.properties
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-server/webapp/project.properties?rev=240408&r1=240407&r2=240408&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-server/webapp/project.properties (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-server/webapp/project.properties Sat Aug 27 04:57:24 2005
@@ -1,3 +1,3 @@
 maven.javadoc.links=http://java.sun.com/j2se/1.4.2/docs/api/,http://www.day.com/maven/jsr170/javadocs/jcr-0.16.1-pfd/
 maven.repo.remote = http://www.ibiblio.org/maven/,http://www.day.com/maven/
-maven.multiproject.type = war
\ No newline at end of file
+maven.multiproject.type = war

Modified: incubator/jackrabbit/trunk/contrib/jcr-server/webdav/maven.xml
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-server/webdav/maven.xml?rev=240408&r1=240407&r2=240408&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-server/webdav/maven.xml (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-server/webdav/maven.xml Sat Aug 27 04:57:24 2005
@@ -16,8 +16,18 @@
    limitations under the License.
 -->
 <project default="jar">
-
-    <goal name="server-dist">
+    <!--
+        build the jar and intall it to the local repository
+    -->
+    <goal name="multiproject:artifact">
         <attainGoal name="jar:install" />
     </goal>
+    <!--
+        the 'clean' goal is already redefined in the maven.xml
+        of the parent project. we need to redefine it here
+        again to 'maven clean' works.
+    -->
+    <goal name="clean">
+  	    <attainGoal name="clean:clean"/>
+  	</goal>
 </project>