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/10 02:01:57 UTC
svn commit: r367440 - in /myfaces: api/trunk/ api/trunk/api/
api/trunk/myfaces-assembly/ commons/trunk/ sandbox/trunk/
sandbox/trunk/sandbox-assembly/ sandbox/trunk/sandbox/
site/trunk/src/site/xdoc/ tomahawk/trunk/ tomahawk/trunk/tomahawk-examples/
to...
Author: schof
Date: Mon Jan 9 17:01:50 2006
New Revision: 367440
URL: http://svn.apache.org/viewcvs?rev=367440&view=rev
Log:
Applied several POM patches from Bernd
Removed:
myfaces/site/trunk/src/site/xdoc/license.xml
Modified:
myfaces/api/trunk/api/pom.xml
myfaces/api/trunk/myfaces-assembly/pom.xml
myfaces/api/trunk/pom.xml
myfaces/commons/trunk/pom.xml
myfaces/sandbox/trunk/pom.xml
myfaces/sandbox/trunk/sandbox-assembly/pom.xml
myfaces/sandbox/trunk/sandbox/pom.xml
myfaces/tomahawk/trunk/pom.xml
myfaces/tomahawk/trunk/tomahawk-examples/blank/pom.xml
myfaces/tomahawk/trunk/tomahawk-examples/pom.xml
myfaces/tomahawk/trunk/tomahawk-examples/wap/pom.xml
myfaces/tomahawk/trunk/tomahawk/pom.xml
Modified: myfaces/api/trunk/api/pom.xml
URL: http://svn.apache.org/viewcvs/myfaces/api/trunk/api/pom.xml?rev=367440&r1=367439&r2=367440&view=diff
==============================================================================
--- myfaces/api/trunk/api/pom.xml (original)
+++ myfaces/api/trunk/api/pom.xml Mon Jan 9 17:01:50 2006
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<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>
@@ -146,11 +147,56 @@
</dependencies>
<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>
+
</project>
Modified: myfaces/api/trunk/myfaces-assembly/pom.xml
URL: http://svn.apache.org/viewcvs/myfaces/api/trunk/myfaces-assembly/pom.xml?rev=367440&r1=367439&r2=367440&view=diff
==============================================================================
--- myfaces/api/trunk/myfaces-assembly/pom.xml (original)
+++ myfaces/api/trunk/myfaces-assembly/pom.xml Mon Jan 9 17:01:50 2006
@@ -34,12 +34,15 @@
</plugins>
</build>
+
<dependencies>
+
<dependency>
<groupId>org.apache.myfaces</groupId>
<artifactId>myfaces-impl</artifactId>
<version>${version}</version>
</dependency>
+
</dependencies>
</project>
Modified: myfaces/api/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/myfaces/api/trunk/pom.xml?rev=367440&r1=367439&r2=367440&view=diff
==============================================================================
--- myfaces/api/trunk/pom.xml (original)
+++ myfaces/api/trunk/pom.xml Mon Jan 9 17:01:50 2006
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<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>
@@ -7,11 +8,11 @@
<packaging>pom</packaging>
<version>1.1.2-SNAPSHOT</version>
<name>MyFaces</name>
- <url>http://myfaces.apache.org</url>
+ <url>http://myfaces.apache.org/projects</url>
<issueManagement>
<system>jira</system>
- <url>http://issues.apache.org/jira/browse/MYFACES</url>
+ <url>http://issues.apache.org/jira/secure/BrowseProject.jspa?id=10600</url>
</issueManagement>
<modules>
@@ -19,8 +20,11 @@
</modules>
<build>
+
<defaultGoal>install</defaultGoal>
+
<plugins>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
@@ -28,7 +32,9 @@
<skip>true</skip>
</configuration>
</plugin>
+
</plugins>
+
<extensions>
<!-- Note: We're using scpexe protocol instead of scp because
jsch has an issue (already reported) that makes it fail.
@@ -39,11 +45,13 @@
<artifactId>wagon-ssh-external</artifactId>
<version>1.0-alpha-5</version>
</extension>
+
</extensions>
</build>
<mailingLists>
+
<mailingList>
<name>Myfaces User List</name>
<subscribe>users-subscribe@myfaces.apache.org</subscribe>
@@ -51,6 +59,7 @@
<post>users@myfaces.apache.org</post>
<archive>http://mail-archives.apache.org/mod_mbox/myfaces-users</archive>
</mailingList>
+
<mailingList>
<name>Myfaces Developer List</name>
<subscribe>dev-subscribe@myfaces.apache.org</subscribe>
@@ -58,6 +67,7 @@
<post>dev@myfaces.apache.org</post>
<archive>http://mail-archives.apache.org/mod_mbox/myfaces-dev</archive>
</mailingList>
+
<mailingList>
<name>Myfaces Commits List</name>
<subscribe>commits-subscribe@myfaces.apache.org</subscribe>
@@ -65,6 +75,7 @@
<post>do not post</post>
<archive>http://mail-archives.apache.org/mod_mbox/myfaces-commits</archive>
</mailingList>
+
<mailingList>
<name>Myfaces Announcements List</name>
<subscribe>announce-subscribe@myfaces.apache.org</subscribe>
@@ -72,9 +83,11 @@
<post>do not post</post>
<archive>http://mail-archives.apache.org/mod_mbox/myfaces-announce</archive>
</mailingList>
+
</mailingLists>
<developers>
+
<developer>
<id>koinov</id>
<name>Anton Koinov</name>
@@ -263,6 +276,7 @@
<organization></organization>
<timezone>+12</timezone>
</developer>
+
</developers>
<contributors>
@@ -325,65 +339,12 @@
</licenses>
<reporting>
+
<plugins>
- <plugin>
- <inherited>true</inherited>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <reportSets>
- <reportSet>
- <reports>
- <report>project-team</report>
- <report>mailing-list</report>
- <report>issue-tracking</report>
- <report>license</report>
- <report>scm</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>
-
- <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>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
</plugin>
</plugins>
@@ -391,18 +352,20 @@
</reporting>
<dependencies>
+
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
<scope>test</scope>
+
</dependency>
</dependencies>
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/api/trunk</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/api/trunk</developerConnection>
- <url>http://svn.apache.org/viewcvs.cgi/myfaces/</url>
+ <url>http://svn.apache.org/viewcvs.cgi/myfaces/api/trunk</url>
</scm>
<organization>
@@ -410,7 +373,6 @@
<url>http://www.apache.org/</url>
</organization>
-
<pluginRepositories>
<pluginRepository>
<snapshots>
@@ -441,9 +403,9 @@
<site>
<id>apache.site</id>
<name>Apache Website</name>
- <!-- NOTE: We're using sean's public html dir for testing -->
- <url>scpexe://people.apache.org/home/schof/public_html</url>
- <!--url>scpexe://people.apache.org/www/myfaces.apache.org</url-->
+ <!-- NOTE: I'm using my public html dir for testing -->
+ <url>scpexe://minotaur.apache.org/home/bommel/public_html/projects</url>
+ <!--url>scpexe://minotaur.apache.org/www/myfaces.apache.org/projects</url-->
</site>
</distributionManagement>
Modified: myfaces/commons/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/myfaces/commons/trunk/pom.xml?rev=367440&r1=367439&r2=367440&view=diff
==============================================================================
--- myfaces/commons/trunk/pom.xml (original)
+++ myfaces/commons/trunk/pom.xml Mon Jan 9 17:01:50 2006
@@ -1,5 +1,6 @@
-<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">
+<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-commons</artifactId>
@@ -7,20 +8,22 @@
<name>MyFaces Commons</name>
<url>http://myfaces.apache.org</url>
<description>
- This is the MyFaces Commons Subproject Description [INSERT MORE STUFF HERE]
+ 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>
</parent>
+
<dependencies>
<dependency>
<groupId>org.apache.myfaces</groupId>
<artifactId>myfaces-api</artifactId>
- <version>${version}</version>
- <scope>compile</scope>
+ <version>${version}</version>
+ <scope>compile</scope>
</dependency>
<dependency>
@@ -35,93 +38,145 @@
<artifactId>servlet-api</artifactId>
<version>2.3</version>
<scope>provided</scope>
- </dependency>
+ </dependency>
<dependency>
- <groupId>commons-el</groupId>
- <artifactId>commons-el</artifactId>
- <version>1.0</version>
+ <groupId>commons-el</groupId>
+ <artifactId>commons-el</artifactId>
+ <version>1.0</version>
<scope>compile</scope>
- </dependency>
-
+ </dependency>
+
<dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>1.3</version>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.3</version>
<scope>compile</scope>
- </dependency>
-
+ </dependency>
+
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.4</version>
<scope>compile</scope>
- </dependency>
+ </dependency>
<dependency>
- <groupId>portlet-api</groupId>
- <artifactId>portlet-api</artifactId>
- <version>1.0</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
+ <groupId>portlet-api</groupId>
+ <artifactId>portlet-api</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope>
</dependency>
-
+
<dependency>
<groupId>cactus</groupId>
<artifactId>cactus</artifactId>
<version>13-1.7.1</version>
<scope>test</scope>
</dependency>
-
+
<dependency>
<groupId>aspectj</groupId>
<artifactId>aspectjrt</artifactId>
<version>1.2.1</version>
<scope>test</scope>
</dependency>
-
+
<dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
<version>2.0.2</version>
<scope>test</scope>
</dependency>
-
+
<dependency>
<groupId>httpunit</groupId>
<artifactId>httpunit</artifactId>
<version>1.6</version>
<scope>test</scope>
</dependency>
-
+
<dependency>
<groupId>nekohtml</groupId>
<artifactId>nekohtml</artifactId>
<version>0.9.1</version>
<scope>test</scope>
- </dependency>
-
+ </dependency>
+
<dependency>
- <groupId>easymock</groupId>
- <artifactId>easymock</artifactId>
- <version>1.1</version>
- <scope>test</scope>
- </dependency>
+ <groupId>easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <version>1.1</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
- <groupId>easymock</groupId>
- <artifactId>easymockclassextension</artifactId>
- <version>1.1</version>
- <scope>test</scope>
- </dependency>
+ <groupId>easymock</groupId>
+ <artifactId>easymockclassextension</artifactId>
+ <version>1.1</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
-
+
+ <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>
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/commons/trunk</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/commons/trunk</developerConnection>
+ <url>http://svn.apache.org/viewcvs.cgi/myfaces/commons/trunk</url>
+ </scm>
+
</project>
Modified: myfaces/sandbox/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/myfaces/sandbox/trunk/pom.xml?rev=367440&r1=367439&r2=367440&view=diff
==============================================================================
--- myfaces/sandbox/trunk/pom.xml (original)
+++ myfaces/sandbox/trunk/pom.xml Mon Jan 9 17:01:50 2006
@@ -1,21 +1,32 @@
-<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">
+<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-sandbox</artifactId>
<packaging>pom</packaging>
<name>MyFaces Sandbox</name>
- <url>http://myfaces.apache.org</url> <!-- TODO which url has sandbox? -->
+ <url>http://myfaces.apache.org</url>
+ <!-- TODO which url has sandbox? -->
<description>
- This is the MyFaces Sandbox Subproject Description [INSERT MORE STUFF HERE]
+ This is the MyFaces Sandbox Subproject Description [INSERT MORE STUFF HERE]
</description>
+
<parent>
<groupId>org.apache.myfaces</groupId>
<artifactId>myfaces</artifactId>
<version>1.1.2-SNAPSHOT</version>
</parent>
+
<modules>
<module>sandbox</module>
<module>sandbox-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>
Modified: myfaces/sandbox/trunk/sandbox-assembly/pom.xml
URL: http://svn.apache.org/viewcvs/myfaces/sandbox/trunk/sandbox-assembly/pom.xml?rev=367440&r1=367439&r2=367440&view=diff
==============================================================================
--- myfaces/sandbox/trunk/sandbox-assembly/pom.xml (original)
+++ myfaces/sandbox/trunk/sandbox-assembly/pom.xml Mon Jan 9 17:01:50 2006
@@ -1,7 +1,7 @@
-<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">
+<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>sandbox-assembly</artifactId>
<packaging>pom</packaging>
@@ -12,7 +12,7 @@
<parent>
<groupId>org.apache.myfaces</groupId>
- <artifactId>myfaces</artifactId>
+ <artifactId>myfaces-sandbox</artifactId>
<version>1.1.2-SNAPSHOT</version>
</parent>
@@ -34,12 +34,13 @@
</plugins>
</build>
+
<dependencies>
- <dependency>
- <groupId>org.apache.myfaces</groupId>
- <artifactId>sandbox</artifactId>
- <version>${version}</version>
- </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces</groupId>
+ <artifactId>sandbox</artifactId>
+ <version>${version}</version>
+ </dependency>
</dependencies>
</project>
Modified: myfaces/sandbox/trunk/sandbox/pom.xml
URL: http://svn.apache.org/viewcvs/myfaces/sandbox/trunk/sandbox/pom.xml?rev=367440&r1=367439&r2=367440&view=diff
==============================================================================
--- myfaces/sandbox/trunk/sandbox/pom.xml (original)
+++ myfaces/sandbox/trunk/sandbox/pom.xml Mon Jan 9 17:01:50 2006
@@ -1,154 +1,129 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<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>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.myfaces</groupId>
+ <artifactId>sandbox</artifactId>
+ <packaging>jar</packaging>
+ <name>MyFaces Sandbox</name>
+ <url>http://myfaces.apache.org</url>
+ <description>
+ This is the Sandbox Subproject Description [INSERT MORE STUFF HERE]
+ </description>
+
+ <parent>
<groupId>org.apache.myfaces</groupId>
- <artifactId>sandbox</artifactId>
- <packaging>jar</packaging>
- <name>MyFaces Sandbox</name>
- <url>http://myfaces.apache.org</url>
- <description>
- This is the Sandbox Subproject Description [INSERT MORE STUFF HERE]
- </description>
-
- <parent>
- <groupId>org.apache.myfaces</groupId>
- <artifactId>myfaces-sandbox</artifactId>
- <version>1.1.2-SNAPSHOT</version>
- </parent>
-
- <dependencies>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.myfaces</groupId>
- <artifactId>tomahawk</artifactId>
- <version>1.1.2-SNAPSHOT</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.0</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.3</version>
- <scope>provided</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- <resource>
- <directory>src/main/resources-facesconfig</directory>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>xslt-maven-plugin</artifactId>
- <version>1.0-SNAPSHOT</version>
- <configuration>
- <xslFile>src/main/tld/misc/resolve_entities.xsl</xslFile>
- <srcIncludes>**/*.tld</srcIncludes>
- <srcDir>src/main/tld</srcDir>
- <destDir>target/classes/META-INF</destDir>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>transform</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <reporting>
- <plugins>
- <plugin>
- <inherited>false</inherited>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <reportSets>
- <reportSet>
- <reports>
- <report>project-team</report>
- <report>dependencies</report>
- <report>mailing-list</report>
- <report>issue-tracking</report>
- <report>license</report>
- <report>scm</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>
-
- <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>
-
- </plugins>
- </reporting>
-
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/sandbox</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/sandbox</developerConnection>
- <url>http://svn.apache.org/viewcvs.cgi/myfaces/sandbox</url>
- </scm>
+ <artifactId>myfaces-sandbox</artifactId>
+ <version>1.1.2-SNAPSHOT</version>
+ </parent>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.myfaces</groupId>
+ <artifactId>tomahawk</artifactId>
+ <version>1.1.2-SNAPSHOT</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.0</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.3</version>
+ <scope>provided</scope>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <directory>src/main/resources-facesconfig</directory>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>xslt-maven-plugin</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <configuration>
+ <xslFile>src/main/tld/misc/resolve_entities.xsl</xslFile>
+ <srcIncludes>**/*.tld</srcIncludes>
+ <srcDir>src/main/tld</srcDir>
+ <destDir>target/classes/META-INF</destDir>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>transform</goal>
+ </goals>
+ </execution>
+ </executions>
+ </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>
+
</project>
Modified: myfaces/tomahawk/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/pom.xml?rev=367440&r1=367439&r2=367440&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/pom.xml (original)
+++ myfaces/tomahawk/trunk/pom.xml Mon Jan 9 17:01:50 2006
@@ -1,27 +1,30 @@
-<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">
+<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-tomahawk</artifactId>
<packaging>pom</packaging>
<name>MyFaces Tomahawk</name>
- <url>http://myfaces.apache.org/tomahawk</url>
+ <url>http://myfaces.apache.org/tomahawk</url> <!-- TODO which url has tomahawk? -->
<description>
- This is the MyFaces Tomahawk Subproject Description [INSERT MORE STUFF HERE]
+ 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>
</parent>
+
+ <modules>
+ <module>tomahawk</module>
+ <module>tomahawk-examples</module>
+ </modules>
+
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/tomahawk/trunk</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/tomahawk/trunk</developerConnection>
<url>http://svn.apache.org/viewcvs.cgi/myfaces/tomahawk/trunk</url>
</scm>
- <modules>
- <module>tomahawk</module>
- <module>tomahawk-examples</module>
- </modules>
</project>
Modified: myfaces/tomahawk/trunk/tomahawk-examples/blank/pom.xml
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/tomahawk-examples/blank/pom.xml?rev=367440&r1=367439&r2=367440&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/tomahawk-examples/blank/pom.xml (original)
+++ myfaces/tomahawk/trunk/tomahawk-examples/blank/pom.xml Mon Jan 9 17:01:50 2006
@@ -40,4 +40,5 @@
<scope>compile</scope>
</dependency>
</dependencies>
+
</project>
Modified: myfaces/tomahawk/trunk/tomahawk-examples/pom.xml
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/tomahawk-examples/pom.xml?rev=367440&r1=367439&r2=367440&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/tomahawk-examples/pom.xml (original)
+++ myfaces/tomahawk/trunk/tomahawk-examples/pom.xml Mon Jan 9 17:01:50 2006
@@ -1,20 +1,25 @@
-<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">
+<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>
+ <packaging>pom</packaging>
+ <name>Tomahawk Examples</name>
+ <groupId>org.apache.myfaces</groupId>
+ <artifactId>tomahawk-examples</artifactId>
+
<parent>
<groupId>org.apache.myfaces</groupId>
<artifactId>myfaces-tomahawk</artifactId>
<version>1.1.2-SNAPSHOT</version>
</parent>
- <packaging>pom</packaging>
- <name>Tomahawk Examples</name>
- <groupId>org.apache.myfaces</groupId>
- <artifactId>tomahawk-examples</artifactId>
+
+
<modules>
<module>blank</module>
<module>simple</module>
<module>tiles</module>
<module>wap</module>
</modules>
+
</project>
Modified: myfaces/tomahawk/trunk/tomahawk-examples/wap/pom.xml
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/tomahawk-examples/wap/pom.xml?rev=367440&r1=367439&r2=367440&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/tomahawk-examples/wap/pom.xml (original)
+++ myfaces/tomahawk/trunk/tomahawk-examples/wap/pom.xml Mon Jan 9 17:01:50 2006
@@ -40,4 +40,5 @@
<scope>compile</scope>
</dependency>
</dependencies>
+
</project>
Modified: myfaces/tomahawk/trunk/tomahawk/pom.xml
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/tomahawk/pom.xml?rev=367440&r1=367439&r2=367440&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/tomahawk/pom.xml (original)
+++ myfaces/tomahawk/trunk/tomahawk/pom.xml Mon Jan 9 17:01:50 2006
@@ -1,208 +1,198 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<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>
+ <modelVersion>4.0.0</modelVersion>
+ <name>Tomahawk</name>
+ <groupId>org.apache.myfaces</groupId>
+ <artifactId>tomahawk</artifactId>
+ <packaging>jar</packaging>
+ <version>1.1.2-SNAPSHOT</version>
+ <parent>
<groupId>org.apache.myfaces</groupId>
- <artifactId>tomahawk</artifactId>
- <packaging>jar</packaging>
+ <artifactId>myfaces-tomahawk</artifactId>
<version>1.1.2-SNAPSHOT</version>
+ </parent>
- <parent>
- <groupId>org.apache.myfaces</groupId>
- <artifactId>myfaces-tomahawk</artifactId>
- <version>1.1.2-SNAPSHOT</version>
- </parent>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.myfaces</groupId>
- <artifactId>myfaces-impl</artifactId>
- <version>1.1.2-SNAPSHOT</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.0</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.3</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>commons-validator</groupId>
- <artifactId>commons-validator</artifactId>
- <version>1.2.0</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>struts</groupId>
- <artifactId>struts</artifactId>
- <version>1.2.8</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>cactus</groupId>
- <artifactId>cactus</artifactId>
- <version>13-1.7.1</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>aspectj</groupId>
- <artifactId>aspectjrt</artifactId>
- <version>1.2.1</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- <version>2.0.2</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>httpunit</groupId>
- <artifactId>httpunit</artifactId>
- <version>1.6</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>nekohtml</groupId>
- <artifactId>nekohtml</artifactId>
- <version>0.9.1</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>easymock</groupId>
- <artifactId>easymock</artifactId>
- <version>1.1</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>easymock</groupId>
- <artifactId>easymockclassextension</artifactId>
- <version>1.1</version>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- <resource>
- <directory>src/main/resources-facesconfig</directory>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>xslt-maven-plugin</artifactId>
- <version>1.0-SNAPSHOT</version>
- <configuration>
- <xslFile>src/main/tld/misc/resolve_entities.xsl</xslFile>
- <srcIncludes>**/*.tld</srcIncludes>
- <srcDir>src/main/tld</srcDir>
- <destDir>target/classes/META-INF</destDir>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>transform</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <reporting>
- <plugins>
- <plugin>
- <inherited>false</inherited>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <reportSets>
- <reportSet>
- <reports>
- <report>project-team</report>
- <report>dependencies</report>
- <report>mailing-list</report>
- <report>issue-tracking</report>
- <report>license</report>
- <report>scm</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>
-
- <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>
+ <dependencies>
- </plugins>
- </reporting>
+ <dependency>
+ <groupId>org.apache.myfaces</groupId>
+ <artifactId>myfaces-impl</artifactId>
+ <version>1.1.2-SNAPSHOT</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.0</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.3</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-validator</groupId>
+ <artifactId>commons-validator</artifactId>
+ <version>1.2.0</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>portlet-api</groupId>
+ <artifactId>portlet-api</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>struts</groupId>
+ <artifactId>struts</artifactId>
+ <version>1.2.8</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>cactus</groupId>
+ <artifactId>cactus</artifactId>
+ <version>13-1.7.1</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>aspectj</groupId>
+ <artifactId>aspectjrt</artifactId>
+ <version>1.2.1</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>2.0.2</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>httpunit</groupId>
+ <artifactId>httpunit</artifactId>
+ <version>1.6</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>nekohtml</groupId>
+ <artifactId>nekohtml</artifactId>
+ <version>0.9.1</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <version>1.1</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>easymock</groupId>
+ <artifactId>easymockclassextension</artifactId>
+ <version>1.1</version>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <directory>src/main/resources-facesconfig</directory>
+ </resource>
+ </resources>
+
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>xslt-maven-plugin</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <configuration>
+ <xslFile>src/main/tld/misc/resolve_entities.xsl</xslFile>
+ <srcIncludes>**/*.tld</srcIncludes>
+ <srcDir>src/main/tld</srcDir>
+ <destDir>target/classes/META-INF</destDir>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>transform</goal>
+ </goals>
+ </execution>
+ </executions>
+ </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>
-
</project>