myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From manol...@apache.org
Subject svn commit: r381727 - in /myfaces/tomahawk/branches/1_1_2/core: build.xml pom.xml
Date Tue, 28 Feb 2006 18:19:51 GMT
Author: manolito
Date: Tue Feb 28 10:19:49 2006
New Revision: 381727

URL: http://svn.apache.org/viewcvs?rev=381727&view=rev
Log:
shared refactoring is done in tomahawk now

Added:
    myfaces/tomahawk/branches/1_1_2/core/build.xml   (with props)
Modified:
    myfaces/tomahawk/branches/1_1_2/core/pom.xml

Added: myfaces/tomahawk/branches/1_1_2/core/build.xml
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/core/build.xml?rev=381727&view=auto
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/core/build.xml (added)
+++ myfaces/tomahawk/branches/1_1_2/core/build.xml Tue Feb 28 10:19:49 2006
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="iso-8859-1" ?>
+<project name="myfaces_shared_tasks">
+
+  <target name="refactor-java-sources">
+      <!-- 1. Move and rename package dir "shared" to new name -->
+      <move todir="${refactor.output.dir}/org/apache/myfaces/${refactor.package.new}">
+        <fileset dir="${refactor.src.dir}/org/apache/myfaces/shared"> 
+          <include name="**/*.java"/>
+        </fileset>
+      </move>
+      <!-- 2. 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="**/*.java"/>
+      </replace>
+  </target>       
+
+  <target name="refactor-resources">
+      <!-- 1. Move and rename package dir "shared" to new name -->
+      <move todir="${refactor.output.dir}/org/apache/myfaces/${refactor.package.new}">
+        <fileset dir="${refactor.src.dir}/org/apache/myfaces/shared"> 
+          <include name="**/*.properties"/>
+          <include name="**/*.xml"/>
+        </fileset>
+      </move>
+      <!-- 2. 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="**/*.properties"/>
+        <include name="**/*.xml"/>
+      </replace>
+  </target>       
+
+</project>

Propchange: myfaces/tomahawk/branches/1_1_2/core/build.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/tomahawk/branches/1_1_2/core/build.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: myfaces/tomahawk/branches/1_1_2/core/pom.xml
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/core/pom.xml?rev=381727&r1=381726&r2=381727&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/core/pom.xml (original)
+++ myfaces/tomahawk/branches/1_1_2/core/pom.xml Tue Feb 28 10:19:49 2006
@@ -2,10 +2,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <name>Tomahawk Core</name>
   <groupId>org.apache.myfaces.tomahawk</groupId>
   <artifactId>tomahawk</artifactId>
   <packaging>jar</packaging>
+  <name>Tomahawk Core</name>
   
   <parent>
     <groupId>org.apache.myfaces.tomahawk</groupId>
@@ -52,6 +52,20 @@
       <optional>true</optional>
     </dependency>
 
+    <dependency>
+      <groupId>commons-el</groupId>
+      <artifactId>commons-el</artifactId>
+      <version>1.0</version>
+      <scope>compile</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>commons-codec</groupId>
+      <artifactId>commons-codec</artifactId>
+      <version>1.3</version>
+      <scope>compile</scope>
+    </dependency>
+
     <!-- provided dependencies -->
 
     <dependency>
@@ -61,13 +75,14 @@
       <scope>provided</scope>
     </dependency>
 
+    <!--
     <dependency>
       <groupId>org.apache.myfaces.shared</groupId>
       <artifactId>myfaces-shared-tomahawk</artifactId>
       <version>2.0.0-SNAPSHOT</version>
-      <!-- classes will be directly included in tomahawk.jar -->
       <scope>provided</scope>
     </dependency>
+    -->
 
     <dependency>
       <groupId>javax.servlet</groupId>
@@ -90,21 +105,6 @@
       <scope>provided</scope>
     </dependency>
 
-    <!-- runtime dependencies -->
- 
-    <dependency>
-      <groupId>commons-el</groupId>
-      <artifactId>commons-el</artifactId>
-      <version>1.0</version>
-      <scope>runtime</scope> <!-- needed by shared classes -->
-    </dependency>
-    <dependency>
-      <groupId>commons-codec</groupId>
-      <artifactId>commons-codec</artifactId>
-      <version>1.3</version>
-      <scope>runtime</scope> <!-- needed by shared classes -->
-    </dependency>
-
     <!-- test dependencies -->
 
     <dependency>
@@ -186,6 +186,10 @@
       <resource>
         <directory>src/main/resources-facesconfig</directory>
       </resource>
+      <resource>
+        <!-- because adding an additional resourceRoot not possible with antrun yet -->
+        <directory>target/refactored-shared-sources/main/resources</directory>
+      </resource>
     </resources>
 
     <plugins>
@@ -218,32 +222,73 @@
           </execution>
         </executions>
       </plugin>
-      
+
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>dependency-maven-plugin</artifactId>
         <executions>
           <execution>
-            <id>unpack-shared-tomahawk-classes</id>
-            <phase>process-classes</phase>
-            <goals>
-              <goal>unpack</goal>
-            </goals>
+            <id>unpack-sources</id>
+            <phase>generate-sources</phase>
+            <goals><goal>unpack</goal></goals>
             <configuration>
               <artifactItems>
                 <artifactItem>
                    <groupId>org.apache.myfaces.shared</groupId>
-                   <artifactId>myfaces-shared-tomahawk</artifactId>
+                   <artifactId>myfaces-shared</artifactId>
                    <version>2.0.0-SNAPSHOT</version>
                    <type>jar</type>
+                   <classifier>sources</classifier>
                  </artifactItem>
                </artifactItems>
-               <outputDirectory>${project.build.directory}/classes</outputDirectory>
+               <outputDirectory>${project.build.directory}/unpacked-shared-sources</outputDirectory>
             </configuration>
           </execution>
         </executions>
       </plugin>
       
+      <plugin>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>refactor-shared-sources</id>
+            <phase>process-sources</phase>
+            <configuration>
+              <tasks>
+                  <property name="refactor.src.dir" value="${project.build.directory}/unpacked-shared-sources"/>
+                  <property name="refactor.output.dir" value="${project.build.directory}/refactored-shared-sources/main/java"/>
+                  <property name="refactor.package.new" value="shared_tomahawk"/>
+                  <ant dir="${project.basedir}" antfile="build.xml"
+                        inheritRefs="true" inheritAll="true">
+                    <target name="refactor-java-sources"/>
+                  </ant>
+              </tasks>
+              <sourceRoot>${project.build.directory}/refactored-shared-sources/main/java</sourceRoot>
+            </configuration>
+            <goals><goal>run</goal></goals>
+          </execution>
+          
+          <execution>
+            <id>refactor-resources</id>
+            <phase>generate-resources</phase>
+            <configuration>
+              <tasks>
+                  <property name="refactor.src.dir" value="${project.build.directory}/unpacked-shared-sources"/>
+                  <property name="refactor.output.dir" value="${project.build.directory}/refactored-shared-sources/main/resources"/>
+                  <property name="refactor.package.new" value="shared_tomahawk"/>
+                  <ant dir="${project.basedir}" antfile="build.xml"
+                        inheritRefs="true" inheritAll="true">
+                    <target name="refactor-resources"/>
+                  </ant>
+              </tasks>
+              <resourceRoot>${project.build.directory}/refactored-shared-sources/main/resources</resourceRoot>
<!-- not yet supported -->
+            </configuration>
+            <goals><goal>run</goal></goals>
+          </execution>
+          
+        </executions>
+      </plugin>
+ 
     </plugins>
   </build>
 



Mime
View raw message