Author: craigmcc
Date: Wed Sep 13 23:17:34 2006
New Revision: 443257
URL: http://svn.apache.org/viewvc?view=rev&rev=443257
Log:
Make changes needed due to the refactoring of Maven dependencies in the
Shale Framework POMs.
Modified:
shale/sandbox/shale-dialog2-legacy/pom.xml
shale/sandbox/shale-dialog2-scxml/pom.xml
shale/sandbox/shale-dialog2/pom.xml
shale/sandbox/shale-dialog2/src/main/java/org/apache/shale/dialog2/faces/Dialog2NavigationHandler.java
Modified: shale/sandbox/shale-dialog2-legacy/pom.xml
URL:
http://svn.apache.org/viewvc/shale/sandbox/shale-dialog2-legacy/pom.xml?view=diff&rev=443257&r1=443256&r2=443257
==============================================================================
--- shale/sandbox/shale-dialog2-legacy/pom.xml (original)
+++ shale/sandbox/shale-dialog2-legacy/pom.xml Wed Sep 13 23:17:34 2006
@@ -34,9 +34,20 @@
<dependencies>
<dependency>
+ <groupId>commons-digester</groupId>
+ <artifactId>commons-digester</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>myfaces</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <scope>provided</scope>
</dependency>
<!--
Modified: shale/sandbox/shale-dialog2-scxml/pom.xml
URL:
http://svn.apache.org/viewvc/shale/sandbox/shale-dialog2-scxml/pom.xml?view=diff&rev=443257&r1=443256&r2=443257
==============================================================================
--- shale/sandbox/shale-dialog2-scxml/pom.xml (original)
+++ shale/sandbox/shale-dialog2-scxml/pom.xml Wed Sep 13 23:17:34 2006
@@ -45,6 +45,12 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>myfaces</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
<!--
<dependency>
<groupId>org.apache.shale</groupId>
Modified: shale/sandbox/shale-dialog2/pom.xml
URL:
http://svn.apache.org/viewvc/shale/sandbox/shale-dialog2/pom.xml?view=diff&rev=443257&r1=443256&r2=443257
==============================================================================
--- shale/sandbox/shale-dialog2/pom.xml (original)
+++ shale/sandbox/shale-dialog2/pom.xml Wed Sep 13 23:17:34 2006
@@ -36,13 +36,24 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.1</version>
</dependency>
<dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>myfaces</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <scope>provided</scope>
</dependency>
<!--
Modified:
shale/sandbox/shale-dialog2/src/main/java/org/apache/shale/dialog2/faces/Dialog2NavigationHandler.java
URL:
http://svn.apache.org/viewvc/shale/sandbox/shale-dialog2/src/main/java/org/apache/shale/dialog2/faces/Dialog2NavigationHandler.java?view=diff&rev=443257&r1=443256&r2=443257
==============================================================================
---
shale/sandbox/shale-dialog2/src/main/java/org/apache/shale/dialog2/faces/Dialog2NavigationHandler.java
(original)
+++
shale/sandbox/shale-dialog2/src/main/java/org/apache/shale/dialog2/faces/Dialog2NavigationHandler.java
Wed Sep 13 23:17:34 2006
@@ -93,7 +93,6 @@
* outcome.</p>
* </ul>
*
- *
* @param context FacesContext for the current request
* @param fromAction Action that was invoked
* @param outcome Logical outcome from the invoked action
