Author: craigmcc
Date: Wed Nov 29 17:39:06 2006
New Revision: 480801
URL: http://svn.apache.org/viewvc?view=rev&rev=480801
Log:
Separate support for JSF 1.2 into two different profiles, depending on whether
you are targeting a Java EE 5 app server (which has JSF built in) or a
Servlet 2.5 / JSP 2.1 container (which does not). There are now two profiles
for JSF 1.2:
mvn -Djsf=ri12 Includes JSF 1.2 RI jars, for servers like Tomcat 6
mvn -Djsf=ee5 Does not include JSF, for servers like Glassfish
Modified:
shale/framework/trunk/shale-apps/pom.xml
Modified: shale/framework/trunk/shale-apps/pom.xml
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/pom.xml?view=diff&rev=480801&r1=480800&r2=480801
==============================================================================
--- shale/framework/trunk/shale-apps/pom.xml (original)
+++ shale/framework/trunk/shale-apps/pom.xml Wed Nov 29 17:39:06 2006
@@ -123,6 +123,7 @@
</dependencies>
</profile>
+ <!-- Profile for the Apache MyFaces JSF 1.1 Implementation -->
<profile>
<id>myfaces</id>
<activation>
@@ -152,6 +153,7 @@
</dependencies>
</profile>
+ <!-- Profile for the JSF 1.1 Reference Implementation -->
<profile>
<id>jsfri</id>
<activation>
@@ -213,6 +215,7 @@
</dependencies>
</profile>
+ <!-- Profile for JSF 1.2 on a Non-Java EE 5 Container (such as Tomcat
6.0) -->
<profile>
<id>jsfri12</id>
<activation>
@@ -223,14 +226,62 @@
</activation>
<dependencies>
<dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ <version>1</version>
+ <scope>provided</scope> <!-- JSP 2.1 requires it -->
+ </dependency>
+ <dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>el-ri</artifactId>
+ <version>1</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
<groupId>javax.faces</groupId>
<artifactId>jsf-api</artifactId>
<version>1.2_02</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.faces</groupId>
<artifactId>jsf-impl</artifactId>
+ <version>1.2_02</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.1</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+
+ <!-- Profile for JSF 1.2 on a Java EE 5 Container (such as Glassfish)
-->
+ <profile>
+ <id>jsfee5</id>
+ <activation>
+ <property>
+ <name>jsf</name>
+ <value>ee5</value>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ <version>1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
<version>1.2_02</version>
<scope>provided</scope>
</dependency>
