From 28bee3dffdecf9ebe9269ebaa2f07d354d48e19d Mon Sep 17 00:00:00 2001 From: Toby Jee Date: Sun, 11 Jun 2006 17:50:12 +0000 Subject: [PATCH] - remove the ones without history such that we could moved the one with history over git-svn-id: https://svn.apache.org/repos/asf/struts/action2/trunk@413487 13f79535-47bb-0310-9956-ffa450edef68 --- .../main/resources/globalMessages.properties | 7 -- .../resources/globalMessages_de.properties | 7 -- .../src/main/resources/log4j.properties | 31 ------ .../src/main/resources/struts.properties | 12 --- .../main/resources/xwork-actionchaining.xml | 23 ---- .../src/main/resources/xwork-ajax.xml | 43 -------- .../main/resources/xwork-continuations.xml | 10 -- .../src/main/resources/xwork-conversion.xml | 30 ------ .../src/main/resources/xwork-filedownload.xml | 26 ----- .../src/main/resources/xwork-fileupload.xml | 25 ----- .../src/main/resources/xwork-freemarker.xml | 16 --- .../showcase/src/main/resources/xwork-jsf.xml | 22 ---- .../src/main/resources/xwork-model-driven.xml | 22 ---- .../src/main/resources/xwork-person.xml | 31 ------ .../src/main/resources/xwork-tags-non-ui.xml | 89 ---------------- .../src/main/resources/xwork-tags-ui.xml | 73 ------------- .../src/main/resources/xwork-tags.xml | 5 - .../src/main/resources/xwork-token.xml | 63 ----------- .../src/main/resources/xwork-validation.xml | 100 ------------------ .../src/main/resources/xwork-wait.xml | 35 ------ apps/showcase/src/main/resources/xwork.xml | 2 + 21 files changed, 2 insertions(+), 670 deletions(-) delete mode 100644 apps/showcase/src/main/resources/globalMessages.properties delete mode 100644 apps/showcase/src/main/resources/globalMessages_de.properties delete mode 100644 apps/showcase/src/main/resources/log4j.properties delete mode 100644 apps/showcase/src/main/resources/struts.properties delete mode 100644 apps/showcase/src/main/resources/xwork-actionchaining.xml delete mode 100644 apps/showcase/src/main/resources/xwork-ajax.xml delete mode 100644 apps/showcase/src/main/resources/xwork-continuations.xml delete mode 100644 apps/showcase/src/main/resources/xwork-conversion.xml delete mode 100644 apps/showcase/src/main/resources/xwork-filedownload.xml delete mode 100644 apps/showcase/src/main/resources/xwork-fileupload.xml delete mode 100644 apps/showcase/src/main/resources/xwork-freemarker.xml delete mode 100644 apps/showcase/src/main/resources/xwork-jsf.xml delete mode 100644 apps/showcase/src/main/resources/xwork-model-driven.xml delete mode 100644 apps/showcase/src/main/resources/xwork-person.xml delete mode 100644 apps/showcase/src/main/resources/xwork-tags-non-ui.xml delete mode 100644 apps/showcase/src/main/resources/xwork-tags-ui.xml delete mode 100644 apps/showcase/src/main/resources/xwork-tags.xml delete mode 100644 apps/showcase/src/main/resources/xwork-token.xml delete mode 100755 apps/showcase/src/main/resources/xwork-validation.xml delete mode 100644 apps/showcase/src/main/resources/xwork-wait.xml diff --git a/apps/showcase/src/main/resources/globalMessages.properties b/apps/showcase/src/main/resources/globalMessages.properties deleted file mode 100644 index 24a39d45c..000000000 --- a/apps/showcase/src/main/resources/globalMessages.properties +++ /dev/null @@ -1,7 +0,0 @@ -save=Save - -item.edit=Edit {0} -item.create=Create {0} -item.list={0} List - -token.transfer.time=The bank transfer was executed at {0,date,HH:mm:ss MM-dd-yyyy} diff --git a/apps/showcase/src/main/resources/globalMessages_de.properties b/apps/showcase/src/main/resources/globalMessages_de.properties deleted file mode 100644 index 0dc66efa8..000000000 --- a/apps/showcase/src/main/resources/globalMessages_de.properties +++ /dev/null @@ -1,7 +0,0 @@ -save=Speichern - -item.edit={0} bearbeiten -item.create={0} neu anlegen -item.list={0}-Liste - -token.transfer.time=Die \u00dcberweisung wurde am {0,date,HH:mm:ss MM-dd-yyyy} durchgef\u00fchrt diff --git a/apps/showcase/src/main/resources/log4j.properties b/apps/showcase/src/main/resources/log4j.properties deleted file mode 100644 index 44a410e3b..000000000 --- a/apps/showcase/src/main/resources/log4j.properties +++ /dev/null @@ -1,31 +0,0 @@ -# -# Log4J Settings for log4j 1.2.x (via jakarta-commons-logging) -# -# The five logging levels used by Log are (in order): -# -# 1. DEBUG (the least serious) -# 2. INFO -# 3. WARN -# 4. ERROR -# 5. FATAL (the most serious) - - -# Set root logger level to WARN and append to stdout -log4j.rootLogger=WARN, stdout - -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout - -# Pattern to output the caller's file name and line number. -log4j.appender.stdout.layout.ConversionPattern=%d %5p (%c:%L) - %m%n - -# Print only messages of level ERROR or above in the package noModule. -log4j.logger.noModule=FATAL - -# OpenSymphony Stuff -log4j.logger.com.opensymphony=INFO -log4j.logger.org.apache.struts.action2=DEBUG - -# Spring Stuff -log4j.logger.org.springframework=INFO - diff --git a/apps/showcase/src/main/resources/struts.properties b/apps/showcase/src/main/resources/struts.properties deleted file mode 100644 index 523c856b1..000000000 --- a/apps/showcase/src/main/resources/struts.properties +++ /dev/null @@ -1,12 +0,0 @@ -struts.i18n.reload=true -struts.devMode = true -struts.configuration.xml.reload=true -struts.continuations.package = org.apache.struts.action2.showcase -struts.objectFactory = spring -struts.custom.i18n.resources=globalMessages -#struts.action.extension=jspa -struts.url.http.port = 8080 -struts.freemarker.manager.classname=customFreemarkerManager - -struts.serve.static=true -struts.serve.static.browserCache=false diff --git a/apps/showcase/src/main/resources/xwork-actionchaining.xml b/apps/showcase/src/main/resources/xwork-actionchaining.xml deleted file mode 100644 index 9809fd920..000000000 --- a/apps/showcase/src/main/resources/xwork-actionchaining.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - actionChain2 - - - actionChain3 - - - /actionchaining/actionChainingResult.jsp - - - - - diff --git a/apps/showcase/src/main/resources/xwork-ajax.xml b/apps/showcase/src/main/resources/xwork-ajax.xml deleted file mode 100644 index 2b88ed20b..000000000 --- a/apps/showcase/src/main/resources/xwork-ajax.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - /ajax/AjaxResult.jsp - - - - /ajax/AjaxResult2.js - - - - /ajax/AjaxResult3.jsp - - - - /ajax/remoteforms/test2.jsp - - - - /ajax/remoteforms/test3.jsp - - - - /ajax/testjs.jsp - - - - /ajax/tree/tree.jsp - - - - /ajax/tree/getCategory.jsp - - - - /ajax/tree/toggle.jsp - - - diff --git a/apps/showcase/src/main/resources/xwork-continuations.xml b/apps/showcase/src/main/resources/xwork-continuations.xml deleted file mode 100644 index a59e2a92b..000000000 --- a/apps/showcase/src/main/resources/xwork-continuations.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - guess.ftl - - - diff --git a/apps/showcase/src/main/resources/xwork-conversion.xml b/apps/showcase/src/main/resources/xwork-conversion.xml deleted file mode 100644 index d05420d0f..000000000 --- a/apps/showcase/src/main/resources/xwork-conversion.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - enterPersonInfo.jsp - - - showPersonInfo.jsp - enterPersonInfo.jsp - - - /conversion/enterPersonInfo.jsp - - - /conversion/PersonAction.java.txt - - - /conversion/Person.java.txt - - - diff --git a/apps/showcase/src/main/resources/xwork-filedownload.xml b/apps/showcase/src/main/resources/xwork-filedownload.xml deleted file mode 100644 index dc6f70b13..000000000 --- a/apps/showcase/src/main/resources/xwork-filedownload.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - image/jpeg - imageStream - filename="logo.png" - 4096 - - - - - - - diff --git a/apps/showcase/src/main/resources/xwork-fileupload.xml b/apps/showcase/src/main/resources/xwork-fileupload.xml deleted file mode 100644 index 89464630f..000000000 --- a/apps/showcase/src/main/resources/xwork-fileupload.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - upload.jsp - - - - upload-success.jsp - - - - - - diff --git a/apps/showcase/src/main/resources/xwork-freemarker.xml b/apps/showcase/src/main/resources/xwork-freemarker.xml deleted file mode 100644 index c6dbf112b..000000000 --- a/apps/showcase/src/main/resources/xwork-freemarker.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - /freemarker/customFreemarkerManagerUsage.ftl - - - diff --git a/apps/showcase/src/main/resources/xwork-jsf.xml b/apps/showcase/src/main/resources/xwork-jsf.xml deleted file mode 100644 index e72d8ef8c..000000000 --- a/apps/showcase/src/main/resources/xwork-jsf.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - index - - - - - diff --git a/apps/showcase/src/main/resources/xwork-model-driven.xml b/apps/showcase/src/main/resources/xwork-model-driven.xml deleted file mode 100644 index dd217e804..000000000 --- a/apps/showcase/src/main/resources/xwork-model-driven.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - modelDriven.jsp - - - - - modelDrivenResult.jsp - - - - \ No newline at end of file diff --git a/apps/showcase/src/main/resources/xwork-person.xml b/apps/showcase/src/main/resources/xwork-person.xml deleted file mode 100644 index e0b54cab3..000000000 --- a/apps/showcase/src/main/resources/xwork-person.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - listPeople.ftl - - - - listPeople.action - newPerson.ftl - - - - editPeople.jsp - - - - editPeople.jsp - listPeople.action - - - - - - diff --git a/apps/showcase/src/main/resources/xwork-tags-non-ui.xml b/apps/showcase/src/main/resources/xwork-tags-non-ui.xml deleted file mode 100644 index b17f29af6..000000000 --- a/apps/showcase/src/main/resources/xwork-tags-non-ui.xml +++ /dev/null @@ -1,89 +0,0 @@ - - - - - - - - - - - - - /tags/non-ui/actionTag/showActionTagDemo.jsp - - - /tags/non-ui/actionTag/includedPage.jsp - - - /tags/non-ui/actionTag/includedPage2.jsp - - - /tags/non-ui/actionTag/includedPage3.jsp - - - /tags/non-ui/actionTag/showActionTagDemo.jsp - - - - - - - - - - /tags/non-ui/iteratorTag/showIteratorGeneratorTagDemo.jsp - - - /tags/non-ui/iteratorTag/showIteratorGeneratorTagDemo.jsp - /tags/non-ui/iteratorTag/iteratorGeneratorTagDemoResult.jsp - - - - - - - - - - /tags/non-ui/iteratorTag/showAppendIteratorTagDemo.jsp - - - /tag/non-ui/iteratorTag/showAppendIteratorTagDemo.jsp - /tags/non-ui/iteratorTag/appendIteratorTagDemoResult.jsp - - - - - - - - - - /tags/non-ui/iteratorTag/showMergeIteratorTagDemo.jsp - - - /tags/non-ui/iteratorTag/showMergeIteratorTagDemo.jsp - /tags/non-ui/iteratorTag/mergeIteratorTagDemoResult.jsp - - - - - - - - - /tags/non-ui/iteratorTag/subsetIteratorTagDemo.jsp - - - /tags/non-ui/iteratorTag/subsetIteratorTagDemo.jsp - /tags/non-ui/iteratorTag/subsetIteratorTagDemoResult.jsp - - - - - - - diff --git a/apps/showcase/src/main/resources/xwork-tags-ui.xml b/apps/showcase/src/main/resources/xwork-tags-ui.xml deleted file mode 100644 index 1e9722aa9..000000000 --- a/apps/showcase/src/main/resources/xwork-tags-ui.xml +++ /dev/null @@ -1,73 +0,0 @@ - - - - - - - - - - example.jsp - example.jsp - - - exampleSubmited.jsp - example.jsp - - - example.vm - example.vm - - - exampleSubmited.vm - example.vm - - - lotsOfOptiontransferselect.jsp - - - lotsOfOptiontransferselect.jsp - lotsOfOptiontransferselectSubmit.jsp - - - lotsOfRichtexteditor.jsp - - - lotsOfRichtexteditor.jsp - lotsOfRichtexteditorSubmit.jsp - - - tooltipExample.jsp - - - - - - /tags/ui/treeExampleDynamic.jsp - - - - - - - /tags/ui/componentTagExample.jsp - - - - - - - - - - /tags/ui/staticTreeSelect.jsp - - - /tags/ui/dynamicTreeSelect.jsp - - - - - diff --git a/apps/showcase/src/main/resources/xwork-tags.xml b/apps/showcase/src/main/resources/xwork-tags.xml deleted file mode 100644 index 610ab2e47..000000000 --- a/apps/showcase/src/main/resources/xwork-tags.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/apps/showcase/src/main/resources/xwork-token.xml b/apps/showcase/src/main/resources/xwork-token.xml deleted file mode 100644 index d5aad93ae..000000000 --- a/apps/showcase/src/main/resources/xwork-token.xml +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - - - example1.jsp - - - - - - doublePost.jsp - transferDone.jsp - - - - - - - example2.jsp - - - - - - doublePost.jsp - transferDone.jsp - - - - - - - example3.jsp - - - - - - doublePost.jsp - transferDone.jsp - - - - - - - example4.ftl - - - - - - doublePost.jsp - transferDone.jsp - - - - - diff --git a/apps/showcase/src/main/resources/xwork-validation.xml b/apps/showcase/src/main/resources/xwork-validation.xml deleted file mode 100755 index 7b280d245..000000000 --- a/apps/showcase/src/main/resources/xwork-validation.xml +++ /dev/null @@ -1,100 +0,0 @@ - - - - - - - - quiz-basic.jsp - quiz-success.jsp - - - - quiz-client.jsp - quiz-success.jsp - - - - quiz-client-css.jsp - quiz-success.jsp - - - - quiz-ajax.jsp - quiz-success.jsp - - - - - - - - index.jsp - - - - - - - - - /validation/fieldValidatorsExample.jsp - - - - /validation/fieldValidatorsExample.jsp - /validation/successFieldValidatorsExample.jsp - - - - - - - - - - /validation/nonFieldValidatorsExample.jsp - - - - /validation/nonFieldValidatorsExample.jsp - /validation/successNonFieldValidatorsExample.jsp - - - - - - - - - - /validation/visitorValidatorsExample.jsp - - - - /validation/visitorValidatorsExample.jsp - /validation/successVisitorValidatorsExample.jsp - - - - - - - - - - /validation/clientSideValidationExample.jsp - - - - /validation/clientSideValidationExample.jsp - /validation/successClientSideValidationExample.jsp - - - - - - - diff --git a/apps/showcase/src/main/resources/xwork-wait.xml b/apps/showcase/src/main/resources/xwork-wait.xml deleted file mode 100644 index aac4426b6..000000000 --- a/apps/showcase/src/main/resources/xwork-wait.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - wait.jsp - complete.jsp - - - - - - 2000 - - wait.jsp - complete.jsp - - - - - - 3000 - 1000 - - wait.jsp - complete.jsp - - - - - diff --git a/apps/showcase/src/main/resources/xwork.xml b/apps/showcase/src/main/resources/xwork.xml index 6cd461d9b..2ca435e6f 100644 --- a/apps/showcase/src/main/resources/xwork.xml +++ b/apps/showcase/src/main/resources/xwork.xml @@ -12,6 +12,8 @@ + +