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 [2/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...
Modified: myfaces/tobago/trunk/tobago-jsf-compat/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-jsf-compat/pom.xml?rev=828672&r1=828671&r2=828672&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-jsf-compat/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-jsf-compat/pom.xml Thu Oct 22 12:38:26 2009
@@ -36,9 +36,6 @@
<target>${maven.compile.target}</target>
<encoding>${maven.compile.encoding}</encoding>
<showWarnings>true</showWarnings>
- <excludes>
- <exclude>${jsf12.exclude}</exclude>
- </excludes>
</configuration>
</plugin>
<plugin>
@@ -61,10 +58,20 @@
</scm>
<dependencies>
<dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- <version>${myfaces12.version}</version>
- <scope>provided</scope>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ <!-- note: version is overwritten for this compatibility sub project -->
+ <version>2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <!-- note: version is overwritten for this compatibility sub project -->
+ <version>2.5</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
@@ -84,18 +91,6 @@
<scope>test</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>
- <dependency>
<groupId>maven-taglib</groupId>
<artifactId>maven-taglib-plugin</artifactId>
</dependency>
@@ -108,12 +103,6 @@
</dependencies>
<profiles>
<profile>
- <id>jsf-1.2</id>
- <properties>
- <jsf12.exclude>javax/faces/component/*</jsf12.exclude>
- </properties>
- </profile>
- <profile>
<id>jdk14retro</id>
<build>
<plugins>
@@ -145,8 +134,65 @@
</dependency>
</dependencies>
</profile>
+
+ <profile>
+ <id>myfaces-1.1</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <!-- note: version is overwritten for this compatibility sub project -->
+ <version>${myfaces12.version}</version>
+ </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>
+ <!-- note: version is overwritten for this compatibility sub project -->
+ <version>${mojarra12.version}</version>
+ </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>
- <properties>
- <jsf12.exclude>no/excluded/package/*</jsf12.exclude>
- </properties>
-</project>
\ No newline at end of file
+</project>
Propchange: myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.1/javax/
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: myfaces/tobago/trunk/tobago-tool/tobago-tool-annotation/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-tool/tobago-tool-annotation/pom.xml?rev=828672&r1=828671&r2=828672&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-tool/tobago-tool-annotation/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-tool/tobago-tool-annotation/pom.xml Thu Oct 22 12:38:26 2009
@@ -32,11 +32,6 @@
<groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- <scope>provided</scope>
- </dependency>
</dependencies>
<profiles>
@@ -57,5 +52,61 @@
</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>
\ No newline at end of file
Modified: myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/pom.xml?rev=828672&r1=828671&r2=828672&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/pom.xml Thu Oct 22 12:38:26 2009
@@ -29,6 +29,10 @@
<dependencies>
<dependency>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-tool-annotation</artifactId>
<version>${project.version}</version>
@@ -49,13 +53,8 @@
<artifactId>commons-lang</artifactId>
</dependency>
<dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- <scope>provided</scope>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
</dependency>
<dependency>
<groupId>org.codehaus.modello</groupId>
@@ -102,7 +101,6 @@
</dependency>
</dependencies>
-
<profiles>
<!-- Mac OS X has not a tools.jar! -->
<profile>
@@ -121,5 +119,61 @@
</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>
\ No newline at end of file
+</project>