myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From manol...@apache.org
Subject svn commit: r381638 - in /myfaces/shared/trunk: build.xml shared-impl/pom.xml shared-tomahawk/pom.xml
Date Tue, 28 Feb 2006 11:44:06 GMT
Author: manolito
Date: Tue Feb 28 03:44:02 2006
New Revision: 381638

URL: http://svn.apache.org/viewcvs?rev=381638&view=rev
Log:
no more relative paths (for continuum),
ant tasks now use a common build.xml file

Added:
    myfaces/shared/trunk/build.xml   (with props)
Modified:
    myfaces/shared/trunk/shared-impl/pom.xml
    myfaces/shared/trunk/shared-tomahawk/pom.xml

Added: myfaces/shared/trunk/build.xml
URL: http://svn.apache.org/viewcvs/myfaces/shared/trunk/build.xml?rev=381638&view=auto
==============================================================================
--- myfaces/shared/trunk/build.xml (added)
+++ myfaces/shared/trunk/build.xml Tue Feb 28 03:44:02 2006
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="iso-8859-1" ?>
+<project name="myfaces_shared_tasks">
+
+  <target name="refactor-java-sources">
+
+      <!-- 1. Copy files from original sources -->
+      <copy todir="${refactor.output.dir}/main/java">
+        <fileset dir="${refactor.src.dir}/main/java"/>
+      </copy>
+      <copy todir="${refactor.output.dir}/test/java">
+        <fileset dir="${refactor.src.dir}/test/java"/>
+      </copy>
+      
+      <!-- 2. Rename package dir "shared" to new name -->
+      <move todir="${refactor.output.dir}/main/java/org/apache/myfaces/${refactor.package.new}">
+        <fileset dir="${refactor.output.dir}/main/java/org/apache/myfaces/shared"/>

+      </move>
+      <move todir="${refactor.output.dir}/test/java/org/apache/myfaces/${refactor.package.new}">
+        <fileset dir="${refactor.output.dir}/test/java/org/apache/myfaces/shared"/>

+      </move>
+      
+      <!-- 3. Rename occurrences of package "shared" by new name -->
+      <replace dir="${refactor.output.dir}"
+            token="org.apache.myfaces.shared."
+            value="org.apache.myfaces.${refactor.package.new}.">
+        <include name="main/java/**/*.java"/>
+        <include name="test/java/**/*.java"/>
+      </replace>
+      
+  </target>       
+
+
+  <target name="refactor-resources">
+
+      <!-- 1. Copy files from original resources -->
+      <copy todir="${refactor.output.dir}/main/resources">
+        <fileset dir="${refactor.src.dir}/main/resources"/>
+      </copy>
+      <copy todir="${refactor.output.dir}/test/resources">
+        <fileset dir="${refactor.src.dir}/test/resources"/>
+      </copy>
+      <!-- 2. Rename package dir "shared" to new name -->
+      <move todir="${refactor.output.dir}/main/resources/org/apache/myfaces/${refactor.package.new}">
+        <fileset dir="${refactor.output.dir}/main/resources/org/apache/myfaces/shared"/>

+      </move>
+      <move todir="${refactor.output.dir}/test/resources/org/apache/myfaces/${refactor.package.new}"
failonerror="false">
+        <fileset dir="${refactor.output.dir}/test/resources/org/apache/myfaces/shared"/>

+      </move>
+      <!-- 3. Rename occurrences of package "shared" new name -->
+      <replace dir="${refactor.output.dir}"
+            token="org.apache.myfaces.shared."
+            value="org.apache.myfaces.${refactor.package.new}.">
+        <include name="main/resources/**/*.properties"/>
+        <include name="main/resources/**/*.xml"/>
+        <include name="test/resources/**/*.properties"/>
+        <include name="test/resources/**/*.xml"/>
+      </replace>
+
+  </target>       
+
+
+</project>

Propchange: myfaces/shared/trunk/build.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/shared/trunk/build.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: myfaces/shared/trunk/shared-impl/pom.xml
URL: http://svn.apache.org/viewcvs/myfaces/shared/trunk/shared-impl/pom.xml?rev=381638&r1=381637&r2=381638&view=diff
==============================================================================
--- myfaces/shared/trunk/shared-impl/pom.xml (original)
+++ myfaces/shared/trunk/shared-impl/pom.xml Tue Feb 28 03:44:02 2006
@@ -52,27 +52,13 @@
             <phase>generate-sources</phase>
             <configuration>
               <tasks>
-                <!-- 1. Copy files from original sources -->
-                <copy todir="${project.build.directory}/gen-src/main/java">
-                  <fileset dir="../src/main/java"/>
-                </copy>
-                <copy todir="${project.build.directory}/gen-src/test/java">
-                  <fileset dir="../src/test/java"/>
-                </copy>
-                <!-- 2. Rename package dir "shared" to "shared_impl" -->
-                <move todir="${project.build.directory}/gen-src/main/java/org/apache/myfaces/shared_impl">
-                  <fileset dir="${project.build.directory}/gen-src/main/java/org/apache/myfaces/shared"/>

-                </move>
-                <move todir="${project.build.directory}/gen-src/test/java/org/apache/myfaces/shared_impl">
-                  <fileset dir="${project.build.directory}/gen-src/test/java/org/apache/myfaces/shared"/>

-                </move>
-                <!-- 3. Rename occurrences of package "shared" by "shared_impl" -->
-                <replace dir="${project.build.directory}/gen-src">
-                  <include name="main/java/**/*.java"/>
-                  <include name="test/java/**/*.java"/>
-                  <replacetoken>org.apache.myfaces.shared.</replacetoken>
-                  <replacevalue>org.apache.myfaces.shared_impl.</replacevalue>
-                </replace>
+                  <property name="refactor.src.dir" value="${project.basedir}/../src"/>
+                  <property name="refactor.output.dir" value="${project.build.directory}/gen-src"/>
+                  <property name="refactor.package.new" value="shared_impl"/>
+                  <ant dir="${project.basedir}" antfile="${project.basedir}/../build.xml"
+                        inheritRefs="true" inheritAll="true">
+                    <target name="refactor-java-sources"/>
+                  </ant>
               </tasks>
               <sourceRoot>${project.build.directory}/gen-src/main/java</sourceRoot>
               <testSourceRoot>${project.build.directory}/gen-src/test/java</testSourceRoot>
@@ -85,31 +71,15 @@
             <phase>generate-resources</phase>
             <configuration>
               <tasks>
-                <!-- 1. Copy java files and resources from original shared sources -->
-                <copy todir="${project.build.directory}/gen-src/main/resources">
-                  <fileset dir="../src/main/resources"/>
-                </copy>
-                <copy todir="${project.build.directory}/gen-src/test/resources">
-                  <fileset dir="../src/test/resources"/>
-                </copy>
-                <!-- 2. Rename package dir "shared" to "shared_impl" -->
-                <move todir="${project.build.directory}/gen-src/main/resources/org/apache/myfaces/shared_impl">
-                  <fileset dir="${project.build.directory}/gen-src/main/resources/org/apache/myfaces/shared"/>

-                </move>
-                <move todir="${project.build.directory}/gen-src/test/resources/org/apache/myfaces/shared_impl"
failonerror="false">
-                  <fileset dir="${project.build.directory}/gen-src/test/resources/org/apache/myfaces/shared"/>

-                </move>
-                <!-- 3. Rename occurrences of package "shared" by "shared_impl" -->
-                <replace dir="${project.build.directory}/gen-src">
-                  <include name="main/resources/**/*.properties"/>
-                  <include name="main/resources/**/*.xml"/>
-                  <include name="test/resources/**/*.properties"/>
-                  <include name="test/resources/**/*.xml"/>
-                  <replacetoken>org.apache.myfaces.shared.</replacetoken>
-                  <replacevalue>org.apache.myfaces.shared_impl.</replacevalue>
-                </replace>
+                  <property name="refactor.src.dir" value="${project.basedir}/../src"/>
+                  <property name="refactor.output.dir" value="${project.build.directory}/gen-src"/>
+                  <property name="refactor.package.new" value="shared_impl"/>
+                  <ant dir="${project.basedir}" antfile="${project.basedir}/../build.xml"
+                        inheritRefs="true" inheritAll="true">
+                    <target name="refactor-resources"/>
+                  </ant>
               </tasks>
-              <!-- does not seem to be supported yet: -->
+              <!-- not supported by antrun yet: -->
               <resourceRoot>${project.build.directory}/gen-src/main/resources</resourceRoot>
               <testResourceRoot>${project.build.directory}/gen-src/test/resources</testResourceRoot>
             </configuration>

Modified: myfaces/shared/trunk/shared-tomahawk/pom.xml
URL: http://svn.apache.org/viewcvs/myfaces/shared/trunk/shared-tomahawk/pom.xml?rev=381638&r1=381637&r2=381638&view=diff
==============================================================================
--- myfaces/shared/trunk/shared-tomahawk/pom.xml (original)
+++ myfaces/shared/trunk/shared-tomahawk/pom.xml Tue Feb 28 03:44:02 2006
@@ -52,27 +52,13 @@
             <phase>generate-sources</phase>
             <configuration>
               <tasks>
-                <!-- 1. Copy files from original sources -->
-                <copy todir="${project.build.directory}/gen-src/main/java">
-                  <fileset dir="../src/main/java"/>
-                </copy>
-                <copy todir="${project.build.directory}/gen-src/test/java">
-                  <fileset dir="../src/test/java"/>
-                </copy>
-                <!-- 2. Rename package dir "shared" to "shared_tomahawk" -->
-                <move todir="${project.build.directory}/gen-src/main/java/org/apache/myfaces/shared_tomahawk">
-                  <fileset dir="${project.build.directory}/gen-src/main/java/org/apache/myfaces/shared"/>

-                </move>
-                <move todir="${project.build.directory}/gen-src/test/java/org/apache/myfaces/shared_tomahawk">
-                  <fileset dir="${project.build.directory}/gen-src/test/java/org/apache/myfaces/shared"/>

-                </move>
-                <!-- 3. Rename occurrences of package "shared" by "shared_tomahawk" -->
-                <replace dir="${project.build.directory}/gen-src">
-                  <include name="main/java/**/*.java"/>
-                  <include name="test/java/**/*.java"/>
-                  <replacetoken>org.apache.myfaces.shared.</replacetoken>
-                  <replacevalue>org.apache.myfaces.shared_tomahawk.</replacevalue>
-                </replace>
+                  <property name="refactor.src.dir" value="${project.basedir}/../src"/>
+                  <property name="refactor.output.dir" value="${project.build.directory}/gen-src"/>
+                  <property name="refactor.package.new" value="shared_tomahawk"/>
+                  <ant dir="${project.basedir}" antfile="${project.basedir}/../build.xml"
+                        inheritRefs="true" inheritAll="true">
+                    <target name="refactor-java-sources"/>
+                  </ant>
               </tasks>
               <sourceRoot>${project.build.directory}/gen-src/main/java</sourceRoot>
               <testSourceRoot>${project.build.directory}/gen-src/test/java</testSourceRoot>
@@ -85,31 +71,15 @@
             <phase>generate-resources</phase>
             <configuration>
               <tasks>
-                <!-- 1. Copy java files and resources from original shared sources -->
-                <copy todir="${project.build.directory}/gen-src/main/resources">
-                  <fileset dir="../src/main/resources"/>
-                </copy>
-                <copy todir="${project.build.directory}/gen-src/test/resources">
-                  <fileset dir="../src/test/resources"/>
-                </copy>
-                <!-- 2. Rename package dir "shared" to "shared_tomahawk" -->
-                <move todir="${project.build.directory}/gen-src/main/resources/org/apache/myfaces/shared_tomahawk">
-                  <fileset dir="${project.build.directory}/gen-src/main/resources/org/apache/myfaces/shared"/>

-                </move>
-                <move todir="${project.build.directory}/gen-src/test/resources/org/apache/myfaces/shared_tomahawk"
failonerror="false">
-                  <fileset dir="${project.build.directory}/gen-src/test/resources/org/apache/myfaces/shared"/>

-                </move>
-                <!-- 3. Rename occurrences of package "shared" by "shared_tomahawk" -->
-                <replace dir="${project.build.directory}/gen-src">
-                  <include name="main/resources/**/*.properties"/>
-                  <include name="main/resources/**/*.xml"/>
-                  <include name="test/resources/**/*.properties"/>
-                  <include name="test/resources/**/*.xml"/>
-                  <replacetoken>org.apache.myfaces.shared.</replacetoken>
-                  <replacevalue>org.apache.myfaces.shared_tomahawk.</replacevalue>
-                </replace>
+                  <property name="refactor.src.dir" value="${project.basedir}/../src"/>
+                  <property name="refactor.output.dir" value="${project.build.directory}/gen-src"/>
+                  <property name="refactor.package.new" value="shared_tomahawk"/>
+                  <ant dir="${project.basedir}" antfile="${project.basedir}/../build.xml"
+                        inheritRefs="true" inheritAll="true">
+                    <target name="refactor-resources"/>
+                  </ant>
               </tasks>
-              <!-- does not seem to be supported yet: -->
+              <!-- not supported by antrun yet: -->
               <resourceRoot>${project.build.directory}/gen-src/main/resources</resourceRoot>
               <testResourceRoot>${project.build.directory}/gen-src/test/resources</testResourceRoot>
             </configuration>
@@ -124,7 +94,7 @@
           <artifactId>maven-source-plugin</artifactId>
           <executions>
             <execution>
-              <!-- create a sources jar for easier debugging of impl -->
+              <!-- create a sources jar for easier debugging of tomahawk -->
               <id>create-source-jar</id>
               <goals><goal>jar</goal></goals>
             </execution>



Mime
View raw message