You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2009/10/22 14:38:29 UTC
svn commit: r828672 [1/2] - in /myfaces/tobago/trunk: ./ core/ example/
example/addressbook/lib/ example/blank/ example/demo/ example/experimental/
example/experimental/src/main/java-jsf-1.1/
example/experimental/src/main/java-jsf-1.1/org/ example/expe...
Author: lofwyr
Date: Thu Oct 22 12:38:26 2009
New Revision: 828672
URL: http://svn.apache.org/viewvc?rev=828672&view=rev
Log:
TOBAGO-658: JSF 1.2 compatibility
- global refactoring of all pom.xml files
- now, all pom.xml files are able to be compiled with 1.1 or 1.2 and also with myfaces or mojarra
use myfaces-1.1, myfaces-1.2 (default), mojarra-1.1, mojarra-1.2 as profile
- jsf version specific code can be put into src/main/java-jsf-1.1 or src/main/java-jsf-1.2
Added:
myfaces/tobago/trunk/example/experimental/src/main/java-jsf-1.1/ (with props)
myfaces/tobago/trunk/example/experimental/src/main/java-jsf-1.1/org/
myfaces/tobago/trunk/example/experimental/src/main/java-jsf-1.1/org/apache/
myfaces/tobago/trunk/example/experimental/src/main/java-jsf-1.1/org/apache/myfaces/
myfaces/tobago/trunk/example/experimental/src/main/java-jsf-1.1/org/apache/myfaces/tobago/
myfaces/tobago/trunk/example/experimental/src/main/java-jsf-1.1/org/apache/myfaces/tobago/example/
myfaces/tobago/trunk/example/experimental/src/main/java-jsf-1.1/org/apache/myfaces/tobago/example/reference/
myfaces/tobago/trunk/example/experimental/src/main/java-jsf-1.1/org/apache/myfaces/tobago/example/reference/DynamicController.java
myfaces/tobago/trunk/example/experimental/src/main/java-jsf-1.2/
myfaces/tobago/trunk/example/experimental/src/main/java-jsf-1.2/org/
myfaces/tobago/trunk/example/experimental/src/main/java-jsf-1.2/org/apache/
myfaces/tobago/trunk/example/experimental/src/main/java-jsf-1.2/org/apache/myfaces/
myfaces/tobago/trunk/example/experimental/src/main/java-jsf-1.2/org/apache/myfaces/tobago/
myfaces/tobago/trunk/example/experimental/src/main/java-jsf-1.2/org/apache/myfaces/tobago/example/
myfaces/tobago/trunk/example/experimental/src/main/java-jsf-1.2/org/apache/myfaces/tobago/example/reference/
myfaces/tobago/trunk/example/experimental/src/main/java-jsf-1.2/org/apache/myfaces/tobago/example/reference/DynamicController.java
myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf-1.1/ (props changed)
- copied from r827677, myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf11/
myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf-1.2/ (props changed)
- copied from r827677, myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf12/
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.1/
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.1/javax/ (props changed)
- copied from r827677, myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/javax/
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.2/
Removed:
myfaces/tobago/trunk/example/experimental/src/main/java/org/apache/myfaces/tobago/example/reference/DynamicController.java
myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf11/
myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf12/
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/javax/
Modified:
myfaces/tobago/trunk/core/pom.xml
myfaces/tobago/trunk/example/addressbook/lib/pom.xml
myfaces/tobago/trunk/example/blank/pom.xml
myfaces/tobago/trunk/example/demo/pom.xml
myfaces/tobago/trunk/example/experimental/pom.xml
myfaces/tobago/trunk/example/facelets/pom.xml
myfaces/tobago/trunk/example/nonfacesrequest/pom.xml
myfaces/tobago/trunk/example/pom.xml
myfaces/tobago/trunk/example/portlet/pom.xml
myfaces/tobago/trunk/example/sandbox/pom.xml
myfaces/tobago/trunk/example/seam/pom.xml
myfaces/tobago/trunk/example/security/pom.xml
myfaces/tobago/trunk/example/tobago-theme-example/pom.xml
myfaces/tobago/trunk/extension/facelets/pom.xml
myfaces/tobago/trunk/extension/fileupload/pom.xml
myfaces/tobago/trunk/extension/message-fix/pom.xml
myfaces/tobago/trunk/extension/pom.xml
myfaces/tobago/trunk/extension/security/pom.xml
myfaces/tobago/trunk/extension/tobago-taglib-extension/pom.xml
myfaces/tobago/trunk/pom.xml
myfaces/tobago/trunk/sandbox/pom.xml
myfaces/tobago/trunk/theme/pom.xml
myfaces/tobago/trunk/theme/scarborough/pom.xml
myfaces/tobago/trunk/theme/speyside/pom.xml
myfaces/tobago/trunk/theme/standard/pom.xml
myfaces/tobago/trunk/tobago-jsf-compat/pom.xml
myfaces/tobago/trunk/tobago-tool/tobago-tool-annotation/pom.xml
myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/pom.xml
Modified: myfaces/tobago/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/pom.xml?rev=828672&r1=828671&r2=828672&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/pom.xml (original)
+++ myfaces/tobago/trunk/core/pom.xml Thu Oct 22 12:38:26 2009
@@ -280,6 +280,19 @@
</dependency-->
<dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>maven-taglib</groupId>
<artifactId>maven-taglib-plugin</artifactId>
<scope>test</scope>
@@ -338,55 +351,9 @@
<!--version>1.1.0-SNAPSHOT</version-->
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </dependency>
</dependencies>
<profiles>
- <profile>
- <id>jsf-1.2</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- <version>${myfaces12.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.1</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
- </dependency>
- </dependencies>
- <properties>
- <jsf.target>1.2</jsf.target>
- </properties>
- </profile>
<!-- Mac OS X has not a tools.jar! -->
<profile>
<id>tools.jar</id>
@@ -540,8 +507,81 @@
</dependency>
</dependencies>
</profile>
+
+ <profile>
+ <id>myfaces-1.1</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-impl</artifactId>
+ </dependency>
+ </dependencies>
+ </profile>
+
+ <profile>
+ <id>myfaces-1.2</id>
+ <activation>
+ <property>
+ <name>!jsf.target</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>
+ </dependency>
+ </dependencies>
+ </profile>
+
+ <profile>
+ <id>mojarra-1.1</id>
+ <dependencies>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ </dependency>
+ </dependencies>
+ </profile>
+
+ <profile>
+ <id>mojarra-1.2</id>
+ <dependencies>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ </dependency>
+ </dependencies>
+ </profile>
+
+ <profile>
+ <id>mojarra-2.0</id>
+ <dependencies>
+ <dependency>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ </dependency>
+ </dependencies>
+ </profile>
+
</profiles>
- <properties>
- <jsf.target>1.1</jsf.target>
- </properties>
</project>
Modified: myfaces/tobago/trunk/example/addressbook/lib/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/addressbook/lib/pom.xml?rev=828672&r1=828671&r2=828672&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/addressbook/lib/pom.xml (original)
+++ myfaces/tobago/trunk/example/addressbook/lib/pom.xml Thu Oct 22 12:38:26 2009
@@ -157,18 +157,6 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.3</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
<version>10.3.1.4</version>
@@ -208,72 +196,6 @@
<artifactId>standard</artifactId>
</dependency>
</dependencies>
-
- <profiles>
- <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>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>jsf-provided</id>
- <activation>
- <property>
- <name>jsf</name>
- <value>provided</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-impl</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>sunjsf</id>
- <activation>
- <property>
- <name>jsf</name>
- <value>ri</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-impl</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
<properties>
<openjpa.version>1.0.2</openjpa.version>
Modified: myfaces/tobago/trunk/example/blank/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/blank/pom.xml?rev=828672&r1=828671&r2=828672&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/blank/pom.xml (original)
+++ myfaces/tobago/trunk/example/blank/pom.xml Thu Oct 22 12:38:26 2009
@@ -87,23 +87,10 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.11</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.3</version>
- <scope>provided</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>jstl</artifactId>
<exclusions>
<exclusion>
@@ -117,69 +104,4 @@
<artifactId>standard</artifactId>
</dependency>
</dependencies>
- <profiles>
- <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>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>jsf-provided</id>
- <activation>
- <property>
- <name>jsf</name>
- <value>provided</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-impl</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>sunjsf</id>
- <activation>
- <property>
- <name>jsf</name>
- <value>ri</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-impl</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-</project>
\ No newline at end of file
+</project>
Modified: myfaces/tobago/trunk/example/demo/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/pom.xml?rev=828672&r1=828671&r2=828672&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/pom.xml (original)
+++ myfaces/tobago/trunk/example/demo/pom.xml Thu Oct 22 12:38:26 2009
@@ -55,13 +55,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>tomcat-maven-plugin</artifactId>
-<!--
- <configuration>
- <server>asari</server>
- <update>true</update>
- <url>http://10.0.0.4:8080/manager</url>
- </configuration>
--->
<configuration>
<server>tomcat</server>
<update>true</update>
@@ -98,11 +91,6 @@
</scm>
<dependencies>
- <!--dependency>
- <groupId>org.apache.myfaces.tobago</groupId>
- <artifactId>tobago-theme-example</artifactId>
- <version>${project.version}</version>
- </dependency-->
<dependency>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-theme-charlotteville</artifactId>
@@ -113,11 +101,6 @@
<artifactId>tobago-theme-scarborough</artifactId>
<version>${project.version}</version>
</dependency>
- <!--dependency>
- <groupId>org.apache.myfaces.tobago</groupId>
- <artifactId>tobago-sandbox</artifactId>
- <version>${project.version}</version>
- </dependency-->
<dependency>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-theme-speyside</artifactId>
@@ -157,9 +140,13 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>org.apache.myfaces.tobago</groupId>
+ <artifactId>tobago-fileupload</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.11</version>
<scope>runtime</scope>
</dependency>
<dependency>
@@ -169,18 +156,6 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.3</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>com.sun.facelets</groupId>
<artifactId>jsf-facelets</artifactId>
<version>${facelets.version}</version>
@@ -210,124 +185,6 @@
</build>
</profile>
<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>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>myfaces12</id>
- <activation>
- <property>
- <name>jsf</name>
- <value>myfaces12</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- <version>${myfaces12.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-impl</artifactId>
- <version>${myfaces12.version}</version>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>jsf-provided</id>
- <activation>
- <property>
- <name>jsf</name>
- <value>provided</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-impl</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>sunjsf</id>
- <activation>
- <property>
- <name>jsf</name>
- <value>ri</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.myfaces.tobago</groupId>
- <artifactId>tobago-message-fix</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-impl</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>sunjsf12</id>
- <activation>
- <property>
- <name>jsf</name>
- <value>ri12</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- <version>${sunjsf12.version}</version>
- </dependency>
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-impl</artifactId>
- <version>${sunjsf12.version}</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>
- </repositories>
- </profile>
- <profile>
<!--
mvn package cargo:start -Ptomcat5x
-->
Modified: myfaces/tobago/trunk/example/experimental/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/experimental/pom.xml?rev=828672&r1=828671&r2=828672&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/experimental/pom.xml (original)
+++ myfaces/tobago/trunk/example/experimental/pom.xml Thu Oct 22 12:38:26 2009
@@ -29,6 +29,7 @@
<build>
<finalName>tobago-example-experimental</finalName>
<plugins>
+
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>tomcat-maven-plugin</artifactId>
@@ -38,6 +39,7 @@
<url>http://localhost:8080/manager</url>
</configuration>
</plugin>
+
</plugins>
</build>
@@ -88,23 +90,10 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.11</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.3</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
<version>1.1.0</version>
<exclusions>
@@ -135,127 +124,71 @@
<version>1.8.0.1</version>
<scope>runtime</scope>
</dependency>
- <dependency>
- <groupId>org.apache.myfaces.tomahawk</groupId>
- <artifactId>tomahawk</artifactId>
- <version>1.1.6</version>
- </dependency>
</dependencies>
<profiles>
+
<profile>
- <id>myfaces</id>
- <activation>
- <property>
- <name>!jsf</name>
- </property>
- </activation>
+ <id>myfaces-1.1</id>
<dependencies>
<dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-impl</artifactId>
+ <groupId>org.apache.myfaces.tomahawk</groupId>
+ <artifactId>tomahawk</artifactId>
+ <version>1.1.9</version>
</dependency>
</dependencies>
</profile>
+
<profile>
- <id>myfaces12</id>
+ <id>myfaces-1.2</id>
<activation>
<property>
- <name>jsf</name>
- <value>myfaces12</value>
+ <name>!jsf.target</name>
</property>
</activation>
<dependencies>
<dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- <version>${myfaces12.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-impl</artifactId>
- <version>${myfaces12.version}</version>
+ <groupId>org.apache.myfaces.tomahawk</groupId>
+ <artifactId>tomahawk12</artifactId>
+ <version>1.1.9</version>
</dependency>
</dependencies>
</profile>
+
<profile>
- <id>jsf-provided</id>
- <activation>
- <property>
- <name>jsf</name>
- <value>provided</value>
- </property>
- </activation>
+ <id>mojarra-1.1</id>
<dependencies>
<dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-impl</artifactId>
- <scope>provided</scope>
+ <groupId>org.apache.myfaces.tomahawk</groupId>
+ <artifactId>tomahawk</artifactId>
+ <version>1.1.9</version>
</dependency>
</dependencies>
</profile>
+
<profile>
- <id>sunjsf</id>
- <activation>
- <property>
- <name>jsf</name>
- <value>ri</value>
- </property>
- </activation>
+ <id>mojarra-1.2</id>
<dependencies>
<dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-impl</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
- <scope>runtime</scope>
+ <groupId>org.apache.myfaces.tomahawk</groupId>
+ <artifactId>tomahawk12</artifactId>
+ <version>1.1.9</version>
</dependency>
</dependencies>
</profile>
+
<profile>
- <id>sunjsf12</id>
- <activation>
- <property>
- <name>jsf</name>
- <value>ri12</value>
- </property>
- </activation>
+ <id>mojarra-2.0</id>
<dependencies>
+ <!-- todo: use correct artifact/version -->
<dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- <version>${sunjsf12.version}</version>
+ <groupId>org.apache.myfaces.tomahawk</groupId>
+ <artifactId>tomahawk12</artifactId>
+ <version>1.1.9</version>
</dependency>
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-impl</artifactId>
- <version>${sunjsf12.version}</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>
- </repositories>
+ </dependencies>
</profile>
+
<profile>
<!--
mvn package cargo:start -Ptomcat5x
Propchange: myfaces/tobago/trunk/example/experimental/src/main/java-jsf-1.1/
------------------------------------------------------------------------------
svn:mergeinfo =
Added: myfaces/tobago/trunk/example/experimental/src/main/java-jsf-1.1/org/apache/myfaces/tobago/example/reference/DynamicController.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/experimental/src/main/java-jsf-1.1/org/apache/myfaces/tobago/example/reference/DynamicController.java?rev=828672&view=auto
==============================================================================
--- myfaces/tobago/trunk/example/experimental/src/main/java-jsf-1.1/org/apache/myfaces/tobago/example/reference/DynamicController.java (added)
+++ myfaces/tobago/trunk/example/experimental/src/main/java-jsf-1.1/org/apache/myfaces/tobago/example/reference/DynamicController.java Thu Oct 22 12:38:26 2009
@@ -0,0 +1,75 @@
+package org.apache.myfaces.tobago.example.reference;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.myfaces.tobago.internal.taglib.ButtonTag;
+import org.apache.myfaces.tobago.internal.taglib.LinkTag;
+import org.apache.myfaces.tobago.taglib.extension.InExtensionTag;
+
+import javax.servlet.jsp.tagext.TagSupport;
+import java.util.ArrayList;
+import java.util.List;
+
+public class DynamicController {
+
+ private static final Log LOG = LogFactory.getLog(DynamicController.class);
+
+ private List<TagData> tags;
+
+ private List<AttributeData> attributes;
+
+ public DynamicController() {
+ tags = new ArrayList<TagData>();
+ TagData in = new TagData(InExtensionTag.class);
+ in.setName("In");
+ in.setTip("Ein In");
+ tags.add(in);
+ TagData button = new TagData(ButtonTag.class);
+ button.setName("Button");
+ button.setTip("Ein Knopf");
+ tags.add(button);
+ TagData link = new TagData(LinkTag.class);
+ link.setName("Link");
+ link.setTip("Ein Link");
+ tags.add(link);
+ attributes = new ArrayList<AttributeData>();
+ }
+
+ public TagSupport createTag() {
+ try {
+ Class clazz = tags.get(0).getTagClass();
+ InExtensionTag tag = (InExtensionTag) clazz.newInstance();
+ tag.setValue("Hallo Tester");
+ tag.setLabel("Label");
+ return tag;
+ } catch (Exception e) {
+ LOG.error("", e); // fixme
+ throw new RuntimeException(e);
+ }
+ }
+
+ public List<TagData> getTags() {
+ return tags;
+ }
+
+ public List<AttributeData> getAttributes() {
+ return attributes;
+ }
+}
Added: myfaces/tobago/trunk/example/experimental/src/main/java-jsf-1.2/org/apache/myfaces/tobago/example/reference/DynamicController.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/experimental/src/main/java-jsf-1.2/org/apache/myfaces/tobago/example/reference/DynamicController.java?rev=828672&view=auto
==============================================================================
--- myfaces/tobago/trunk/example/experimental/src/main/java-jsf-1.2/org/apache/myfaces/tobago/example/reference/DynamicController.java (added)
+++ myfaces/tobago/trunk/example/experimental/src/main/java-jsf-1.2/org/apache/myfaces/tobago/example/reference/DynamicController.java Thu Oct 22 12:38:26 2009
@@ -0,0 +1,84 @@
+package org.apache.myfaces.tobago.example.reference;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.myfaces.tobago.internal.taglib.ButtonTag;
+import org.apache.myfaces.tobago.internal.taglib.LinkTag;
+import org.apache.myfaces.tobago.taglib.extension.InExtensionTag;
+
+import javax.el.ValueExpression;
+import javax.faces.context.FacesContext;
+import javax.servlet.jsp.tagext.TagSupport;
+import java.util.ArrayList;
+import java.util.List;
+
+public class DynamicController {
+
+ private static final Log LOG = LogFactory.getLog(DynamicController.class);
+
+ private List<TagData> tags;
+
+ private List<AttributeData> attributes;
+
+ public DynamicController() {
+ tags = new ArrayList<TagData>();
+ TagData in = new TagData(InExtensionTag.class);
+ in.setName("In");
+ in.setTip("Ein In");
+ tags.add(in);
+ TagData button = new TagData(ButtonTag.class);
+ button.setName("Button");
+ button.setTip("Ein Knopf");
+ tags.add(button);
+ TagData link = new TagData(LinkTag.class);
+ link.setName("Link");
+ link.setTip("Ein Link");
+ tags.add(link);
+ attributes = new ArrayList<AttributeData>();
+ }
+
+ public TagSupport createTag() {
+ try {
+ Class clazz = tags.get(0).getTagClass();
+ InExtensionTag tag = (InExtensionTag) clazz.newInstance();
+ tag.setValue(createStringValueExpression("Hallo Tester"));
+ tag.setLabel(createStringValueExpression("Label"));
+ return tag;
+ } catch (Exception e) {
+ LOG.error("", e); // fixme
+ throw new RuntimeException(e);
+ }
+ }
+
+ protected ValueExpression createStringValueExpression(String expression) {
+ FacesContext facesContext = FacesContext.getCurrentInstance();
+ ValueExpression value = facesContext.getApplication().getExpressionFactory().
+ createValueExpression(facesContext.getELContext(), expression, String.class);
+ return value;
+ }
+
+ public List<TagData> getTags() {
+ return tags;
+ }
+
+ public List<AttributeData> getAttributes() {
+ return attributes;
+ }
+}
Modified: myfaces/tobago/trunk/example/facelets/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/facelets/pom.xml?rev=828672&r1=828671&r2=828672&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/facelets/pom.xml (original)
+++ myfaces/tobago/trunk/example/facelets/pom.xml Thu Oct 22 12:38:26 2009
@@ -95,7 +95,6 @@
<dependency>
<groupId>javax.el</groupId>
<artifactId>el-api</artifactId>
- <version>1.0</version>
<!-- in the case of Servlet 2.5 / JSP 2.1
e. g. Tomcat 6 the scope should be "provided"
<scope>provided</scope>
@@ -116,99 +115,9 @@
<artifactId>log4j</artifactId>
<scope>runtime</scope>
</dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.3</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.0</version>
- <scope>provided</scope>
- </dependency>
</dependencies>
<profiles>
<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>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>sunjsf</id>
- <activation>
- <property>
- <name>jsf</name>
- <value>ri</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-impl</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>sunjsf12</id>
- <activation>
- <property>
- <name>jsf</name>
- <value>ri12</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- <version>${sunjsf12.version}</version>
- </dependency>
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-impl</artifactId>
- <version>${sunjsf12.version}</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>
- </repositories>
- </profile>
-
- <profile>
<!--
mvn package cargo:start -Ptomcat5x
-->
Modified: myfaces/tobago/trunk/example/nonfacesrequest/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/nonfacesrequest/pom.xml?rev=828672&r1=828671&r2=828672&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/nonfacesrequest/pom.xml (original)
+++ myfaces/tobago/trunk/example/nonfacesrequest/pom.xml Thu Oct 22 12:38:26 2009
@@ -77,114 +77,7 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.11</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.3</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.0</version>
- <scope>provided</scope>
+ <scope>runtime</scope>
</dependency>
</dependencies>
- <profiles>
- <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>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>myfaces12</id>
- <activation>
- <property>
- <name>jsf</name>
- <value>myfaces12</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- <version>${myfaces12.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-impl</artifactId>
- <version>${myfaces12.version}</version>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>sunjsf</id>
- <activation>
- <property>
- <name>jsf</name>
- <value>ri</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-impl</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>sunjsf12</id>
- <activation>
- <property>
- <name>jsf</name>
- <value>ri12</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- <version>${sunjsf12.version}</version>
- </dependency>
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-impl</artifactId>
- <version>${sunjsf12.version}</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>
- </repositories>
- </profile>
- </profiles>
</project>
\ No newline at end of file
Modified: myfaces/tobago/trunk/example/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/pom.xml?rev=828672&r1=828671&r2=828672&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/pom.xml (original)
+++ myfaces/tobago/trunk/example/pom.xml Thu Oct 22 12:38:26 2009
@@ -61,6 +61,17 @@
</pluginRepository>
</pluginRepositories>
+ <dependencies>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ </dependency>
+ </dependencies>
+
<profiles>
<profile>
<id>default-modules</id>
@@ -111,5 +122,91 @@
<module>tobago-example-assembly</module>
</modules>
</profile>
+
+ <profile>
+ <id>myfaces-1.1</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-impl</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+
+ <profile>
+ <id>myfaces-1.2</id>
+ <activation>
+ <property>
+ <name>!jsf.target</name>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-impl</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+
+ <profile>
+ <id>mojarra-1.1</id>
+ <dependencies>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+
+ <profile>
+ <id>mojarra-1.2</id>
+ <dependencies>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+
+ <profile>
+ <id>mojarra-2.0</id>
+ <dependencies>
+ <dependency>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+
</profiles>
</project>
\ No newline at end of file
Modified: myfaces/tobago/trunk/example/portlet/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/portlet/pom.xml?rev=828672&r1=828671&r2=828672&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/portlet/pom.xml (original)
+++ myfaces/tobago/trunk/example/portlet/pom.xml Thu Oct 22 12:38:26 2009
@@ -48,15 +48,6 @@
<artifactId>tobago-theme-speyside</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- </dependency>
<dependency>
<groupId>javax.el</groupId>
@@ -99,17 +90,5 @@
</dependency>
-->
- <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>
-
</dependencies>
</project>
Modified: myfaces/tobago/trunk/example/sandbox/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/sandbox/pom.xml?rev=828672&r1=828671&r2=828672&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/sandbox/pom.xml (original)
+++ myfaces/tobago/trunk/example/sandbox/pom.xml Thu Oct 22 12:38:26 2009
@@ -126,23 +126,10 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.11</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.3</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
<exclusions>
<exclusion>
@@ -151,18 +138,6 @@
</exclusion>
</exclusions>
</dependency>
- <!--<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.0</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>commons-el</groupId>
- <artifactId>commons-el</artifactId>
- <version>1.0</version>
- <scope>compile</scope>
- </dependency>-->
<dependency>
<groupId>el-impl</groupId>
<artifactId>el-impl</artifactId>
@@ -173,69 +148,4 @@
<artifactId>standard</artifactId>
</dependency>
</dependencies>
- <profiles>
- <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>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>jsf-provided</id>
- <activation>
- <property>
- <name>jsf</name>
- <value>provided</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-impl</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>sunjsf</id>
- <activation>
- <property>
- <name>jsf</name>
- <value>ri</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-impl</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
</project>
\ No newline at end of file
Modified: myfaces/tobago/trunk/example/seam/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/seam/pom.xml?rev=828672&r1=828671&r2=828672&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/seam/pom.xml (original)
+++ myfaces/tobago/trunk/example/seam/pom.xml Thu Oct 22 12:38:26 2009
@@ -210,16 +210,6 @@
</dependency>
<dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- <version>${sunjsf12.version}</version>
- </dependency>
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-impl</artifactId>
- <version>${sunjsf12.version}</version>
- </dependency>
- <dependency>
<groupId>com.sun.facelets</groupId>
<artifactId>jsf-facelets</artifactId>
<version>${facelets.version}</version>
Modified: myfaces/tobago/trunk/example/security/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/security/pom.xml?rev=828672&r1=828671&r2=828672&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/security/pom.xml (original)
+++ myfaces/tobago/trunk/example/security/pom.xml Thu Oct 22 12:38:26 2009
@@ -72,64 +72,7 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.11</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.0</version>
- <scope>provided</scope>
+ <scope>runtime</scope>
</dependency>
</dependencies>
- <profiles>
- <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>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>sunjsf</id>
- <activation>
- <property>
- <name>jsf</name>
- <value>ri</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-impl</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-</project>
\ No newline at end of file
+</project>
Modified: myfaces/tobago/trunk/example/tobago-theme-example/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/tobago-theme-example/pom.xml?rev=828672&r1=828671&r2=828672&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/tobago-theme-example/pom.xml (original)
+++ myfaces/tobago/trunk/example/tobago-theme-example/pom.xml Thu Oct 22 12:38:26 2009
@@ -37,10 +37,5 @@
<artifactId>tobago-theme-speyside</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- <scope>provided</scope>
- </dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: myfaces/tobago/trunk/extension/facelets/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/facelets/pom.xml?rev=828672&r1=828671&r2=828672&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/facelets/pom.xml (original)
+++ myfaces/tobago/trunk/extension/facelets/pom.xml Thu Oct 22 12:38:26 2009
@@ -120,8 +120,6 @@
<dependency>
<groupId>javax.el</groupId>
<artifactId>el-api</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>com.sun.facelets</groupId>
@@ -145,20 +143,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- <!--version>${myfaces12.version}</version-->
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </dependency>
</dependencies>
<profiles>
@@ -177,33 +161,6 @@
</dependency>
</dependencies>
</profile>
- <profile>
- <id>jsf-1.2</id>
- <dependencies>
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- <version>${myfaces12.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.1</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
- </dependency>
- </dependencies>
- </profile>
</profiles>
</project>
Modified: myfaces/tobago/trunk/extension/fileupload/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/fileupload/pom.xml?rev=828672&r1=828671&r2=828672&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/fileupload/pom.xml (original)
+++ myfaces/tobago/trunk/extension/fileupload/pom.xml Thu Oct 22 12:38:26 2009
@@ -43,23 +43,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- <scope>provided</scope>
- </dependency>
</dependencies>
<profiles>
<profile>
Modified: myfaces/tobago/trunk/extension/message-fix/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/message-fix/pom.xml?rev=828672&r1=828671&r2=828672&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/message-fix/pom.xml (original)
+++ myfaces/tobago/trunk/extension/message-fix/pom.xml Thu Oct 22 12:38:26 2009
@@ -33,15 +33,12 @@
</scm>
<dependencies>
<dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- <scope>provided</scope>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
- <scope>test</scope>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
</dependency>
<dependency>
<groupId>org.apache.shale</groupId>
Modified: myfaces/tobago/trunk/extension/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/pom.xml?rev=828672&r1=828671&r2=828672&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/pom.xml (original)
+++ myfaces/tobago/trunk/extension/pom.xml Thu Oct 22 12:38:26 2009
@@ -15,7 +15,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
-->
-<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>
<parent>
<groupId>org.apache.myfaces.tobago</groupId>
@@ -37,4 +38,74 @@
<module>message-fix</module>
<module>tobago-taglib-extension</module>
</modules>
+
+ <dependencies>
+ <dependency>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
+ </dependencies>
+
+ <profiles>
+
+ <profile>
+ <id>myfaces-1.1</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ </dependency>
+ </dependencies>
+ </profile>
+
+ <profile>
+ <id>myfaces-1.2</id>
+ <activation>
+ <property>
+ <name>!jsf.target</name>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ </dependency>
+ </dependencies>
+ </profile>
+
+ <profile>
+ <id>mojarra-1.1</id>
+ <dependencies>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ </dependency>
+ </dependencies>
+ </profile>
+
+ <profile>
+ <id>mojarra-1.2</id>
+ <dependencies>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ </dependency>
+ </dependencies>
+ </profile>
+
+ <profile>
+ <id>mojarra-2.0</id>
+ <dependencies>
+ <dependency>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ </dependency>
+ </dependencies>
+ </profile>
+
+ </profiles>
</project>
Modified: myfaces/tobago/trunk/extension/security/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/security/pom.xml?rev=828672&r1=828671&r2=828672&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/security/pom.xml (original)
+++ myfaces/tobago/trunk/extension/security/pom.xml Thu Oct 22 12:38:26 2009
@@ -15,7 +15,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
-->
-<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>
<parent>
<groupId>org.apache.myfaces.tobago</groupId>
@@ -37,26 +38,13 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-annotation_1.0_spec</artifactId>
<version>1.0</version>
</dependency>
<dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- <scope>provided</scope>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
</dependency>
</dependencies>
</project>
Modified: myfaces/tobago/trunk/extension/tobago-taglib-extension/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/pom.xml?rev=828672&r1=828671&r2=828672&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/pom.xml (original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/pom.xml Thu Oct 22 12:38:26 2009
@@ -28,7 +28,6 @@
<description>Tobago Taglib Extension contains the tobago extension tags (tx)</description>
<build>
- <sourceDirectory>${source.directory}</sourceDirectory>
<plugins>
<plugin>
@@ -160,56 +159,9 @@
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </dependency>
</dependencies>
<profiles>
- <profile>
- <id>jsf-1.2</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <properties>
- <jsf.target>1.2</jsf.target>
- <source.directory>src/main/java-jsf12</source.directory>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- <version>${myfaces12.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.1</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
- </dependency>
- </dependencies>
- </profile>
<!-- Mac OS X has not a tools.jar! -->
<profile>
<id>tools.jar</id>
@@ -346,7 +298,4 @@
</dependencies>
</profile>
</profiles>
- <properties>
- <source.directory>src/main/java-jsf11</source.directory>
- </properties>
</project>
Propchange: myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf-1.1/
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf-1.2/
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: myfaces/tobago/trunk/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/pom.xml?rev=828672&r1=828671&r2=828672&view=diff
==============================================================================
--- myfaces/tobago/trunk/pom.xml (original)
+++ myfaces/tobago/trunk/pom.xml Thu Oct 22 12:38:26 2009
@@ -383,12 +383,12 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>${common-io.version}</version>
+ <version>${commons-io.version}</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>${common-lang.version}</version>
+ <version>${commons-lang.version}</version>
</dependency>
<dependency>
<groupId>commons-beanutils</groupId>
@@ -443,35 +443,9 @@
<version>1.1.2</version>
</dependency>
<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>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- <version>${sunjsf.version}</version>
- </dependency>
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-impl</artifactId>
- <version>${sunjsf.version}</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ <version>1.0</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -521,15 +495,36 @@
<build>
<defaultGoal>install</defaultGoal>
<plugins>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.4</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>add-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>src/main/java-jsf-${jsf.target}</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
<version>2.4</version>
</plugin>
+
<plugin>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>2.2</version>
</plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
@@ -1330,12 +1325,217 @@
</plugins>
</build>
</profile>
+
+<!--
+ Attention: The next profiles should only be changed by a clean build.
+ It may also make sense to activate it in your personal settings.xml.
+
+ They define the JSF version which are generally incompatible.
+
+ They also define the JSF implementation used to compile and for runtime.
+-->
+
<profile>
- <id>jsf-1.2</id>
+ <id>myfaces-1.1</id>
+ <properties>
+ <jsf.target>1.1</jsf.target>
+ </properties>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <version>${myfaces11.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-impl</artifactId>
+ <version>${myfaces11.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+ </profile>
+
+ <profile>
+ <id>myfaces-1.2</id>
+ <activation>
+ <property>
+ <name>!jsf.target</name>
+ </property>
+ </activation>
+ <properties>
+ <jsf.target>1.2</jsf.target>
+ </properties>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <version>${myfaces12.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-impl</artifactId>
+ <version>${myfaces12.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+ </profile>
+
+ <profile>
+ <id>mojarra-1.1</id>
+ <properties>
+ <jsf.target>1.1</jsf.target>
+ </properties>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <version>${mojarra11.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ <version>${mojarra11.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+ <repositories>
+ <repository>
+ <id>maven2-repository.dev.java.net</id>
+ <name>Java.net Repository for Maven</name>
+ <url>http://download.java.net/maven/2/</url>
+ </repository>
+ </repositories>
+ </profile>
+
+ <profile>
+ <id>mojarra-1.2</id>
<properties>
<jsf.target>1.2</jsf.target>
</properties>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <version>${mojarra12.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ <version>${mojarra12.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+ <repositories>
+ <repository>
+ <id>maven2-repository.dev.java.net</id>
+ <name>Java.net Repository for Maven</name>
+ <url>http://download.java.net/maven/2/</url>
+ </repository>
+ </repositories>
+ </profile>
+
+ <profile>
+ <id>mojarra-2.0</id>
+ <properties>
+ <jsf.target>2.0</jsf.target>
+ </properties>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <version>${mojarra20.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ <version>${mojarra20.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+ <repositories>
+ <repository>
+ <id>maven2-repository.dev.java.net</id>
+ <name>Java.net Repository for Maven</name>
+ <url>http://download.java.net/maven/2/</url>
+ </repository>
+ </repositories>
</profile>
+
</profiles>
<repositories>
@@ -1365,15 +1565,15 @@
</contributors>
<properties>
- <myfaces.version>1.1.7</myfaces.version>
+ <myfaces11.version>1.1.7</myfaces11.version>
<myfaces12.version>1.2.7</myfaces12.version>
- <sunjsf.version>1.1_02</sunjsf.version>
- <sunjsf12.version>1.2_13</sunjsf12.version>
- <sunjsf20.version>2.0.0-b18</sunjsf20.version>
+ <mojarra11.version>1.1_02</mojarra11.version>
+ <mojarra12.version>1.2_13</mojarra12.version>
+ <mojarra20.version>2.0.1-b02</mojarra20.version>
<facelets.version>1.1.14</facelets.version>
<jetty.version>6.1.14</jetty.version>
- <common-io.version>1.1</common-io.version>
- <common-lang.version>2.1</common-lang.version>
+ <commons-io.version>1.1</commons-io.version>
+ <commons-lang.version>2.1</commons-lang.version>
<commons-logging.version>1.1.1</commons-logging.version>
<commons-digester.version>1.8</commons-digester.version>
<commons-collection.version>3.1</commons-collection.version>
Modified: myfaces/tobago/trunk/sandbox/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/pom.xml?rev=828672&r1=828671&r2=828672&view=diff
==============================================================================
--- myfaces/tobago/trunk/sandbox/pom.xml (original)
+++ myfaces/tobago/trunk/sandbox/pom.xml Thu Oct 22 12:38:26 2009
@@ -290,11 +290,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
</dependency>
@@ -305,8 +300,6 @@
<dependency>
<groupId>javax.el</groupId>
<artifactId>el-api</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>fop</groupId>
@@ -452,5 +445,62 @@
</dependency>
</dependencies>
</profile>
+
+
+ <profile>
+ <id>myfaces-1.1</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ </dependency>
+ </dependencies>
+ </profile>
+
+ <profile>
+ <id>myfaces-1.2</id>
+ <activation>
+ <property>
+ <name>!jsf.target</name>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ </dependency>
+ </dependencies>
+ </profile>
+
+ <profile>
+ <id>mojarra-1.1</id>
+ <dependencies>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ </dependency>
+ </dependencies>
+ </profile>
+
+ <profile>
+ <id>mojarra-1.2</id>
+ <dependencies>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ </dependency>
+ </dependencies>
+ </profile>
+
+ <profile>
+ <id>mojarra-2.0</id>
+ <dependencies>
+ <dependency>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ </dependency>
+ </dependencies>
+ </profile>
+
</profiles>
</project>
Modified: myfaces/tobago/trunk/theme/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/pom.xml?rev=828672&r1=828671&r2=828672&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/pom.xml (original)
+++ myfaces/tobago/trunk/theme/pom.xml Thu Oct 22 12:38:26 2009
@@ -15,7 +15,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
-->
-<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>
<parent>
<groupId>org.apache.myfaces.tobago</groupId>
@@ -38,6 +39,66 @@
<module>speyside</module>
<module>richmond</module>
<module>charlotteville</module>
-<!-- <module>tobago-theme-boccoo</module>-->
+ <!-- <module>tobago-theme-boccoo</module>-->
</modules>
+
+ <profiles>
+
+ <profile>
+ <id>myfaces-1.1</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ </dependency>
+ </dependencies>
+ </profile>
+
+ <profile>
+ <id>myfaces-1.2</id>
+ <activation>
+ <property>
+ <name>!jsf.target</name>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ </dependency>
+ </dependencies>
+ </profile>
+
+ <profile>
+ <id>mojarra-1.1</id>
+ <dependencies>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ </dependency>
+ </dependencies>
+ </profile>
+
+ <profile>
+ <id>mojarra-1.2</id>
+ <dependencies>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ </dependency>
+ </dependencies>
+ </profile>
+
+ <profile>
+ <id>mojarra-2.0</id>
+ <dependencies>
+ <dependency>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ </dependency>
+ </dependencies>
+ </profile>
+
+ </profiles>
+
</project>
\ No newline at end of file
Modified: myfaces/tobago/trunk/theme/scarborough/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/pom.xml?rev=828672&r1=828671&r2=828672&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/pom.xml (original)
+++ myfaces/tobago/trunk/theme/scarborough/pom.xml Thu Oct 22 12:38:26 2009
@@ -50,11 +50,6 @@
<dependencies>
<dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-theme-standard</artifactId>
<version>${project.version}</version>
@@ -75,6 +70,10 @@
<artifactId>servlet-api</artifactId>
</dependency>
<dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
@@ -94,36 +93,6 @@
</dependencies>
<profiles>
<profile>
- <id>jsf-1.2</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- <version>${myfaces12.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.1</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
- </dependency>
- </dependencies>
- </profile>
- <profile>
<id>jdk14retro</id>
<build>
<plugins>
Modified: myfaces/tobago/trunk/theme/speyside/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/speyside/pom.xml?rev=828672&r1=828671&r2=828672&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/speyside/pom.xml (original)
+++ myfaces/tobago/trunk/theme/speyside/pom.xml Thu Oct 22 12:38:26 2009
@@ -34,11 +34,6 @@
<dependencies>
<dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-theme-scarborough</artifactId>
<version>${project.version}</version>
Modified: myfaces/tobago/trunk/theme/standard/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/standard/pom.xml?rev=828672&r1=828671&r2=828672&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/standard/pom.xml (original)
+++ myfaces/tobago/trunk/theme/standard/pom.xml Thu Oct 22 12:38:26 2009
@@ -118,11 +118,6 @@
<dependencies>
<dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-core</artifactId>
<version>${project.version}</version>