You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by pa...@apache.org on 2007/05/19 14:49:43 UTC
svn commit: r539743 - in /myfaces/tomahawk/trunk: examples/pom.xml pom.xml
sandbox/examples/pom.xml
Author: paulsp
Date: Sat May 19 05:49:42 2007
New Revision: 539743
URL: http://svn.apache.org/viewvc?view=rev&rev=539743
Log:
TOMAHAWK-998 - Move JSF implementation to Tomahawk's pom.
Modified:
myfaces/tomahawk/trunk/examples/pom.xml
myfaces/tomahawk/trunk/pom.xml
myfaces/tomahawk/trunk/sandbox/examples/pom.xml
Modified: myfaces/tomahawk/trunk/examples/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/pom.xml?view=diff&rev=539743&r1=539742&r2=539743
==============================================================================
--- myfaces/tomahawk/trunk/examples/pom.xml (original)
+++ myfaces/tomahawk/trunk/examples/pom.xml Sat May 19 05:49:42 2007
@@ -60,37 +60,6 @@
</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>
- <!-- Tomahawk examples must only 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. -->
- <scope>runtime</scope>
- </dependency>
- </dependencies>
-
- <properties>
- <jsf_implementation>MyFaces 1.1</jsf_implementation>
- </properties>
- </profile>
-
<!-- To use the examples using MyFaces 1.2: -Djsf=12 -->
<profile>
<id>myfaces-1.2</id>
@@ -140,83 +109,6 @@
</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.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>runtime</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.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- <version>1.2.0</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
- <version>1.1.0</version>
- <scope>compile</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>
- </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>
@@ -461,4 +353,11 @@
</plugins>
</build>
+ <properties>
+ <!-- Tomahawk examples must only have runtime dependency to the imlementation
+ 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. -->
+ <jsf-impl.scope>runtime</jsf-impl.scope>
+ </properties>
</project>
Modified: myfaces/tomahawk/trunk/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/pom.xml?view=diff&rev=539743&r1=539742&r2=539743
==============================================================================
--- myfaces/tomahawk/trunk/pom.xml (original)
+++ myfaces/tomahawk/trunk/pom.xml Sat May 19 05:49:42 2007
@@ -113,6 +113,118 @@
</build>
</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>
+ </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.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>1.2.0</version>
+ <scope>compile</scope>
+ </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>
+ </repositories>
+
+ <properties>
+ <jsf_implementation>JSF-RI</jsf_implementation>
+ </properties>
+ </profile>
</profiles>
<modules>
@@ -136,6 +248,7 @@
<properties>
<myfaces.version>1.1.6-SNAPSHOT</myfaces.version>
<myfaces-shared.version>2.0.6-SNAPSHOT</myfaces-shared.version>
+ <jsf-impl.scope>test</jsf-impl.scope>
</properties>
</project>
Modified: myfaces/tomahawk/trunk/sandbox/examples/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/examples/pom.xml?view=diff&rev=539743&r1=539742&r2=539743
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/examples/pom.xml (original)
+++ myfaces/tomahawk/trunk/sandbox/examples/pom.xml Sat May 19 05:49:42 2007
@@ -49,78 +49,6 @@
</build>
</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>
- </dependency>
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-impl</artifactId>
- <!-- Sandbox examples must only 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. -->
- <scope>runtime</scope>
- </dependency>
- </dependencies>
-
- <properties>
- <jsf_implementation>MyFaces</jsf_implementation>
- </properties>
- </profile>
-
- <!-- To use the examples using the Sun's JSF Reference Implementation -->
- <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>
- </dependency>
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-impl</artifactId>
- <version>1.1_02</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>jstl</groupId>
- <artifactId>jstl</artifactId>
- <version>1.1.0</version>
- <scope>compile</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>
- </repositories>
-
- <properties>
- <jsf_implementation>JSF-RI</jsf_implementation>
- </properties>
- </profile>
<!-- Profile to run jetty, so the tomcat jars are included in the bundle. They are not included by default -->
<profile>
@@ -208,5 +136,13 @@
</resources>
</build>
+
+ <properties>
+ <!-- Tomahawk examples must only have runtime dependency to the imlementation
+ 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. -->
+ <jsf-impl.scope>runtime</jsf-impl.scope>
+ </properties>
</project>