myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sc...@apache.org
Subject svn commit: r413717 - in /myfaces/shared/trunk: shared-impl/pom.xml shared-tomahawk/pom.xml
Date Mon, 12 Jun 2006 17:55:40 GMT
Author: schof
Date: Mon Jun 12 10:55:38 2006
New Revision: 413717

URL: http://svn.apache.org/viewvc?rev=413717&view=rev
Log:
merged changes from 2.0.2 branch (r409506 - r412554)

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

Modified: myfaces/shared/trunk/shared-impl/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/shared-impl/pom.xml?rev=413717&r1=413716&r2=413717&view=diff
==============================================================================
--- myfaces/shared/trunk/shared-impl/pom.xml (original)
+++ myfaces/shared/trunk/shared-impl/pom.xml Mon Jun 12 10:55:38 2006
@@ -1,39 +1,27 @@
-<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>
-
+<?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">
   <parent>
-    <groupId>org.apache.myfaces.shared</groupId>
     <artifactId>myfaces-shared-project</artifactId>
+    <groupId>org.apache.myfaces.shared</groupId>
     <version>2.0.3-SNAPSHOT</version>
   </parent>
-
+  <modelVersion>4.0.0</modelVersion>
   <artifactId>myfaces-shared-impl</artifactId>
-  <packaging>jar</packaging>
   <name>MyFaces Shared Impl</name>
+  <version>2.0.2</version>
+  <description>This is the MyFaces Shared Impl Subproject Description [INSERT MORE
STUFF HERE]</description>
   <url>http://myfaces.apache.org</url>
-  <description>
-    This is the MyFaces Shared Impl Subproject Description [INSERT MORE STUFF HERE]
-  </description>
-
   <scm>
     <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/shared/trunk/shared-impl</connection>
     <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/shared/trunk/shared-impl</developerConnection>
     <url>http://svn.apache.org/viewcvs.cgi/myfaces/shared/trunk/shared-impl</url>
   </scm>
-
   <build>
-
     <resources>
       <resource>
-        <!-- because adding an additional resourceRoot not possible with antrun yet -->
         <directory>target/refactored-shared-sources/main/resources</directory>
       </resource>
     </resources>
-
     <plugins>
-
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>dependency-maven-plugin</artifactId>
@@ -41,63 +29,65 @@
           <execution>
             <id>unpack-sources</id>
             <phase>generate-sources</phase>
-            <goals><goal>unpack</goal></goals>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
             <configuration>
               <artifactItems>
                 <artifactItem>
-                   <groupId>org.apache.myfaces.shared</groupId>
-                   <artifactId>myfaces-shared-core</artifactId>
-                   <version>${version}</version>
-                   <type>jar</type>
-                   <classifier>sources</classifier>
-                 </artifactItem>
-               </artifactItems>
-               <outputDirectory>${project.build.directory}/unpacked-shared-sources</outputDirectory>
+                  <groupId>org.apache.myfaces.shared</groupId>
+                  <artifactId>myfaces-shared-core</artifactId>
+                  <version>${version}</version>
+                  <type>jar</type>
+                  <classifier>sources</classifier>
+                </artifactItem>
+              </artifactItems>
+              <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>
+            <goals>
+              <goal>run</goal>
+            </goals>
             <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_impl"/>
-                  <ant dir="${project.basedir}" antfile="build.xml"
-                        inheritRefs="true" inheritAll="true">
-                    <target name="refactor-java-sources"/>
-                  </ant>
+                <property value="${project.build.directory}/unpacked-shared-sources" name="refactor.src.dir"></property>
+                <property value="${project.build.directory}/refactored-shared-sources/main/java"
name="refactor.output.dir"></property>
+                <property value="shared_impl" name="refactor.package.new"></property>
+                <ant inheritRefs="true" inheritAll="true" antfile="build.xml" dir="${project.basedir}">
+                  <target name="refactor-java-sources"></target>
+                </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>
+            <goals>
+              <goal>run</goal>
+            </goals>
             <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_impl"/>
-                  <ant dir="${project.basedir}" antfile="build.xml"
-                        inheritRefs="true" inheritAll="true">
-                    <target name="refactor-resources"/>
-                  </ant>
+                <property value="${project.build.directory}/unpacked-shared-sources" name="refactor.src.dir"></property>
+                <property value="${project.build.directory}/refactored-shared-sources/main/resources"
name="refactor.output.dir"></property>
+                <property value="shared_impl" name="refactor.package.new"></property>
+                <ant inheritRefs="true" inheritAll="true" antfile="build.xml" dir="${project.basedir}">
+                  <target name="refactor-resources"></target>
+                </ant>
               </tasks>
-              <resourceRoot>${project.build.directory}/refactored-shared-sources/main/resources</resourceRoot>
<!-- not yet supported -->
+              <resourceRoot>${project.build.directory}/refactored-shared-sources/main/resources</resourceRoot>
             </configuration>
-            <goals><goal>run</goal></goals>
           </execution>
         </executions>
       </plugin>
-
       <plugin>
         <artifactId>maven-source-plugin</artifactId>
         <executions>
@@ -109,10 +99,6 @@
           </execution>
         </executions>
       </plugin>
-
     </plugins>
-
   </build>
-
-
-</project>
+</project>
\ No newline at end of file

Modified: myfaces/shared/trunk/shared-tomahawk/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/shared-tomahawk/pom.xml?rev=413717&r1=413716&r2=413717&view=diff
==============================================================================
--- myfaces/shared/trunk/shared-tomahawk/pom.xml (original)
+++ myfaces/shared/trunk/shared-tomahawk/pom.xml Mon Jun 12 10:55:38 2006
@@ -1,39 +1,27 @@
-<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>
-
+<?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">
   <parent>
-    <groupId>org.apache.myfaces.shared</groupId>
     <artifactId>myfaces-shared-project</artifactId>
+    <groupId>org.apache.myfaces.shared</groupId>
     <version>2.0.3-SNAPSHOT</version>
   </parent>
-
+  <modelVersion>4.0.0</modelVersion>
   <artifactId>myfaces-shared-tomahawk</artifactId>
-  <packaging>jar</packaging>
   <name>MyFaces Shared Tomahawk</name>
+  <version>2.0.2</version>
+  <description>This is the MyFaces Shared Tomahawk Subproject Description [INSERT MORE
STUFF HERE]</description>
   <url>http://myfaces.apache.org</url>
-  <description>
-    This is the MyFaces Shared Tomahawk Subproject Description [INSERT MORE STUFF HERE]
-  </description>
-
   <scm>
     <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/shared/trunk/shared-tomahawk</connection>
     <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/shared/trunk/shared-tomahawk</developerConnection>
     <url>http://svn.apache.org/viewcvs.cgi/myfaces/shared/trunk/shared-tomahawk</url>
   </scm>
-
   <build>
-
     <resources>
       <resource>
-        <!-- because adding an additional resourceRoot not possible with antrun yet -->
         <directory>target/refactored-shared-sources/main/resources</directory>
       </resource>
     </resources>
-
     <plugins>
-
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>dependency-maven-plugin</artifactId>
@@ -41,63 +29,65 @@
           <execution>
             <id>unpack-sources</id>
             <phase>generate-sources</phase>
-            <goals><goal>unpack</goal></goals>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
             <configuration>
               <artifactItems>
                 <artifactItem>
-                   <groupId>org.apache.myfaces.shared</groupId>
-                   <artifactId>myfaces-shared-core</artifactId>
-                   <version>${version}</version>
-                   <type>jar</type>
-                   <classifier>sources</classifier>
-                 </artifactItem>
-               </artifactItems>
-               <outputDirectory>${project.build.directory}/unpacked-shared-sources</outputDirectory>
+                  <groupId>org.apache.myfaces.shared</groupId>
+                  <artifactId>myfaces-shared-core</artifactId>
+                  <version>${version}</version>
+                  <type>jar</type>
+                  <classifier>sources</classifier>
+                </artifactItem>
+              </artifactItems>
+              <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>
+            <goals>
+              <goal>run</goal>
+            </goals>
             <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>
+                <property value="${project.build.directory}/unpacked-shared-sources" name="refactor.src.dir"></property>
+                <property value="${project.build.directory}/refactored-shared-sources/main/java"
name="refactor.output.dir"></property>
+                <property value="shared_tomahawk" name="refactor.package.new"></property>
+                <ant inheritRefs="true" inheritAll="true" antfile="build.xml" dir="${project.basedir}">
+                  <target name="refactor-java-sources"></target>
+                </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>
+            <goals>
+              <goal>run</goal>
+            </goals>
             <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>
+                <property value="${project.build.directory}/unpacked-shared-sources" name="refactor.src.dir"></property>
+                <property value="${project.build.directory}/refactored-shared-sources/main/resources"
name="refactor.output.dir"></property>
+                <property value="shared_tomahawk" name="refactor.package.new"></property>
+                <ant inheritRefs="true" inheritAll="true" antfile="build.xml" dir="${project.basedir}">
+                  <target name="refactor-resources"></target>
+                </ant>
               </tasks>
-              <resourceRoot>${project.build.directory}/refactored-shared-sources/main/resources</resourceRoot>
<!-- not yet supported -->
+              <resourceRoot>${project.build.directory}/refactored-shared-sources/main/resources</resourceRoot>
             </configuration>
-            <goals><goal>run</goal></goals>
           </execution>
         </executions>
       </plugin>
-
       <plugin>
         <artifactId>maven-source-plugin</artifactId>
         <executions>
@@ -109,10 +99,6 @@
           </execution>
         </executions>
       </plugin>
-
     </plugins>
-
   </build>
-
-
-</project>
+</project>
\ No newline at end of file



Mime
View raw message