You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by sc...@apache.org on 2006/01/17 16:23:31 UTC
svn commit: r369815 - in /myfaces: commons/trunk/ current/ maven/trunk/
maven/trunk/master-pom/ site/trunk/ tomahawk/trunk/ tomahawk/trunk/core/
tomahawk/trunk/examples/ tomahawk/trunk/examples/blank/
tomahawk/trunk/examples/simple/ tomahawk/trunk/exam...
Author: schof
Date: Tue Jan 17 07:23:18 2006
New Revision: 369815
URL: http://svn.apache.org/viewcvs?rev=369815&view=rev
Log:
new poms to comply with new structure
Added:
myfaces/current/pom.xml
myfaces/tomahawk/trunk/sandbox/pom.xml
Modified:
myfaces/commons/trunk/pom.xml
myfaces/maven/trunk/master-pom/pom.xml
myfaces/maven/trunk/pom.xml
myfaces/site/trunk/pom.xml
myfaces/tomahawk/trunk/core/pom.xml
myfaces/tomahawk/trunk/examples/blank/pom.xml
myfaces/tomahawk/trunk/examples/pom.xml
myfaces/tomahawk/trunk/examples/simple/pom.xml
myfaces/tomahawk/trunk/examples/tiles/pom.xml
myfaces/tomahawk/trunk/examples/wap/pom.xml
myfaces/tomahawk/trunk/pom.xml
myfaces/tomahawk/trunk/sandbox/core/pom.xml
myfaces/tomahawk/trunk/sandbox/examples/pom.xml
Modified: myfaces/commons/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/myfaces/commons/trunk/pom.xml?rev=369815&r1=369814&r2=369815&view=diff
==============================================================================
--- myfaces/commons/trunk/pom.xml (original)
+++ myfaces/commons/trunk/pom.xml Tue Jan 17 07:23:18 2006
@@ -2,28 +2,35 @@
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</groupId>
+ <groupId>org.apache.myfaces.commons</groupId>
<artifactId>myfaces-commons</artifactId>
<packaging>jar</packaging>
<name>MyFaces Commons</name>
<url>http://myfaces.apache.org</url>
+ <version>1.1.2-SNAPSHOT</version>
<description>
This is the MyFaces Commons Subproject Description [INSERT MORE STUFF HERE]
</description>
<parent>
- <groupId>org.apache.myfaces</groupId>
- <artifactId>myfaces</artifactId>
- <version>1.1.2-SNAPSHOT</version>
+ <groupId>org.apache.myfaces.maven</groupId>
+ <artifactId>myfaces-master</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
+ <!-- NOTE: Commons requires an api to compile against so we'll use the old 1.1.1 version -->
+ <groupId>myfaces</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <version>1.1.1</version>
+ <!--
<groupId>org.apache.myfaces</groupId>
<artifactId>myfaces-api</artifactId>
<version>${version}</version>
- <scope>compile</scope>
+ -->
+ <scope>provided</scope>
</dependency>
<dependency>
@@ -118,79 +125,6 @@
</dependency>
</dependencies>
-
- <build>
-
- <plugins>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.1.2</version>
- <configuration>
- <excludes>
- <exclude>**/*StateUtilsAES_CBCTestCase*</exclude>
- </excludes>
- </configuration>
- </plugin>
-
- </plugins>
-
- </build>
-
-
- <reporting>
-
- <plugins>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>changelog-maven-plugin</artifactId>
- <version>2.0-beta-1</version>
- <reportSets>
- <reportSet>
- <id>dual-report</id>
- <configuration>
- <type>range</type>
- <range>30</range>
- </configuration>
- <reports>
- <report>changelog</report>
- <report>file-activity</report>
- <report>dev-activity</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.0-beta-3</version>
- </plugin>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jxr-maven-plugin</artifactId>
- </plugin>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>taglist-maven-plugin</artifactId>
- <version>2.0-beta-1</version>
- <configuration>
- <tags>TODO, FIXME, XXX, @deprecated</tags>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>surefire-report-maven-plugin</artifactId>
- </plugin>
-
- </plugins>
-
- </reporting>
<profiles>
<profile>
Added: myfaces/current/pom.xml
URL: http://svn.apache.org/viewcvs/myfaces/current/pom.xml?rev=369815&view=auto
==============================================================================
--- myfaces/current/pom.xml (added)
+++ myfaces/current/pom.xml Tue Jan 17 07:23:18 2006
@@ -0,0 +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>
+ <groupId>org.apache.myfaces</groupId>
+ <artifactId>myfaces-build</artifactId>
+ <packaging>pom</packaging>
+ <version>1.1.2-SNAPSHOT</version>
+ <name>MyFaces</name>
+ <url>http://myfaces.apache.org</url>
+
+
+ <modules>
+ <module>maven</module>
+ <module>commons</module>
+ <module>core</module>
+ <module>tomahawk</module>
+ <module>site</module>
+ </modules>
+
+ <build>
+ <defaultGoal>install</defaultGoal>
+ </build>
+
+
+</project>
+
Modified: myfaces/maven/trunk/master-pom/pom.xml
URL: http://svn.apache.org/viewcvs/myfaces/maven/trunk/master-pom/pom.xml?rev=369815&r1=369814&r2=369815&view=diff
==============================================================================
--- myfaces/maven/trunk/master-pom/pom.xml (original)
+++ myfaces/maven/trunk/master-pom/pom.xml Tue Jan 17 07:23:18 2006
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.myfaces.maven</groupId>
- <artifactId>master-pom</artifactId>
+ <artifactId>myfaces-master</artifactId>
<packaging>pom</packaging>
<name>MyFaces Master POM</name>
@@ -16,7 +16,7 @@
<parent>
<groupId>org.apache.myfaces.maven</groupId>
- <artifactId>maven</artifactId>
+ <artifactId>maven-project</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
Modified: myfaces/maven/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/myfaces/maven/trunk/pom.xml?rev=369815&r1=369814&r2=369815&view=diff
==============================================================================
--- myfaces/maven/trunk/pom.xml (original)
+++ myfaces/maven/trunk/pom.xml Tue Jan 17 07:23:18 2006
@@ -3,7 +3,7 @@
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.maven</groupId>
- <artifactId>maven</artifactId>
+ <artifactId>maven-project</artifactId>
<packaging>pom</packaging>
<name>MyFaces Maven</name>
<url>http://myfaces.apache.org</url>
Modified: myfaces/site/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/myfaces/site/trunk/pom.xml?rev=369815&r1=369814&r2=369815&view=diff
==============================================================================
--- myfaces/site/trunk/pom.xml (original)
+++ myfaces/site/trunk/pom.xml Tue Jan 17 07:23:18 2006
@@ -6,13 +6,13 @@
<groupId>org.apache.myfaces</groupId>
<artifactId>myfaces-site</artifactId>
<packaging>pom</packaging>
- <name>MyFaces</name>
+ <name>MyFaces Site</name>
<url>http://myfaces.apache.org</url>
<parent>
- <groupId>org.apache.myfaces</groupId>
- <artifactId>myfaces</artifactId>
- <version>1.1.2-SNAPSHOT</version>
+ <groupId>org.apache.myfaces.maven</groupId>
+ <artifactId>myfaces-master</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<build>
Modified: myfaces/tomahawk/trunk/core/pom.xml
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/core/pom.xml?rev=369815&r1=369814&r2=369815&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/pom.xml (original)
+++ myfaces/tomahawk/trunk/core/pom.xml Tue Jan 17 07:23:18 2006
@@ -3,21 +3,20 @@
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</name>
- <groupId>org.apache.myfaces</groupId>
+ <groupId>org.apache.myfaces.tomahawk</groupId>
<artifactId>tomahawk</artifactId>
<packaging>jar</packaging>
- <version>1.1.2-SNAPSHOT</version>
-
+
<parent>
- <groupId>org.apache.myfaces</groupId>
- <artifactId>myfaces-tomahawk</artifactId>
+ <groupId>org.apache.myfaces.tomahawk</groupId>
+ <artifactId>tomahawk-project</artifactId>
<version>1.1.2-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
- <groupId>org.apache.myfaces</groupId>
+ <groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-impl</artifactId>
<version>1.1.2-SNAPSHOT</version>
<scope>compile</scope>
Modified: myfaces/tomahawk/trunk/examples/blank/pom.xml
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/examples/blank/pom.xml?rev=369815&r1=369814&r2=369815&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/blank/pom.xml (original)
+++ myfaces/tomahawk/trunk/examples/blank/pom.xml Tue Jan 17 07:23:18 2006
@@ -21,8 +21,8 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.myfaces</groupId>
- <artifactId>tomahawk-examples</artifactId>
+ <groupId>org.apache.myfaces.tomahawk</groupId>
+ <artifactId>tomahawk-examples-project</artifactId>
<version>1.1.2-SNAPSHOT</version>
</parent>
<artifactId>myfaces-example-blank</artifactId>
@@ -31,14 +31,5 @@
<build>
<finalName>myfaces-example-blank</finalName>
</build>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.myfaces</groupId>
- <artifactId>tomahawk</artifactId>
- <version>${version}</version>
- <scope>compile</scope>
- </dependency>
- </dependencies>
</project>
Modified: myfaces/tomahawk/trunk/examples/pom.xml
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/examples/pom.xml?rev=369815&r1=369814&r2=369815&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/pom.xml (original)
+++ myfaces/tomahawk/trunk/examples/pom.xml Tue Jan 17 07:23:18 2006
@@ -4,22 +4,30 @@
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
<name>Tomahawk Examples</name>
- <groupId>org.apache.myfaces</groupId>
- <artifactId>tomahawk-examples</artifactId>
+ <groupId>org.apache.myfaces.tomahawk</groupId>
+ <artifactId>tomahawk-examples-project</artifactId>
<parent>
- <groupId>org.apache.myfaces</groupId>
- <artifactId>myfaces-tomahawk</artifactId>
+ <groupId>org.apache.myfaces.tomahawk</groupId>
+ <artifactId>tomahawk-project</artifactId>
<version>1.1.2-SNAPSHOT</version>
</parent>
-
<modules>
<module>blank</module>
<module>simple</module>
<module>tiles</module>
<module>wap</module>
</modules>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.myfaces.tomahawk</groupId>
+ <artifactId>tomahawk</artifactId>
+ <version>${version}</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
</project>
Modified: myfaces/tomahawk/trunk/examples/simple/pom.xml
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/examples/simple/pom.xml?rev=369815&r1=369814&r2=369815&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple/pom.xml (original)
+++ myfaces/tomahawk/trunk/examples/simple/pom.xml Tue Jan 17 07:23:18 2006
@@ -21,8 +21,8 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.myfaces</groupId>
- <artifactId>tomahawk-examples</artifactId>
+ <groupId>org.apache.myfaces.tomahawk</groupId>
+ <artifactId>tomahawk-examples-project</artifactId>
<version>1.1.2-SNAPSHOT</version>
</parent>
<artifactId>myfaces-example-simple</artifactId>
@@ -32,12 +32,4 @@
<finalName>myfaces-example-simple</finalName>
</build>
- <dependencies>
- <dependency>
- <groupId>org.apache.myfaces</groupId>
- <artifactId>tomahawk</artifactId>
- <version>${version}</version>
- <scope>compile</scope>
- </dependency>
- </dependencies>
</project>
Modified: myfaces/tomahawk/trunk/examples/tiles/pom.xml
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/examples/tiles/pom.xml?rev=369815&r1=369814&r2=369815&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/tiles/pom.xml (original)
+++ myfaces/tomahawk/trunk/examples/tiles/pom.xml Tue Jan 17 07:23:18 2006
@@ -21,8 +21,8 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.myfaces</groupId>
- <artifactId>tomahawk-examples</artifactId>
+ <groupId>org.apache.myfaces.tomahawk</groupId>
+ <artifactId>tomahawk-examples-project</artifactId>
<version>1.1.2-SNAPSHOT</version>
</parent>
<artifactId>myfaces-example-tiles</artifactId>
@@ -32,12 +32,4 @@
<finalName>myfaces-example-tiles</finalName>
</build>
- <dependencies>
- <dependency>
- <groupId>org.apache.myfaces</groupId>
- <artifactId>tomahawk</artifactId>
- <version>${version}</version>
- <scope>compile</scope>
- </dependency>
- </dependencies>
</project>
Modified: myfaces/tomahawk/trunk/examples/wap/pom.xml
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/examples/wap/pom.xml?rev=369815&r1=369814&r2=369815&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/wap/pom.xml (original)
+++ myfaces/tomahawk/trunk/examples/wap/pom.xml Tue Jan 17 07:23:18 2006
@@ -21,8 +21,8 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.myfaces</groupId>
- <artifactId>tomahawk-examples</artifactId>
+ <groupId>org.apache.myfaces.tomahawk</groupId>
+ <artifactId>tomahawk-examples-project</artifactId>
<version>1.1.2-SNAPSHOT</version>
</parent>
<artifactId>myfaces-example-wap</artifactId>
@@ -31,14 +31,5 @@
<build>
<finalName>myfaces-example-wap</finalName>
</build>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.myfaces</groupId>
- <artifactId>tomahawk</artifactId>
- <version>${version}</version>
- <scope>compile</scope>
- </dependency>
- </dependencies>
</project>
Modified: myfaces/tomahawk/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/pom.xml?rev=369815&r1=369814&r2=369815&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/pom.xml (original)
+++ myfaces/tomahawk/trunk/pom.xml Tue Jan 17 07:23:18 2006
@@ -2,23 +2,26 @@
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</groupId>
- <artifactId>myfaces-tomahawk</artifactId>
+ <groupId>org.apache.myfaces.tomahawk</groupId>
+ <artifactId>tomahawk-project</artifactId>
<packaging>pom</packaging>
<name>MyFaces Tomahawk</name>
<url>http://myfaces.apache.org/tomahawk</url> <!-- TODO which url has tomahawk? -->
+ <version>1.1.2-SNAPSHOT</version>
<description>
This is the MyFaces Tomahawk Subproject Description [INSERT MORE STUFF HERE]
</description>
+
<parent>
- <groupId>org.apache.myfaces</groupId>
- <artifactId>myfaces</artifactId>
- <version>1.1.2-SNAPSHOT</version>
+ <groupId>org.apache.myfaces.maven</groupId>
+ <artifactId>myfaces-master</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
-
+
<modules>
- <module>tomahawk</module>
- <module>tomahawk-examples</module>
+ <module>core</module>
+ <module>examples</module>
+ <module>sandbox</module>
</modules>
<scm>
Modified: myfaces/tomahawk/trunk/sandbox/core/pom.xml
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/sandbox/core/pom.xml?rev=369815&r1=369814&r2=369815&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core/pom.xml (original)
+++ myfaces/tomahawk/trunk/sandbox/core/pom.xml Tue Jan 17 07:23:18 2006
@@ -3,8 +3,7 @@
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</groupId>
- <artifactId>sandbox</artifactId>
+ <artifactId>tomahawk-sandbox</artifactId>
<packaging>jar</packaging>
<name>MyFaces Sandbox</name>
<url>http://myfaces.apache.org</url>
@@ -13,15 +12,15 @@
</description>
<parent>
- <groupId>org.apache.myfaces</groupId>
- <artifactId>myfaces-sandbox</artifactId>
+ <groupId>org.apache.myfaces.tomahawk</groupId>
+ <artifactId>sandbox-project</artifactId>
<version>1.1.2-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
- <groupId>org.apache.myfaces</groupId>
+ <groupId>org.apache.myfaces.tomahawk</groupId>
<artifactId>tomahawk</artifactId>
<version>1.1.2-SNAPSHOT</version>
<scope>compile</scope>
Modified: myfaces/tomahawk/trunk/sandbox/examples/pom.xml
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/sandbox/examples/pom.xml?rev=369815&r1=369814&r2=369815&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/examples/pom.xml (original)
+++ myfaces/tomahawk/trunk/sandbox/examples/pom.xml Tue Jan 17 07:23:18 2006
@@ -21,11 +21,11 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.myfaces</groupId>
- <artifactId>myfaces-sandbox</artifactId>
+ <groupId>org.apache.myfaces.tomahawk</groupId>
+ <artifactId>sandbox-project</artifactId>
<version>1.1.2-SNAPSHOT</version>
</parent>
- <artifactId>sandbox-examples</artifactId>
+ <artifactId>tomahawk-sandbox-examples</artifactId>
<packaging>war</packaging>
<name>MyFaces Examples: Sandbox</name>
<build>
@@ -34,8 +34,8 @@
<dependencies>
<dependency>
- <groupId>org.apache.myfaces</groupId>
- <artifactId>sandbox</artifactId>
+ <groupId>org.apache.myfaces.tomahawk</groupId>
+ <artifactId>tomahawk-sandbox</artifactId>
<version>${version}</version>
<scope>compile</scope>
</dependency>
Added: myfaces/tomahawk/trunk/sandbox/pom.xml
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/sandbox/pom.xml?rev=369815&view=auto
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/pom.xml (added)
+++ myfaces/tomahawk/trunk/sandbox/pom.xml Tue Jan 17 07:23:18 2006
@@ -0,0 +1,33 @@
+<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.tomahawk</groupId>
+ <artifactId>sandbox-project</artifactId>
+ <packaging>pom</packaging>
+ <name>MyFaces Sandbox</name>
+ <url>http://myfaces.apache.org</url>
+ <!-- TODO which url has sandbox? -->
+ <version>1.1.2-SNAPSHOT</version>
+ <description>
+ This is the MyFaces Sandbox Subproject Description [INSERT MORE STUFF HERE]
+ </description>
+
+ <parent>
+ <groupId>org.apache.myfaces.tomahawk</groupId>
+ <artifactId>tomahawk-project</artifactId>
+ <version>1.1.2-SNAPSHOT</version>
+ </parent>
+
+ <modules>
+ <module>core</module>
+ <module>examples</module>
+ </modules>
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/sandbox/trunk</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/sandbox/trunk</developerConnection>
+ <url>http://svn.apache.org/viewcvs.cgi/myfaces/sandbox/trunk</url>
+ </scm>
+
+</project>