You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shale.apache.org by ws...@apache.org on 2006/09/26 06:50:55 UTC
svn commit: r449902 - in /shale/framework/trunk: pom.xml shale-apps/pom.xml
shale-clay/pom.xml shale-core/pom.xml shale-remoting/pom.xml
shale-spring/pom.xml shale-test/pom.xml shale-tiger/pom.xml
shale-tiles/pom.xml
Author: wsmoak
Date: Mon Sep 25 21:50:54 2006
New Revision: 449902
URL: http://svn.apache.org/viewvc?view=rev&rev=449902
Log:
Upgrade to MyFaces Core 1.1.4, and clean up comments and exclusions.
SHALE-293
Modified:
shale/framework/trunk/pom.xml
shale/framework/trunk/shale-apps/pom.xml
shale/framework/trunk/shale-clay/pom.xml
shale/framework/trunk/shale-core/pom.xml
shale/framework/trunk/shale-remoting/pom.xml
shale/framework/trunk/shale-spring/pom.xml
shale/framework/trunk/shale-test/pom.xml
shale/framework/trunk/shale-tiger/pom.xml
shale/framework/trunk/shale-tiles/pom.xml
Modified: shale/framework/trunk/pom.xml
URL: http://svn.apache.org/viewvc/shale/framework/trunk/pom.xml?view=diff&rev=449902&r1=449901&r2=449902
==============================================================================
--- shale/framework/trunk/pom.xml (original)
+++ shale/framework/trunk/pom.xml Mon Sep 25 21:50:54 2006
@@ -93,91 +93,6 @@
<module>shale-tiger</module>
</modules>
</profile>
-<!--
- <profile>
- <id>myfaces</id>
- <activation>
- <property>
- <name>!jsf</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>myfaces</groupId>
- <artifactId>myfaces-api</artifactId>
- <version>1.1.1</version>
- </dependency>
- <dependency>
- <groupId>myfaces</groupId>
- <artifactId>myfaces-impl</artifactId>
- <version>1.1.1</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.0</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
- </profile>
- <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>javax.servlet</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.0</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>jsfri12</id>
- <activation>
- <property>
- <name>jsf</name>
- <value>ri12</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- <version>1.2_01-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-impl</artifactId>
- <version>1.2_01-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jsp-2.1</artifactId>
- <version>6.0.0beta17</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
- </profile>
--->
</profiles>
<modules>
@@ -528,46 +443,10 @@
</dependency>
<dependency>
- <groupId>myfaces</groupId>
+ <groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
- <version>1.1.1</version>
- <!-- myfaces:myfaces-api:1.1.1 pulls in a bunch of dependencies -->
- <!-- that should only be on the implementation JAR -->
- <exclusions>
-<!-- For some reason, uncommenting this makes it impossible to declare
- a direct dependency on digester in shale-clay and shale-tiger
- <exclusion>
- <groupId>commons-digester</groupId>
- <artifactId>commons-digester</artifactId>
- </exclusion>
--->
- <exclusion>
- <groupId>commons-el</groupId>
- <artifactId>commons-el</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload</artifactId>
- </exclusion>
-<!--
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
--->
- <exclusion>
- <groupId>commons-validator</groupId>
- <artifactId>commons-validator</artifactId>
- </exclusion>
- <exclusion>
- <groupId>oro</groupId>
- <artifactId>oro</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- </exclusion>
- </exclusions>
+ <version>1.1.4</version>
+ <scope>provided</scope>
</dependency>
<dependency>
Modified: shale/framework/trunk/shale-apps/pom.xml
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/pom.xml?view=diff&rev=449902&r1=449901&r2=449902
==============================================================================
--- shale/framework/trunk/shale-apps/pom.xml (original)
+++ shale/framework/trunk/shale-apps/pom.xml Mon Sep 25 21:50:54 2006
@@ -99,14 +99,15 @@
</activation>
<dependencies>
<dependency>
- <groupId>myfaces</groupId>
+ <groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
- <version>1.1.1</version>
+ <version>1.1.4</version>
+ <scope>compile</scope>
</dependency>
<dependency>
- <groupId>myfaces</groupId>
+ <groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-impl</artifactId>
- <version>1.1.1</version>
+ <version>1.1.4</version>
<scope>runtime</scope>
</dependency>
<dependency>
Modified: shale/framework/trunk/shale-clay/pom.xml
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-clay/pom.xml?view=diff&rev=449902&r1=449901&r2=449902
==============================================================================
--- shale/framework/trunk/shale-clay/pom.xml (original)
+++ shale/framework/trunk/shale-clay/pom.xml Mon Sep 25 21:50:54 2006
@@ -67,15 +67,15 @@
</dependency>
<dependency>
- <groupId>myfaces</groupId>
+ <groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>myfaces</groupId>
+ <groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-impl</artifactId>
- <version>1.1.1</version>
+ <version>1.1.4</version>
<scope>test</scope>
</dependency>
Modified: shale/framework/trunk/shale-core/pom.xml
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-core/pom.xml?view=diff&rev=449902&r1=449901&r2=449902
==============================================================================
--- shale/framework/trunk/shale-core/pom.xml (original)
+++ shale/framework/trunk/shale-core/pom.xml Mon Sep 25 21:50:54 2006
@@ -36,6 +36,16 @@
<dependency>
<groupId>commons-chain</groupId>
<artifactId>commons-chain</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>myfaces</groupId>
+ <artifactId>myfaces-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.portlet</groupId>
+ <artifactId>portlet-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -72,7 +82,7 @@
</dependency>
<dependency>
- <groupId>myfaces</groupId>
+ <groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
<scope>provided</scope>
</dependency>
Modified: shale/framework/trunk/shale-remoting/pom.xml
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-remoting/pom.xml?view=diff&rev=449902&r1=449901&r2=449902
==============================================================================
--- shale/framework/trunk/shale-remoting/pom.xml (original)
+++ shale/framework/trunk/shale-remoting/pom.xml Mon Sep 25 21:50:54 2006
@@ -82,7 +82,7 @@
</dependency>
<dependency>
- <groupId>myfaces</groupId>
+ <groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
<scope>provided</scope>
</dependency>
Modified: shale/framework/trunk/shale-spring/pom.xml
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-spring/pom.xml?view=diff&rev=449902&r1=449901&r2=449902
==============================================================================
--- shale/framework/trunk/shale-spring/pom.xml (original)
+++ shale/framework/trunk/shale-spring/pom.xml Mon Sep 25 21:50:54 2006
@@ -34,7 +34,7 @@
<dependencies>
<dependency>
- <groupId>myfaces</groupId>
+ <groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
<scope>provided</scope>
</dependency>
Modified: shale/framework/trunk/shale-test/pom.xml
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-test/pom.xml?view=diff&rev=449902&r1=449901&r2=449902
==============================================================================
--- shale/framework/trunk/shale-test/pom.xml (original)
+++ shale/framework/trunk/shale-test/pom.xml Mon Sep 25 21:50:54 2006
@@ -63,7 +63,7 @@
</dependency>
<dependency>
- <groupId>myfaces</groupId>
+ <groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
<scope>provided</scope>
</dependency>
Modified: shale/framework/trunk/shale-tiger/pom.xml
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-tiger/pom.xml?view=diff&rev=449902&r1=449901&r2=449902
==============================================================================
--- shale/framework/trunk/shale-tiger/pom.xml (original)
+++ shale/framework/trunk/shale-tiger/pom.xml Mon Sep 25 21:50:54 2006
@@ -140,7 +140,7 @@
</dependency>
<dependency>
- <groupId>myfaces</groupId>
+ <groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
<scope>provided</scope>
</dependency>
Modified: shale/framework/trunk/shale-tiles/pom.xml
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-tiles/pom.xml?view=diff&rev=449902&r1=449901&r2=449902
==============================================================================
--- shale/framework/trunk/shale-tiles/pom.xml (original)
+++ shale/framework/trunk/shale-tiles/pom.xml Mon Sep 25 21:50:54 2006
@@ -34,7 +34,7 @@
<dependencies>
<dependency>
- <groupId>myfaces</groupId>
+ <groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
<scope>provided</scope>
</dependency>