myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From manol...@apache.org
Subject svn commit: r381157 - in /myfaces/shared/trunk: pom.xml shared-tomahawk/ shared-tomahawk/pom.xml
Date Sun, 26 Feb 2006 20:15:43 GMT
Author: manolito
Date: Sun Feb 26 12:15:40 2006
New Revision: 381157

URL: http://svn.apache.org/viewcvs?rev=381157&view=rev
Log:
added myfaces-shared-tomahawk submodule

Added:
    myfaces/shared/trunk/shared-tomahawk/
    myfaces/shared/trunk/shared-tomahawk/pom.xml
Modified:
    myfaces/shared/trunk/pom.xml

Modified: myfaces/shared/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/myfaces/shared/trunk/pom.xml?rev=381157&r1=381156&r2=381157&view=diff
==============================================================================
--- myfaces/shared/trunk/pom.xml (original)
+++ myfaces/shared/trunk/pom.xml Sun Feb 26 12:15:40 2006
@@ -22,6 +22,7 @@
 
   <modules>
     <module>shared-impl</module>
+    <module>shared-tomahawk</module>
   </modules>
    
   <url>http://myfaces.apache.org</url>
@@ -81,7 +82,9 @@
       </build>
     </profile>
   </profiles>
+  
   <dependencies>
+    <!-- test dependencies -->
     <dependency>
       <groupId>easymock</groupId>
       <artifactId>easymockclassextension</artifactId>
@@ -94,32 +97,6 @@
       <version>1.6</version>
       <scope>test</scope>
     </dependency>
-
-    <dependency>
-      <groupId>myfaces</groupId>
-      <artifactId>myfaces-api</artifactId>
-      <version>1.1.2-SNAPSHOT</version>
-      <scope>provided</scope>
-    </dependency>
-    
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <version>2.3</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>jsp-api</artifactId>
-      <version>2.0</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>commons-el</groupId>
-      <artifactId>commons-el</artifactId>
-      <version>1.0</version>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>struts</groupId>
       <artifactId>shale-test</artifactId>
@@ -133,30 +110,12 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>commons-codec</groupId>
-      <artifactId>commons-codec</artifactId>
-      <version>1.3</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>portlet-api</groupId>
-      <artifactId>portlet-api</artifactId>
-      <version>1.0</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
       <groupId>nekohtml</groupId>
       <artifactId>nekohtml</artifactId>
       <version>0.9.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-      <version>1.0.4</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
       <groupId>easymock</groupId>
       <artifactId>easymock</artifactId>
       <version>1.1</version>
@@ -174,7 +133,54 @@
       <version>1.2.1</version>
       <scope>test</scope>
     </dependency>
+
+    <!-- provided dependencies -->
+    <dependency>
+      <groupId>myfaces</groupId>
+      <artifactId>myfaces-api</artifactId>
+      <version>1.1.1</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>2.3</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>jsp-api</artifactId>
+      <version>2.0</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>portlet-api</groupId>
+      <artifactId>portlet-api</artifactId>
+      <version>1.0</version>
+      <scope>provided</scope>
+    </dependency>
+
+    <!-- compile dependencies -->
+    <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>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.0.4</version>
+      <scope>compile</scope>
+    </dependency>
   </dependencies>
+
   <reporting>
     <plugins>
       <plugin>

Added: myfaces/shared/trunk/shared-tomahawk/pom.xml
URL: http://svn.apache.org/viewcvs/myfaces/shared/trunk/shared-tomahawk/pom.xml?rev=381157&view=auto
==============================================================================
--- myfaces/shared/trunk/shared-tomahawk/pom.xml (added)
+++ myfaces/shared/trunk/shared-tomahawk/pom.xml Sun Feb 26 12:15:40 2006
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="UTF-8"?><project xmlns="http://maven.apache.org/POM/4.0.0"
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>
+
+  <groupId>org.apache.myfaces.shared</groupId>
+  <artifactId>myfaces-shared-tomahawk</artifactId>
+  <name>MyFaces Shared Tomahawk</name>
+  <packaging>jar</packaging>
+  <description>The MyFaces Shared Tomahawk subproject provides the auto-refactored
+    shared classes for usage in the MyFaces Tomahawk components.
+    See description for MyFaces Shared Subproject for more info.
+  </description>
+
+  <parent>
+    <groupId>org.apache.myfaces.shared</groupId>
+    <artifactId>myfaces-shared</artifactId>
+    <version>2.0.0-SNAPSHOT</version>
+  </parent>
+
+  <url>http://myfaces.apache.org</url>
+  <build>
+  
+    <resources>
+      <!-- antrun plugin does not support adding a resourceRoot,
+           therefore we must customize resources dir here -->
+      <resource>
+        <directory>target/gen-src/main/resources</directory>
+      </resource>
+    </resources>
+ 
+    <testResources>
+      <!-- antrun plugin does not support adding a testResourceRoot,
+           therefore we must customize testResources dir here -->
+      <testResource>
+        <directory>target/gen-src/test/resources</directory>
+      </testResource>
+    </testResources>
+
+    <plugins>
+
+      <plugin>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <executions>
+
+          <execution>
+            <id>refactor-java-sources</id>
+            <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>
+              </tasks>
+              <sourceRoot>${project.build.directory}/gen-src/main/java</sourceRoot>
+              <testSourceRoot>${project.build.directory}/gen-src/test/java</testSourceRoot>
+            </configuration>
+            <goals><goal>run</goal></goals>
+          </execution>
+
+          <execution>
+            <id>refactor-resources</id>
+            <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>
+              </tasks>
+              <!-- does not seem to be supported yet: -->
+              <resourceRoot>${project.build.directory}/gen-src/main/resources</resourceRoot>
+              <testResourceRoot>${project.build.directory}/gen-src/test/resources</testResourceRoot>
+            </configuration>
+            <goals><goal>run</goal></goals>
+          </execution>
+
+        </executions>
+      </plugin>
+
+       <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-source-plugin</artifactId>
+          <executions>
+            <execution>
+              <!-- create a sources jar for easier debugging of impl -->
+              <id>create-source-jar</id>
+              <goals><goal>jar</goal></goals>
+            </execution>
+          </executions>
+       </plugin>
+
+    </plugins>
+  </build>
+  
+</project>



Mime
View raw message