Author: craigmcc
Date: Thu Oct 12 11:38:03 2006
New Revision: 463368
URL: http://svn.apache.org/viewvc?view=rev&rev=463368
Log:
Finish refactoring of shale-dialog module. One down, four to go.
SHALE-300
Added:
shale/framework/trunk/shale-dialog/src/main/java/org/apache/shale/dialog/faces/DialogNavigationHandler.java
- copied, changed from r463362,
shale/framework/trunk/shale-dialog/src/main/java/org/apache/shale/dialog/faces/Dialog2NavigationHandler.java
shale/framework/trunk/shale-dialog/src/main/java/org/apache/shale/dialog/faces/DialogPhaseListener.java
- copied, changed from r463362,
shale/framework/trunk/shale-dialog/src/main/java/org/apache/shale/dialog/faces/Dialog2PhaseListener.java
Removed:
shale/framework/trunk/shale-dialog/src/main/java/org/apache/shale/dialog/faces/Dialog2NavigationHandler.java
shale/framework/trunk/shale-dialog/src/main/java/org/apache/shale/dialog/faces/Dialog2PhaseListener.java
shale/framework/trunk/shale-dialog/src/test/java/org/apache/shale/dialog/faces/Dialog2NavigationHandlerTest.java
Modified:
shale/framework/trunk/pom.xml
shale/framework/trunk/shale-dialog/pom.xml
shale/framework/trunk/shale-dialog/src/main/java/org/apache/shale/dialog/Constants.java
shale/framework/trunk/shale-dialog/src/main/java/org/apache/shale/dialog/DialogContext.java
shale/framework/trunk/shale-dialog/src/main/java/org/apache/shale/dialog/DialogContextManager.java
shale/framework/trunk/shale-dialog/src/main/java/org/apache/shale/dialog/DialogListener.java
shale/framework/trunk/shale-dialog/src/main/java/org/apache/shale/dialog/base/AbstractDialogContext.java
shale/framework/trunk/shale-dialog/src/main/java/org/apache/shale/dialog/base/AbstractDialogListener.java
Modified: shale/framework/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/pom.xml?view=diff&rev=463368&r1=463367&r2=463368
==============================================================================
--- shale/framework/trunk/pom.xml (original)
+++ shale/framework/trunk/pom.xml Thu Oct 12 11:38:03 2006
@@ -139,6 +139,7 @@
<module>shale-application</module>
<module>shale-clay</module>
<module>shale-core</module>
+ <module>shale-dialog</module>
<module>shale-remoting</module>
<module>shale-spring</module>
<module>shale-test</module>
Modified: shale/framework/trunk/shale-dialog/pom.xml
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-dialog/pom.xml?view=diff&rev=463368&r1=463367&r2=463368
==============================================================================
--- shale/framework/trunk/shale-dialog/pom.xml (original)
+++ shale/framework/trunk/shale-dialog/pom.xml Thu Oct 12 11:38:03 2006
@@ -56,19 +56,12 @@
<scope>provided</scope>
</dependency>
-
- <dependency>
- <groupId>org.apache.shale</groupId>
- <artifactId>shale-test</artifactId>
- <version>1.0.4-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>jmock</groupId>
- <artifactId>jmock-cglib</artifactId>
- <version>1.0.1</version>
- <scope>test</scope>
- </dependency>
+ <dependency>
+ <groupId>org.apache.shale</groupId>
+ <artifactId>shale-test</artifactId>
+ <version>1.0.4-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
Modified:
shale/framework/trunk/shale-dialog/src/main/java/org/apache/shale/dialog/Constants.java
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-dialog/src/main/java/org/apache/shale/dialog/Constants.java?view=diff&rev=463368&r1=463367&r2=463368
==============================================================================
---
shale/framework/trunk/shale-dialog/src/main/java/org/apache/shale/dialog/Constants.java
(original)
+++
shale/framework/trunk/shale-dialog/src/main/java/org/apache/shale/dialog/Constants.java
Thu Oct 12 11:38:03 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.shale.dialog2;
+package org.apache.shale.dialog;
/**
* <p>Manifest constants related to the integration of state machine
@@ -28,11 +28,8 @@
/**
* <p>Request scoped attribute under which the [EMAIL PROTECTED]
DialogContext} instance
* for the dialog that is active for this view (if any) is stored.</p>
- *
- * <p>FIXME - review this value if this class is promoted out of
- * the sandbox.</p>
*/
- public static final String CONTEXT_BEAN = "dialog2";
+ public static final String CONTEXT_BEAN = "dialog";
/**
@@ -40,12 +37,9 @@
* JSF component tree) under which the context identifier for the
* dialog instance that is current for this view (if any) should be
* stored and retrieved.</p>
- *
- * <p>FIXME - review this value if this class is promoted out of
- * the sandbox.</p>
*/
public static final String CONTEXT_ID_ATTR =
- "org.apache.shale.dialog2.CONTEXT_ID";
+ "org.apache.shale.dialog.CONTEXT_ID";
/**
@@ -56,14 +50,14 @@
* the new instance will be associated with that instance as a parent.</p>
*/
public static final String DIALOG_NAME =
- "org.apache.shale.dialog2.DIALOG_NAME";
+ "org.apache.shale.dialog.DIALOG_NAME";
/**
* <p>Prefix on a logical outcome that indicates a new dialog instance
* should be initiated.</p>
*/
- public static final String DIALOG_PREFIX = "dialog2:";
+ public static final String DIALOG_PREFIX = "dialog:";
/**
@@ -73,7 +67,7 @@
* this name.</p>
*/
public static final String MANAGER_BEAN =
- "org.apache.shale.dialog2.MANAGER";
+ "org.apache.shale.dialog.MANAGER";
/**
@@ -84,7 +78,7 @@
* currently active [EMAIL PROTECTED] DialogContext} instance.</p>
*/
public static final String PARENT_ID =
- "org.apache.shale.dialog2.PARENT_ID";
+ "org.apache.shale.dialog.PARENT_ID";
}
Modified:
shale/framework/trunk/shale-dialog/src/main/java/org/apache/shale/dialog/DialogContext.java
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-dialog/src/main/java/org/apache/shale/dialog/DialogContext.java?view=diff&rev=463368&r1=463367&r2=463368
==============================================================================
---
shale/framework/trunk/shale-dialog/src/main/java/org/apache/shale/dialog/DialogContext.java
(original)
+++
shale/framework/trunk/shale-dialog/src/main/java/org/apache/shale/dialog/DialogContext.java
Thu Oct 12 11:38:03 2006
@@ -14,15 +14,13 @@
* limitations under the License.
*/
-package org.apache.shale.dialog2;
+package org.apache.shale.dialog;
import javax.faces.context.FacesContext;
/**
* <p>Interface describing the current state of a particular dialog
- * context instance. If successful, it is likely that this
- * interface would be defined in the <code>org.apache.shale.dialog</code>
- * package.</p>
+ * context instance.</p>
*
* <p><strong>IMPLEMENTATION NOTE</strong> - Implementations of this interface
* will be stored in session scope, so they should be serializable.</p>
Modified:
shale/framework/trunk/shale-dialog/src/main/java/org/apache/shale/dialog/DialogContextManager.java
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-dialog/src/main/java/org/apache/shale/dialog/DialogContextManager.java?view=diff&rev=463368&r1=463367&r2=463368
==============================================================================
---
shale/framework/trunk/shale-dialog/src/main/java/org/apache/shale/dialog/DialogContextManager.java
(original)
+++
shale/framework/trunk/shale-dialog/src/main/java/org/apache/shale/dialog/DialogContextManager.java
Thu Oct 12 11:38:03 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.shale.dialog2;
+package org.apache.shale.dialog;
import javax.faces.context.FacesContext;
Modified:
shale/framework/trunk/shale-dialog/src/main/java/org/apache/shale/dialog/DialogListener.java
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-dialog/src/main/java/org/apache/shale/dialog/DialogListener.java?view=diff&rev=463368&r1=463367&r2=463368
==============================================================================
---
shale/framework/trunk/shale-dialog/src/main/java/org/apache/shale/dialog/DialogListener.java
(original)
+++
shale/framework/trunk/shale-dialog/src/main/java/org/apache/shale/dialog/DialogListener.java
Thu Oct 12 11:38:03 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.shale.dialog2;
+package org.apache.shale.dialog;
/**
@@ -105,4 +105,3 @@
}
-
Modified:
shale/framework/trunk/shale-dialog/src/main/java/org/apache/shale/dialog/base/AbstractDialogContext.java
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-dialog/src/main/java/org/apache/shale/dialog/base/AbstractDialogContext.java?view=diff&rev=463368&r1=463367&r2=463368
==============================================================================
---
shale/framework/trunk/shale-dialog/src/main/java/org/apache/shale/dialog/base/AbstractDialogContext.java
(original)
+++
shale/framework/trunk/shale-dialog/src/main/java/org/apache/shale/dialog/base/AbstractDialogContext.java
Thu Oct 12 11:38:03 2006
@@ -14,14 +14,14 @@
* limitations under the License.
*/
-package org.apache.shale.dialog2.base;
+package org.apache.shale.dialog.base;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
-import org.apache.shale.dialog2.DialogContext;
-import org.apache.shale.dialog2.DialogListener;
+import org.apache.shale.dialog.DialogContext;
+import org.apache.shale.dialog.DialogListener;
/**
* <p>Convenience abstract [EMAIL PROTECTED] DialogContext} implementation.
Subclasses
@@ -214,4 +214,3 @@
}
}
-
Modified:
shale/framework/trunk/shale-dialog/src/main/java/org/apache/shale/dialog/base/AbstractDialogListener.java
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-dialog/src/main/java/org/apache/shale/dialog/base/AbstractDialogListener.java?view=diff&rev=463368&r1=463367&r2=463368
==============================================================================
---
shale/framework/trunk/shale-dialog/src/main/java/org/apache/shale/dialog/base/AbstractDialogListener.java
(original)
+++
shale/framework/trunk/shale-dialog/src/main/java/org/apache/shale/dialog/base/AbstractDialogListener.java
Thu Oct 12 11:38:03 2006
@@ -14,12 +14,12 @@
* limitations under the License.
*/
-package org.apache.shale.dialog2.base;
+package org.apache.shale.dialog.base;
import java.io.Serializable;
-import org.apache.shale.dialog2.DialogContext;
-import org.apache.shale.dialog2.DialogListener;
+import org.apache.shale.dialog.DialogContext;
+import org.apache.shale.dialog.DialogListener;
/**
* <p>Convenience abstract [EMAIL PROTECTED] DialogListener} implementation.
Subclasses
@@ -128,4 +128,3 @@
}
}
-
Copied:
shale/framework/trunk/shale-dialog/src/main/java/org/apache/shale/dialog/faces/DialogNavigationHandler.java
(from r463362,
shale/framework/trunk/shale-dialog/src/main/java/org/apache/shale/dialog/faces/Dialog2NavigationHandler.java)
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-dialog/src/main/java/org/apache/shale/dialog/faces/DialogNavigationHandler.java?view=diff&rev=463368&p1=shale/framework/trunk/shale-dialog/src/main/java/org/apache/shale/dialog/faces/Dialog2NavigationHandler.java&r1=463362&p2=shale/framework/trunk/shale-dialog/src/main/java/org/apache/shale/dialog/faces/DialogNavigationHandler.java&r2=463368
==============================================================================
---
shale/framework/trunk/shale-dialog/src/main/java/org/apache/shale/dialog/faces/Dialog2NavigationHandler.java
(original)
+++
shale/framework/trunk/shale-dialog/src/main/java/org/apache/shale/dialog/faces/DialogNavigationHandler.java
Thu Oct 12 11:38:03 2006
@@ -14,16 +14,16 @@
* limitations under the License.
*/
-package org.apache.shale.dialog2.faces;
+package org.apache.shale.dialog.faces;
import javax.faces.application.NavigationHandler;
import javax.faces.context.FacesContext;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.shale.dialog2.Constants;
-import org.apache.shale.dialog2.DialogContext;
-import org.apache.shale.dialog2.DialogContextManager;
+import org.apache.shale.dialog.Constants;
+import org.apache.shale.dialog.DialogContext;
+import org.apache.shale.dialog.DialogContextManager;
/**
* <p><code>NavigationHandler</code> implementation that allows dialogs to
@@ -33,21 +33,21 @@
*
* @since 1.0.4
*/
-public final class Dialog2NavigationHandler extends NavigationHandler {
+public final class DialogNavigationHandler extends NavigationHandler {
// ------------------------------------------------------------
Constructors
/**
- * <p>Creates a new instance of Dialog2NavigationHandler that delegates
+ * <p>Creates a new instance of DialogNavigationHandler that delegates
* to the specified original handler.</p>
*
* @param original Original NavigationHandler
*/
- public Dialog2NavigationHandler(NavigationHandler original) {
+ public DialogNavigationHandler(NavigationHandler original) {
if (log.isInfoEnabled()) {
- log.info("Instantiating Dialog2NavigationHandler (wrapping
instance '"
+ log.info("Instantiating DialogNavigationHandler (wrapping instance
'"
+ original + "')");
}
this.original = original;
@@ -60,7 +60,7 @@
/**
* <p>The <code>Log</code> instance for this class.</p>
*/
- private Log log = LogFactory.getLog(Dialog2NavigationHandler.class);
+ private Log log = LogFactory.getLog(DialogNavigationHandler.class);
/**
Copied:
shale/framework/trunk/shale-dialog/src/main/java/org/apache/shale/dialog/faces/DialogPhaseListener.java
(from r463362,
shale/framework/trunk/shale-dialog/src/main/java/org/apache/shale/dialog/faces/Dialog2PhaseListener.java)
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-dialog/src/main/java/org/apache/shale/dialog/faces/DialogPhaseListener.java?view=diff&rev=463368&p1=shale/framework/trunk/shale-dialog/src/main/java/org/apache/shale/dialog/faces/Dialog2PhaseListener.java&r1=463362&p2=shale/framework/trunk/shale-dialog/src/main/java/org/apache/shale/dialog/faces/DialogPhaseListener.java&r2=463368
==============================================================================
---
shale/framework/trunk/shale-dialog/src/main/java/org/apache/shale/dialog/faces/Dialog2PhaseListener.java
(original)
+++
shale/framework/trunk/shale-dialog/src/main/java/org/apache/shale/dialog/faces/DialogPhaseListener.java
Thu Oct 12 11:38:03 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.shale.dialog2.faces;
+package org.apache.shale.dialog.faces;
import java.util.Map;
@@ -25,9 +25,9 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.shale.dialog2.Constants;
-import org.apache.shale.dialog2.DialogContext;
-import org.apache.shale.dialog2.DialogContextManager;
+import org.apache.shale.dialog.Constants;
+import org.apache.shale.dialog.DialogContext;
+import org.apache.shale.dialog.DialogContextManager;
/**
* <p>Phase listener that saves and restores the dialog identifier for the
@@ -38,18 +38,18 @@
*
* @since 1.0.4
*/
-public final class Dialog2PhaseListener implements PhaseListener {
+public final class DialogPhaseListener implements PhaseListener {
// ------------------------------------------------------------
Constructors
/**
- * <p>Creates a new instance of Dialog2PhaseListener.</p>
+ * <p>Creates a new instance of DialogPhaseListener.</p>
*/
- public Dialog2PhaseListener() {
+ public DialogPhaseListener() {
if (log.isInfoEnabled()) {
- log.info("Instantiating Dialog2PhaseListener()");
+ log.info("Instantiating DialogPhaseListener()");
}
}
@@ -60,7 +60,7 @@
/**
* <p>The <code>Log</code> instance for this class.</p>
*/
- private Log log = LogFactory.getLog(Dialog2PhaseListener.class);
+ private Log log = LogFactory.getLog(DialogPhaseListener.class);
// --------------------------------------------------- PhaseListener
Methods
