You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by jm...@apache.org on 2005/02/23 21:39:04 UTC

svn commit: r155066 - in struts: build/trunk/maven.xml build/trunk/project.xml core/trunk/maven.xml

Author: jmitchell
Date: Wed Feb 23 12:39:02 2005
New Revision: 155066

URL: http://svn.apache.org/viewcvs?view=rev&rev=155066
Log:
modify build, pull the 'copy of conf/share' down to core

Added:
    struts/core/trunk/maven.xml   (with props)
Modified:
    struts/build/trunk/maven.xml
    struts/build/trunk/project.xml

Modified: struts/build/trunk/maven.xml
URL: http://svn.apache.org/viewcvs/struts/build/trunk/maven.xml?view=diff&r1=155065&r2=155066
==============================================================================
--- struts/build/trunk/maven.xml (original)
+++ struts/build/trunk/maven.xml Wed Feb 23 12:39:02 2005
@@ -30,42 +30,23 @@
   <postGoal name="dist:prepare-bin-filesystem">
     <!-- Copy Instructions and Readmes -->
     <ant:copy todir="${maven.dist.bin.assembly.dir}">
-      <ant:fileset dir=".">
+      <ant:fileset dir="build/">
         <ant:include name="README*"/>
         <ant:include name="LICENSE*"/>
         <ant:include name="STATUS*"/>
         <ant:include name="INSTALL*"/>
       </ant:fileset>
     </ant:copy>
-
-    <!-- Copy configuration files -->
-    <j:set var="docsDest" value="${maven.docs.dest}"/>
-    <ant:copy todir="${maven.dist.bin.assembly.dir}/conf">
-      <ant:fileset dir="./conf/share">
-        <ant:include name="*.xml"/>
-        <ant:include name="*.dtd"/>
-      </ant:fileset>
-    </ant:copy>
   </postGoal>
 
-
   <postGoal name="dist:prepare-src-filesystem">
     <!-- Copy Instructions and Readmes -->
     <ant:copy todir="${maven.dist.src.assembly.dir}">
-      <ant:fileset dir=".">
+      <ant:fileset dir="build">
         <ant:include name="README*"/>
         <ant:include name="LICENSE*"/>
         <ant:include name="STATUS*"/>
         <ant:include name="INSTALL*"/>
-      </ant:fileset>
-    </ant:copy>
-
-    <!-- Copy configuration files -->
-    <j:set var="docsDest" value="${maven.docs.dest}"/>
-    <ant:copy todir="${maven.dist.src.assembly.dir}/conf">
-      <ant:fileset dir="./conf/share">
-        <ant:include name="*.xml"/>
-        <ant:include name="*.dtd"/>
       </ant:fileset>
     </ant:copy>
   </postGoal>

Modified: struts/build/trunk/project.xml
URL: http://svn.apache.org/viewcvs/struts/build/trunk/project.xml?view=diff&r1=155065&r2=155066
==============================================================================
--- struts/build/trunk/project.xml (original)
+++ struts/build/trunk/project.xml Wed Feb 23 12:39:02 2005
@@ -325,7 +325,7 @@
       <groupId>antlr</groupId>
       <artifactId>antlr</artifactId>
       <version>2.7.2</version>
-      <url>http://www.antlr.org/download.html</url>
+      <url>http://www.antlr.org/</url>
       <properties>
         <war.bundle>true</war.bundle>
       </properties>
@@ -412,6 +412,7 @@
     <report>maven-jdepend-plugin</report>
     <report>maven-junit-report-plugin</report>
     <report>maven-jxr-plugin</report>
+	<report>maven-linkcheck-plugin</report>
     <report>maven-pmd-plugin</report>
     <report>maven-simian-plugin</report>
     <report>maven-tasklist-plugin</report>

Added: struts/core/trunk/maven.xml
URL: http://svn.apache.org/viewcvs/struts/core/trunk/maven.xml?view=auto&rev=155066
==============================================================================
--- struts/core/trunk/maven.xml (added)
+++ struts/core/trunk/maven.xml Wed Feb 23 12:39:02 2005
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+
+<project    
+            xmlns:j="jelly:core"
+            xmlns:ant="jelly:ant"
+            xmlns:maven="jelly:maven">
+  
+  <postGoal name="dist:prepare-bin-filesystem">
+
+    <!-- Copy configuration files -->
+    <j:set var="docsDest" value="${maven.docs.dest}"/>
+    <ant:copy todir="${maven.dist.bin.assembly.dir}/conf">
+      <ant:fileset dir="build/conf/share">
+        <ant:include name="*.xml"/>
+        <ant:include name="*.dtd"/>
+      </ant:fileset>
+    </ant:copy>
+  </postGoal>
+
+
+  <postGoal name="dist:prepare-src-filesystem">
+
+    <!-- Copy configuration files -->
+    <j:set var="docsDest" value="${maven.docs.dest}"/>
+    <ant:copy todir="${maven.dist.src.assembly.dir}/conf">
+      <ant:fileset dir="build/conf/share">
+        <ant:include name="*.xml"/>
+        <ant:include name="*.dtd"/>
+      </ant:fileset>
+    </ant:copy>
+  </postGoal>
+
+</project>
\ No newline at end of file

Propchange: struts/core/trunk/maven.xml
------------------------------------------------------------------------------
    svn:executable = *



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org