You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by jo...@apache.org on 2015/05/25 12:12:14 UTC
[3/3] struts git commit: Cleanup struts2 showcase after removing of
deprecated plugins
Cleanup struts2 showcase after removing of deprecated plugins
- Remove struts1 integration example
- Remove JSF integration example
- Remove all references to dojo plugin
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/ffe0e20e
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/ffe0e20e
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/ffe0e20e
Branch: refs/heads/master
Commit: ffe0e20edd9d5386f4410fddd970286a69373243
Parents: 17d73d2
Author: Johannes Geppert <jo...@gmail.com>
Authored: Mon May 25 12:11:59 2015 +0200
Committer: Johannes Geppert <jo...@gmail.com>
Committed: Mon May 25 12:11:59 2015 +0200
----------------------------------------------------------------------
apps/showcase/pom.xml | 16 -
.../integration/EditGangsterAction.java | 44 --
.../showcase/integration/GangsterForm.java | 115 -----
.../integration/SaveGangsterAction.java | 46 --
.../struts2/showcase/jsf/JsfEmployeeAction.java | 115 -----
.../showcase/ajax/Example5Action-validation.xml | 19 -
.../ChatLoginAction-chatLogin-validation.xml | 14 -
.../chat/ChatMessage-conversion.properties | 1 -
.../CrudRoomAction-createRoom-validation.xml | 20 -
.../showcase/chat/Room-conversion.properties | 1 -
...oRoomAction-sendMessageToRoom-validation.xml | 15 -
.../showcase/src/main/resources/struts-ajax.xml | 114 -----
.../showcase/src/main/resources/struts-chat.xml | 135 -----
.../src/main/resources/struts-integration.xml | 47 --
apps/showcase/src/main/resources/struts-jsf.xml | 44 --
apps/showcase/src/main/resources/struts.xml | 8 -
.../src/main/webapp/WEB-INF/ajax/AjaxResult.jsp | 12 -
.../src/main/webapp/WEB-INF/ajax/AjaxResult2.js | 2 -
.../main/webapp/WEB-INF/ajax/AjaxResult3.jsp | 12 -
.../webapp/WEB-INF/ajax/autocompleter/index.jsp | 186 -------
.../src/main/webapp/WEB-INF/ajax/bind/index.jsp | 61 ---
.../main/webapp/WEB-INF/ajax/commonInclude.jsp | 5 -
.../src/main/webapp/WEB-INF/ajax/footer.jsp | 8 -
.../src/main/webapp/WEB-INF/ajax/options.ftl | 5 -
.../webapp/WEB-INF/ajax/remotebutton/index.jsp | 70 ---
.../webapp/WEB-INF/ajax/remotediv/example1.jsp | 23 -
.../webapp/WEB-INF/ajax/remotediv/example10.jsp | 31 --
.../webapp/WEB-INF/ajax/remotediv/example2.jsp | 28 --
.../webapp/WEB-INF/ajax/remotediv/example3.jsp | 27 -
.../webapp/WEB-INF/ajax/remotediv/example4.jsp | 28 --
.../webapp/WEB-INF/ajax/remotediv/example5.jsp | 27 -
.../webapp/WEB-INF/ajax/remotediv/example6.jsp | 24 -
.../webapp/WEB-INF/ajax/remotediv/example7.jsp | 27 -
.../webapp/WEB-INF/ajax/remotediv/example8.jsp | 57 ---
.../webapp/WEB-INF/ajax/remotediv/example9.jsp | 63 ---
.../webapp/WEB-INF/ajax/remotediv/index.jsp | 55 --
.../webapp/WEB-INF/ajax/remoteforms/index.jsp | 119 -----
.../webapp/WEB-INF/ajax/remotelink/index.jsp | 127 -----
.../WEB-INF/ajax/tabbedpanel/example1.jsp | 95 ----
.../WEB-INF/ajax/tabbedpanel/example2.jsp | 26 -
.../WEB-INF/ajax/tabbedpanel/example3.jsp | 46 --
.../WEB-INF/ajax/tabbedpanel/example4.jsp | 57 ---
.../WEB-INF/ajax/tabbedpanel/example5.jsp | 29 --
.../WEB-INF/ajax/tabbedpanel/example5Ok.jsp | 9 -
.../WEB-INF/ajax/tabbedpanel/example6.jsp | 40 --
.../webapp/WEB-INF/ajax/tabbedpanel/index.jsp | 28 --
.../ajax/tabbedpanel/nodecorate/panel1.ftl | 3 -
.../ajax/tabbedpanel/nodecorate/panel2.ftl | 7 -
.../tabbedpanel/nodecorate/panel2Submit.ftl | 2 -
.../ajax/tabbedpanel/nodecorate/panel3.ftl | 9 -
.../tabbedpanel/nodecorate/panel3Submit.ftl | 2 -
.../src/main/webapp/WEB-INF/ajax/testjs.jsp | 14 -
.../webapp/WEB-INF/ajax/tree/getCategory.jsp | 23 -
.../WEB-INF/ajax/tree/partialChunkHeader.jsp | 6 -
.../main/webapp/WEB-INF/ajax/tree/toggle.jsp | 12 -
.../src/main/webapp/WEB-INF/ajax/tree/tree.jsp | 13 -
.../main/webapp/WEB-INF/ajax/widgets/index.jsp | 40 --
.../src/main/webapp/WEB-INF/chat/chatLogin.ftl | 27 -
.../src/main/webapp/WEB-INF/chat/createRoom.ftl | 2 -
.../src/main/webapp/WEB-INF/chat/index.jsp | 3 -
.../WEB-INF/chat/messagesAvailableInRoom.ftl | 33 --
.../main/webapp/WEB-INF/chat/roomSelection.ftl | 172 -------
.../main/webapp/WEB-INF/chat/roomsAvailable.ftl | 44 --
.../WEB-INF/chat/sendMessageToRoomResult.ftl | 2 -
.../src/main/webapp/WEB-INF/chat/showRoom.ftl | 167 ------
.../main/webapp/WEB-INF/chat/usersAvailable.ftl | 6 -
.../WEB-INF/chat/usersAvailableInRoom.ftl | 8 -
.../src/main/webapp/WEB-INF/decorators.xml | 10 -
.../src/main/webapp/WEB-INF/decorators/main.jsp | 504 +++++++++----------
.../webapp/WEB-INF/empmanager/editEmployee.jsp | 3 +-
.../main/webapp/WEB-INF/hangman/hangmanAjax.ftl | 247 ---------
.../webapp/WEB-INF/integration/modelDriven.jsp | 44 --
.../WEB-INF/integration/modelDrivenResult.jsp | 43 --
.../main/webapp/WEB-INF/interactive/demo.jsp | 0
.../WEB-INF/interactive/example-action.jsp | 76 ---
.../main/webapp/WEB-INF/interactive/index.jsp | 241 ---------
.../main/webapp/WEB-INF/interactive/jsp_0.jsp | 62 ---
.../main/webapp/WEB-INF/interactive/jsp_1.jsp | 52 --
.../main/webapp/WEB-INF/interactive/jsp_2.jsp | 54 --
.../main/webapp/WEB-INF/interactive/jsp_3.jsp | 65 ---
.../main/webapp/WEB-INF/interactive/jsp_4.jsp | 16 -
.../main/webapp/WEB-INF/interactive/ognl_0.jsp | 30 --
.../main/webapp/WEB-INF/interactive/ognl_1.jsp | 28 --
.../main/webapp/WEB-INF/interactive/ognl_2.jsp | 43 --
.../main/webapp/WEB-INF/interactive/ognl_3.jsp | 54 --
.../main/webapp/WEB-INF/interactive/ognl_4.jsp | 32 --
.../main/webapp/WEB-INF/interactive/ognl_5.jsp | 25 -
.../main/webapp/WEB-INF/interactive/ognl_6.jsp | 43 --
.../main/webapp/WEB-INF/interactive/ognl_7.jsp | 55 --
.../main/webapp/WEB-INF/interactive/ognl_8.jsp | 18 -
.../main/webapp/WEB-INF/jsf/employee/edit.jsp | 113 -----
.../main/webapp/WEB-INF/jsf/employee/list.jsp | 75 ---
.../src/main/webapp/WEB-INF/jsf/index.jsp | 35 --
.../webapp/WEB-INF/tags/ui/datepicker/index.jsp | 33 --
.../src/main/webapp/WEB-INF/tags/ui/example.jsp | 1 -
.../src/main/webapp/WEB-INF/tags/ui/example.vm | 3 -
.../webapp/WEB-INF/tags/ui/staticTreeSelect.jsp | 11 -
.../webapp/WEB-INF/tags/ui/timepicker/index.jsp | 31 --
.../WEB-INF/tags/ui/treeExampleAjaxDynamic.ftl | 9 -
.../WEB-INF/tags/ui/treeExampleAjaxDynamic.jsp | 25 -
.../WEB-INF/tags/ui/treeExampleDynamic.jsp | 54 --
.../WEB-INF/tags/ui/treeExampleStatic.jsp | 61 ---
.../main/webapp/WEB-INF/validation/index.jsp | 2 -
.../webapp/WEB-INF/validation/quiz-ajax.jsp | 104 ----
apps/showcase/src/main/webapp/ajax/JSONList.js | 63 ---
apps/showcase/src/main/webapp/ajax/index.html | 24 -
106 files changed, 239 insertions(+), 4826 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/ffe0e20e/apps/showcase/pom.xml
----------------------------------------------------------------------
diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml
index 5d167a9..8d2beab 100644
--- a/apps/showcase/pom.xml
+++ b/apps/showcase/pom.xml
@@ -45,22 +45,6 @@
</profile>
</profiles>
<dependencies>
-
- <dependency>
- <groupId>org.apache.struts</groupId>
- <artifactId>struts2-struts1-plugin</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.struts</groupId>
- <artifactId>struts2-dojo-plugin</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.struts</groupId>
- <artifactId>struts2-jsf-plugin</artifactId>
- </dependency>
-
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-config-browser-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/ffe0e20e/apps/showcase/src/main/java/org/apache/struts2/showcase/integration/EditGangsterAction.java
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/integration/EditGangsterAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/integration/EditGangsterAction.java
deleted file mode 100644
index f4610b2..0000000
--- a/apps/showcase/src/main/java/org/apache/struts2/showcase/integration/EditGangsterAction.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * $Id$
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.struts2.showcase.integration;
-
-import org.apache.struts.action.Action;
-import org.apache.struts.action.ActionForm;
-import org.apache.struts.action.ActionForward;
-import org.apache.struts.action.ActionMapping;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-public class EditGangsterAction extends Action {
-
- /* (non-Javadoc)
- * @see org.apache.struts.action.Action#execute(org.apache.struts.action.ActionMapping, org.apache.struts.action.ActionForm, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
- */
- @Override
- public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws Exception {
- // Some code to load the gangster from the db as necessary
-
- return mapping.findForward("success");
- }
-
-
-}
http://git-wip-us.apache.org/repos/asf/struts/blob/ffe0e20e/apps/showcase/src/main/java/org/apache/struts2/showcase/integration/GangsterForm.java
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/integration/GangsterForm.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/integration/GangsterForm.java
deleted file mode 100644
index 8704741..0000000
--- a/apps/showcase/src/main/java/org/apache/struts2/showcase/integration/GangsterForm.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * $Id$
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.struts2.showcase.integration;
-
-import org.apache.struts.action.ActionErrors;
-import org.apache.struts.action.ActionMapping;
-import org.apache.struts.action.ActionMessage;
-import org.apache.struts.validator.ValidatorForm;
-
-import javax.servlet.http.HttpServletRequest;
-
-public class GangsterForm extends ValidatorForm {
-
- private String name;
- private String age;
- private String description;
- private boolean bustedBefore;
-
- /* (non-Javadoc)
- * @see org.apache.struts.action.ActionForm#reset(org.apache.struts.action.ActionMapping, javax.servlet.http.HttpServletRequest)
- */
- @Override
- public void reset(ActionMapping arg0, HttpServletRequest arg1) {
- bustedBefore = false;
- }
-
- /* (non-Javadoc)
- * @see org.apache.struts.action.ActionForm#validate(org.apache.struts.action.ActionMapping, javax.servlet.http.HttpServletRequest)
- */
- @Override
- public ActionErrors validate(ActionMapping mapping, HttpServletRequest request) {
- ActionErrors errors = super.validate(mapping, request);
- if (name == null || name.length() == 0) {
- errors.add("name", new ActionMessage("The name must not be blank"));
- }
-
- return errors;
- }
-
- /**
- * @return the age
- */
- public String getAge() {
- return age;
- }
-
- /**
- * @param age the age to set
- */
- public void setAge(String age) {
- this.age = age;
- }
-
- /**
- * @return the bustedBefore
- */
- public boolean isBustedBefore() {
- return bustedBefore;
- }
-
- /**
- * @param bustedBefore the bustedBefore to set
- */
- public void setBustedBefore(boolean bustedBefore) {
- this.bustedBefore = bustedBefore;
- }
-
- /**
- * @return the description
- */
- public String getDescription() {
- return description;
- }
-
- /**
- * @param description the description to set
- */
- public void setDescription(String description) {
- this.description = description;
- }
-
- /**
- * @return the name
- */
- public String getName() {
- return name;
- }
-
- /**
- * @param name the name to set
- */
- public void setName(String name) {
- this.name = name;
- }
-
-
-}
http://git-wip-us.apache.org/repos/asf/struts/blob/ffe0e20e/apps/showcase/src/main/java/org/apache/struts2/showcase/integration/SaveGangsterAction.java
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/integration/SaveGangsterAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/integration/SaveGangsterAction.java
deleted file mode 100644
index afc3587..0000000
--- a/apps/showcase/src/main/java/org/apache/struts2/showcase/integration/SaveGangsterAction.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * $Id$
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.struts2.showcase.integration;
-
-import org.apache.struts.action.*;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-public class SaveGangsterAction extends Action {
-
- /* (non-Javadoc)
- * @see org.apache.struts.action.Action#execute(org.apache.struts.action.ActionMapping, org.apache.struts.action.ActionForm, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
- */
- @Override
- public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws Exception {
-
- // Some code to save the gangster to the db as necessary
- GangsterForm gform = (GangsterForm) form;
- ActionMessages messages = new ActionMessages();
- messages.add("msg", new ActionMessage("Gangster " + gform.getName() + " added successfully"));
- addMessages(request, messages);
-
- return mapping.findForward("success");
- }
-
-
-}
http://git-wip-us.apache.org/repos/asf/struts/blob/ffe0e20e/apps/showcase/src/main/java/org/apache/struts2/showcase/jsf/JsfEmployeeAction.java
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/jsf/JsfEmployeeAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/jsf/JsfEmployeeAction.java
deleted file mode 100644
index 0a0387f..0000000
--- a/apps/showcase/src/main/java/org/apache/struts2/showcase/jsf/JsfEmployeeAction.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * $Id$
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.struts2.showcase.jsf;
-
-import org.apache.struts2.showcase.action.EmployeeAction;
-import org.apache.struts2.showcase.dao.SkillDao;
-import org.apache.struts2.showcase.model.Employee;
-import org.apache.struts2.showcase.model.Skill;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import java.util.*;
-
-/**
- * Overriding the EmployeeAction to main provide getters returning the data in
- * the form required by the JSF components
- */
-public class JsfEmployeeAction extends EmployeeAction {
-
- private static final long serialVersionUID = 1L;
-
- @Autowired
- private SkillDao skillDao;
-
- /**
- * Creating a default employee and main skill, since the JSF EL can't handle
- * creating new objects as necessary
- */
- public JsfEmployeeAction() {
- Employee e = new Employee();
- e.setMainSkill(new Skill());
- setCurrentEmployee(e);
- }
-
-
- /**
- * Returning a List because the JSF dataGrid can't handle a Set for some
- * reason
- */
- @Override
- public Collection getAvailableItems() {
- return new ArrayList(super.getAvailableItems());
- }
-
- /**
- * Changing the String array into a Map
- */
- public Map<String, String> getAvailablePositionsAsMap() {
- Map<String, String> map = new LinkedHashMap<String, String>();
- for (String val : super.getAvailablePositions()) {
- map.put(val, val);
- }
- return map;
- }
-
- /**
- * Converting the list into a map
- */
- public Map getAvailableLevelsAsMap() {
- Map map = new LinkedHashMap();
- for (Object val : super.getAvailableLevels()) {
- map.put(val, val);
- }
- return map;
- }
-
- /**
- * Converting the Skill object list into a map
- */
- public Map<String, String> getAvailableSkills() {
- Map<String, String> map = new HashMap<String, String>();
- for (Object val : skillDao.findAll()) {
- Skill skill = (Skill) val;
- map.put(skill.getDescription(), skill.getName());
- }
- return map;
- }
-
- /**
- * Gets the selected Skill objects as a list
- */
- public List<String> getSelectedSkillsAsList() {
- System.out.println("asked for skills");
- List<String> list = new ArrayList<String>();
- List skills = super.getSelectedSkills();
- if (skills != null) {
- for (Object val : skills) {
- if (val instanceof Skill) {
- list.add(((Skill) val).getDescription());
- } else {
- Skill skill = skillDao.getSkill((String) val);
- list.add(skill.getDescription());
- }
- }
- }
- return list;
- }
-}
http://git-wip-us.apache.org/repos/asf/struts/blob/ffe0e20e/apps/showcase/src/main/resources/org/apache/struts2/showcase/ajax/Example5Action-validation.xml
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/resources/org/apache/struts2/showcase/ajax/Example5Action-validation.xml b/apps/showcase/src/main/resources/org/apache/struts2/showcase/ajax/Example5Action-validation.xml
deleted file mode 100644
index 15ec8d9..0000000
--- a/apps/showcase/src/main/resources/org/apache/struts2/showcase/ajax/Example5Action-validation.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE validators PUBLIC
- "-//Apache Struts//XWork Validator 1.0//EN"
- "http://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
-
-<validators>
- <field name="name">
- <field-validator type="requiredstring">
- <message>Name is required</message>
- </field-validator>
- </field>
- <field name="age">
- <field-validator type="required">
- <message>Age is required</message>
- </field-validator>
- </field>
-</validators>
-
-
http://git-wip-us.apache.org/repos/asf/struts/blob/ffe0e20e/apps/showcase/src/main/resources/org/apache/struts2/showcase/chat/ChatLoginAction-chatLogin-validation.xml
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/resources/org/apache/struts2/showcase/chat/ChatLoginAction-chatLogin-validation.xml b/apps/showcase/src/main/resources/org/apache/struts2/showcase/chat/ChatLoginAction-chatLogin-validation.xml
deleted file mode 100644
index dddbc61..0000000
--- a/apps/showcase/src/main/resources/org/apache/struts2/showcase/chat/ChatLoginAction-chatLogin-validation.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE validators PUBLIC
- "-//Apache Struts//XWork Validator 1.0.2//EN"
- "http://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
-
-<validators>
- <field name="name">
- <field-validator type="requiredstring">
- <param name="trim">true</param>
- <message>Name is required</message>
- </field-validator>
- </field>
-</validators>
-
http://git-wip-us.apache.org/repos/asf/struts/blob/ffe0e20e/apps/showcase/src/main/resources/org/apache/struts2/showcase/chat/ChatMessage-conversion.properties
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/resources/org/apache/struts2/showcase/chat/ChatMessage-conversion.properties b/apps/showcase/src/main/resources/org/apache/struts2/showcase/chat/ChatMessage-conversion.properties
deleted file mode 100644
index 8869d38..0000000
--- a/apps/showcase/src/main/resources/org/apache/struts2/showcase/chat/ChatMessage-conversion.properties
+++ /dev/null
@@ -1 +0,0 @@
-creationDate=org.apache.struts2.showcase.chat.DateConverter
http://git-wip-us.apache.org/repos/asf/struts/blob/ffe0e20e/apps/showcase/src/main/resources/org/apache/struts2/showcase/chat/CrudRoomAction-createRoom-validation.xml
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/resources/org/apache/struts2/showcase/chat/CrudRoomAction-createRoom-validation.xml b/apps/showcase/src/main/resources/org/apache/struts2/showcase/chat/CrudRoomAction-createRoom-validation.xml
deleted file mode 100644
index a657919..0000000
--- a/apps/showcase/src/main/resources/org/apache/struts2/showcase/chat/CrudRoomAction-createRoom-validation.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE validators PUBLIC
- "-//Apache Struts//XWork Validator 1.0.2//EN"
- "http://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
-
-<validators>
- <field name="name">
- <field-validator type="requiredstring">
- <param name="trim">true</param>
- <message>Room name is required</message>
- </field-validator>
- </field>
- <field name="description">
- <field-validator type="requiredstring">
- <param name="trim">true</param>
- <message>Room description is required</message>
- </field-validator>
- </field>
-</validators>
-
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/struts/blob/ffe0e20e/apps/showcase/src/main/resources/org/apache/struts2/showcase/chat/Room-conversion.properties
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/resources/org/apache/struts2/showcase/chat/Room-conversion.properties b/apps/showcase/src/main/resources/org/apache/struts2/showcase/chat/Room-conversion.properties
deleted file mode 100644
index 8869d38..0000000
--- a/apps/showcase/src/main/resources/org/apache/struts2/showcase/chat/Room-conversion.properties
+++ /dev/null
@@ -1 +0,0 @@
-creationDate=org.apache.struts2.showcase.chat.DateConverter
http://git-wip-us.apache.org/repos/asf/struts/blob/ffe0e20e/apps/showcase/src/main/resources/org/apache/struts2/showcase/chat/SendMessageToRoomAction-sendMessageToRoom-validation.xml
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/resources/org/apache/struts2/showcase/chat/SendMessageToRoomAction-sendMessageToRoom-validation.xml b/apps/showcase/src/main/resources/org/apache/struts2/showcase/chat/SendMessageToRoomAction-sendMessageToRoom-validation.xml
deleted file mode 100644
index 5b4840e..0000000
--- a/apps/showcase/src/main/resources/org/apache/struts2/showcase/chat/SendMessageToRoomAction-sendMessageToRoom-validation.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE validators PUBLIC
- "-//Apache Struts//XWork Validator 1.0.2//EN"
- "http://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
-
-<validators>
- <field name="message">
- <field-validator type="requiredstring">
- <param name="trim">true</param>
- <message>Message is required</message>
- </field-validator>
- </field>
-</validators>
-
-
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/struts/blob/ffe0e20e/apps/showcase/src/main/resources/struts-ajax.xml
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/resources/struts-ajax.xml b/apps/showcase/src/main/resources/struts-ajax.xml
deleted file mode 100644
index a5ce83c..0000000
--- a/apps/showcase/src/main/resources/struts-ajax.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE struts PUBLIC
- "-//Apache Software Foundation//DTD Struts Configuration 2.3//EN"
- "http://struts.apache.org/dtds/struts-2.3.dtd">
-
-<struts>
- <package name="ajax" extends="struts-default">
- <action name="AjaxTest" class="org.apache.struts2.showcase.ajax.AjaxTestAction">
- <result>/WEB-INF/ajax/AjaxResult.jsp</result>
- </action>
-
- <action name="AjaxRemoteLink" class="org.apache.struts2.showcase.ajax.AjaxTestAction">
- <result>/WEB-INF/ajax/AjaxResult2.js</result>
- </action>
-
- <action name="AjaxRemoteForm" class="org.apache.struts2.showcase.ajax.AjaxTestAction">
- <result>/WEB-INF/ajax/AjaxResult3.jsp</result>
- </action>
-
- <action name="Test1">
- <result>/WEB-INF/ajax/remoteforms/test2.jsp</result>
- </action>
-
- <action name="Test2">
- <result>/WEB-INF/ajax/remoteforms/test3.jsp</result>
- </action>
-
- <action name="Test3">
- <result>/WEB-INF/ajax/testjs.jsp</result>
- </action>
-
- <action name="JSONList">
- <result>/ajax/JSONList.js</result>
- </action>
-
- <action name="tree">
- <result>/WEB-INF/ajax/tree/tree.jsp</result>
- </action>
-
- <action name="getCategory" class="org.apache.struts2.showcase.ajax.tree.GetCategory">
- <result>/WEB-INF/ajax/tree/getCategory.jsp</result>
- </action>
-
- <action name="toggle" class="org.apache.struts2.showcase.ajax.tree.Toggle">
- <result>/WEB-INF/ajax/tree/toggle.jsp</result>
- </action>
-
- <action name="example4">
- <result type="freemarker">/WEB-INF/ajax/tabbedpanel/example4.ftl</result>
- </action>
-
- <action name="example5" class="org.apache.struts2.showcase.ajax.Example5Action">
- <result name="input">/WEB-INF/ajax/tabbedpanel/example5.jsp</result>
- <result>/WEB-INF/ajax/tabbedpanel/example5Ok.jsp</result>
- </action>
- </package>
-
- <package name="ajax-examples" namespace="/ajax" extends="struts-default">
- <action name="bind">
- <result>/WEB-INF/ajax/bind/index.jsp</result>
- </action>
- <action name="autocompleter">
- <result>/WEB-INF/ajax/autocompleter/index.jsp</result>
- </action>
- <action name="remotebutton">
- <result>/WEB-INF/ajax/remotebutton/index.jsp</result>
- </action>
- <action name="remotediv">
- <result>/WEB-INF/ajax/remotediv/index.jsp</result>
- </action>
- <action name="remotelink">
- <result>/WEB-INF/ajax/remotelink/index.jsp</result>
- </action>
- <action name="tabbedpanel">
- <result>/WEB-INF/ajax/tabbedpanel/index.jsp</result>
- </action>
- <action name="remoteforms">
- <result>/WEB-INF/ajax/remoteforms/index.jsp</result>
- </action>
- <action name="widgets">
- <result>/WEB-INF/ajax/widgets/index.jsp</result>
- </action>
- </package>
-
- <package name="ajaxNoDecorate" namespace="/nodecorate" extends="json-default">
- <!-- example 4 -->
- <action name="panel1" class="org.apache.struts2.showcase.ajax.Example4ShowPanelAction" method="panel1">
- <result type="freemarker">/WEB-INF/ajax/tabbedpanel/nodecorate/panel1.ftl</result>
- </action>
- <action name="panel2">
- <result type="freemarker">/WEB-INF/ajax/tabbedpanel/nodecorate/panel2.ftl</result>
- </action>
- <action name="panel3">
- <result type="freemarker">/WEB-INF/ajax/tabbedpanel/nodecorate/panel3.ftl</result>
- </action>
- <action name="panel2Submit" class="org.apache.struts2.showcase.ajax.Example4ShowPanelAction" method="panel2">
- <result type="freemarker">/WEB-INF/ajax/tabbedpanel/nodecorate/panel2Submit.ftl</result>
- </action>
- <action name="panel3Submit" class="org.apache.struts2.showcase.ajax.Example4ShowPanelAction" method="panel3">
- <result type="freemarker">/WEB-INF/ajax/tabbedpanel/nodecorate/panel3Submit.ftl</result>
- </action>
- <action name="AutocompleterExample" class="org.apache.struts2.showcase.ajax.AutocompleterExampleAction">
- <result type="freemarker">/WEB-INF/ajax/options.ftl</result>
- </action>
- <action name="quizAjax" class="org.apache.struts2.showcase.validation.QuizAction">
- <interceptor-ref name="jsonValidationWorkflowStack"/>
- <result name="input">/WEB-INF/validation/quiz-ajax.jsp</result>
- <result>/WEB-INF/validation/quiz-success.jsp</result>
- </action>
- <action name="getNodes" class="org.apache.struts2.showcase.ShowAjaxDynamicTreeAction">
- <result type="freemarker">/WEB-INF/tags/ui/treeExampleAjaxDynamic.ftl</result>
- </action>
- </package>
-</struts>
http://git-wip-us.apache.org/repos/asf/struts/blob/ffe0e20e/apps/showcase/src/main/resources/struts-chat.xml
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/resources/struts-chat.xml b/apps/showcase/src/main/resources/struts-chat.xml
deleted file mode 100644
index 15ea15b..0000000
--- a/apps/showcase/src/main/resources/struts-chat.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE struts PUBLIC
- "-//Apache Software Foundation//DTD Struts Configuration 2.3//EN"
- "http://struts.apache.org/dtds/struts-2.3.dtd">
-
-<struts>
- <package name="chat" extends="struts-default" namespace="/chat">
- <interceptors>
- <interceptor name="chatAuthentication"
- class="org.apache.struts2.showcase.chat.ChatAuthenticationInterceptor" />
- <interceptor-stack name="chatAuthenticationStack">
- <interceptor-ref name="createSession" />
- <interceptor-ref name="exception"/>
- <interceptor-ref name="alias"/>
- <interceptor-ref name="servletConfig"/>
- <interceptor-ref name="prepare"/>
- <interceptor-ref name="i18n"/>
- <interceptor-ref name="chain"/>
- <interceptor-ref name="debugging"/>
- <interceptor-ref name="modelDriven"/>
- <interceptor-ref name="fileUpload"/>
- <interceptor-ref name="staticParams"/>
- <interceptor-ref name="params"/>
- <interceptor-ref name="conversionError"/>
- <interceptor-ref name="validation">
- <param name="excludeMethods">input,back,cancel,browse</param>
- </interceptor-ref>
- <interceptor-ref name="workflow">
- <param name="excludeMethods">input,back,cancel,browse</param>
- </interceptor-ref>
- <interceptor-ref name="chatAuthentication" />
- </interceptor-stack>
- </interceptors>
-
- <global-results>
- <result name="login" type="freemarker">/WEB-INF/chat/chatLogin.ftl</result>
- </global-results>
-
- <action name="main">
- <interceptor-ref name="chatAuthentication" />
- <result type="freemarker">/WEB-INF/chat/roomSelection.ftl</result>
- </action>
-
- <action name="login" class="chatLoginAction">
- <interceptor-ref name="defaultStack" />
- <result type="redirect">/chat/showRooms.action</result>
- <result name="input" type="freemarker">/WEB-INF/chat/chatLogin.ftl</result>
- </action>
-
- <action name="logout" class="chatLogoutAction">
- <interceptor-ref name="defaultStack" />
- <result type="redirect">/chat/main.action</result>
- </action>
-
- <action name="showRooms">
- <interceptor-ref name="chatAuthenticationStack" />
- <result type="freemarker">/WEB-INF/chat/roomSelection.ftl</result>
- </action>
-
- <action name="enterRoom" class="enterRoomAction">
- <interceptor-ref name="chatAuthenticationStack" />
- <result type="freemarker">/WEB-INF/chat/showRoom.ftl</result>
- </action>
-
- <action name="exitRoom" class="exitRoomAction">
- <interceptor-ref name="chatAuthenticationStack" />
- <result type="redirect">/chat/showRooms.action</result>
- </action>
-
- </package>
-
- <package name="chat-remote" extends="struts-default" namespace="/chat/ajax">
- <interceptors>
- <interceptor name="chatAuthentication"
- class="org.apache.struts2.showcase.chat.ChatAuthenticationInterceptor" />
- <interceptor-stack name="chatAuthenticationStack">
- <interceptor-ref name="createSession" />
- <interceptor-ref name="exception"/>
- <interceptor-ref name="alias"/>
- <interceptor-ref name="servletConfig"/>
- <interceptor-ref name="prepare"/>
- <interceptor-ref name="i18n"/>
- <interceptor-ref name="chain"/>
- <interceptor-ref name="debugging"/>
- <interceptor-ref name="modelDriven"/>
- <interceptor-ref name="fileUpload"/>
- <interceptor-ref name="staticParams"/>
- <interceptor-ref name="params"/>
- <interceptor-ref name="conversionError"/>
- <interceptor-ref name="validation">
- <param name="excludeMethods">input,back,cancel,browse</param>
- </interceptor-ref>
- <interceptor-ref name="workflow">
- <param name="excludeMethods">input,back,cancel,browse</param>
- </interceptor-ref>
- <interceptor-ref name="chatAuthentication" />
- </interceptor-stack>
- </interceptors>
-
-
- <action name="usersAvailable" class="usersAvailableAction">
- <interceptor-ref name="chatAuthenticationStack" />
- <result type="freemarker">/WEB-INF/chat/usersAvailable.ftl</result>
- </action>
-
- <action name="roomsAvailable" class="roomsAvailableAction">
- <interceptor-ref name="chatAuthenticationStack" />
- <result type="freemarker">/WEB-INF/chat/roomsAvailable.ftl</result>
- </action>
-
- <action name="createRoom" class="crudRoomAction" method="create">
- <interceptor-ref name="chatAuthenticationStack" />
- <result type="freemarker">/WEB-INF/chat/createRoom.ftl</result>
- <result name="input" type="freemarker">/WEB-INF/chat/createRoom.ftl</result>
- </action>
-
- <action name="messagesAvailableInRoom" class="messagesAvailableInRoomAction">
- <interceptor-ref name="chatAuthenticationStack" />
- <result type="freemarker">/WEB-INF/chat/messagesAvailableInRoom.ftl</result>
- <result name="input" type="freemarker">/WEB-INF/chat/messagesAvailableInRoom.ftl</result>
- </action>
-
- <action name="sendMessageToRoom" class="sendMessageToRoomAction">
- <interceptor-ref name="chatAuthenticationStack" />
- <result type="freemarker">/WEB-INF/chat/sendMessageToRoomResult.ftl</result>
- <result name="input" type="freemarker">/WEB-INF/chat/sendMessageToRoomResult.ftl</result>
- </action>
-
- <action name="usersAvailableInRoom" class="usersAvailableInRoomAction">
- <interceptor-ref name="chatAuthenticationStack" />
- <result type="freemarker">/WEB-INF/chat/usersAvailableInRoom.ftl</result>
- </action>
- </package>
-</struts>
-
http://git-wip-us.apache.org/repos/asf/struts/blob/ffe0e20e/apps/showcase/src/main/resources/struts-integration.xml
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/resources/struts-integration.xml b/apps/showcase/src/main/resources/struts-integration.xml
deleted file mode 100644
index ffff4ac..0000000
--- a/apps/showcase/src/main/resources/struts-integration.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE struts PUBLIC
- "-//Apache Software Foundation//DTD Struts Configuration 2.3//EN"
- "http://struts.apache.org/dtds/struts-2.3.dtd">
-
-<struts>
- <package name="integration" extends="struts1-default" namespace="/integration">
-
- <interceptors>
- <interceptor name="gangsterForm" class="com.opensymphony.xwork2.interceptor.ScopedModelDrivenInterceptor">
- <param name="className">org.apache.struts2.showcase.integration.GangsterForm</param>
- <param name="name">gangsterForm</param>
- </interceptor>
- <interceptor name="gangsterValidation" class="org.apache.struts2.s1.ActionFormValidationInterceptor">
- <param name="pathnames">/org/apache/struts/validator/validator-rules.xml,/WEB-INF/validation.xml</param>
- </interceptor>
-
- <interceptor-stack name="integration">
- <interceptor-ref name="staticParams"/>
- <interceptor-ref name="gangsterForm"/>
- <interceptor-ref name="modelDriven"/>
- <interceptor-ref name="actionForm-reset"/>
- <interceptor-ref name="basicStack"/>
- <interceptor-ref name="gangsterValidation"/>
- <interceptor-ref name="workflow"/>
- </interceptor-stack>
- </interceptors>
-
- <default-interceptor-ref name="integration"/>
- <default-action-ref name="editGangster"/>
-
- <!-- Display entry page that uses Model-Driven technique -->
- <action name="editGangster" class="org.apache.struts2.s1.Struts1Action">
- <param name="className">org.apache.struts2.showcase.integration.EditGangsterAction</param>
- <result>/WEB-INF/integration/modelDriven.jsp</result>
- </action>
-
- <!-- Display the result page whose content is populated using the Model-Driven technique -->
- <action name="saveGangster" class="org.apache.struts2.s1.Struts1Action">
- <param name="className">org.apache.struts2.showcase.integration.SaveGangsterAction</param>
- <param name="validate">true</param>
- <result name="input">/WEB-INF/integration/modelDriven.jsp</result>
- <result>/WEB-INF/integration/modelDrivenResult.jsp</result>
- </action>
-
- </package>
-</struts>
http://git-wip-us.apache.org/repos/asf/struts/blob/ffe0e20e/apps/showcase/src/main/resources/struts-jsf.xml
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/resources/struts-jsf.xml b/apps/showcase/src/main/resources/struts-jsf.xml
deleted file mode 100644
index baa458a..0000000
--- a/apps/showcase/src/main/resources/struts-jsf.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE struts PUBLIC
- "-//Apache Software Foundation//DTD Struts Configuration 2.3//EN"
- "http://struts.apache.org/dtds/struts-2.3.dtd">
-
-<struts>
- <package name="jsf" extends="jsf-default" namespace="/jsf">
-
- <result-types>
- <result-type name="jsf" class="org.apache.struts2.jsf.FacesResult" />
- </result-types>
-
- <interceptors>
- <interceptor-stack name="jsfFullStack">
- <interceptor-ref name="params" />
- <interceptor-ref name="basicStack"/>
- <interceptor-ref name="jsfStack"/>
- </interceptor-stack>
- </interceptors>
-
- <default-interceptor-ref name="jsfFullStack"/>
-
- <action name="index">
- <result>/WEB-INF/jsf/index.jsp</result>
- </action>
-
- </package>
-
- <package name="jsf.employee" extends="jsf" namespace="/jsf/employee">
-
- <action name="list" class="org.apache.struts2.showcase.jsf.JsfEmployeeAction" method="list">
- <result name="success" type="jsf" />
- </action>
- <action name="edit" class="org.apache.struts2.showcase.jsf.JsfEmployeeAction">
- <result name="success" type="jsf" />
- </action>
- <action name="delete" class="org.apache.struts2.showcase.action.EmployeeAction" method="delete">
- <result name="error" type="redirect">list.action</result>
- <result type="redirect">list.action</result>
- </action>
-
- </package>
-
-</struts>
http://git-wip-us.apache.org/repos/asf/struts/blob/ffe0e20e/apps/showcase/src/main/resources/struts.xml
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/resources/struts.xml b/apps/showcase/src/main/resources/struts.xml
index 2df1d0f..4761eb3 100644
--- a/apps/showcase/src/main/resources/struts.xml
+++ b/apps/showcase/src/main/resources/struts.xml
@@ -25,8 +25,6 @@
<constant name="struts.serve.static" value="true" />
<constant name="struts.serve.static.browserCache" value="false" />
- <include file="struts-chat.xml" />
-
<include file="struts-interactive.xml" />
<include file="struts-hangman.xml" />
@@ -37,22 +35,16 @@
<include file="struts-actionchaining.xml" />
- <include file="struts-ajax.xml" />
-
<include file="struts-fileupload.xml" />
<include file="struts-person.xml" />
<include file="struts-wait.xml" />
- <include file="struts-jsf.xml" />
-
<include file="struts-token.xml" />
<include file="struts-model-driven.xml" />
- <include file="struts-integration.xml" />
-
<include file="struts-filedownload.xml" />
<include file="struts-conversion.xml" />
http://git-wip-us.apache.org/repos/asf/struts/blob/ffe0e20e/apps/showcase/src/main/webapp/WEB-INF/ajax/AjaxResult.jsp
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/ajax/AjaxResult.jsp b/apps/showcase/src/main/webapp/WEB-INF/ajax/AjaxResult.jsp
deleted file mode 100644
index 3dc8521..0000000
--- a/apps/showcase/src/main/webapp/WEB-INF/ajax/AjaxResult.jsp
+++ /dev/null
@@ -1,12 +0,0 @@
-<%@ taglib prefix="s" uri="/struts-tags" %>
-
-<%
- request.setAttribute("decorator", "none");
- response.setHeader("Cache-Control","no-cache"); //HTTP 1.1
- response.setHeader("Pragma","no-cache"); //HTTP 1.0
- response.setDateHeader ("Expires", 0); //prevents caching at the proxy server
-%>
-
-Result: <s:property value="count"/> @ <s:property value="serverTime"/>
-<br/>
-<s:property value="data"/>
http://git-wip-us.apache.org/repos/asf/struts/blob/ffe0e20e/apps/showcase/src/main/webapp/WEB-INF/ajax/AjaxResult2.js
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/ajax/AjaxResult2.js b/apps/showcase/src/main/webapp/WEB-INF/ajax/AjaxResult2.js
deleted file mode 100644
index 537c390..0000000
--- a/apps/showcase/src/main/webapp/WEB-INF/ajax/AjaxResult2.js
+++ /dev/null
@@ -1,2 +0,0 @@
-alert('This JavaScript currently being evaluated is the result...');
-alert('... of an action executed on the server!');
http://git-wip-us.apache.org/repos/asf/struts/blob/ffe0e20e/apps/showcase/src/main/webapp/WEB-INF/ajax/AjaxResult3.jsp
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/ajax/AjaxResult3.jsp b/apps/showcase/src/main/webapp/WEB-INF/ajax/AjaxResult3.jsp
deleted file mode 100644
index 45cb2b0..0000000
--- a/apps/showcase/src/main/webapp/WEB-INF/ajax/AjaxResult3.jsp
+++ /dev/null
@@ -1,12 +0,0 @@
-<%@ taglib prefix="s" uri="/struts-tags" %>
-
-<%
- request.setAttribute("decorator", "none");
- response.setHeader("Cache-Control","no-cache"); //HTTP 1.1
- response.setHeader("Pragma","no-cache"); //HTTP 1.0
- response.setDateHeader ("Expires", 0); //prevents caching at the proxy server
-%>
-
-Result: <s:property value="count"/> @ <s:property value="serverTime"/>
-
-The value you entered was: <s:property value="data"/><br/>
http://git-wip-us.apache.org/repos/asf/struts/blob/ffe0e20e/apps/showcase/src/main/webapp/WEB-INF/ajax/autocompleter/index.jsp
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/ajax/autocompleter/index.jsp b/apps/showcase/src/main/webapp/WEB-INF/ajax/autocompleter/index.jsp
deleted file mode 100644
index 0d29a64..0000000
--- a/apps/showcase/src/main/webapp/WEB-INF/ajax/autocompleter/index.jsp
+++ /dev/null
@@ -1,186 +0,0 @@
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib prefix="s" uri="/struts-tags" %>
-<%@ taglib prefix="sx" uri="/struts-dojo-tags" %>
-<html>
-<head>
- <title>Ajax Examples</title>
-
- <!--// START SNIPPET: common-include-->
- <jsp:include page="/WEB-INF/ajax/commonInclude.jsp"/>
- <!--// END SNIPPET: common-include-->
-</head>
-
-<script type="text/javascript">
- dojo.event.topic.subscribe("/before", function(event, widget){
- alert('inside a topic event. before request');
- //event: set event.cancel = true, to cancel request
- //widget: widget that published the topic
- });
-
- dojo.event.topic.subscribe("/after", function(data, request, widget){
- alert('inside a topic event. after request');
- //data : json object from request
- //request: XMLHttpRequest object
- //widget: widget that published the topic
- });
-
- dojo.event.topic.subscribe("/value", function(error, request, widget){
- alert('inside a topic event. on error');
- //error : error object (error.message has the error message)
- //request: XMLHttpRequest object
- //widget: widget that published the topic
- });
-
- function showKey() {
- var autoCompleter = dojo.widget.byId('jsauto');
- alert(autoCompleter.getSelectedKey());
- }
-
- function showValue() {
- var autoCompleter = dojo.widget.byId('jsauto');
- alert(autoCompleter.getSelectedValue());
- }
-</script>
-
-<body>
-
-
-<s:url var="jsonList" value="/JSONList.action"/>
-
-Using a JSON list returned from an action (href="/JSONList.action"), without autoComplete (autoComplete="false"), use indicator, search substring (searchType="substring")
-<br/>
-<sx:autocompleter
- id="auto1"
- indicator="indicator1"
- href="%{jsonList}"
- cssStyle="width: 200px;"
- autoComplete="false"
- searchType="substring"
- name="state"/>
-<img id="indicator1" src="${pageContext.request.contextPath}/images/indicator.gif" alt="Loading..." style="display:none"/>
-
-<br/><br/>
-
-Reload on type (loadOnTextChange="true"), after 3 characters (loadMinimumCount="3", it is "3" by default), without the down arrow button (showDownArrow="false")
-<br/>
-<sx:autocompleter
- id="auto2"
- indicator="indicator"
- href="%{jsonList}"
- cssStyle="width: 200px;"
- autoComplete="false"
- loadOnTextChange="true"
- loadMinimumCount="3"
- showDownArrow="false"/>
-<img id="indicator" src="${pageContext.request.contextPath}/images/indicator.gif" alt="Loading..." style="display:none"/>
-
-<br/><br/>
-
-Using a JSON list returned from an action (href="/JSONList.action"), with autoComplete (autoComplete="true")
-<br/>
-<sx:autocompleter
- id="auto3"
- name="auto3"
- href="%{#jsonList}"
- cssStyle="width: 200px;"
- autoComplete="true" />
-
-<br/><br/>
-
-Using a local list (list="%{'apple','banana','grape','pear'}")
-<br/>
-<sx:autocompleter id="auto-list" list="{'apple','banana','grape','pear'}" cssStyle="width: 150px;"/>
-
-<br/><br/>
-
-Force valid options (forceValidOption="true")
-<br/>
-<sx:autocompleter
- id="auto4"
- name="auto4"
- href="%{#jsonList}"
- cssStyle="width: 200px;"
- forceValidOption="true"/>
-
-<br/>
-<br/>
-
-Make dropdown's height to 180px (dropdownHeight="180")
-<br/>
-<sx:autocompleter
- id="auto5"
- name="auto5"
- href="%{#jsonList}"
- cssStyle="width: 200px;"
- dropdownHeight="180"/>
-
-<br/>
-<br/>
-
-Disabled combobox (disabled="true")
-<br/>
-<sx:autocompleter
- id="auto6"
- name="auto6"
- href="%{#jsonList}"
- cssStyle="width: 200px;"
- disabled="true"/>
-
-<br/>
-<br/>
-
-
-<s:url var="autoex" action="AutocompleterExample" namespace="/nodecorate"/>
-
-Link two autocompleter elements. When the selected value in 'Autocompleter 1' changes, the available values in 'Autocompleter 2' will change also.
-<br/>
-<form id="selectForm">
- <p>
- Autocompleter 1
- <sx:autocompleter
- id="auto7"
- name="select"
- list="{'fruits','colors'}"
- value="colors"
- valueNotifyTopics="/Changed"
- forceValidOption="true"/>
- </p>
-</form>
-Autocompleter 2
-<sx:autocompleter
- id="auto8"
- name="auto8"
- href="%{#autoex}"
- autoComplete="false"
- formId="selectForm"
- listenTopics="/Changed"
- forceValidOption="true" />
-
-<br/><br/>
-
-Publish before/after/value notify topics
-<br/>
-<sx:autocompleter
- id="auto9"
- name="auto9"
- href="%{#jsonList}"
- listenTopics="/reload"
- beforeNotifyTopics="/before"
- afterNotifyTopics="/after"
- valueNotifyTopics="/value"
- cssStyle="width: 200px;" />
-<s:submit theme="simple" value="Reload Values" onclick="dojo.event.topic.publish('/reload')"/>
-
-<br/><br/>
-
-Get values using JavaScript
-<br/>
-<sx:autocompleter href="%{#jsonList}" id="jsauto" name="state"/>
-<s:submit theme="simple" value="Show Key" onclick="showKey()"/>
-<s:submit theme="simple" value="Show Value" onclick="showValue()"/>
-
-<br/><br/>
-
-<s:include value="../footer.jsp"/>
-</body>
-</html>
http://git-wip-us.apache.org/repos/asf/struts/blob/ffe0e20e/apps/showcase/src/main/webapp/WEB-INF/ajax/bind/index.jsp
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/ajax/bind/index.jsp b/apps/showcase/src/main/webapp/WEB-INF/ajax/bind/index.jsp
deleted file mode 100644
index 046006c..0000000
--- a/apps/showcase/src/main/webapp/WEB-INF/ajax/bind/index.jsp
+++ /dev/null
@@ -1,61 +0,0 @@
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib prefix="s" uri="/struts-tags" %>
-<%@ taglib prefix="sx" uri="/struts-dojo-tags" %>
-
-<html>
-<head>
- <title>Bind Examples</title>
- <jsp:include page="/WEB-INF/ajax/commonInclude.jsp"/>
-</head>
-
-<script type="text/javascript">
- dojo.event.topic.subscribe("/before", function(event, widget){
- alert('inside a topic event. before request');
- //event: set event.cancel = true, to cancel request
- //widget: widget that published the topic
- });
-
- dojo.event.topic.subscribe("/after", function(data, request, widget){
- alert('inside a topic event. after request');
- //data : text returned from request
- //request: XMLHttpRequest object
- //widget: widget that published the topic
- });
-</script>
-
-<body>
-
-<div id="div1">Div 1</div>
-<s:url var="ajaxTest" value="/AjaxTest.action" />
-
-
-<br/><br/>
-<p>
- 1. Attach to "onclick" event on button. Update content of Div 1. Use with indicator.
- <img id="indicator" src="${pageContext.request.contextPath}/images/indicator.gif" alt="Loading..." style="display:none"/>
- <sx:bind href="%{#ajaxTest}" sources="button" targets="div1" events="onclick" indicator="indicator" />
- <br/>
- <s:submit theme="simple" type="submit" value="submit" id="button"/>
-</p>
-<br/><br/>
-<p>
- 2. Attach to "onmouseover", and "onclick" event on Area below and update content of Div1, highlight targets with green color
- <sx:bind id="ex2" href="%{#ajaxTest}" sources="div2" targets="div1" events="onmouseover,onclick" highlightColor="green"/>
- <div id="div2" style="width: 300px; height: 50px; border: 1px solid black">
- Mouse Over or Click Here!
- </div>
-</p>
-<br/><br/>
-<p>
- 3. Attach to "onkeydown" event on Textbox below update content of Div1. Publish topics.
- <sx:bind id="ex4" href="%{#ajaxTest}" sources="txt1" targets="div1" events="onkeydown" beforeNotifyTopics="/before" afterNotifyTopics="/after" />
- <br/>
- <s:textfield id="txt1"/>
-</p>
-
-
-<br/><br/>
-<s:include value="../footer.jsp"/>
-
-</body>
-</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/struts/blob/ffe0e20e/apps/showcase/src/main/webapp/WEB-INF/ajax/commonInclude.jsp
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/ajax/commonInclude.jsp b/apps/showcase/src/main/webapp/WEB-INF/ajax/commonInclude.jsp
deleted file mode 100644
index 32ea69e..0000000
--- a/apps/showcase/src/main/webapp/WEB-INF/ajax/commonInclude.jsp
+++ /dev/null
@@ -1,5 +0,0 @@
-<%@ taglib prefix="s" uri="/struts-tags" %>
-<%@ taglib prefix="sx" uri="/struts-dojo-tags" %>
-<!--// START SNIPPET: common-include-->
-<sx:head cache="false"/>
-<!--// END SNIPPET: common-include-->
http://git-wip-us.apache.org/repos/asf/struts/blob/ffe0e20e/apps/showcase/src/main/webapp/WEB-INF/ajax/footer.jsp
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/ajax/footer.jsp b/apps/showcase/src/main/webapp/WEB-INF/ajax/footer.jsp
deleted file mode 100644
index 12854b5..0000000
--- a/apps/showcase/src/main/webapp/WEB-INF/ajax/footer.jsp
+++ /dev/null
@@ -1,8 +0,0 @@
-<%@taglib prefix="s" uri="/struts-tags" %>
-
-<hr/>
-
-<s:url var="backToAjaxExamples" value="/ajax/index.html" />
-
-<s:a href="%{backToAjaxExamples}">Back To AJAX Examples</s:a>
-
http://git-wip-us.apache.org/repos/asf/struts/blob/ffe0e20e/apps/showcase/src/main/webapp/WEB-INF/ajax/options.ftl
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/ajax/options.ftl b/apps/showcase/src/main/webapp/WEB-INF/ajax/options.ftl
deleted file mode 100644
index d12ad6d..0000000
--- a/apps/showcase/src/main/webapp/WEB-INF/ajax/options.ftl
+++ /dev/null
@@ -1,5 +0,0 @@
-[
-<#list options as option>
- ["${option?html}"],
-</#list>
-]
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/struts/blob/ffe0e20e/apps/showcase/src/main/webapp/WEB-INF/ajax/remotebutton/index.jsp
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/ajax/remotebutton/index.jsp b/apps/showcase/src/main/webapp/WEB-INF/ajax/remotebutton/index.jsp
deleted file mode 100644
index b8486ae..0000000
--- a/apps/showcase/src/main/webapp/WEB-INF/ajax/remotebutton/index.jsp
+++ /dev/null
@@ -1,70 +0,0 @@
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib prefix="s" uri="/struts-tags" %>
-<%@ taglib prefix="sx" uri="/struts-dojo-tags" %>
-
-<html>
-<head>
- <title>Ajax Examples</title>
- <jsp:include page="/WEB-INF/ajax/commonInclude.jsplude.jsp"/>
-</head>
-
-<script type="text/javascript">
- function before() {alert("before request");}
- function after() {alert("after request");}
- function handler(widget, node) {
- alert('I will handle this myself!');
- dojo.byId(widget.targetsArray[0]).innerHTML = "Done";
- }
-
- dojo.event.topic.subscribe("/alltopics", function(data, type, e){
- alert('inside a topic event. type='+type);
- //data : text returned
- //type : "before", "load" or "error"
- //e : request object
- });
-</script>
-
-<body>
-
-<div id="t1">Div 1</div>
-<s:url var="ajaxTest" value="/AjaxTest.action" />
-
-<br/><br/>
-
-A submit button, that highlights (blue color) its targets
-<sx:submit type="submit" value="submit" targets="t1" href="%{ajaxTest}" highlightColor="blue"/>
-
-<br/><br/>
-
-A submit button, with an indicator
-<img id="indicator" src="${pageContext.request.contextPath}/images/indicator.gif" alt="Loading..." style="display:none"/>
-<sx:submit id="submit2" type="submit" value="submit" targets="t1" href="%{ajaxTest}" indicator="indicator"/>
-
-<br/><br/>
-
-A submit button, with "notifyTopics"
-<sx:submit type="submit" value="submit" targets="t1" href="%{ajaxTest}" notifyTopics="/alltopics"/>
-
-<br/><br/>
-
-Use an image as submit
-<s:url value="/images/struts-power.gif" var="imgUrl" />
-<sx:submit type="image" label="Alt Text" targets="t1"
- src="%{imgUrl}" href="%{ajaxTest}" />
-<br/><br/>
-
-<label for="textInput">Text to be echoed</label>
-<br/><br/>
-
-Use a button as submit (custom text)
-<s:form id="form" action="AjaxTest">
- <input type=textbox name="data">
- <sx:submit type="button" label="Update Content" targets="t1" id="ajaxbtn"/>
-</s:form>
-
-<br/><br/>
-
-<s:include value="../footer.jsp"/>
-
-</body>
-</html>
http://git-wip-us.apache.org/repos/asf/struts/blob/ffe0e20e/apps/showcase/src/main/webapp/WEB-INF/ajax/remotediv/example1.jsp
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/ajax/remotediv/example1.jsp b/apps/showcase/src/main/webapp/WEB-INF/ajax/remotediv/example1.jsp
deleted file mode 100644
index 4dfdd1d..0000000
--- a/apps/showcase/src/main/webapp/WEB-INF/ajax/remotediv/example1.jsp
+++ /dev/null
@@ -1,23 +0,0 @@
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib prefix="s" uri="/struts-tags" %>
-<%@ taglib prefix="sx" uri="/struts-dojo-tags" %>
-
-<html>
-<head>
- <title>Ajax Examples</title>
- <jsp:include page="/WEB-INF/ajax/commonInclude.jsp"/>
-</head>
-
-<s:url var="ajaxTest" value="/AjaxTest.action" />
-
-
-<body>
-<sx:div
- cssStyle="border: 1px solid yellow;"
- href="%{ajaxTest}">
- Initial Content</sx:div>
-
-<s:include value="../footer.jsp"/>
-
-</body>
-</html>
http://git-wip-us.apache.org/repos/asf/struts/blob/ffe0e20e/apps/showcase/src/main/webapp/WEB-INF/ajax/remotediv/example10.jsp
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/ajax/remotediv/example10.jsp b/apps/showcase/src/main/webapp/WEB-INF/ajax/remotediv/example10.jsp
deleted file mode 100644
index 4350984..0000000
--- a/apps/showcase/src/main/webapp/WEB-INF/ajax/remotediv/example10.jsp
+++ /dev/null
@@ -1,31 +0,0 @@
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib prefix="s" uri="/struts-tags" %>
-<%@ taglib prefix="sx" uri="/struts-dojo-tags" %>
-
-<html>
-<head>
- <title>Ajax Examples</title>
- <jsp:include page="/WEB-INF/ajax/commonInclude.jsp"/>
-</head>
-
-<script type="text/javascript">
- function handler(widget, node) {
- alert('I will handle this myself!');
- node.innerHTML = "Done";
- }
-</script>
-
-<s:url var="ajaxTest" value="/AjaxTest.action" />
-
-<body>
-<sx:div
- id="once"
- cssStyle="border: 1px solid yellow;"
- href="%{ajaxTest}"
- handler="handler">
- Initial Content</sx:div>
-
-<s:include value="../footer.jsp"/>
-
-</body>
-</html>
http://git-wip-us.apache.org/repos/asf/struts/blob/ffe0e20e/apps/showcase/src/main/webapp/WEB-INF/ajax/remotediv/example2.jsp
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/ajax/remotediv/example2.jsp b/apps/showcase/src/main/webapp/WEB-INF/ajax/remotediv/example2.jsp
deleted file mode 100644
index 4257d72..0000000
--- a/apps/showcase/src/main/webapp/WEB-INF/ajax/remotediv/example2.jsp
+++ /dev/null
@@ -1,28 +0,0 @@
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib prefix="s" uri="/struts-tags" %>
-<%@ taglib prefix="sx" uri="/struts-dojo-tags" %>
-
-<html>
-<head>
- <title>Ajax Examples</title>
- <jsp:include page="/WEB-INF/ajax/commonInclude.jsp"/>
-</head>
-
-
-<body>
-<s:url var="ajaxTest" value="/AjaxTest.action" />
-
-
-<sx:div
- id="once"
- cssStyle="border: 1px solid yellow;"
- href="%{#ajaxTest}"
- updateFreq="2000"
- indicator="indicator"
- >
- Initial Content</sx:div>
-<img id="indicator" src="${pageContext.request.contextPath}/images/indicator.gif" alt="Loading..." style="display:none"/>
-<s:include value="../footer.jsp"/>
-
-</body>
-</html>
http://git-wip-us.apache.org/repos/asf/struts/blob/ffe0e20e/apps/showcase/src/main/webapp/WEB-INF/ajax/remotediv/example3.jsp
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/ajax/remotediv/example3.jsp b/apps/showcase/src/main/webapp/WEB-INF/ajax/remotediv/example3.jsp
deleted file mode 100644
index 1ea2b17..0000000
--- a/apps/showcase/src/main/webapp/WEB-INF/ajax/remotediv/example3.jsp
+++ /dev/null
@@ -1,27 +0,0 @@
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib prefix="s" uri="/struts-tags" %>
-<%@ taglib prefix="sx" uri="/struts-dojo-tags" %>
-
-<html>
-<head>
- <title>Ajax Examples</title>
- <jsp:include page="/WEB-INF/ajax/commonInclude.jsp"/>
-</head>
-
-<body>
-
-<s:url var="ajaxTest" value="/AjaxTest.action" />
-
-
-<sx:div
- id="twoseconds"
- cssStyle="border: 1px solid yellow;"
- href="%{ajaxTest}"
- delay="2000"
- updateFreq="%{#parameters.period}"
- errorText="There was an error">Initial Content</sx:div>
-
-<s:include value="../footer.jsp"/>
-
-</body>
-</html>
http://git-wip-us.apache.org/repos/asf/struts/blob/ffe0e20e/apps/showcase/src/main/webapp/WEB-INF/ajax/remotediv/example4.jsp
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/ajax/remotediv/example4.jsp b/apps/showcase/src/main/webapp/WEB-INF/ajax/remotediv/example4.jsp
deleted file mode 100644
index 959cff1..0000000
--- a/apps/showcase/src/main/webapp/WEB-INF/ajax/remotediv/example4.jsp
+++ /dev/null
@@ -1,28 +0,0 @@
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib prefix="s" uri="/struts-tags" %>
-<%@ taglib prefix="sx" uri="/struts-dojo-tags" %>
-
-<html>
-<head>
- <title>Ajax Examples</title>
- <jsp:include page="/WEB-INF/ajax/commonInclude.jsp"/>
-</head>
-
-<body>
-
-<s:url var="ajaxTest" value="/AjaxTest.action" />
-
-<sx:div
- id="fiveseconds"
- cssStyle="border: 1px solid yellow;"
- href="%{ajaxTest}"
- delay="1000"
- updateFreq="5000"
- errorText="There was an error"
- loadingText="reloading"
- showLoadingText="true">loading now</sx:div>
-
-<s:include value="../footer.jsp"/>
-
-</body>
-</html>
http://git-wip-us.apache.org/repos/asf/struts/blob/ffe0e20e/apps/showcase/src/main/webapp/WEB-INF/ajax/remotediv/example5.jsp
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/ajax/remotediv/example5.jsp b/apps/showcase/src/main/webapp/WEB-INF/ajax/remotediv/example5.jsp
deleted file mode 100644
index ac06d1e..0000000
--- a/apps/showcase/src/main/webapp/WEB-INF/ajax/remotediv/example5.jsp
+++ /dev/null
@@ -1,27 +0,0 @@
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib prefix="s" uri="/struts-tags" %>
-<%@ taglib prefix="sx" uri="/struts-dojo-tags" %>
-
-<html>
-<head>
- <title>Ajax Examples</title>
- <jsp:include page="/WEB-INF/ajax/commonInclude.jsp"/>
-</head>
-
-<body>
-
-<s:url var="ajaxNoUrl" value="/AjaxNoUrl.jsp" />
-
-<sx:div
- id="error"
- cssStyle="border: 1px solid yellow;"
- href="/AjaxNoUrl.jsp"
- delay="1000"
- errorText="Could not contact server"
- loadingText="reloading">loading now</sx:div>
-
-
-<s:include value="../footer.jsp"/>
-
-</body>
-</html>
http://git-wip-us.apache.org/repos/asf/struts/blob/ffe0e20e/apps/showcase/src/main/webapp/WEB-INF/ajax/remotediv/example6.jsp
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/ajax/remotediv/example6.jsp b/apps/showcase/src/main/webapp/WEB-INF/ajax/remotediv/example6.jsp
deleted file mode 100644
index c944005..0000000
--- a/apps/showcase/src/main/webapp/WEB-INF/ajax/remotediv/example6.jsp
+++ /dev/null
@@ -1,24 +0,0 @@
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib prefix="s" uri="/struts-tags" %>
-<%@ taglib prefix="sx" uri="/struts-dojo-tags" %>
-
-<html>
-<head>
- <title>Ajax Examples</title>
- <jsp:include page="/WEB-INF/ajax/commonInclude.jsp"/>
-</head>
-
-<body>
-
-<sx:div
- id="error"
- cssStyle="border: 1px solid yellow;"
- href="/AjaxNoUrl.jsp"
- delay="1000"
- showErrorTransportText="true"
- loadingText="reloading">loading now</sx:div>
-
-<s:include value="../footer.jsp"/>
-
-</body>
-</html>
http://git-wip-us.apache.org/repos/asf/struts/blob/ffe0e20e/apps/showcase/src/main/webapp/WEB-INF/ajax/remotediv/example7.jsp
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/ajax/remotediv/example7.jsp b/apps/showcase/src/main/webapp/WEB-INF/ajax/remotediv/example7.jsp
deleted file mode 100644
index d444474..0000000
--- a/apps/showcase/src/main/webapp/WEB-INF/ajax/remotediv/example7.jsp
+++ /dev/null
@@ -1,27 +0,0 @@
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib prefix="s" uri="/struts-tags" %>
-<%@ taglib prefix="sx" uri="/struts-dojo-tags" %>
-
-<html>
-<head>
- <title>Ajax Examples</title>
- <jsp:include page="/WEB-INF/ajax/commonInclude.jsp"/>
-</head>
-
-<body>
-
-<s:url var="test3" value="/Test3.action" />
-
-
-<sx:div
- id="error"
- cssStyle="border: 1px solid yellow;"
- href="%{test3}"
- delay="1000"
- executeScripts="true"
- loadingText="reloading">loading now</sx:div>
-
-<s:include value="../footer.jsp"/>
-
-</body>
-</html>
http://git-wip-us.apache.org/repos/asf/struts/blob/ffe0e20e/apps/showcase/src/main/webapp/WEB-INF/ajax/remotediv/example8.jsp
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/ajax/remotediv/example8.jsp b/apps/showcase/src/main/webapp/WEB-INF/ajax/remotediv/example8.jsp
deleted file mode 100644
index 3314475..0000000
--- a/apps/showcase/src/main/webapp/WEB-INF/ajax/remotediv/example8.jsp
+++ /dev/null
@@ -1,57 +0,0 @@
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib prefix="s" uri="/struts-tags" %>
-<%@ taglib prefix="sx" uri="/struts-dojo-tags" %>
-
-<html>
-<head>
- <title>Ajax Examples</title>
- <jsp:include page="/WEB-INF/ajax/commonInclude.jsp"/>
-</head>
-
-<body>
-
-<script>
- var controller = {
- refresh : function() {},
- start : function() {},
- stop : function() {}
- };
-
-
- dojo.event.topic.registerPublisher("/refresh", controller, "refresh");
- dojo.event.topic.registerPublisher("/startTimer", controller, "start");
- dojo.event.topic.registerPublisher("/stopTimer", controller, "stop");
-
-</script>
-<form id="form">
- <label for="textInput">Text to be echoed</label>
- <input type=textbox id="textInput" name="data">
-</form>
-
-<br/><br/>
-
-<input type=button value="refresh" onclick="controller.refresh()">
-<input type=button value="stop timer" onclick="controller.stop()">
-<input type=button value="start timer" onclick="controller.start()">
-
-<s:url var="ajaxTest" value="/AjaxTest.action" />
-
-<sx:div
- id="once"
- cssStyle="border: 1px solid yellow;"
- href="%{ajaxTest}"
- loadingText="Loading..."
- listenTopics="/refresh"
- startTimerListenTopics="/startTimer"
- stopTimerListenTopics="/stopTimer"
- updateFreq="3000"
- autoStart="true"
- highlightColor="red"
- formId="form"
- >
- Initial Content</sx:div>
-
-<s:include value="../footer.jsp"/>
-
-</body>
-</html>
http://git-wip-us.apache.org/repos/asf/struts/blob/ffe0e20e/apps/showcase/src/main/webapp/WEB-INF/ajax/remotediv/example9.jsp
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/ajax/remotediv/example9.jsp b/apps/showcase/src/main/webapp/WEB-INF/ajax/remotediv/example9.jsp
deleted file mode 100644
index 14ab4f0..0000000
--- a/apps/showcase/src/main/webapp/WEB-INF/ajax/remotediv/example9.jsp
+++ /dev/null
@@ -1,63 +0,0 @@
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib prefix="s" uri="/struts-tags" %>
-<%@ taglib prefix="sx" uri="/struts-dojo-tags" %>
-
-<html>
-<head>
- <title>Ajax Examples</title>
- <jsp:include page="/WEB-INF/ajax/commonInclude.jsp"/>
-</head>
-
-<body>
-
-<script>
- var controller = {
- refresh : function() {},
- start : function() {},
- stop : function() {}
- };
-
- dojo.event.topic.registerPublisher("/refresh", controller, "refresh");
- dojo.event.topic.registerPublisher("/startTimer", controller, "start");
- dojo.event.topic.registerPublisher("/stopTimer", controller, "stop");
-
- dojo.event.topic.subscribe("/before", function(data, type, e){
- alert('inside a topic event. before request');
- //data : source element id
- //type : "before"
- //e : request object
- });
-
- dojo.event.topic.subscribe("/after", function(data, type, e){
- alert('inside a topic event. after request');
- //data : text returned
- //type : "load"
- //e : undefined
- });
-
-</script>
-
-<input type=button value="refresh" onclick="controller.refresh()">
-<input type=button value="start timer" onclick="controller.start()">
-<input type=button value="stop timer" onclick="controller.stop()">
-
-<s:url var="ajaxTest" value="/AjaxTest.action" />
-
-<sx:div
- id="div1"
- cssStyle="border: 1px solid yellow;"
- href="%{ajaxTest}"
- listenTopics="/refresh"
- startTimerListenTopics="/startTimer"
- stopTimerListenTopics="/stopTimer"
- updateFreq="10000"
- autoStart="false"
- beforeNotifyTopics="/before"
- afterNotifyTopics="/after"
- >
- Initial Content</sx:div>
-
-<s:include value="../footer.jsp"/>
-
-</body>
-</html>
http://git-wip-us.apache.org/repos/asf/struts/blob/ffe0e20e/apps/showcase/src/main/webapp/WEB-INF/ajax/remotediv/index.jsp
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/ajax/remotediv/index.jsp b/apps/showcase/src/main/webapp/WEB-INF/ajax/remotediv/index.jsp
deleted file mode 100644
index a0e9711..0000000
--- a/apps/showcase/src/main/webapp/WEB-INF/ajax/remotediv/index.jsp
+++ /dev/null
@@ -1,55 +0,0 @@
-<%@ taglib prefix="s" uri="/struts-tags" %>
-<html>
-<head>
- <title>AJAX-based remote DIV tag</title>
- <%@ include file="/WEB-INF/ajax/commonInclude.jsp" %>
-</head>
-
-<body>
-
-<h2>Examples</h2>
-
-<p>
- <ol>
- <li>
- <a href="example1.jsp">A simple DIV that refreshes only once</a>
- </li>
-
- <li>
- <a href="example10.jsp">A simple DIV that uses a custom handler</a>
- </li>
-
- <li>
- <a href="example2.jsp?url=/AjaxTest.action">A simple DIV that updates every 2 seconds, with indicator</a>
- </li>
-
- <li>
- <a href="example4.jsp">A simple DIV that updates every 5 seconds with loading text and reloading text and delay</a>
- </li>
-
- <li>
- <a href="example5.jsp">A simple DIV's that cannot contact the server, with fixed error message</a>
- </li>
-
-
- <li>
- <a href="example7.jsp">A div that calls the server, and JS in the resulting page is executed</a>
- </li>
-
- <li>
- <a href="example8.jsp">A div that will listen to events to refresh and start/stop autoupdate, and gets highlighted in red (when it loads)</a>
- </li>
-
- <li>
- <a href="example9.jsp">A div that will listen to events to refresh and start/stop autoupdate, publish notifyTopics</a>
- </li>
-
- </ol>
-
-
-</p>
-
-<s:include value="../footer.jsp"/>
-
-</body>
-</html>
http://git-wip-us.apache.org/repos/asf/struts/blob/ffe0e20e/apps/showcase/src/main/webapp/WEB-INF/ajax/remoteforms/index.jsp
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/ajax/remoteforms/index.jsp b/apps/showcase/src/main/webapp/WEB-INF/ajax/remoteforms/index.jsp
deleted file mode 100644
index a961b94..0000000
--- a/apps/showcase/src/main/webapp/WEB-INF/ajax/remoteforms/index.jsp
+++ /dev/null
@@ -1,119 +0,0 @@
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib prefix="s" uri="/struts-tags" %>
-<%@ taglib prefix="sx" uri="/struts-dojo-tags" %>
-
-<html>
-<head>
- <title>Ajax Examples</title>
- <sx:head />
-
- <script language="JavaScript" type="text/javascript">
- dojo.event.topic.subscribe("/beforeSubmit", function(event, widget) {
- alert('you can manipulate the form before it gets submitted. To cancel the submit event set event.cancel=true');
- event.cancel = true;
- });
- </script>
-
-</head>
-
-<body>
-
-<div id='two' style="border: 1px solid yellow;"><b>initial content</b></div>
-
-
-<br /><br />
-Remote form replacing another div:<br/>
-<s:form
- id='theForm2'
- cssStyle="border: 1px solid green;"
- action='AjaxRemoteForm'
- method='post'>
-
- <input type='text' name='data' value='Struts User'>
-
- <sx:submit value="GO2" targets="two"/>
-
-</s:form>
-
-<br /><br />
-Remote form replacing the forms content:<br/>
-<s:form
- id='theForm3'
- cssStyle="border: 1px solid green;"
- action='AjaxRemoteForm'
- method='post'>
-
- <input type='text' name='data' value='Struts User'>
-
- <sx:submit value="GO3" targets="theForm3"/>
-
-</s:form>
-
-<br /><br />
-Remote form evaluating suplied JS on completion:<br/>
-<s:form
- id='theForm4'
- cssStyle="border: 1px solid green;"
- action='Test3'
- method='post'>
-
- <input type='text' name='data' value='Struts User'>
-
- <sx:submit value="GO4" executeScripts="true"/>
-
-</s:form>
-
-<br /><br />
-Submit outside form:<br/>
-<s:form
- id='theForm5'
- cssStyle="border: 1px solid green;"
- action='AjaxRemoteForm'
- method='post'>
-
- <input type='text' name='data' value='Struts User'>
-</s:form>
-<sx:submit value="GO5" formId="theForm5" targets="two"/>
-
-<br /><br />
-<s:url var="remoteUrl" namespace="/remoteforms" action="AjaxRemoteForm"/>
-Submit outside form, href in submit tag:<br/>
-<s:form
- id='theForm6'
- cssStyle="border: 1px solid green;"
- method='post'>
-
- <input type='text' name='data' value='Struts User'>
-</s:form>
-<sx:submit value="GO6" formId="theForm6" targets="two" href="%{#remoteUrl}"/>
-
-<br /><br />
-Remote form whose submit is cancelled:<br/>
-<s:form
- id='theForm7'
- cssStyle="border: 1px solid green;"
- action='AjaxRemoteForm'
- method='post'>
-
- <input type='text' name='data' value='Struts User'>
-
- <sx:submit value="GO7" targets="theForm7" beforeNotifyTopics="/beforeSubmit"/>
-
-</s:form>
-
-<br /><br />
-A form with no remote submit (so should not be ajaxified):<br/>
-<s:form
- id='theForm8'
- cssStyle="border: 1px solid green;"
- action='AjaxRemoteForm'
- method='post'>
-
- <input type='text' name='data' value='Struts User'>
-
- <s:submit value="Go AWAY" />
-
-</s:form>
-
-</body>
-</html>
http://git-wip-us.apache.org/repos/asf/struts/blob/ffe0e20e/apps/showcase/src/main/webapp/WEB-INF/ajax/remotelink/index.jsp
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/ajax/remotelink/index.jsp b/apps/showcase/src/main/webapp/WEB-INF/ajax/remotelink/index.jsp
deleted file mode 100644
index 89e32f3..0000000
--- a/apps/showcase/src/main/webapp/WEB-INF/ajax/remotelink/index.jsp
+++ /dev/null
@@ -1,127 +0,0 @@
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib prefix="s" uri="/struts-tags" %>
-<%@ taglib prefix="sx" uri="/struts-dojo-tags" %>
-
-<html>
-<head>
- <title>Ajax Examples</title>
- <jsp:include page="/WEB-INF/ajax/commonInclude.jsp"/>
-</head>
-
-<script type="text/javascript">
- function handler(widget, node) {
- alert('I will handle this myself!');
- dojo.byId(widget.targetsArray[0]).innerHTML = "Done";
- }
-
- dojo.event.topic.subscribe("/before", function(event, widget){
- alert('inside a topic event. before request');
- //event: set event.cancel = true, to cancel request
- //widget: widget that published the topic
- });
-
- dojo.event.topic.subscribe("/after", function(data, request, widget){
- alert('inside a topic event. after request');
- //data : text returned from request
- //request: XMLHttpRequest object
- //widget: widget that published the topic
- });
-
- dojo.event.topic.subscribe("/error", function(error, request, widget){
- alert('inside a topic event. on error');
- //error : error object (error.message has the error message)
- //request: XMLHttpRequest object
- //widget: widget that published the topic
- });
-
- dojo.event.topic.subscribe("/topics", function(data, type, e){
- alert('inside a topic event. type='+type);
- //data : text returned
- //type : "before", "load", "error"
- //e : request object
- });
-</script>
-
-<body>
-
-<div id="t1">Div 1</div>
-
-<br/>
-
-<div id="t2">Div 2</div>
-
-<br/><br/>
-
-<s:url var="ajaxTest" value="/AjaxTest.action" />
-<s:url var="test3" value="/Test3.action" />
-
-<sx:a
- href="%{#ajaxTest}"
- targets="t1"
- highlightColor="red"
- highlightDuration="2000">Update 'Div 1' and use red highligh to notify user of changed content</sx:a>
-
-<br/><br/>
-
-<sx:a id="link1"
- href="%{#ajaxTest}"
- indicator="indicator"
- targets="t1,t2"
- beforeNotifyTopics="/before"
- afterNotifyTopics="/after" >Update 'Div 1' and 'Div 2', publish topic '/before' and '/after', use indicator</sx:a>
-<img id="indicator" src="${pageContext.request.contextPath}/images/indicator.gif" alt="Loading..." style="display:none"/>
-
-<br/><br/>
-
-<sx:a id="link2"
- href="/AjaxNoUrl.jsp"
- errorText="Error Loading"
- targets="t1"
- errorNotifyTopics="/error">Try to update 'Div 1', publish '/error', use custom error message</sx:a>
-
-<br/><br/>
-
-<sx:a id="link3"
- href="%{#ajaxTest}"
- loadingText="Loading!!!"
- showLoadingText="true"
- targets="t1">Update 'Div 1', use custom loading message</sx:a>
-
-<br/><br/>
-
-<sx:a id="link4"
- href="%{#test3}"
- executeScripts="true"
- targets="t2">Update 'Div 2' and execute returned javascript </sx:a>
-
-<br/><br/>
-
-<sx:a id="link5"
- href="%{#ajaxTest}"
- handler="handler"
- targets="t2">Update 'Div 2' using a custom handler </sx:a>
-
-
-<br/><br/>
-
-<label for="textInput">Text to be echoed</label>
-
-<form id="form">
- <input type=textbox name="data">
-</form>
-
-<br/><br/>
-
-<sx:a id="link6"
- href="%{#ajaxTest}"
- targets="t2"
- formId="form"
- >Update 'Div 2' with the content of the textbox </sx:a>
-
-
-<br/><br/>
-
-<s:include value="../footer.jsp"/>
-
-</body>
-</html>
http://git-wip-us.apache.org/repos/asf/struts/blob/ffe0e20e/apps/showcase/src/main/webapp/WEB-INF/ajax/tabbedpanel/example1.jsp
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/ajax/tabbedpanel/example1.jsp b/apps/showcase/src/main/webapp/WEB-INF/ajax/tabbedpanel/example1.jsp
deleted file mode 100644
index 8d455be..0000000
--- a/apps/showcase/src/main/webapp/WEB-INF/ajax/tabbedpanel/example1.jsp
+++ /dev/null
@@ -1,95 +0,0 @@
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib prefix="s" uri="/struts-tags" %>
-<%@ taglib prefix="sx" uri="/struts-dojo-tags" %>
-
-<html>
-<head>
- <title>Ajax examples - tabbled panel</title>
-
- <jsp:include page="/WEB-INF/ajax/commonInclude.jsp"/>
-</head>
-
-<s:url var="ajaxTest" value="/AjaxTest.action" />
-
-<body>
-
- <table cellpadding="0" cellspacing="10" border="0" width="900">
- <tr>
- <td align="top" width="400">
- <sx:tabbedpanel id="test" >
- <sx:div id="one" label="one" >
- This is the first pane<br/>
- <s:form>
- <s:textfield name="tt" label="Test Text"/> <br/>
- <s:textfield name="tt2" label="Test Text2"/>
- </s:form>
- </sx:div>
- <sx:div id="two" label="two" >
- This is the second panel
- </sx:div>
- <sx:div id="three" label="three" >
- This is the three
- </sx:div>
- </sx:tabbedpanel>
- </td>
- <td align="top">
- <sx:tabbedpanel id="test2" >
- <sx:div id="left" label="left" >
- 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>
- </sx:div>
- <sx:div href="%{ajaxTest}" id="ryh1"
- label="remote one"></sx:div>
- <sx:div id="middle" label="middle" >
- middle tab<br/>
- <s:form>
- <s:textfield name="tt" label="Test Text44"/> <br/>
- <s:textfield name="tt2" label="Test Text442"/>
- </s:form>
- </sx:div>
- <sx:div href="%{ajaxTest}" id="ryh21" label="remote right"/>
- </sx:tabbedpanel>
- </td>
- </tr>
- <tr>
- <td align="top">
- <sx:tabbedpanel id="testremote">
- <sx:div href="%{ajaxTest}" id="r1" label="remote one">
- <s:action name="AjaxTest" executeResult="true" />
- </sx:div>
- <sx:div href="%{ajaxTest}" id="r2" label="remote two"></sx:div>
- <sx:div href="%{ajaxTest}" id="r3" label="remote three"></sx:div>
- </sx:tabbedpanel>
- </td>
- <td align="top">
- <sx:tabbedpanel id="test3" >
- <sx:tabbedpanel id="test11" label="Container 1">
- <sx:div id="i11" label="inner 1 one">Inner 1</sx:div>
- <sx:div id="112" label="inner 1 two">Inner 2</sx:div>
- <sx:div id="i13" label="inner 1 three">Inner 3</sx:div>
- </sx:tabbedpanel>
-
- <sx:tabbedpanel id="test12" label="Container 2">
- <sx:div id="i21" label="inner 2 one" >Inner 21</sx:div>
- <sx:div id="122" label="inner 2 two" >Inner 22</sx:div>
- <sx:div id="i23" label="inner 2 three" >Inner 23</sx:div>
- </sx:tabbedpanel>
-
- <sx:tabbedpanel id="test13" label="Container 3">
- <sx:div id="i31" label="inner 3 one" >Inner 31</sx:div>
- <sx:div id="132" label="inner 3 two" >Inner 32</sx:div>
- <sx:div id="i33" label="inner 3 three" >Inner 33</sx:div>
- </sx:tabbedpanel>
- </sx:tabbedpanel>
- </td>
- </tr>
- </table>
-
-<s:include value="../footer.jsp"/>
-
-
-</body>
-</html>
http://git-wip-us.apache.org/repos/asf/struts/blob/ffe0e20e/apps/showcase/src/main/webapp/WEB-INF/ajax/tabbedpanel/example2.jsp
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/ajax/tabbedpanel/example2.jsp b/apps/showcase/src/main/webapp/WEB-INF/ajax/tabbedpanel/example2.jsp
deleted file mode 100644
index 65b54d2..0000000
--- a/apps/showcase/src/main/webapp/WEB-INF/ajax/tabbedpanel/example2.jsp
+++ /dev/null
@@ -1,26 +0,0 @@
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib prefix="s" uri="/struts-tags" %>
-<%@ taglib prefix="sx" uri="/struts-dojo-tags" %>
-
-<html>
-<head>
- <title>Ajax examples - tabbled panel</title>
-
- <jsp:include page="/WEB-INF/ajax/commonInclude.jsp"/>
-</head>
-
-<body>
-
- <sx:tabbedpanel id="test2" cssStyle="width: 500px; height: 300px;" doLayout="true">
- <sx:div label="test1" >
- I'm a Tab!!!
- </sx:div >
- <sx:div id="middle" label="test2" >
- I'm the other Tab!!!
- </sx:div >
- </sx:tabbedpanel>
-
-<s:include value="../footer.jsp"/>
-
-</body>
-</html>
http://git-wip-us.apache.org/repos/asf/struts/blob/ffe0e20e/apps/showcase/src/main/webapp/WEB-INF/ajax/tabbedpanel/example3.jsp
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/ajax/tabbedpanel/example3.jsp b/apps/showcase/src/main/webapp/WEB-INF/ajax/tabbedpanel/example3.jsp
deleted file mode 100644
index cd3c9b6..0000000
--- a/apps/showcase/src/main/webapp/WEB-INF/ajax/tabbedpanel/example3.jsp
+++ /dev/null
@@ -1,46 +0,0 @@
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib prefix="s" uri="/struts-tags" %>
-<%@ taglib prefix="sx" uri="/struts-dojo-tags" %>
-
-<html>
-<head>
- <title>Ajax examples - tabbled panel</title>
-
- <jsp:include page="/WEB-INF/ajax/commonInclude.jsp"/>
-</head>
-
-<s:url var="ajaxTest" value="/AjaxTest.action" />
-
-<body>
-
- <table cellpadding="0" cellspacing="10" border="0" width="600">
- <tr>
- <td align="top">
- <!--// START SNIPPET: tabbedpanel-tag-->
- <sx:tabbedpanel id="test2" cssStyle="width: 500px; height: 300px;" doLayout="true">
- <sx:div id="left" label="left">
- 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>
- </sx:div>
- <sx:div href="%{ajaxTest}" id="ryh1" label="remote one" preload="false"/>
- <sx:div id="middle" label="middle">
- middle tab<br/>
- <s:form >
- <s:textfield name="tt" label="Test Text44" /> <br/>
- <s:textfield name="tt2" label="Test Text442" />
- </s:form>
- </sx:div>
- <sx:div href="%{ajaxTest}" id="ryh21" label="remote right" preload="false"/>
- </sx:tabbedpanel>
- <!--// END SNIPPET: tabbedpanel-tag-->
- </td>
- </tr>
- </table>
-
-<s:include value="../footer.jsp"/>
-
-</body>
-</html>