From e7e6065b36bf60414486ee9a42c1d60e4c513fe7 Mon Sep 17 00:00:00 2001
From: Nils-Helge Garli <nilsga@apache.org>
Date: Sun, 12 Aug 2007 12:39:40 +0000
Subject: [PATCH] WW-1877 Removed ajax examples

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@565051 13f79535-47bb-0310-9956-ffa450edef68
---
 .../src/main/resources/struts-view.xml        | 13 -----
 apps/portlet/src/main/webapp/WEB-INF/dwr.xml  | 21 --------
 .../src/main/webapp/WEB-INF/view/ajax.jsp     |  1 -
 .../src/main/webapp/WEB-INF/view/ajaxData.jsp |  1 -
 .../main/webapp/WEB-INF/view/ajaxExample.jsp  | 48 -------------------
 5 files changed, 84 deletions(-)
 delete mode 100644 apps/portlet/src/main/webapp/WEB-INF/dwr.xml
 delete mode 100644 apps/portlet/src/main/webapp/WEB-INF/view/ajax.jsp
 delete mode 100644 apps/portlet/src/main/webapp/WEB-INF/view/ajaxData.jsp
 delete mode 100644 apps/portlet/src/main/webapp/WEB-INF/view/ajaxExample.jsp

diff --git a/apps/portlet/src/main/resources/struts-view.xml b/apps/portlet/src/main/resources/struts-view.xml
index 51e3c785a..e8544e257 100644
--- a/apps/portlet/src/main/resources/struts-view.xml
+++ b/apps/portlet/src/main/resources/struts-view.xml
@@ -43,7 +43,6 @@
 			<result name="input">
 				/WEB-INF/view/formExampleInputValidation.jsp
 			</result>
-			<interceptor-ref name="validationWorkflowStack" />
 		</action>
 
 		<action name="tokenExample"
@@ -73,18 +72,6 @@
 			</result>
 		</action>
 
-		<action name="ajaxExample"
-			class="com.opensymphony.xwork2.ActionSupport">
-			<result name="success">
-				/WEB-INF/view/ajaxExample.jsp
-			</result>
-		</action>
-
-		<action name="ajaxData"
-			class="com.opensymphony.xwork2.ActionSupport">
-			<result name="success">/WEB-INF/view/ajaxData.jsp</result>
-		</action>
-
 		<action name="freeMarkerExample"
 			class="com.opensymphony.xwork2.ActionSupport" method="input">
 			<result type="freemarker" name="input">
diff --git a/apps/portlet/src/main/webapp/WEB-INF/dwr.xml b/apps/portlet/src/main/webapp/WEB-INF/dwr.xml
deleted file mode 100644
index 4ede30035..000000000
--- a/apps/portlet/src/main/webapp/WEB-INF/dwr.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE dwr PUBLIC
-    "-//GetAhead Limited//DTD Direct Web Remoting 1.0//EN"
-    "http://www.getahead.ltd.uk/dwr/dwr10.dtd">
-<dwr>
-    <allow>
-        <create creator="new" javascript="validator">
-            <param name="class" value="org.apache.struts2.validators.DWRValidator"/>
-        </create>
-        <convert converter="bean" match="com.opensymphony.xwork2.ValidationAwareSupport"/>
-    </allow>
-
-    <signatures>
-        <![CDATA[
-        import java.util.Map;
-        import org.apache.struts2.validators.DWRValidator;
-
-        DWRValidator.doPost(String, String, Map<String, String>);
-        ]]>
-    </signatures>
-</dwr>
diff --git a/apps/portlet/src/main/webapp/WEB-INF/view/ajax.jsp b/apps/portlet/src/main/webapp/WEB-INF/view/ajax.jsp
deleted file mode 100644
index e24ec7c17..000000000
--- a/apps/portlet/src/main/webapp/WEB-INF/view/ajax.jsp
+++ /dev/null
@@ -1 +0,0 @@
-<H2>Hello from Ajax!</H2>
diff --git a/apps/portlet/src/main/webapp/WEB-INF/view/ajaxData.jsp b/apps/portlet/src/main/webapp/WEB-INF/view/ajaxData.jsp
deleted file mode 100644
index 796b0d77d..000000000
--- a/apps/portlet/src/main/webapp/WEB-INF/view/ajaxData.jsp
+++ /dev/null
@@ -1 +0,0 @@
-This data is fetched via Ajax! The server time is <%= new java.util.Date() %>
diff --git a/apps/portlet/src/main/webapp/WEB-INF/view/ajaxExample.jsp b/apps/portlet/src/main/webapp/WEB-INF/view/ajaxExample.jsp
deleted file mode 100644
index 79ed4aa21..000000000
--- a/apps/portlet/src/main/webapp/WEB-INF/view/ajaxExample.jsp
+++ /dev/null
@@ -1,48 +0,0 @@
-<%@ taglib prefix="s" uri="/struts-tags" %>
-<s:head theme="ajax"/>
-<link rel="stylesheet" type="text/css" href="<s:url value="/struts/tabs.css"/>">
-<b>This is a tabbed pane with two panels that fetches data from a remote action via ajax</b>
-
-<s:tabbedPanel id="test2" theme="simple" >
-      <s:div id="left" label="left" theme="ajax">
-          This is the left pane<br/>
-          <s:form >
-              <s:textfield name="tt" label="Test Text" />  <br/>
-              <s:textfield name="tt2" label="Test Text2" />
-          </s:form>
-      </s:div>
-      <s:div href="<s:url action="ajaxData"/>" id="ryh1" theme="ajax" label="remote one" />
-      <s:div id="middle" label="middle" theme="ajax">
-          middle tab<br/>
-          <s:form >
-              <s:textfield name="tt" label="Test Text44" />  <br/>
-              <s:textfield name="tt2" label="Test Text442" />
-          </s:form>
-      </s:div>
-      <s:div href="<s:url action="ajaxData"/>"  id="ryh21" theme="ajax" label="remote right" />
-  </s:tabbedPanel>
-  
-<p/>
-A DIV that waits for 5 seconds before loading the contents
-<s:div
-        id="once"
-        theme="ajax"
-        cssStyle="border: 1px solid yellow;"
-        href="<s:url action="ajaxData"/>"
-        delay="5000"
-        loadingText="loading...">
-    Waiting for data</s:div>
-<p/>
-A DIV that is updated every 2 seconds
-<s:div
-            id="twoseconds"
-            cssStyle="border: 1px solid yellow;"
-            href="<s:url action="ajaxData"/>"
-            theme="ajax"
-            delay="2000"
-            updateFreq="2000"
-            errorText="There was an error"
-            loadingText="loading...">Initial Content
-    </s:div>
-<p/>
-<a href="<s:url action="index"/>">Back to front page</a>