You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by sk...@apache.org on 2008/07/02 12:12:00 UTC
svn commit: r673346 - in /myfaces/tomahawk/trunk: core/pom.xml
examples/pom.xml examples/simple/pom.xml pom.xml sandbox/core/pom.xml
sandbox/pom.xml sandbox15/core/pom.xml sandbox15/examples/pom.xml
Author: skitching
Date: Wed Jul 2 03:11:59 2008
New Revision: 673346
URL: http://svn.apache.org/viewvc?rev=673346&view=rev
Log:
Simplify the pom files for tomahawk module.
Includes some whitespace cleanups in poms.
Disable core12 and sandbox12 modules for now; they don't build.
Modified:
myfaces/tomahawk/trunk/core/pom.xml
myfaces/tomahawk/trunk/examples/pom.xml
myfaces/tomahawk/trunk/examples/simple/pom.xml
myfaces/tomahawk/trunk/pom.xml
myfaces/tomahawk/trunk/sandbox/core/pom.xml
myfaces/tomahawk/trunk/sandbox/pom.xml
myfaces/tomahawk/trunk/sandbox15/core/pom.xml
myfaces/tomahawk/trunk/sandbox15/examples/pom.xml
Modified: myfaces/tomahawk/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/pom.xml?rev=673346&r1=673345&r2=673346&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/pom.xml (original)
+++ myfaces/tomahawk/trunk/core/pom.xml Wed Jul 2 03:11:59 2008
@@ -102,19 +102,31 @@
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>batik</groupId>
+ <artifactId>batik-awt-util</artifactId>
+ <version>1.6-1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.lowagie</groupId>
+ <artifactId>itext</artifactId>
+ <version>1.4.8</version>
+ </dependency>
+
<!-- provided dependencies -->
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
- <version>1.1.6-SNAPSHOT</version>
+ <version>${myfaces-core11-version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.myfaces.shared</groupId>
<artifactId>myfaces-shared-tomahawk</artifactId>
- <version>2.0.8-SNAPSHOT</version>
+ <version>${myfaces-shared11-version}</version>
<scope>provided</scope> <!-- because we add all classes to the jar directly -->
</dependency>
@@ -158,7 +170,7 @@
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-impl</artifactId>
- <version>1.1.5</version>
+ <version>${myfaces-core11-version}</version>
<!--
Since Tomahawk must stay compatible to other JSF implementations we
must not have any (compile time) dependency on myfaces-impl other than
@@ -392,26 +404,6 @@
</excludes>
</configuration>
</plugin>
- <!--
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>xslt-maven-plugin</artifactId>
- <version>1.0</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>
- -->
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.0</version>
@@ -542,55 +534,20 @@
<id>generate-site</id>
<build>
<plugins>
- <!--
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>xslt-maven-plugin</artifactId>
- <version>1.0</version>
- <executions>
- <execution>
- <id>generate-tld-for-tlddoc</id>
- <goals>
- <goal>transform</goal>
- </goals>
- <configuration>
- <xslFile>src/main/tld/misc/resolve_entities-tlddoc.xsl</xslFile>
- <srcIncludes>**/*.tld</srcIncludes>
- <srcDir>src/main/tld</srcDir>
- <destDir>target/tlddoc-site</destDir>
- </configuration>
- </execution>
- <execution>
- <id>generate-tld-for-jar</id>
- <goals>
- <goal>transform</goal>
- </goals>
- <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>
- </execution>
- </executions>
- </plugin>
- -->
- <plugin>
- <!-- Generate report content -->
+ <!-- Generate content for custom tagdoc report -->
<groupId>org.apache.myfaces.buildtools</groupId>
<artifactId>myfaces-builder-plugin</artifactId>
<version>1.0.1-SNAPSHOT</version>
<configuration>
- <taglibs>
- <t>http://myfaces.apache.org/tomahawk</t>
- </taglibs>
+ <taglibs>
+ <t>http://myfaces.apache.org/tomahawk</t>
+ </taglibs>
</configuration>
<executions>
- <execution>
- <goals>
- <goal>tagdoc-content</goal>
- </goals>
- </execution>
+ <execution>
+ <goals><goal>tagdoc-content</goal></goals>
+ </execution>
</executions>
</plugin>
</plugins>
@@ -606,20 +563,25 @@
</configuration>
</plugin>
<plugin>
- <!-- Generate report index -->
- <groupId>org.apache.myfaces.buildtools</groupId>
- <artifactId>myfaces-builder-plugin</artifactId>
- <version>1.0.1-SNAPSHOT</version>
- <configuration>
- <taglibs>
- <t>http://myfaces.apache.org/tomahawk</t>
- </taglibs>
- </configuration>
+ <!-- which goal is run here? -->
+ <groupId>org.apache.myfaces.buildtools</groupId>
+ <artifactId>myfaces-builder-plugin</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ <configuration>
+ <taglibs>
+ <t>http://myfaces.apache.org/tomahawk</t>
+ </taglibs>
+ </configuration>
</plugin>
</plugins>
</reporting>
</profile>
+
<profile>
+ <!--
+ - Build and install into the repository some additional artifacts that we don't
+ - want to build during normal development because they take too long.
+ -->
<id>generate-assembly</id>
<activation>
<property>
@@ -629,40 +591,8 @@
</activation>
<build>
<plugins>
- <!--
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>xslt-maven-plugin</artifactId>
- <version>1.0</version>
- <executions>
- <execution>
- <id>generate-tld-for-tlddoc</id>
- <goals>
- <goal>transform</goal>
- </goals>
- <configuration>
- <xslFile>src/main/tld/misc/resolve_entities-tlddoc.xsl</xslFile>
- <srcIncludes>**/*.tld</srcIncludes>
- <srcDir>src/main/tld</srcDir>
- <destDir>target/tlddoc-site</destDir>
- </configuration>
- </execution>
- <execution>
- <id>generate-tld-for-jar</id>
- <goals>
- <goal>transform</goal>
- </goals>
- <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>
- </execution>
- </executions>
- </plugin>
- -->
<plugin>
+ <!-- Install in the repository a "-javadoc.jar" file -->
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.4</version>
<executions>
@@ -673,6 +603,7 @@
</executions>
</plugin>
<plugin>
+ <!-- Install in the repository a "-tlddoc.jar" file -->
<groupId>net.sourceforge.maven-taglib</groupId>
<artifactId>maven-taglib-plugin</artifactId>
<configuration>
@@ -687,6 +618,7 @@
</executions>
</plugin>
<plugin>
+ <!-- Install in the repository a "-sources.jar" file -->
<artifactId>maven-source-plugin</artifactId>
<executions>
<execution>
Modified: myfaces/tomahawk/trunk/examples/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/pom.xml?rev=673346&r1=673345&r2=673346&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/pom.xml (original)
+++ myfaces/tomahawk/trunk/examples/pom.xml Wed Jul 2 03:11:59 2008
@@ -11,12 +11,19 @@
- be used to build against a specific version of Tomahawk.
-
- To run any example, cd into that dir and execute:
- - mvn jetty:run # runs against MyFaces 1.1.x
- - mvn -Djsf=12 jetty:run # runs against MyFaces 1.2.x
- - mvn -Djsf=ri12 jetty:run # runs against Sun Reference Implementation 1.2.x
+ - mvn clean jetty:run # runs against MyFaces 1.1.x
+ - mvn -Djsf=12 clean jetty:run # runs against MyFaces 1.2.x
+ - mvn -Djsf=ri12 clean jetty:run # runs against Sun Reference Implementation 1.2.x
+ - Note that "clean" is needed to get rid of any cached precompiled jsp pages; pages compiled against one
+ - version of JSF will not work correctly with another. The jetty plugin caches precompiled pages in the
+ - "target" subdir, so running clean discards them.
-
- It should also be possible to run the samples in containers other than jetty via the cargo plugin:
- mvn cargo:start
+ -
+ - To start jetty with debugging enabled (so you can later attach a debugger to the server instance),
+ - you can do this:
+ - MAVEN_OPTS="-Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,address=8085,server=y,suspend=n" mvn jetty:run
-->
<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">
@@ -98,8 +105,51 @@
</dependencies>
</profile>
+ <!-- To run the examples using MyFaces 1.1: do not specify a jsf property -->
+ <profile>
+ <id>myfaces-1.1</id>
+ <activation>
+ <property>
+ <name>!jsf</name>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <version>${myfaces-core11-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-impl</artifactId>
+ <version>${myfaces-core11-version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>jstl</groupId>
+ <artifactId>jstl</artifactId>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>taglibs</groupId>
+ <artifactId>standard</artifactId>
+ <version>1.1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-el_1.0_spec</artifactId>
+ <version>1.0-M1</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+ <properties>
+ <jsf_implementation>MyFaces 1.2</jsf_implementation>
+ </properties>
+ </profile>
+
- <!-- To use the examples using MyFaces 1.2: -Djsf=12 -->
+ <!-- To run the examples using MyFaces 1.2: -Djsf=12 -->
<profile>
<id>myfaces-1.2</id>
<activation>
@@ -144,9 +194,89 @@
</profile>
+ <!-- To run the examples using Sun's JSF Reference Implementation 1.1: -Djsf=ri -->
+ <profile>
+ <id>jsfri-1.1</id>
+ <activation>
+ <property>
+ <name>jsf</name>
+ <value>ri</value>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <version>1.1_02</version>
+ <exclusions>
+ <exclusion>
+ <groupId>java.servlet.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.servlet.jsp.jstl</groupId>
+ <artifactId>jstl</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ <version>1.1_02</version>
+ <scope>${jsf-impl.scope}</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>java.servlet.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.servlet.jsp.jstl</groupId>
+ <artifactId>jstl</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ <version>1.1.0</version>
+ <scope>${jsf-impl.scope}</scope>
+ </dependency>
+ </dependencies>
+
+ <repositories>
+ <repository>
+ <id>java.net</id>
+ <name>java.net Maven 1 Repository</name>
+ <url>https://maven-repository.dev.java.net/nonav/repository</url>
+ <layout>legacy</layout>
+ </repository>
+
+ <repository>
+ <id>Maven2 Repo1</id>
+ <name>Maven2 Repo1</name>
+ <url>http://repo1.maven.org/maven2</url>
+ <layout>legacy</layout>
+ </repository>
+
+ </repositories>
+
+ <properties>
+ <jsf_implementation>JSF-RI</jsf_implementation>
+ </properties>
+ </profile>
+
<!-- To use the examples using the Sun's JSF Reference Implementation 1.2 : -Djsf=ri12 -->
<profile>
- <id>jsfri</id>
+ <id>jsfri-1.2</id>
<activation>
<property>
<name>jsf</name>
Modified: myfaces/tomahawk/trunk/examples/simple/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple/pom.xml?rev=673346&r1=673345&r2=673346&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple/pom.xml (original)
+++ myfaces/tomahawk/trunk/examples/simple/pom.xml Wed Jul 2 03:11:59 2008
@@ -63,30 +63,25 @@
<hostedqa.appConfigs>56</hostedqa.appConfigs>
</properties>
</profile>
- <profile>
- <id>myfaces-1.2</id>
- <activation>
- <property>
- <name>jsf</name>
- <value>12</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
- </profile>
</profiles>
<dependencies>
<dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.3</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.0.4</version>
+ <version>1.1.1</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.13</version>
<scope>compile</scope>
</dependency>
</dependencies>
Modified: myfaces/tomahawk/trunk/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/pom.xml?rev=673346&r1=673345&r2=673346&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/pom.xml (original)
+++ myfaces/tomahawk/trunk/pom.xml Wed Jul 2 03:11:59 2008
@@ -1,4 +1,13 @@
-<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 pom for all tomahawk and sandbox code.
+ -
+ - This is also a "module" pom that builds child modules.
+ -->
+<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>
<parent>
@@ -33,30 +42,11 @@
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- <version>${myfaces.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-impl</artifactId>
- <version>${myfaces.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.myfaces.shared</groupId>
- <artifactId>myfaces-shared-tomahawk</artifactId>
- <version>${myfaces-shared.version}</version>
- </dependency>
-
- <dependency>
<groupId>com.sun.facelets</groupId>
<artifactId>jsf-facelets</artifactId>
<version>1.1.14</version>
<scope>provided</scope>
</dependency>
-
</dependencies>
</dependencyManagement>
@@ -81,7 +71,6 @@
</site>
</distributionManagement>
-
<profiles>
<profile>
<activation>
@@ -91,170 +80,32 @@
<module>sandbox15</module>
</modules>
</profile>
-
- <!-- By default the war examples use myfaces! :) -->
- <profile>
- <id>myfaces</id>
- <activation>
- <property>
- <name>!jsf</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- <version>${myfaces.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-impl</artifactId>
- <version>${myfaces.version}</version>
- <scope>${jsf-impl.scope}</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.3</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>batik</groupId>
- <artifactId>batik-awt-util</artifactId>
- <version>1.6-1</version>
- </dependency>
- <dependency>
- <groupId>com.lowagie</groupId>
- <artifactId>itext</artifactId>
- <version>1.4.8</version>
- </dependency>
- </dependencies>
-
- <properties>
- <jsf_implementation>MyFaces ${myfaces.version}</jsf_implementation>
- </properties>
- </profile>
-
- <!-- To use the examples using the Sun's JSF Reference Implementation 1.1: -Djsf=ri -->
- <profile>
- <id>jsfri</id>
- <activation>
- <property>
- <name>jsf</name>
- <value>ri</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- <version>1.1_02</version>
- <exclusions>
- <exclusion>
- <groupId>java.servlet.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.servlet.jsp.jstl</groupId>
- <artifactId>jstl</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-impl</artifactId>
- <version>1.1_02</version>
- <scope>${jsf-impl.scope}</scope>
- <exclusions>
- <exclusion>
- <groupId>java.servlet.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.servlet.jsp.jstl</groupId>
- <artifactId>jstl</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
- <version>1.1.0</version>
- <scope>${jsf-impl.scope}</scope>
- </dependency>
-
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.3</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>batik</groupId>
- <artifactId>batik-awt-util</artifactId>
- <version>1.6-1</version>
- </dependency>
-
- <dependency>
- <groupId>com.lowagie</groupId>
- <artifactId>itext</artifactId>
- <version>1.4.8</version>
- </dependency>
-
- </dependencies>
-
- <repositories>
- <repository>
- <id>java.net</id>
- <name>java.net Maven 1 Repository</name>
- <url>https://maven-repository.dev.java.net/nonav/repository</url>
- <layout>legacy</layout>
- </repository>
-
- <repository>
- <id>Maven2 Repo1</id>
- <name>Maven2 Repo1</name>
- <url>http://repo1.maven.org/maven2</url>
- <layout>legacy</layout>
- </repository>
-
- </repositories>
-
- <properties>
- <jsf_implementation>JSF-RI</jsf_implementation>
- </properties>
- </profile>
</profiles>
-
+
<modules>
<module>core</module>
+<!--
<module>core12</module>
+-->
<module>examples</module>
<module>sandbox</module>
</modules>
<properties>
- <myfaces.version>1.1.6-SNAPSHOT</myfaces.version>
- <myfaces-shared.version>2.0.8-SNAPSHOT</myfaces-shared.version>
- <jsf-impl.scope>test</jsf-impl.scope>
+ <!--
+ - Define what version of myfaces core 1.1 libs tomahawk and sandbox
+ - code will be compiled and tested against.
+ -
+ - This also affects what version of myfaces the sandbox examples run
+ - against *when jsf1.1 is selected*. When jsf1.2 or a Sun implementation
+ - are selected for running the examples, this is ignored.
+ -->
+ <myfaces-core11-version>1.1.6-SNAPSHOT</myfaces-core11-version>
+
+ <!--
+ - Define what shared lib version tomahawk and sandbox code will be compiled with.
+ -->
+ <myfaces-shared11-version>2.0.8-SNAPSHOT</myfaces-shared11-version>
</properties>
</project>
Modified: myfaces/tomahawk/trunk/sandbox/core/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/core/pom.xml?rev=673346&r1=673345&r2=673346&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core/pom.xml (original)
+++ myfaces/tomahawk/trunk/sandbox/core/pom.xml Wed Jul 2 03:11:59 2008
@@ -100,6 +100,7 @@
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
+ <version>${myfaces-core11-version}</version>
<scope>provided</scope>
</dependency>
@@ -143,15 +144,16 @@
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-impl</artifactId>
+ <version>${myfaces-core11-version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>maven-taglib</groupId>
- <artifactId>maven-taglib-plugin</artifactId>
- <version>1.4.2</version>
- <scope>test</scope>
- </dependency>
+ <dependency>
+ <groupId>maven-taglib</groupId>
+ <artifactId>maven-taglib-plugin</artifactId>
+ <version>1.4.2</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.shale</groupId>
@@ -195,120 +197,98 @@
-->
</resources>
<plugins>
- <plugin>
- <groupId>org.apache.myfaces.buildtools</groupId>
- <artifactId>myfaces-builder-plugin</artifactId>
- <version>1.0.1-SNAPSHOT</version>
- <executions>
- <execution>
- <!-- A hierarchy of different tag classes must be created,
- because this classes are not part of the public api. The
- generation of all html package is the same. Please note that
- we need only a subset -->
- <configuration>
- <replacePackagePrefixTagFrom>org.apache.myfaces.taglib</replacePackagePrefixTagFrom>
- <replacePackagePrefixTagTo>org.apache.myfaces.shared_tomahawk.taglib</replacePackagePrefixTagTo>
- </configuration>
- <goals>
- <goal>build-metadata</goal>
- </goals>
- </execution>
- <execution>
- <id>makefacesconfig</id>
- <configuration>
- <xmlFile>META-INF/faces-config.xml</xmlFile>
- </configuration>
- <goals>
- <goal>make-config</goal>
- </goals>
- </execution>
- <execution>
- <id>makecomp</id>
- <goals>
- <goal>make-components</goal>
- </goals>
- </execution>
- <execution>
- <id>makeval</id>
- <goals>
- <goal>make-validators</goal>
- </goals>
- </execution>
- <execution>
- <id>maketags</id>
- <goals>
- <goal>make-tags</goal>
- </goals>
- </execution>
- <execution>
- <id>make_validator_tags_tomahawk</id>
- <goals>
- <goal>make-validator-tags</goal>
- <goal>make-converter-tags</goal>
- </goals>
- </execution>
- <execution>
- <id>makesandboxtld</id>
- <configuration>
- <xmlFile>META-INF/myfaces_sandbox.tld</xmlFile>
- <xmlBaseFile>src/main/conf/META-INF/myfaces_sandbox-base.tld</xmlBaseFile>
- <templateFile>tomahawk.vm</templateFile>
- <params>
- <shortname>s</shortname>
- <uri>http://myfaces.apache.org/sandbox</uri>
- <displayname>Tomahawk sandbox tag library.</displayname>
- <description>Enhanced standard JSP actions and custom MyFaces actions.</description>
- </params>
- <modelIds>
- <modelId>tomahawk-sandbox</modelId>
- </modelIds>
- </configuration>
- <goals>
- <goal>make-config</goal>
- </goals>
- </execution>
- <execution>
- <id>makesandboxtaglib</id>
- <configuration>
- <xmlFile>META-INF/sandbox.taglib.xml</xmlFile>
- <xmlBaseFile>src/main/conf/META-INF/facelets-taglib-base.xml</xmlBaseFile>
- <templateFile>facelets-taglib.vm</templateFile>
- <params>
+ <plugin>
+ <groupId>org.apache.myfaces.buildtools</groupId>
+ <artifactId>myfaces-builder-plugin</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <!-- A hierarchy of different tag classes must be created,
+ because this classes are not part of the public api. The
+ generation of all html package is the same. Please note that
+ we need only a subset -->
+ <configuration>
+ <replacePackagePrefixTagFrom>org.apache.myfaces.taglib</replacePackagePrefixTagFrom>
+ <replacePackagePrefixTagTo>org.apache.myfaces.shared_tomahawk.taglib</replacePackagePrefixTagTo>
+ </configuration>
+ <goals>
+ <goal>build-metadata</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>makefacesconfig</id>
+ <configuration>
+ <xmlFile>META-INF/faces-config.xml</xmlFile>
+ </configuration>
+ <goals>
+ <goal>make-config</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>makecomp</id>
+ <goals>
+ <goal>make-components</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>makeval</id>
+ <goals>
+ <goal>make-validators</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>maketags</id>
+ <goals>
+ <goal>make-tags</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>make_validator_tags_tomahawk</id>
+ <goals>
+ <goal>make-validator-tags</goal>
+ <goal>make-converter-tags</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>makesandboxtld</id>
+ <configuration>
+ <xmlFile>META-INF/myfaces_sandbox.tld</xmlFile>
+ <xmlBaseFile>src/main/conf/META-INF/myfaces_sandbox-base.tld</xmlBaseFile>
+ <templateFile>tomahawk.vm</templateFile>
+ <params>
<shortname>s</shortname>
<uri>http://myfaces.apache.org/sandbox</uri>
- </params>
- <modelIds>
- <modelId>tomahawk-sandbox</modelId>
- </modelIds>
- </configuration>
- <goals>
- <goal>make-config</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <!--
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>xslt-maven-plugin</artifactId>
- <version>1.0</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>
+ <displayname>Tomahawk sandbox tag library.</displayname>
+ <description>Enhanced standard JSP actions and custom MyFaces actions.</description>
+ </params>
+ <modelIds>
+ <modelId>tomahawk-sandbox</modelId>
+ </modelIds>
+ </configuration>
+ <goals>
+ <goal>make-config</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>makesandboxtaglib</id>
+ <configuration>
+ <xmlFile>META-INF/sandbox.taglib.xml</xmlFile>
+ <xmlBaseFile>src/main/conf/META-INF/facelets-taglib-base.xml</xmlBaseFile>
+ <templateFile>facelets-taglib.vm</templateFile>
+ <params>
+ <shortname>s</shortname>
+ <uri>http://myfaces.apache.org/sandbox</uri>
+ </params>
+ <modelIds>
+ <modelId>tomahawk-sandbox</modelId>
+ </modelIds>
+ </configuration>
+ <goals>
+ <goal>make-config</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
- -->
-
</plugins>
</build>
@@ -364,57 +344,24 @@
<id>generate-site</id>
<build>
<plugins>
- <!--
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>xslt-maven-plugin</artifactId>
- <version>1.0</version>
+ <!-- Generate report content -->
+ <groupId>org.apache.myfaces.buildtools</groupId>
+ <artifactId>myfaces-builder-plugin</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ <configuration>
+ <taglibs>
+ <s>http://myfaces.apache.org/sandbox</s>
+ </taglibs>
+ </configuration>
<executions>
<execution>
- <id>generate-tld-for-tlddoc</id>
<goals>
- <goal>transform</goal>
+ <goal>tagdoc-content</goal>
</goals>
- <configuration>
- <xslFile>src/main/tld/misc/resolve_entities-tlddoc.xsl</xslFile>
- <srcIncludes>**/*.tld</srcIncludes>
- <srcDir>src/main/tld</srcDir>
- <destDir>target/tlddoc-site</destDir>
- </configuration>
- </execution>
- <execution>
- <id>generate-tld-for-jar</id>
- <goals>
- <goal>transform</goal>
- </goals>
- <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>
</execution>
</executions>
</plugin>
- -->
- <plugin>
- <!-- Generate report content -->
- <groupId>org.apache.myfaces.buildtools</groupId>
- <artifactId>myfaces-builder-plugin</artifactId>
- <version>1.0.1-SNAPSHOT</version>
- <configuration>
- <taglibs>
- <s>http://myfaces.apache.org/sandbox</s>
- </taglibs>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>tagdoc-content</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
<reporting>
@@ -427,17 +374,17 @@
<tldDocDir>${basedir}/target/site/tlddoc</tldDocDir>
</configuration>
</plugin>
- <plugin>
- <!-- Generate report index -->
- <groupId>org.apache.myfaces.buildtools</groupId>
- <artifactId>myfaces-builder-plugin</artifactId>
- <version>1.0.1-SNAPSHOT</version>
- <configuration>
- <taglibs>
- <s>http://myfaces.apache.org/sandbox</s>
- </taglibs>
- </configuration>
- </plugin>
+ <plugin>
+ <!-- Generate report index -->
+ <groupId>org.apache.myfaces.buildtools</groupId>
+ <artifactId>myfaces-builder-plugin</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ <configuration>
+ <taglibs>
+ <s>http://myfaces.apache.org/sandbox</s>
+ </taglibs>
+ </configuration>
+ </plugin>
</plugins>
</reporting>
</profile>
@@ -451,39 +398,6 @@
</activation>
<build>
<plugins>
- <!--
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>xslt-maven-plugin</artifactId>
- <version>1.0</version>
- <executions>
- <execution>
- <id>generate-tld-for-tlddoc</id>
- <goals>
- <goal>transform</goal>
- </goals>
- <configuration>
- <xslFile>src/main/tld/misc/resolve_entities-tlddoc.xsl</xslFile>
- <srcIncludes>**/*.tld</srcIncludes>
- <srcDir>src/main/tld</srcDir>
- <destDir>target/tlddoc-site</destDir>
- </configuration>
- </execution>
- <execution>
- <id>generate-tld-for-jar</id>
- <goals>
- <goal>transform</goal>
- </goals>
- <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>
- </execution>
- </executions>
- </plugin>
- -->
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.4</version>
Modified: myfaces/tomahawk/trunk/sandbox/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/pom.xml?rev=673346&r1=673345&r2=673346&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/pom.xml (original)
+++ myfaces/tomahawk/trunk/sandbox/pom.xml Wed Jul 2 03:11:59 2008
@@ -22,7 +22,9 @@
<modules>
<module>core</module>
+<!--
<module>core12</module>
+-->
<module>examples</module>
</modules>
Modified: myfaces/tomahawk/trunk/sandbox15/core/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox15/core/pom.xml?rev=673346&r1=673345&r2=673346&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox15/core/pom.xml (original)
+++ myfaces/tomahawk/trunk/sandbox15/core/pom.xml Wed Jul 2 03:11:59 2008
@@ -92,6 +92,7 @@
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
+ <version>${myfaces-core11-version}</version>
<scope>provided</scope>
</dependency>
@@ -114,6 +115,7 @@
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-impl</artifactId>
+ <version>${myfaces-core11-version}</version>
<scope>test</scope>
</dependency>
Modified: myfaces/tomahawk/trunk/sandbox15/examples/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox15/examples/pom.xml?rev=673346&r1=673345&r2=673346&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox15/examples/pom.xml (original)
+++ myfaces/tomahawk/trunk/sandbox15/examples/pom.xml Wed Jul 2 03:11:59 2008
@@ -67,11 +67,13 @@
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
+ <version>${myfaces-core11-version}</version>
</dependency>
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-impl</artifactId>
- <!-- Sandbox examples must only have runtime dependency to myfaces-impl
+ <version>${myfaces-core11-version}</version>
+ <!-- Sandbox examples must have runtime dependency to myfaces-impl
so that it will be automatically added to war. But there must not be
any compile dependency on impl so that is is always possible to use
other JSF implementations. -->