Author: husted
Date: Fri Oct 29 02:42:31 2004
New Revision: 55959
Modified:
struts/trunk/contrib/struts-shale/src/conf/faces-config.xml
struts/trunk/contrib/struts-shale/src/java/org/apache/shale/faces/ShaleApplicationFilter.java
struts/trunk/contrib/struts-shale/src/java/org/apache/shale/faces/ShaleConstants.java
struts/trunk/contrib/struts-shale/src/java/org/apache/shale/faces/ShalePhaseListener.java
struts/trunk/contrib/struts-shale/src/java/org/apache/shale/faces/ShaleViewHandler.java
struts/trunk/contrib/struts-shale/src/java/org/apache/shale/faces/package.html
Log:
Complete the "who's riding whom" package and classname refactoring (per discussion on
list, "Fwd: Struts Shale").
Modified: struts/trunk/contrib/struts-shale/src/conf/faces-config.xml
==============================================================================
--- struts/trunk/contrib/struts-shale/src/conf/faces-config.xml (original)
+++ struts/trunk/contrib/struts-shale/src/conf/faces-config.xml Fri Oct 29 02:42:31
2004
@@ -35,7 +35,7 @@
<!-- Custom JSF Lifecycle and Evaluator Objects -->
<application>
<view-handler>
- org.apache.shale.impl.ImplViewHandler
+ org.apache.shale.faces.ShaleViewHandler
</view-handler>
</application>
Modified:
struts/trunk/contrib/struts-shale/src/java/org/apache/shale/faces/ShaleApplicationFilter.java
==============================================================================
---
struts/trunk/contrib/struts-shale/src/java/org/apache/shale/faces/ShaleApplicationFilter.java
(original)
+++
struts/trunk/contrib/struts-shale/src/java/org/apache/shale/faces/ShaleApplicationFilter.java
Fri Oct 29 02:42:31 2004
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.shale.impl;
+package org.apache.shale.faces;
import java.io.IOException;
@@ -42,7 +42,7 @@
* $Id$
*/
-public class ImplApplicationFilter implements Filter {
+public class ShaleApplicationFilter implements Filter {
// ------------------------------------------------------ Instance Variables
@@ -110,10 +110,10 @@
this.config = config;
context = config.getServletContext();
- phaseListener = new ImplPhaseListener();
+ phaseListener = new ShalePhaseListener();
getLifecycle().addPhaseListener(phaseListener);
// FIXME - make the mapper pluggable
- context.setAttribute(ImplConstants.VIEW_MAPPER,
+ context.setAttribute(ShaleConstants.VIEW_MAPPER,
new DefaultViewControllerMapper());
}
Modified:
struts/trunk/contrib/struts-shale/src/java/org/apache/shale/faces/ShaleConstants.java
==============================================================================
---
struts/trunk/contrib/struts-shale/src/java/org/apache/shale/faces/ShaleConstants.java
(original)
+++
struts/trunk/contrib/struts-shale/src/java/org/apache/shale/faces/ShaleConstants.java
Fri Oct 29 02:42:31 2004
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.shale.impl;
+package org.apache.shale.faces;
import org.apache.shale.ViewController;
import org.apache.shale.ViewControllerMapper;
@@ -26,7 +26,7 @@
*
* $Id$
*/
-public interface ImplConstants {
+public interface ShaleConstants {
/**
Modified:
struts/trunk/contrib/struts-shale/src/java/org/apache/shale/faces/ShalePhaseListener.java
==============================================================================
---
struts/trunk/contrib/struts-shale/src/java/org/apache/shale/faces/ShalePhaseListener.java
(original)
+++
struts/trunk/contrib/struts-shale/src/java/org/apache/shale/faces/ShalePhaseListener.java
Fri Oct 29 02:42:31 2004
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.shale.impl;
+package org.apache.shale.faces;
import java.util.Iterator;
import java.util.List;
@@ -33,7 +33,7 @@
* $Id$
*/
-public class ImplPhaseListener implements PhaseListener {
+public class ShalePhaseListener implements PhaseListener {
// --------------------------------------------------- PhaseListener Methods
@@ -94,7 +94,7 @@
private void afterRenderResponse(PhaseEvent event) {
Map map = event.getFacesContext().getExternalContext().getRequestMap();
- List list = (List) map.get(ImplConstants.VIEWS_INITIALIZED);
+ List list = (List) map.get(ShaleConstants.VIEWS_INITIALIZED);
if (list == null) {
return;
}
@@ -103,7 +103,7 @@
ViewController vc = (ViewController) vcs.next();
vc.destroy();
}
- map.remove(ImplConstants.VIEWS_INITIALIZED);
+ map.remove(ShaleConstants.VIEWS_INITIALIZED);
}
@@ -119,12 +119,12 @@
Map map = event.getFacesContext().getExternalContext().getRequestMap();
ViewController vc = (ViewController)
- map.get(ImplConstants.VIEW_RENDERED);
+ map.get(ShaleConstants.VIEW_RENDERED);
if (vc == null) {
return;
}
vc.prepare();
- map.remove(ImplConstants.VIEW_RENDERED);
+ map.remove(ShaleConstants.VIEW_RENDERED);
}
Modified:
struts/trunk/contrib/struts-shale/src/java/org/apache/shale/faces/ShaleViewHandler.java
==============================================================================
---
struts/trunk/contrib/struts-shale/src/java/org/apache/shale/faces/ShaleViewHandler.java
(original)
+++
struts/trunk/contrib/struts-shale/src/java/org/apache/shale/faces/ShaleViewHandler.java
Fri Oct 29 02:42:31 2004
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.shale.impl;
+package org.apache.shale.faces;
import java.io.IOException;
import java.util.ArrayList;
@@ -42,20 +42,20 @@
* $Id$
*/
-public class ImplViewHandler extends ViewHandler {
+public class ShaleViewHandler extends ViewHandler {
// ------------------------------------------------------------- Constructor
/**
- * <p>Create a [EMAIL PROTECTED] ImplViewHandler} instance that decorates the
+ * <p>Create a [EMAIL PROTECTED] ShaleViewHandler} instance that decorates the
* specified <code>ViewHandler</code> provided by the JSF runtime
* implementation.</p>
*
* @param original Original <code>ViewHandler</code> to be decorated
*/
- public ImplViewHandler(ViewHandler original) {
+ public ShaleViewHandler(ViewHandler original) {
this.original = original;
if (log.isDebugEnabled()) {
log.debug("ImplViewHandler instance is decorating " +
@@ -70,7 +70,7 @@
/**
* <p>Log instance for this class.</p>
*/
- private static final Log log = LogFactory.getLog(ImplViewHandler.class);
+ private static final Log log = LogFactory.getLog(ShaleViewHandler.class);
// ------------------------------------------------------ Instance Variables
@@ -174,7 +174,7 @@
private ViewControllerMapper getViewControllerMapper(FacesContext context) {
if (mapper != null) {
Map map = context.getExternalContext().getApplicationMap();
- mapper = (ViewControllerMapper) map.get(ImplConstants.VIEW_MAPPER);
+ mapper = (ViewControllerMapper) map.get(ShaleConstants.VIEW_MAPPER);
}
return mapper;
}
@@ -235,11 +235,11 @@
// Schedule this instance for later processing as needed
Map map = context.getExternalContext().getRequestMap();
- map.put(ImplConstants.VIEW_RENDERED, vc);
- List list = (List) map.get(ImplConstants.VIEWS_INITIALIZED);
+ map.put(ShaleConstants.VIEW_RENDERED, vc);
+ List list = (List) map.get(ShaleConstants.VIEWS_INITIALIZED);
if (list == null) {
list = new ArrayList();
- map.put(ImplConstants.VIEWS_INITIALIZED, list);
+ map.put(ShaleConstants.VIEWS_INITIALIZED, list);
}
list.add(vc);
Modified:
struts/trunk/contrib/struts-shale/src/java/org/apache/shale/faces/package.html
==============================================================================
--- struts/trunk/contrib/struts-shale/src/java/org/apache/shale/faces/package.html
(original)
+++ struts/trunk/contrib/struts-shale/src/java/org/apache/shale/faces/package.html
Fri Oct 29 02:42:31 2004
@@ -18,8 +18,9 @@
<body>
-<p>This package contains the internal implementation of the core framework.
-Application deveopers will not need to utilize any APIs defined in this
+<p>This package contains the internal JavaServer Faces implementation of the
+core framework.
+Application developers will not need to utilize any APIs defined in this
package directly.</p>
</body>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
