You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shale.apache.org by cr...@apache.org on 2006/10/12 23:33:45 UTC
svn commit: r463441 - in
/shale/framework/trunk/shale-apps/shale-test-dialog-basic: ./
src/main/java/org/apache/shale/examples/test/dialog/basic/
src/main/java/org/apache/shale/examples/test/dialog/legacy/
src/main/webapp/ src/main/webapp/WEB-INF/ src/...
Author: craigmcc
Date: Thu Oct 12 14:33:43 2006
New Revision: 463441
URL: http://svn.apache.org/viewvc?view=rev&rev=463441
Log:
Update the shale-test-dialog-basic webapp to reflect the refactoring of
bringing the shale-dialog2 functionality into the framework.
SHALE-300
Added:
shale/framework/trunk/shale-apps/shale-test-dialog-basic/src/main/java/org/apache/shale/examples/test/dialog/basic/
- copied from r463405, shale/framework/trunk/shale-apps/shale-test-dialog-basic/src/main/java/org/apache/shale/examples/test/dialog/legacy/
Removed:
shale/framework/trunk/shale-apps/shale-test-dialog-basic/src/main/java/org/apache/shale/examples/test/dialog/legacy/
Modified:
shale/framework/trunk/shale-apps/shale-test-dialog-basic/pom.xml
shale/framework/trunk/shale-apps/shale-test-dialog-basic/src/main/java/org/apache/shale/examples/test/dialog/basic/City.java
shale/framework/trunk/shale-apps/shale-test-dialog-basic/src/main/java/org/apache/shale/examples/test/dialog/basic/Popup.java
shale/framework/trunk/shale-apps/shale-test-dialog-basic/src/main/java/org/apache/shale/examples/test/dialog/basic/PopupData.java
shale/framework/trunk/shale-apps/shale-test-dialog-basic/src/main/java/org/apache/shale/examples/test/dialog/basic/Wizard.java
shale/framework/trunk/shale-apps/shale-test-dialog-basic/src/main/java/org/apache/shale/examples/test/dialog/basic/WizardData.java
shale/framework/trunk/shale-apps/shale-test-dialog-basic/src/main/webapp/WEB-INF/dialog-config.xml
shale/framework/trunk/shale-apps/shale-test-dialog-basic/src/main/webapp/WEB-INF/faces-config.xml
shale/framework/trunk/shale-apps/shale-test-dialog-basic/src/main/webapp/WEB-INF/web.xml
shale/framework/trunk/shale-apps/shale-test-dialog-basic/src/main/webapp/menu.jsp
shale/framework/trunk/shale-apps/shale-test-dialog-basic/src/main/webapp/popuppage1.jsp
shale/framework/trunk/shale-apps/shale-test-dialog-basic/src/main/webapp/wizardpage1.jsp
shale/framework/trunk/shale-apps/shale-test-dialog-basic/src/main/webapp/wizardpage2.jsp
shale/framework/trunk/shale-apps/shale-test-dialog-basic/src/main/webapp/wizardpage3.jsp
shale/framework/trunk/shale-apps/shale-test-dialog-basic/src/test/java/org/apache/shale/examples/test/dialog/basic/systest/IntegrationTestCase.java
Modified: shale/framework/trunk/shale-apps/shale-test-dialog-basic/pom.xml
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-test-dialog-basic/pom.xml?view=diff&rev=463441&r1=463440&r2=463441
==============================================================================
--- shale/framework/trunk/shale-apps/shale-test-dialog-basic/pom.xml (original)
+++ shale/framework/trunk/shale-apps/shale-test-dialog-basic/pom.xml Thu Oct 12 14:33:43 2006
@@ -27,10 +27,11 @@
<version>1.0.4-SNAPSHOT</version>
</parent>
- <artifactId>shale-test-dialog2-legacy</artifactId>
+ <groupId>org.apache.shale</groupId>
+ <artifactId>shale-test-dialog-basic</artifactId>
<packaging>war</packaging>
- <name>Shale Test App (Dialog2 Legacy Implementation)</name>
- <description>A sample application for Shale dialog2 features when using the legacy dialog2 implementation.</description>
+ <name>Shale Test App (Dialog Basic Implementation)</name>
+ <description>A sample application for Shale dialog features when using the basic dialog implementation.</description>
<dependencies>
@@ -75,28 +76,16 @@
<version>0.8</version>
<scope>test</scope>
</dependency>
-<!--
- <dependency>
- <groupId>org.apache.shale</groupId>
- <artifactId>shale-core</artifactId>
- <version>${version}</version>
- <exclusions>
- <exclusion>
- <artifactId>log4j</artifactId>
- <groupId>log4j</groupId>
- </exclusion>
- </exclusions>
- </dependency>
--->
+
<dependency>
<groupId>org.apache.shale</groupId>
- <artifactId>shale-dialog2</artifactId>
+ <artifactId>shale-dialog</artifactId>
<version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.shale</groupId>
- <artifactId>shale-dialog2-legacy</artifactId>
+ <artifactId>shale-dialog-basic</artifactId>
<version>${version}</version>
</dependency>
Modified: shale/framework/trunk/shale-apps/shale-test-dialog-basic/src/main/java/org/apache/shale/examples/test/dialog/basic/City.java
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-test-dialog-basic/src/main/java/org/apache/shale/examples/test/dialog/basic/City.java?view=diff&rev=463441&r1=463405&r2=463441
==============================================================================
--- shale/framework/trunk/shale-apps/shale-test-dialog-basic/src/main/java/org/apache/shale/examples/test/dialog/basic/City.java (original)
+++ shale/framework/trunk/shale-apps/shale-test-dialog-basic/src/main/java/org/apache/shale/examples/test/dialog/basic/City.java Thu Oct 12 14:33:43 2006
@@ -16,7 +16,7 @@
* $Id$
*/
-package org.apache.shale.examples.test.dialog2.legacy;
+package org.apache.shale.examples.test.dialog.basic;
import java.io.Serializable;
Modified: shale/framework/trunk/shale-apps/shale-test-dialog-basic/src/main/java/org/apache/shale/examples/test/dialog/basic/Popup.java
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-test-dialog-basic/src/main/java/org/apache/shale/examples/test/dialog/basic/Popup.java?view=diff&rev=463441&r1=463405&r2=463441
==============================================================================
--- shale/framework/trunk/shale-apps/shale-test-dialog-basic/src/main/java/org/apache/shale/examples/test/dialog/basic/Popup.java (original)
+++ shale/framework/trunk/shale-apps/shale-test-dialog-basic/src/main/java/org/apache/shale/examples/test/dialog/basic/Popup.java Thu Oct 12 14:33:43 2006
@@ -16,13 +16,13 @@
* $Id$
*/
-package org.apache.shale.examples.test.dialog2.legacy;
+package org.apache.shale.examples.test.dialog.basic;
import javax.faces.context.FacesContext;
import javax.faces.el.ValueBinding;
-import org.apache.shale.dialog2.Constants;
-import org.apache.shale.dialog2.DialogContext;
+import org.apache.shale.dialog.Constants;
+import org.apache.shale.dialog.DialogContext;
/**
* <p>Event handlers for the "PopUp" dialog.</p>
Modified: shale/framework/trunk/shale-apps/shale-test-dialog-basic/src/main/java/org/apache/shale/examples/test/dialog/basic/PopupData.java
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-test-dialog-basic/src/main/java/org/apache/shale/examples/test/dialog/basic/PopupData.java?view=diff&rev=463441&r1=463405&r2=463441
==============================================================================
--- shale/framework/trunk/shale-apps/shale-test-dialog-basic/src/main/java/org/apache/shale/examples/test/dialog/basic/PopupData.java (original)
+++ shale/framework/trunk/shale-apps/shale-test-dialog-basic/src/main/java/org/apache/shale/examples/test/dialog/basic/PopupData.java Thu Oct 12 14:33:43 2006
@@ -16,7 +16,7 @@
* $Id$
*/
-package org.apache.shale.examples.test.dialog2.legacy;
+package org.apache.shale.examples.test.dialog.basic;
import java.io.Serializable;
import java.util.ArrayList;
Modified: shale/framework/trunk/shale-apps/shale-test-dialog-basic/src/main/java/org/apache/shale/examples/test/dialog/basic/Wizard.java
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-test-dialog-basic/src/main/java/org/apache/shale/examples/test/dialog/basic/Wizard.java?view=diff&rev=463441&r1=463405&r2=463441
==============================================================================
--- shale/framework/trunk/shale-apps/shale-test-dialog-basic/src/main/java/org/apache/shale/examples/test/dialog/basic/Wizard.java (original)
+++ shale/framework/trunk/shale-apps/shale-test-dialog-basic/src/main/java/org/apache/shale/examples/test/dialog/basic/Wizard.java Thu Oct 12 14:33:43 2006
@@ -16,15 +16,15 @@
* $Id$
*/
-package org.apache.shale.examples.test.dialog2.legacy;
+package org.apache.shale.examples.test.dialog.basic;
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>Utility actions for the wizard dialog series of tests.</p>
Modified: shale/framework/trunk/shale-apps/shale-test-dialog-basic/src/main/java/org/apache/shale/examples/test/dialog/basic/WizardData.java
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-test-dialog-basic/src/main/java/org/apache/shale/examples/test/dialog/basic/WizardData.java?view=diff&rev=463441&r1=463405&r2=463441
==============================================================================
--- shale/framework/trunk/shale-apps/shale-test-dialog-basic/src/main/java/org/apache/shale/examples/test/dialog/basic/WizardData.java (original)
+++ shale/framework/trunk/shale-apps/shale-test-dialog-basic/src/main/java/org/apache/shale/examples/test/dialog/basic/WizardData.java Thu Oct 12 14:33:43 2006
@@ -16,7 +16,7 @@
* $Id$
*/
-package org.apache.shale.examples.test.dialog2.legacy;
+package org.apache.shale.examples.test.dialog.basic;
import java.io.Serializable;
Modified: shale/framework/trunk/shale-apps/shale-test-dialog-basic/src/main/webapp/WEB-INF/dialog-config.xml
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-test-dialog-basic/src/main/webapp/WEB-INF/dialog-config.xml?view=diff&rev=463441&r1=463440&r2=463441
==============================================================================
--- shale/framework/trunk/shale-apps/shale-test-dialog-basic/src/main/webapp/WEB-INF/dialog-config.xml (original)
+++ shale/framework/trunk/shale-apps/shale-test-dialog-basic/src/main/webapp/WEB-INF/dialog-config.xml Thu Oct 12 14:33:43 2006
@@ -20,20 +20,20 @@
<!--
- Dialog definitions for Shale Dialog2 Legacy Integration Tests
+ Dialog definitions for Shale Dialog Basic Integration Tests
-->
<!DOCTYPE dialogs PUBLIC
- "-//Apache Software Foundation//DTD Shale Dialog2 Configuration 1.1//EN"
- "http://shale.apache.org/dtds/dialog2-config_1_1.dtd">
+ "-//Apache Software Foundation//DTD Shale Dialog Configuration 1.1//EN"
+ "http://shale.apache.org/dtds/dialog-config_1_1.dtd">
<dialogs>
<!-- Three Page Wizard Dialog -->
<dialog name="wizard"
- dataClassName="org.apache.shale.examples.test.dialog2.legacy.WizardData"
+ dataClassName="org.apache.shale.examples.test.dialog.basic.WizardData"
start="setup">
<action name="setup"
@@ -112,7 +112,7 @@
<!-- Pop Up Dialog for City/State/Zip Configuration -->
<dialog name="popup"
- dataClassName="org.apache.shale.examples.test.dialog2.legacy.PopupData"
+ dataClassName="org.apache.shale.examples.test.dialog.basic.PopupData"
start="setup">
<action name="setup"
@@ -136,7 +136,6 @@
viewId="/popupFinished.jsp"/>
</dialog>
-
</dialogs>
Modified: shale/framework/trunk/shale-apps/shale-test-dialog-basic/src/main/webapp/WEB-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-test-dialog-basic/src/main/webapp/WEB-INF/faces-config.xml?view=diff&rev=463441&r1=463440&r2=463441
==============================================================================
--- shale/framework/trunk/shale-apps/shale-test-dialog-basic/src/main/webapp/WEB-INF/faces-config.xml (original)
+++ shale/framework/trunk/shale-apps/shale-test-dialog-basic/src/main/webapp/WEB-INF/faces-config.xml Thu Oct 12 14:33:43 2006
@@ -28,13 +28,13 @@
<managed-bean>
<managed-bean-name>popup</managed-bean-name>
- <managed-bean-class>org.apache.shale.examples.test.dialog2.legacy.Popup</managed-bean-class>
+ <managed-bean-class>org.apache.shale.examples.test.dialog.basic.Popup</managed-bean-class>
<managed-bean-scope>request</managed-bean-scope>
</managed-bean>
<managed-bean>
<managed-bean-name>wizard</managed-bean-name>
- <managed-bean-class>org.apache.shale.examples.test.dialog2.legacy.Wizard</managed-bean-class>
+ <managed-bean-class>org.apache.shale.examples.test.dialog.basic.Wizard</managed-bean-class>
<managed-bean-scope>request</managed-bean-scope>
</managed-bean>
Modified: shale/framework/trunk/shale-apps/shale-test-dialog-basic/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-test-dialog-basic/src/main/webapp/WEB-INF/web.xml?view=diff&rev=463441&r1=463440&r2=463441
==============================================================================
--- shale/framework/trunk/shale-apps/shale-test-dialog-basic/src/main/webapp/WEB-INF/web.xml (original)
+++ shale/framework/trunk/shale-apps/shale-test-dialog-basic/src/main/webapp/WEB-INF/web.xml Thu Oct 12 14:33:43 2006
@@ -25,7 +25,7 @@
version="2.4">
<!-- Display name for this application -->
- <display-name>Shale Test App (Dialog2 Legacy Implementation)</display-name>
+ <display-name>Shale Test App (Dialog Basic Implementation)</display-name>
<!-- Select JSF State Saving Mode -->
<context-param>
@@ -39,10 +39,10 @@
<param-value>/WEB-INF/faces-config.xml</param-value>
</context-param>
- <!-- Dialog2 Legacy Configuration Resources (comma separated list) -->
+ <!-- Dialog Basic Configuration Resources (comma separated list) -->
<!-- Not explicitly required, because this is the default resource name
<context-param>
- <param-name>org.apache.shale.dialog2.legacy.CONFIGURATION</param-name>
+ <param-name>org.apache.shale.dialog.basic.CONFIGURATION</param-name>
<param-value>/WEB-INF/dialog-config.xml</param-value>
</context-param>
-->
Modified: shale/framework/trunk/shale-apps/shale-test-dialog-basic/src/main/webapp/menu.jsp
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-test-dialog-basic/src/main/webapp/menu.jsp?view=diff&rev=463441&r1=463440&r2=463441
==============================================================================
--- shale/framework/trunk/shale-apps/shale-test-dialog-basic/src/main/webapp/menu.jsp (original)
+++ shale/framework/trunk/shale-apps/shale-test-dialog-basic/src/main/webapp/menu.jsp Thu Oct 12 14:33:43 2006
@@ -24,16 +24,16 @@
<f:view>
<html>
<head>
- <title>Shale Test App (Dialog2 Legacy Implementation)</title>
+ <title>Shale Test App (Dialog Basic Implementation)</title>
</head>
<body>
- <h3>Shale Test App (Dialog2 Legacy Implementation)</h3>
+ <h3>Shale Test App (Dialog Basic Implementation)</h3>
<h:form id="form">
<ul>
<li><h:commandLink id="navigate"
- action="dialog2:wizard"
+ action="dialog:wizard"
value="Start dialog via navigation"/></li>
<li><h:commandLink id="programmatic"
action="#{wizard.start}"
Modified: shale/framework/trunk/shale-apps/shale-test-dialog-basic/src/main/webapp/popuppage1.jsp
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-test-dialog-basic/src/main/webapp/popuppage1.jsp?view=diff&rev=463441&r1=463440&r2=463441
==============================================================================
--- shale/framework/trunk/shale-apps/shale-test-dialog-basic/src/main/webapp/popuppage1.jsp (original)
+++ shale/framework/trunk/shale-apps/shale-test-dialog-basic/src/main/webapp/popuppage1.jsp Thu Oct 12 14:33:43 2006
@@ -37,9 +37,9 @@
<h:outputLabel for="state"
value="State:"/>
<h:selectOneMenu id="state"
- value="#{dialog2.data.state}">
+ value="#{dialog.data.state}">
<f:selectItems
- value="#{dialog2.data.states}"/>
+ value="#{dialog.data.states}"/>
</h:selectOneMenu>
<h:commandButton id="refresh"
action="#{popup.refresh}"
@@ -49,7 +49,7 @@
</h:panelGrid>
<h:dataTable id="table"
- value="#{dialog2.data.cities}"
+ value="#{dialog.data.cities}"
var="city">
<h:column>
<f:facet name="header">
Modified: shale/framework/trunk/shale-apps/shale-test-dialog-basic/src/main/webapp/wizardpage1.jsp
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-test-dialog-basic/src/main/webapp/wizardpage1.jsp?view=diff&rev=463441&r1=463440&r2=463441
==============================================================================
--- shale/framework/trunk/shale-apps/shale-test-dialog-basic/src/main/webapp/wizardpage1.jsp (original)
+++ shale/framework/trunk/shale-apps/shale-test-dialog-basic/src/main/webapp/wizardpage1.jsp Thu Oct 12 14:33:43 2006
@@ -38,14 +38,14 @@
value="Username:"/>
<h:inputText id="username"
required="true"
- value="#{dialog2.data.username}"/>
+ value="#{dialog.data.username}"/>
<h:message for="username"/>
<h:outputLabel for="password"
value="Password:"/>
<h:inputText id="password"
required="true"
- value="#{dialog2.data.password}"/>
+ value="#{dialog.data.password}"/>
<h:message for="password"/>
<h:outputText value=""/>
Modified: shale/framework/trunk/shale-apps/shale-test-dialog-basic/src/main/webapp/wizardpage2.jsp
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-test-dialog-basic/src/main/webapp/wizardpage2.jsp?view=diff&rev=463441&r1=463440&r2=463441
==============================================================================
--- shale/framework/trunk/shale-apps/shale-test-dialog-basic/src/main/webapp/wizardpage2.jsp (original)
+++ shale/framework/trunk/shale-apps/shale-test-dialog-basic/src/main/webapp/wizardpage2.jsp Thu Oct 12 14:33:43 2006
@@ -38,34 +38,34 @@
value="Name:"/>
<h:inputText id="name"
required="true"
- value="#{dialog2.data.name}"/>
+ value="#{dialog.data.name}"/>
<h:message for="name"/>
<h:outputLabel for="address1"
value="Address 1:"/>
<h:inputText id="address1"
required="true"
- value="#{dialog2.data.address1}"/>
+ value="#{dialog.data.address1}"/>
<h:message for="address1"/>
<h:outputLabel for="address2"
value="Address 2:"/>
<h:inputText id="address2"
- value="#{dialog2.data.address2}"/>
+ value="#{dialog.data.address2}"/>
<h:message for="address2"/>
<h:outputLabel for="city"
value="City:"/>
<h:inputText id="city"
required="true"
- value="#{dialog2.data.city}"/>
+ value="#{dialog.data.city}"/>
<h:message for="city"/>
<h:outputLabel for="state"
value="State:"/>
<h:inputText id="state"
required="true"
- value="#{dialog2.data.state}"/>
+ value="#{dialog.data.state}"/>
<h:message for="state"/>
<h:outputLabel for="zipCode"
@@ -73,7 +73,7 @@
<h:panelGroup>
<h:inputText id="zipCode"
required="true"
- value="#{dialog2.data.zipCode}"/>
+ value="#{dialog.data.zipCode}"/>
<h:outputLink id="zipCodePopup"
value="#"
onclick="javascript:window.open('popuppage1.faces?org.apache.shale.dialog2.PARENT_ID=#{dialog2.id}&org.apache.shale.dialog2.DIALOG_NAME=popup','popup','height=600,width=800')">
Modified: shale/framework/trunk/shale-apps/shale-test-dialog-basic/src/main/webapp/wizardpage3.jsp
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-test-dialog-basic/src/main/webapp/wizardpage3.jsp?view=diff&rev=463441&r1=463440&r2=463441
==============================================================================
--- shale/framework/trunk/shale-apps/shale-test-dialog-basic/src/main/webapp/wizardpage3.jsp (original)
+++ shale/framework/trunk/shale-apps/shale-test-dialog-basic/src/main/webapp/wizardpage3.jsp Thu Oct 12 14:33:43 2006
@@ -38,14 +38,14 @@
value="Administrator:"/>
<h:selectBooleanCheckbox
id="administrator"
- value="#{dialog2.data.administrator}"/>
+ value="#{dialog.data.administrator}"/>
<h:message for="administrator"/>
<h:outputLabel for="enabled"
value="Enabled:"/>
<h:selectBooleanCheckbox
id="enabled"
- value="#{dialog2.data.enabled}"/>
+ value="#{dialog.data.enabled}"/>
<h:message for="enabled"/>
<h:outputText value=""/>
Modified: shale/framework/trunk/shale-apps/shale-test-dialog-basic/src/test/java/org/apache/shale/examples/test/dialog/basic/systest/IntegrationTestCase.java
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-test-dialog-basic/src/test/java/org/apache/shale/examples/test/dialog/basic/systest/IntegrationTestCase.java?view=diff&rev=463441&r1=463440&r2=463441
==============================================================================
--- shale/framework/trunk/shale-apps/shale-test-dialog-basic/src/test/java/org/apache/shale/examples/test/dialog/basic/systest/IntegrationTestCase.java (original)
+++ shale/framework/trunk/shale-apps/shale-test-dialog-basic/src/test/java/org/apache/shale/examples/test/dialog/basic/systest/IntegrationTestCase.java Thu Oct 12 14:33:43 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.shale.examples.test.dialog2.legacy.systest;
+package org.apache.shale.examples.test.dialog.basic.systest;
import junit.framework.Test;
import junit.framework.TestSuite;
@@ -26,7 +26,7 @@
import com.gargoylesoftware.htmlunit.html.HtmlSubmitInput;
/**
- * <p>Integration tests for the Shale Dialog2 Legacy Implementation.</p>
+ * <p>Integration tests for the Shale Dialog Basic Implementation.</p>
*/
public class IntegrationTestCase extends AbstractHtmlUnitTestCase {
@@ -87,7 +87,7 @@
// Test /menu.jsp
public void testMenu() throws Exception {
- assertEquals("Shale Test App (Dialog2 Legacy Implementation)", title());
+ assertEquals("Shale Test App (Dialog Basic Implementation)", title());
}