Author: craigmcc
Date: Thu Oct 12 15:14:32 2006
New Revision: 463462
URL: http://svn.apache.org/viewvc?view=rev&rev=463462
Log:
Move a forgotten resource file from shale-core to shale-application. Also,
remove from it the intialization and cleanup of the original dialog
implementation, because that has now been farmed out to shale-dialog.
SHALE-299
Added:
shale/framework/trunk/shale-application/src/main/resources/org/
shale/framework/trunk/shale-application/src/main/resources/org/apache/
shale/framework/trunk/shale-application/src/main/resources/org/apache/shale/
shale/framework/trunk/shale-application/src/main/resources/org/apache/shale/application/
shale/framework/trunk/shale-application/src/main/resources/org/apache/shale/application/faces/
shale/framework/trunk/shale-application/src/main/resources/org/apache/shale/application/faces/shale-config.xml
- copied, changed from r463404,
shale/framework/trunk/shale-core/src/main/resources/org/apache/shale/faces/shale-config.xml
Removed:
shale/framework/trunk/shale-core/src/main/resources/org/apache/shale/faces/shale-config.xml
Modified:
shale/framework/trunk/shale-application/src/main/java/org/apache/shale/application/faces/ShaleApplicationFilter.java
Modified:
shale/framework/trunk/shale-application/src/main/java/org/apache/shale/application/faces/ShaleApplicationFilter.java
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-application/src/main/java/org/apache/shale/application/faces/ShaleApplicationFilter.java?view=diff&rev=463462&r1=463461&r2=463462
==============================================================================
---
shale/framework/trunk/shale-application/src/main/java/org/apache/shale/application/faces/ShaleApplicationFilter.java
(original)
+++
shale/framework/trunk/shale-application/src/main/java/org/apache/shale/application/faces/ShaleApplicationFilter.java
Thu Oct 12 15:14:32 2006
@@ -147,7 +147,7 @@
* configuration of the default command.</p>
*/
public static final String RESOURCE_NAME =
- "org/apache/shale/faces/shale-config.xml";
+ "org/apache/shale/application/faces/shale-config.xml";
// ------------------------------------------------------ Instance
Variables
Copied:
shale/framework/trunk/shale-application/src/main/resources/org/apache/shale/application/faces/shale-config.xml
(from r463404,
shale/framework/trunk/shale-core/src/main/resources/org/apache/shale/faces/shale-config.xml)
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-application/src/main/resources/org/apache/shale/application/faces/shale-config.xml?view=diff&rev=463462&p1=shale/framework/trunk/shale-core/src/main/resources/org/apache/shale/faces/shale-config.xml&r1=463404&p2=shale/framework/trunk/shale-application/src/main/resources/org/apache/shale/application/faces/shale-config.xml&r2=463462
==============================================================================
---
shale/framework/trunk/shale-core/src/main/resources/org/apache/shale/faces/shale-config.xml
(original)
+++
shale/framework/trunk/shale-application/src/main/resources/org/apache/shale/application/faces/shale-config.xml
Thu Oct 12 15:14:32 2006
@@ -38,8 +38,6 @@
<chain name="destroy">
- <!-- Clean up dialogs configuration -->
- <command className="org.apache.shale.dialog.config.ConfigurationDestroy"/>
</chain>
@@ -47,8 +45,6 @@
<chain name="init">
- <!-- Configure dialogs from specified resources -->
- <command className="org.apache.shale.dialog.config.ConfigurationInit"/>
</chain>