You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2015/06/17 20:13:21 UTC
[01/11] struts git commit: WW-4503 Build Struts with JDK 7
Repository: struts
Updated Branches:
refs/heads/master 3720bbff4 -> 86da1ea8c
WW-4503 Build Struts with JDK 7
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/e262854e
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/e262854e
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/e262854e
Branch: refs/heads/master
Commit: e262854e2a1b7548efa0a1eb50d350ecd215231b
Parents: 9a33d29
Author: Aaron Johnson <aa...@pearson.com>
Authored: Fri May 22 09:28:08 2015 -0500
Committer: Aaron Johnson <aa...@pearson.com>
Committed: Fri May 22 09:28:08 2015 -0500
----------------------------------------------------------------------
pom.xml | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/e262854e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b99e47e..83582ec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -146,9 +146,10 @@
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
+ <version>3.3</version>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.7</source>
+ <target>1.7</target>
</configuration>
</plugin>
<plugin>
[09/11] struts git commit: WW-4515 Convert try blocks to
try-with-resources
Posted by lu...@apache.org.
WW-4515 Convert try blocks to try-with-resources
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/c71c3def
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/c71c3def
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/c71c3def
Branch: refs/heads/master
Commit: c71c3def74aae42ad205bd1ec839044c220b7ac0
Parents: 3fab155
Author: Aaron Johnson <aa...@pearson.com>
Authored: Wed Jun 17 09:32:57 2015 -0500
Committer: Aaron Johnson <aa...@pearson.com>
Committed: Wed Jun 17 09:32:57 2015 -0500
----------------------------------------------------------------------
core/pom.xml | 47 ++++++++++++++++++++++++++++++-----------------
pom.xml | 3 +--
2 files changed, 31 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/c71c3def/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index dd91ca1..be09a0b 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -40,25 +40,38 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
+ <groupId>org.apache.myfaces.tobago</groupId>
+ <artifactId>maven-apt-plugin</artifactId>
+ <version>1.0.15</version>
<configuration>
- <compilerArgs>
- <arg>-Auri=/struts-tags</arg>
- <arg>-AtlibVersion=${tlib.version}</arg>
- <arg>-AjspVersion=2.0</arg>
- <arg>-AshortName=s</arg>
- <arg>-AdisplayName=Struts Tags</arg>
- <arg>-AoutFile=${basedir}/target/classes/META-INF/struts-tags.tld</arg>
- <arg>-Adescription="To make it easier to access dynamic data;
- the Apache Struts framework includes a library of custom tags.
- The tags interact with the framework's validation and
- internationalization features;
- to ensure that input is correct and output is localized.
- The Struts Tags can be used with JSP FreeMarker or Velocity."</arg>
- <arg>-AoutTemplatesDir=${basedir}/src/site/resources/tags</arg>
- </compilerArgs>
+ <A>uri=/struts-tags,tlibVersion=${tlib.version},jspVersion=2.0,shortName=s,displayName=Struts Tags,
+ outFile=${basedir}/target/classes/META-INF/struts-tags.tld,
+ description="To make it easier to access dynamic data;
+ the Apache Struts framework includes a library of custom tags.
+ The tags interact with the framework's validation and internationalization features;
+ to ensure that input is correct and output is localized.
+ The Struts Tags can be used with JSP FreeMarker or Velocity.",
+ outTemplatesDir=${basedir}/src/site/resources/tags
+ </A>
+ <resourceTargetPath>target</resourceTargetPath>
+ <fork>false</fork>
+ <force>true</force>
+ <nocompile>true</nocompile>
+ <showWarnings>true</showWarnings>
+ <factory>org.apache.struts.annotations.taglib.apt.TLDAnnotationProcessorFactory</factory>
+ <target>1.5</target>
+ <includes>
+ <include>**/*.java</include>
+ </includes>
</configuration>
+ <executions>
+ <execution>
+ <phase>compile</phase>
+ <goals>
+ <goal>execute</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/struts/blob/c71c3def/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 32e16c9..73d9599 100644
--- a/pom.xml
+++ b/pom.xml
@@ -146,7 +146,6 @@
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.3</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
@@ -354,7 +353,7 @@
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts-annotations</artifactId>
- <version>1.0.6-SNAPSHOT</version>
+ <version>1.0.5</version>
</dependency>
<dependency>
[05/11] struts git commit: Merge branch 'master' of
github.com:apache/struts
Posted by lu...@apache.org.
Merge branch 'master' of github.com:apache/struts
# By Johannes Geppert (9) and others
# Via Johannes Geppert (3) and Lukasz Lenart (1)
* 'master' of github.com:apache/struts:
Refactor showcase and migrate to bootstrap 3
WW-4505 Add plugin to support bean validation
Drops version of maven-compiler-plugin as this breaks build
WW-4503 Sitches to JDK7
WW-4505 Add plugin to support bean validation
WW-4505 Add plugin to support bean validation
WW-4505 Add plugin to support bean validation
Create README.md
Add test cases for ModelDriven action, standard actions and FieldMatch validator
WW-4504 - Mark current logging layer as @deprecated and use Log4j2 as default one
Fix missing import of LoggerFactory
WW-4505 Add plugin to support bean validation
WW-4505 Add plugin to support bean validation
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/6c9ca620
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/6c9ca620
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/6c9ca620
Branch: refs/heads/master
Commit: 6c9ca6201c2f7f4f4fbac28fad844bcd1e4d62ef
Parents: b922d5a 72e6f70
Author: Aaron Johnson <aa...@pearson.com>
Authored: Fri May 29 10:42:12 2015 -0500
Committer: Aaron Johnson <aa...@pearson.com>
Committed: Fri May 29 10:42:12 2015 -0500
----------------------------------------------------------------------
README.md | 35 +
.../webapp/WEB-INF/content/orders-index.jsp | 2 +-
.../src/main/webapp/css/bootstrap-theme.css | 124 +-
.../src/main/webapp/css/bootstrap-theme.css.map | 2 +-
.../src/main/webapp/css/bootstrap-theme.min.css | 6 +-
.../src/main/webapp/css/bootstrap.css | 803 +-
.../src/main/webapp/css/bootstrap.css.map | 2 +-
.../src/main/webapp/css/bootstrap.min.css | 6 +-
.../fonts/glyphicons-halflings-regular.eot | Bin 20335 -> 20127 bytes
.../fonts/glyphicons-halflings-regular.svg | 485 +-
.../fonts/glyphicons-halflings-regular.ttf | Bin 41280 -> 45404 bytes
.../fonts/glyphicons-halflings-regular.woff | Bin 23320 -> 23424 bytes
.../fonts/glyphicons-halflings-regular.woff2 | Bin 0 -> 18028 bytes
apps/showcase/pom.xml | 17 +
.../validation/BeanValidationExampleAction.java | 170 +
.../src/main/resources/struts-validation.xml | 8 +
apps/showcase/src/main/resources/struts.xml | 6 +-
.../actionchaining/actionChainingResult.jsp | 4 +-
.../WEB-INF/bean-validation/bean-validation.jsp | 57 +
.../WEB-INF/conversion/enterAddressInfo.jsp | 4 +-
.../WEB-INF/conversion/enterOperations.jsp | 4 +-
.../WEB-INF/conversion/enterPersonInfo.jsp | 4 +-
.../main/webapp/WEB-INF/conversion/index.jsp | 4 +-
.../WEB-INF/conversion/showAddressInfo.jsp | 4 +-
.../WEB-INF/conversion/showOperations.jsp | 4 +-
.../WEB-INF/conversion/showPersonInfo.jsp | 4 +-
.../src/main/webapp/WEB-INF/decorators/main.jsp | 246 +-
.../webapp/WEB-INF/empmanager/editEmployee.jsp | 7 +-
.../webapp/WEB-INF/empmanager/editSkill.jsp | 6 +-
.../webapp/WEB-INF/empmanager/listEmployees.jsp | 6 +-
.../webapp/WEB-INF/empmanager/listSkills.jsp | 6 +-
.../main/webapp/WEB-INF/filedownload/index.jsp | 6 +-
.../fileupload/multipleUploadUsingArray.jsp | 4 +-
.../fileupload/multipleUploadUsingList.jsp | 4 +-
.../WEB-INF/fileupload/upload-success.jsp | 4 +-
.../main/webapp/WEB-INF/fileupload/upload.jsp | 4 +-
.../freemarker/customFreemarkerManagerUsage.ftl | 4 +-
.../webapp/WEB-INF/freemarker/standardTags.ftl | 4 +-
.../webapp/WEB-INF/hangman/hangmanNonAjax.ftl | 4 +-
apps/showcase/src/main/webapp/WEB-INF/help.jsp | 14 +-
.../webapp/WEB-INF/modelDriven/modelDriven.jsp | 4 +-
.../WEB-INF/modelDriven/modelDrivenResult.jsp | 4 +-
.../main/webapp/WEB-INF/person/edit-person.jsp | 6 +-
.../main/webapp/WEB-INF/person/list-people.ftl | 6 +-
.../main/webapp/WEB-INF/person/new-person.ftl | 6 +-
.../src/main/webapp/WEB-INF/showcase.jsp | 4 +-
.../tags/non-ui/actionPrefix/actionPrefix.ftl | 4 +-
.../non-ui/actionPrefix/actionPrefixExample.ftl | 4 +-
.../tags/non-ui/actionPrefix/methodPrefix.ftl | 4 +-
.../tags/non-ui/actionPrefix/normalSubmit.ftl | 4 +-
.../actionPrefix/redirectActionPrefix.ftl | 4 +-
.../tags/non-ui/actionTag/showActionTagDemo.jsp | 4 +-
.../main/webapp/WEB-INF/tags/non-ui/date.jsp | 4 +-
.../main/webapp/WEB-INF/tags/non-ui/debug.jsp | 4 +-
.../webapp/WEB-INF/tags/non-ui/ifTag/testIf.ftl | 4 +-
.../webapp/WEB-INF/tags/non-ui/ifTag/testIf.jsp | 4 +-
.../iteratorTag/appendIteratorTagDemoResult.jsp | 4 +-
.../iteratorGeneratorTagDemoResult.jsp | 4 +-
.../iteratorTag/mergeIteratorTagDemoResult.jsp | 4 +-
.../iteratorTag/showAppendIteratorTagDemo.jsp | 4 +-
.../showIteratorGeneratorTagDemo.jsp | 4 +-
.../iteratorTag/showMergeIteratorTagDemo.jsp | 4 +-
.../iteratorTag/subsetIteratorTagDemo.jsp | 4 +-
.../iteratorTag/subsetIteratorTagDemoResult.jsp | 4 +-
.../WEB-INF/tags/ui/actionTagExampleCalling.jsp | 4 +-
.../WEB-INF/tags/ui/componentTagExample.jsp | 4 +-
.../src/main/webapp/WEB-INF/tags/ui/example.jsp | 9 +-
.../src/main/webapp/WEB-INF/tags/ui/example.vm | 6 +-
.../webapp/WEB-INF/tags/ui/exampleSubmited.jsp | 4 +-
.../webapp/WEB-INF/tags/ui/exampleSubmited.vm | 7 +-
.../tags/ui/lotsOfOptiontransferselect.jsp | 4 +-
.../ui/lotsOfOptiontransferselectSubmit.jsp | 4 +-
.../main/webapp/WEB-INF/tags/ui/moreSelects.jsp | 4 +-
.../WEB-INF/tags/ui/moreSelectsSubmit.jsp | 4 +-
.../src/main/webapp/WEB-INF/tiles/body.ftl | 4 +-
.../src/main/webapp/WEB-INF/tiles/body.jsp | 4 +-
.../main/webapp/WEB-INF/token/doublePost.jsp | 4 +-
.../src/main/webapp/WEB-INF/token/example1.jsp | 4 +-
.../src/main/webapp/WEB-INF/token/example2.jsp | 4 +-
.../src/main/webapp/WEB-INF/token/example3.jsp | 4 +-
.../src/main/webapp/WEB-INF/token/example4.ftl | 4 +-
.../main/webapp/WEB-INF/token/transferDone.jsp | 4 +-
.../validation/clientSideValidationExample.jsp | 7 +-
.../validation/fieldValidatorsExample.jsp | 6 +-
.../main/webapp/WEB-INF/validation/footer.jsp | 8 -
.../main/webapp/WEB-INF/validation/index.jsp | 49 -
.../validation/nonFieldValidatorsExample.jsp | 7 +-
.../webapp/WEB-INF/validation/quiz-basic.jsp | 7 +-
.../WEB-INF/validation/quiz-client-css.jsp | 7 +-
.../webapp/WEB-INF/validation/quiz-client.jsp | 6 +-
.../webapp/WEB-INF/validation/quiz-success.jsp | 6 +-
.../storeErrorsAcrossRequestCancel.jsp | 6 +-
.../storeErrorsAcrossRequestExample.jsp | 6 +-
.../validation/storeErrorsAcrossRequestOk.jsp | 6 +-
.../successClientSideValidationExample.jsp | 6 +-
.../successFieldValidatorsExample.jsp | 6 +-
.../successNonFieldValidatorsExample.jsp | 32 +-
.../successVisitorValidatorsExample.jsp | 32 +-
.../validation/visitorValidatorsExample.jsp | 6 +-
.../src/main/webapp/WEB-INF/viewSource.jsp | 4 +-
.../src/main/webapp/WEB-INF/wait/complete.jsp | 4 +-
.../src/main/webapp/WEB-INF/wait/example1.jsp | 4 +-
.../src/main/webapp/WEB-INF/wait/example2.jsp | 4 +-
.../src/main/webapp/WEB-INF/wait/example3.jsp | 4 +-
.../src/main/webapp/WEB-INF/wait/wait.jsp | 4 +-
.../fonts/glyphicons-halflings-regular.eot | Bin 0 -> 20127 bytes
.../fonts/glyphicons-halflings-regular.svg | 288 +
.../fonts/glyphicons-halflings-regular.ttf | Bin 0 -> 45404 bytes
.../fonts/glyphicons-halflings-regular.woff | Bin 0 -> 23424 bytes
.../fonts/glyphicons-halflings-regular.woff2 | Bin 0 -> 18028 bytes
.../src/main/webapp/js/bootstrap.min.js | 11 +-
.../src/main/webapp/js/jquery-1.8.2.min.js | 2 -
.../main/webapp/styles/bootstrap-responsive.css | 1058 --
.../webapp/styles/bootstrap-responsive.min.css | 9 -
.../src/main/webapp/styles/bootstrap-theme.css | 476 +
.../main/webapp/styles/bootstrap-theme.css.map | 1 +
.../main/webapp/styles/bootstrap-theme.min.css | 5 +
.../src/main/webapp/styles/bootstrap.css | 10316 +++++++++--------
.../src/main/webapp/styles/bootstrap.css.map | 1 +
.../src/main/webapp/styles/bootstrap.min.css | 12 +-
apps/showcase/src/main/webapp/styles/main.css | 10 +-
apps/showcase/src/main/webapp/token/index.html | 4 +-
apps/showcase/src/main/webapp/wait/index.html | 4 +-
assembly/pom.xml | 5 +
assembly/src/main/assembly/all.xml | 4 +
assembly/src/main/assembly/docs.xml | 4 +
bom/pom.xml | 5 +
.../apache/struts2/StrutsInternalTestCase.java | 6 +-
plugins/bean-validation/pom.xml | 70 +
.../beanvalidation/constraints/FieldMatch.java | 87 +
.../constraints/impl/FieldMatchValidator.java | 53 +
.../validation/constant/ValidatorConstants.java | 41 +
.../interceptor/BeanValidationInterceptor.java | 219 +
.../interceptor/BeanValidationManager.java | 34 +
.../DefaultBeanValidationManager.java | 118 +
.../src/main/resources/LICENSE.txt | 174 +
.../src/main/resources/NOTICE.txt | 8 +
.../src/main/resources/struts-plugin.xml | 75 +
.../BeanValidationInterceptorTest.java | 141 +
.../struts/beanvalidation/VoidResult.java | 29 +
.../beanvalidation/actions/FieldAction.java | 39 +
.../actions/FieldMatchAction.java | 80 +
.../actions/ModelDrivenAction.java | 38 +
.../struts/beanvalidation/models/Address.java | 40 +
.../struts/beanvalidation/models/Person.java | 67 +
.../src/test/resources/bean-validation-test.xml | 39 +
plugins/pom.xml | 1 +
pom.xml | 5 +
148 files changed, 9317 insertions(+), 6747 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/6c9ca620/pom.xml
----------------------------------------------------------------------
[04/11] struts git commit: Merge branch 'master' of
github.com:apache/struts
Posted by lu...@apache.org.
Merge branch 'master' of github.com:apache/struts
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/b922d5aa
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/b922d5aa
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/b922d5aa
Branch: refs/heads/master
Commit: b922d5aad1c91510d7a77443b8e21078fb7bab3a
Parents: 08fad71 73ef38d
Author: Aaron Johnson <aa...@pearson.com>
Authored: Tue May 26 15:41:20 2015 -0500
Committer: Aaron Johnson <aa...@pearson.com>
Committed: Tue May 26 15:41:20 2015 -0500
----------------------------------------------------------------------
.gitignore | 6 +-
apps/blank/pom.xml | 12 +---
apps/blank/src/main/resources/log4j2.xml | 4 +-
apps/jboss-blank/pom.xml | 8 +++
apps/jboss-blank/src/main/resources/log4j2.xml | 15 ++++
.../src/test/java/example/HelloWorldTest.java | 3 +-
apps/mailreader/pom.xml | 31 ++++----
.../java/mailreader2/ApplicationListener.java | 16 ++---
.../mailreader2/AuthenticationInterceptor.java | 7 +-
.../src/main/java/mailreader2/Login.java | 2 +-
.../java/mailreader2/MailreaderSupport.java | 11 ++-
.../src/main/resources/log4j.properties | 36 ----------
apps/mailreader/src/main/resources/log4j2.xml | 16 +++++
apps/portlet/pom.xml | 12 +++-
apps/portlet/src/main/resources/log4j.xml | 15 ----
apps/portlet/src/main/resources/log4j2.xml | 15 ++++
apps/rest-showcase/pom.xml | 1 +
apps/showcase/pom.xml | 44 +++++-------
.../showcase/action/AbstractCRUDAction.java | 5 +-
.../struts2/showcase/action/EmployeeAction.java | 5 +-
.../struts2/showcase/action/SkillAction.java | 5 +-
.../showcase/application/TestDataProvider.java | 5 +-
.../chat/ChatAuthenticationInterceptor.java | 6 +-
.../struts2/showcase/chat/ChatInterceptor.java | 6 +-
.../showcase/chat/ChatSessionListener.java | 6 +-
.../struts2/showcase/chat/DateConverter.java | 6 +-
.../src/main/resources/log4j.properties | 33 ---------
apps/showcase/src/main/resources/log4j2.xml | 16 +++++
.../src/main/webapp/WEB-INF/decorators/main.jsp | 8 ++-
apps/showcase/src/main/webapp/WEB-INF/web.xml | 22 +-----
.../main/resources/archetype-resources/pom.xml | 5 --
.../main/resources/archetype-resources/pom.xml | 6 --
.../main/resources/archetype-resources/pom.xml | 5 --
.../main/resources/archetype-resources/pom.xml | 6 ++
.../src/main/resources/log4j2.xml | 16 +++++
.../main/resources/archetype-resources/pom.xml | 13 ++--
.../src/main/resources/log4j.properties | 20 ------
.../src/main/resources/log4j2.xml | 17 +++++
assembly/pom.xml | 21 ------
assembly/src/main/assembly/all.xml | 16 -----
assembly/src/main/assembly/docs.xml | 16 -----
bom/pom.xml | 24 +------
.../main/java/actions/osgi/BundlesAction.java | 12 ++--
.../java/actions/osgi/HelloWorldAction.java | 5 --
.../META-INF/spring/applicationContext.xml | 5 +-
core/pom.xml | 13 ++--
.../java/org/apache/struts2/RequestUtils.java | 12 ++--
.../apache/struts2/ServletActionContext.java | 10 ++-
.../struts2/components/ActionComponent.java | 6 +-
.../org/apache/struts2/components/Anchor.java | 6 +-
.../struts2/components/AppendIterator.java | 6 +-
.../org/apache/struts2/components/Bean.java | 6 +-
.../struts2/components/ClosingUIBean.java | 6 +-
.../apache/struts2/components/Component.java | 6 +-
.../org/apache/struts2/components/Date.java | 12 ++--
.../org/apache/struts2/components/File.java | 6 +-
.../org/apache/struts2/components/I18n.java | 6 +-
.../org/apache/struts2/components/Include.java | 6 +-
.../struts2/components/InputTransferSelect.java | 6 +-
.../struts2/components/IteratorComponent.java | 6 +-
.../struts2/components/MergeIterator.java | 6 +-
.../org/apache/struts2/components/Number.java | 6 +-
.../org/apache/struts2/components/OptGroup.java | 6 +-
.../components/OptionTransferSelect.java | 6 +-
.../org/apache/struts2/components/Property.java | 6 +-
.../struts2/components/ServletUrlRenderer.java | 6 +-
.../org/apache/struts2/components/Submit.java | 6 +-
.../org/apache/struts2/components/Text.java | 6 +-
.../org/apache/struts2/components/UIBean.java | 10 ++-
.../java/org/apache/struts2/components/URL.java | 6 +-
.../apache/struts2/components/UpDownSelect.java | 6 +-
.../components/template/BaseTemplateEngine.java | 8 +--
.../template/FreemarkerTemplateEngine.java | 6 +-
.../components/template/JspTemplateEngine.java | 6 +-
.../template/VelocityTemplateEngine.java | 6 +-
.../config/AbstractBeanSelectionProvider.java | 16 ++---
.../config/DefaultBeanSelectionProvider.java | 12 ++--
.../apache/struts2/config/DefaultSettings.java | 6 +-
.../struts2/config/PropertiesSettings.java | 6 +-
.../config/StrutsXmlConfigurationProvider.java | 6 +-
.../dispatcher/ActionContextCleanUp.java | 6 +-
.../DefaultDispatcherErrorHandler.java | 12 ++--
.../dispatcher/DefaultStaticContentLoader.java | 8 +--
.../apache/struts2/dispatcher/Dispatcher.java | 20 +++---
.../struts2/dispatcher/FilterDispatcher.java | 6 +-
.../FilterDispatcherCompatWeblogic61.java | 6 +-
.../struts2/dispatcher/HttpHeaderResult.java | 8 +--
.../struts2/dispatcher/PlainTextResult.java | 6 +-
.../dispatcher/ServletDispatcherResult.java | 6 +-
.../dispatcher/ServletRedirectResult.java | 22 ++----
.../apache/struts2/dispatcher/StreamResult.java | 6 +-
.../struts2/dispatcher/StrutsResultSupport.java | 6 +-
.../struts2/dispatcher/VelocityResult.java | 10 ++-
.../mapper/CompositeActionMapper.java | 6 +-
.../dispatcher/mapper/DefaultActionMapper.java | 16 ++---
.../mapper/PrefixBasedActionMapper.java | 34 ++++-----
.../dispatcher/mapper/Restful2ActionMapper.java | 6 +-
.../dispatcher/mapper/RestfulActionMapper.java | 6 +-
.../multipart/JakartaMultiPartRequest.java | 25 +++----
.../JakartaStreamMultiPartRequest.java | 26 ++++---
.../multipart/MultiPartRequestWrapper.java | 8 +--
.../struts2/dispatcher/ng/InitOperations.java | 2 +
.../dispatcher/ng/PrepareOperations.java | 8 +--
.../impl/PrefixBasedActionProxyFactory.java | 22 +++---
.../interceptor/CheckboxInterceptor.java | 10 ++-
.../interceptor/ClearSessionInterceptor.java | 6 +-
.../struts2/interceptor/CookieInterceptor.java | 26 ++++---
.../interceptor/CookieProviderInterceptor.java | 16 ++---
.../interceptor/CreateSessionInterceptor.java | 6 +-
.../interceptor/DateTextFieldInterceptor.java | 6 +-
.../interceptor/DeprecationInterceptor.java | 6 +-
.../interceptor/ExecuteAndWaitInterceptor.java | 6 +-
.../interceptor/FileUploadInterceptor.java | 6 +-
.../struts2/interceptor/I18nInterceptor.java | 6 +-
.../interceptor/MessageStoreInterceptor.java | 6 +-
.../struts2/interceptor/RolesInterceptor.java | 8 +--
.../struts2/interceptor/ScopeInterceptor.java | 6 +-
.../debugging/DebuggingInterceptor.java | 6 +-
.../apache/struts2/util/IteratorGenerator.java | 6 +-
.../apache/struts2/util/SortIteratorFilter.java | 6 +-
.../org/apache/struts2/util/StrutsUtil.java | 12 ++--
.../struts2/util/SubsetIteratorFilter.java | 14 ++--
.../apache/struts2/util/TextProviderHelper.java | 6 +-
.../org/apache/struts2/util/TokenHelper.java | 6 +-
.../struts2/util/fs/JBossFileManager.java | 34 ++++-----
.../views/freemarker/FreemarkerManager.java | 10 ++-
.../views/freemarker/FreemarkerResult.java | 6 +-
.../struts2/views/freemarker/tags/TagModel.java | 10 ++-
.../org/apache/struts2/views/jsp/BeanTag.java | 6 +-
.../jsp/iterator/IteratorGeneratorTag.java | 6 +-
.../views/jsp/iterator/SubsetIteratorTag.java | 6 +-
.../views/jsp/ui/AbstractUITagBeanInfo.java | 6 +-
.../struts2/views/util/DefaultUrlHelper.java | 14 ++--
.../struts2/views/velocity/VelocityManager.java | 6 +-
.../struts2/views/xslt/AbstractAdapterNode.java | 10 +--
.../apache/struts2/views/xslt/ArrayAdapter.java | 6 +-
.../apache/struts2/views/xslt/BeanAdapter.java | 15 ++--
.../struts2/views/xslt/CollectionAdapter.java | 6 +-
.../struts2/views/xslt/ProxyElementAdapter.java | 6 +-
.../struts2/views/xslt/ProxyNodeAdapter.java | 6 +-
.../struts2/views/xslt/ServletURIResolver.java | 6 +-
.../struts2/views/xslt/SimpleNodeList.java | 6 +-
.../struts2/views/xslt/StringAdapter.java | 6 +-
.../apache/struts2/views/xslt/XSLTResult.java | 10 ++-
.../apache/struts2/ClassInstantiationTest.java | 2 -
.../struts2/ExecutionCountTestAction.java | 6 +-
.../struts2/ServletActionContextTest.java | 14 ++--
.../apache/struts2/StrutsInternalTestCase.java | 7 +-
.../java/org/apache/struts2/TestAction.java | 6 +-
.../struts2/TestConfigurationProvider.java | 4 +-
.../java/org/apache/struts2/TestResult.java | 15 ++--
.../struts2/views/jsp/AbstractUITagTest.java | 6 +-
.../apache/struts2/cdi/CdiObjectFactory.java | 6 +-
.../config_browser/ShowConfigAction.java | 6 +-
.../config_browser/ShowValidatorAction.java | 6 +-
.../convention/ConventionUnknownHandler.java | 44 +++++-------
.../DefaultInterceptorMapBuilder.java | 10 +--
.../convention/DefaultResultMapBuilder.java | 37 ++++------
.../PackageBasedActionConfigBuilder.java | 76 ++++++++------------
.../convention/SEOActionNameBuilder.java | 10 ++-
.../apache/struts2/validators/DWRValidator.java | 6 +-
.../main/java/org/apache/struts2/JSPLoader.java | 20 ++----
.../jasperreports/JasperReportsResult.java | 6 +-
.../jasperreports/ValueStackDataSource.java | 21 ++----
.../struts2/convention/Java8ClassFinder.java | 42 +++++------
.../convention/Java8ClassFinderFactory.java | 6 +-
.../views/java/DefaultTagHandlerFactory.java | 9 ++-
.../apache/struts2/views/java/DefaultTheme.java | 10 ++-
.../struts2/views/java/JavaTemplateEngine.java | 30 +++-----
.../apache/struts2/dispatcher/ChartResult.java | 6 +-
.../org/apache/struts2/json/JSONCleaner.java | 6 +-
.../apache/struts2/json/JSONInterceptor.java | 6 +-
.../org/apache/struts2/json/JSONPopulator.java | 6 +-
.../org/apache/struts2/json/JSONResult.java | 6 +-
.../java/org/apache/struts2/json/JSONUtil.java | 6 +-
.../struts2/json/JSONValidationInterceptor.java | 6 +-
.../org/apache/struts2/json/JSONWriter.java | 10 +--
.../org/apache/struts2/json/rpc/RPCError.java | 6 +-
.../apache/struts2/json/smd/SMDGenerator.java | 6 +-
.../apache/struts2/StrutsJUnit4TestCase.java | 1 +
.../java/org/apache/struts2/StrutsTestCase.java | 1 +
.../junit/src/test/java/actions/ViewAction.java | 2 -
.../struts2/osgi/BundleFreemarkerManager.java | 6 +-
.../struts2/osgi/BundlePackageLoader.java | 6 +-
.../struts2/osgi/DefaultBundleAccessor.java | 9 ++-
.../struts2/osgi/OsgiConfigurationProvider.java | 22 +++---
.../java/org/apache/struts2/osgi/OsgiUtil.java | 12 ++--
.../apache/struts2/osgi/StrutsOsgiListener.java | 11 ++-
.../apache/struts2/osgi/host/BaseOsgiHost.java | 50 ++++++-------
.../apache/struts2/osgi/host/FelixOsgiHost.java | 27 +++----
.../struts2/osgi/host/GlassfishOSGiHost.java | 15 ++--
.../osgi/interceptor/OsgiInterceptor.java | 6 +-
.../DefaultOValValidationManager.java | 12 ++--
.../interceptor/OValValidationInterceptor.java | 28 +++-----
.../multipart/PellMultiPartRequest.java | 10 ++-
.../org/apache/struts2/plexus/PlexusFilter.java | 6 +-
.../struts2/plexus/PlexusLifecycleListener.java | 6 +-
.../struts2/plexus/PlexusObjectFactory.java | 6 +-
.../org/apache/struts2/plexus/PlexusUtils.java | 6 +-
.../apache/struts2/StrutsPortletTestCase.java | 6 +-
.../portlet/dispatcher/Jsr168Dispatcher.java | 6 +-
.../portlet/dispatcher/Jsr286Dispatcher.java | 6 +-
.../interceptor/PortletAwareInterceptor.java | 6 +-
.../interceptor/PortletStateInterceptor.java | 6 +-
.../struts2/portlet/result/PortletResult.java | 6 +-
.../portlet/result/PortletVelocityResult.java | 6 +-
.../servlet/PortletServletResponseJSR286.java | 6 +-
.../struts2/portlet/util/PortletUrlHelper.java | 6 +-
.../portlet/util/PortletUrlHelperJSR286.java | 6 +-
.../struts2/rest/RestActionInvocation.java | 6 +-
.../apache/struts2/rest/RestActionMapper.java | 6 +-
.../struts2/rest/RestWorkflowInterceptor.java | 6 +-
.../org/apache/struts2/sitegraph/SiteGraph.java | 6 +-
.../sitegraph/StrutsConfigRetriever.java | 6 +-
.../sitegraph/entities/FileBasedView.java | 6 +-
.../sitemesh/FreemarkerDecoratorServlet.java | 22 ++----
...dDecorator2NewStrutsFreemarkerDecorator.java | 6 +-
...OldDecorator2NewStrutsVelocityDecorator.java | 6 +-
.../struts2/sitemesh/StrutsSiteMeshFactory.java | 6 +-
.../ClassReloadingXMLWebApplicationContext.java | 20 ++----
.../spring/StrutsSpringObjectFactory.java | 6 +-
.../struts2/tiles/StrutsTilesListener.java | 6 +-
.../tiles/StrutsTilesRequestContext.java | 6 +-
pom.xml | 22 +-----
xwork-core/pom.xml | 7 ++
.../opensymphony/xwork2/ActionChainResult.java | 6 +-
.../com/opensymphony/xwork2/ActionSupport.java | 13 ++--
.../xwork2/CompositeTextProvider.java | 6 +-
.../xwork2/DefaultActionInvocation.java | 19 ++---
.../opensymphony/xwork2/DefaultActionProxy.java | 10 ++-
.../xwork2/DefaultLocaleProvider.java | 6 +-
.../com/opensymphony/xwork2/ObjectFactory.java | 13 ++--
.../xwork2/TextProviderSupport.java | 6 +-
.../xwork2/XWorkJUnit4TestCase.java | 6 +-
.../xwork2/config/ConfigurationManager.java | 28 +++-----
.../xwork2/config/ConfigurationUtil.java | 6 +-
.../xwork2/config/entities/PackageConfig.java | 6 +-
.../xwork2/config/impl/AbstractMatcher.java | 6 +-
.../config/impl/DefaultConfiguration.java | 6 +-
.../config/providers/InterceptorBuilder.java | 20 +++---
.../providers/XmlConfigurationProvider.java | 63 +++++-----------
.../DefaultConversionAnnotationProcessor.java | 18 ++---
.../impl/DefaultConversionFileProcessor.java | 32 +++------
.../DefaultConversionPropertiesProcessor.java | 16 ++---
.../impl/DefaultObjectTypeDeterminer.java | 10 ++-
.../impl/InstantiatingNullHandler.java | 6 +-
.../xwork2/conversion/impl/XWorkConverter.java | 48 +++++--------
.../metadata/ConversionDescription.java | 8 +--
.../xwork2/factory/DefaultConverterFactory.java | 10 ++-
.../xwork2/interceptor/AliasInterceptor.java | 6 +-
.../xwork2/interceptor/ChainingInterceptor.java | 6 +-
.../interceptor/DefaultWorkflowInterceptor.java | 22 ++----
.../ExceptionMappingInterceptor.java | 8 +--
.../xwork2/interceptor/I18nInterceptor.java | 28 ++++----
.../xwork2/interceptor/LoggingInterceptor.java | 6 +-
.../interceptor/MethodFilterInterceptor.java | 6 +-
.../interceptor/ParameterFilterInterceptor.java | 6 +-
.../ParameterRemoverInterceptor.java | 6 +-
.../interceptor/ParametersInterceptor.java | 14 ++--
.../interceptor/PrefixMethodInvocationUtil.java | 10 ++-
.../xwork2/interceptor/PrepareInterceptor.java | 4 +-
.../StaticParametersInterceptor.java | 6 +-
.../xwork2/interceptor/TimerInterceptor.java | 8 +--
.../com/opensymphony/xwork2/ognl/OgnlUtil.java | 6 +-
.../xwork2/ognl/OgnlValueStack.java | 19 +++--
.../xwork2/ognl/SecurityMemberAccess.java | 32 +++------
.../ognl/accessor/CompoundRootAccessor.java | 18 ++---
.../XWorkCollectionPropertyAccessor.java | 6 +-
.../ognl/accessor/XWorkMapPropertyAccessor.java | 6 +-
.../ognl/accessor/XWorkMethodAccessor.java | 12 ++--
.../DefaultAcceptedPatternsChecker.java | 22 ++----
.../DefaultExcludedPatternsChecker.java | 22 ++----
.../xwork2/spring/SpringObjectFactory.java | 6 +-
.../spring/SpringProxyableObjectFactory.java | 6 +-
.../ActionAutowiringInterceptor.java | 6 +-
.../com/opensymphony/xwork2/util/DomHelper.java | 37 +++-------
.../xwork2/util/LocalizedTextUtil.java | 53 ++++++--------
.../opensymphony/xwork2/util/ResolverUtil.java | 6 +-
.../com/opensymphony/xwork2/util/URLUtil.java | 14 ++--
.../com/opensymphony/xwork2/util/XWorkList.java | 6 +-
.../util/classloader/FileResourceStore.java | 12 ++--
.../util/classloader/JarResourceStore.java | 12 ++--
.../util/classloader/ReloadingClassLoader.java | 14 ++--
.../classloader/ResourceStoreClassLoader.java | 6 +-
.../xwork2/util/finder/DefaultClassFinder.java | 42 +++++------
.../xwork2/util/finder/ResourceFinder.java | 18 ++---
.../opensymphony/xwork2/util/finder/UrlSet.java | 21 +++---
.../xwork2/util/fs/DefaultFileManager.java | 14 ++--
.../util/fs/DefaultFileManagerFactory.java | 26 +++----
.../xwork2/util/fs/JarEntryRevision.java | 15 ++--
.../xwork2/util/logging/Logger.java | 1 +
.../xwork2/util/logging/LoggerFactory.java | 1 +
.../xwork2/util/logging/LoggerUtils.java | 1 +
.../util/logging/commons/CommonsLogger.java | 1 +
.../logging/commons/CommonsLoggerFactory.java | 1 +
.../xwork2/util/logging/jdk/JdkLogger.java | 1 +
.../util/logging/jdk/JdkLoggerFactory.java | 1 +
.../util/logging/log4j2/Log4j2Logger.java | 1 +
.../logging/log4j2/Log4j2LoggerFactory.java | 1 +
.../xwork2/util/logging/slf4j/Slf4jLogger.java | 1 +
.../util/logging/slf4j/Slf4jLoggerFactory.java | 1 +
.../xwork2/util/profiling/UtilTimerStack.java | 6 +-
.../AnnotationActionValidatorManager.java | 6 +-
.../DefaultActionValidatorManager.java | 6 +-
.../validator/DefaultValidatorFactory.java | 8 +--
.../validator/DefaultValidatorFileParser.java | 6 +-
.../validator/DelegatingValidatorContext.java | 8 +--
.../xwork2/validator/ValidationInterceptor.java | 6 +-
.../validators/ExpressionValidator.java | 6 +-
.../validators/RangeValidatorSupport.java | 14 ++--
.../validators/RegexFieldValidator.java | 11 ++-
...ateConversionErrorFieldValidatorSupport.java | 6 +-
.../validator/validators/ValidatorSupport.java | 6 +-
.../opensymphony/xwork2/ActionSupportTest.java | 6 +-
.../xwork2/UnknownHandlerManagerMock.java | 2 -
.../interceptor/TimerInterceptorTest.java | 2 +-
xwork-core/src/test/resources/log4j.properties | 6 --
xwork-core/src/test/resources/log4j2.xml | 13 ++++
318 files changed, 1425 insertions(+), 2030 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/b922d5aa/core/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/b922d5aa/pom.xml
----------------------------------------------------------------------
[02/11] struts git commit: Merge branch 'master' of
github.com:apache/struts
Posted by lu...@apache.org.
Merge branch 'master' of github.com:apache/struts
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/0ad77d40
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/0ad77d40
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/0ad77d40
Branch: refs/heads/master
Commit: 0ad77d403ec83646f5a11d2147bc3fca694ecfe6
Parents: e262854 ffe0e20
Author: Aaron Johnson <aa...@pearson.com>
Authored: Tue May 26 09:35:04 2015 -0500
Committer: Aaron Johnson <aa...@pearson.com>
Committed: Tue May 26 09:35:04 2015 -0500
----------------------------------------------------------------------
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 -
plugins/codebehind/pom.xml | 72 -
.../codebehind/CodebehindUnknownHandler.java | 281 -
.../java/org/apache/struts2/config/Action.java | 32 -
.../config/ClasspathPackageProvider.java | 761 -
.../org/apache/struts2/config/Namespace.java | 36 -
.../apache/struts2/config/ParentPackage.java | 36 -
.../java/org/apache/struts2/config/Result.java | 41 -
.../java/org/apache/struts2/config/Results.java | 36 -
.../codebehind/src/main/resources/LICENSE.txt | 174 -
.../codebehind/src/main/resources/NOTICE.txt | 5 -
.../src/main/resources/struts-plugin.xml | 38 -
plugins/codebehind/src/site/site.xml | 57 -
.../CodebehindUnknownHandlerTest.java | 137 -
.../apache/struts2/config/AnnotatedAction.java | 27 -
.../struts2/config/AnotherAnnotatedObject.java | 27 -
.../config/ClasspathPackageProviderTest.java | 166 -
.../struts2/config/CustomNamespaceAction.java | 27 -
.../config/CustomParentPackageAction.java | 27 -
.../struts2/config/cltest/ActionImpl.java | 32 -
.../struts2/config/cltest/OneResultAction.java | 29 -
.../struts2/config/cltest/TwoResultAction.java | 35 -
.../struts2/config/parenttest/SomeAction.java | 30 -
.../struts2/config/parenttest/package-info.java | 24 -
plugins/dojo/pom.xml | 240 -
.../dojo/components/AbstractRemoteBean.java | 268 -
.../dojo/components/AbstractValidateBean.java | 67 -
.../apache/struts2/dojo/components/Anchor.java | 143 -
.../struts2/dojo/components/Autocompleter.java | 528 -
.../apache/struts2/dojo/components/Bind.java | 295 -
.../struts2/dojo/components/DateTimePicker.java | 435 -
.../org/apache/struts2/dojo/components/Div.java | 176 -
.../apache/struts2/dojo/components/Head.java | 218 -
.../struts2/dojo/components/RemoteBean.java | 72 -
.../apache/struts2/dojo/components/Submit.java | 465 -
.../struts2/dojo/components/TabbedPanel.java | 223 -
.../struts2/dojo/components/TextArea.java | 70 -
.../apache/struts2/dojo/components/Tree.java | 551 -
.../struts2/dojo/components/TreeNode.java | 161 -
.../struts2/dojo/views/DojoTagLibrary.java | 71 -
.../dojo/views/freemarker/tags/AnchorModel.java | 47 -
.../freemarker/tags/AutocompleterModel.java | 45 -
.../dojo/views/freemarker/tags/BindModel.java | 44 -
.../freemarker/tags/DateTimePickerModel.java | 45 -
.../dojo/views/freemarker/tags/DivModel.java | 48 -
.../dojo/views/freemarker/tags/DojoModels.java | 137 -
.../dojo/views/freemarker/tags/HeadModel.java | 44 -
.../dojo/views/freemarker/tags/SubmitModel.java | 47 -
.../views/freemarker/tags/TabbedPanelModel.java | 44 -
.../views/freemarker/tags/TextAreaModel.java | 44 -
.../dojo/views/freemarker/tags/TreeModel.java | 46 -
.../views/freemarker/tags/TreeNodeModel.java | 45 -
.../dojo/views/jsp/ui/AbstractRemoteTag.java | 155 -
.../dojo/views/jsp/ui/AbstractValidateTag.java | 49 -
.../struts2/dojo/views/jsp/ui/AnchorTag.java | 58 -
.../dojo/views/jsp/ui/AutocompleterTag.java | 221 -
.../struts2/dojo/views/jsp/ui/BindTag.java | 61 -
.../dojo/views/jsp/ui/DateTimePickerTag.java | 148 -
.../struts2/dojo/views/jsp/ui/DivTag.java | 100 -
.../struts2/dojo/views/jsp/ui/HeadTag.java | 92 -
.../struts2/dojo/views/jsp/ui/SubmitTag.java | 216 -
.../dojo/views/jsp/ui/TabbedPanelTag.java | 98 -
.../struts2/dojo/views/jsp/ui/TextareaTag.java | 52 -
.../struts2/dojo/views/jsp/ui/TreeNodeTag.java | 58 -
.../struts2/dojo/views/jsp/ui/TreeTag.java | 298 -
.../velocity/components/AnchorDirective.java | 47 -
.../components/AutocompleterDirective.java | 46 -
.../velocity/components/BindDirective.java | 43 -
.../components/DateTimePickerDirective.java | 44 -
.../views/velocity/components/DivDirective.java | 47 -
.../components/DojoAbstractDirective.java | 34 -
.../velocity/components/HeadDirective.java | 43 -
.../velocity/components/SubmitDirective.java | 43 -
.../components/TabbedPanelDirective.java | 47 -
.../velocity/components/TextAreaDirective.java | 48 -
.../velocity/components/TreeDirective.java | 48 -
.../velocity/components/TreeNodeDirective.java | 49 -
.../dojo/src/main/resources/META-INF/README.txt | 3 -
plugins/dojo/src/main/resources/NOTICE.txt | 6 -
.../org/apache/struts2/static/TabbedPanel.css | 25 -
.../org/apache/struts2/static/dojo/LICENSE | 195 -
.../org/apache/struts2/static/dojo/README | 176 -
.../struts2/static/dojo/Storage_version6.swf | Bin 1963 -> 0 bytes
.../struts2/static/dojo/Storage_version8.swf | Bin 2594 -> 0 bytes
.../org/apache/struts2/static/dojo/build.txt | 35 -
.../org/apache/struts2/static/dojo/dojo.js | 6441 ----
.../struts2/static/dojo/dojo.js.uncompressed.js | 9865 ------
.../struts2/static/dojo/flash6_gateway.swf | Bin 1170 -> 0 bytes
.../struts2/static/dojo/iframe_history.html | 84 -
.../apache/struts2/static/dojo/nls/dojo_ROOT.js | 11 -
.../struts2/static/dojo/nls/dojo_de-de.js | 11 -
.../apache/struts2/static/dojo/nls/dojo_de.js | 11 -
.../struts2/static/dojo/nls/dojo_en-gb.js | 11 -
.../struts2/static/dojo/nls/dojo_en-us.js | 11 -
.../apache/struts2/static/dojo/nls/dojo_en.js | 11 -
.../struts2/static/dojo/nls/dojo_es-es.js | 11 -
.../apache/struts2/static/dojo/nls/dojo_es.js | 11 -
.../struts2/static/dojo/nls/dojo_fr-fr.js | 11 -
.../apache/struts2/static/dojo/nls/dojo_fr.js | 11 -
.../struts2/static/dojo/nls/dojo_it-it.js | 11 -
.../apache/struts2/static/dojo/nls/dojo_it.js | 11 -
.../struts2/static/dojo/nls/dojo_ja-jp.js | 11 -
.../apache/struts2/static/dojo/nls/dojo_ja.js | 11 -
.../struts2/static/dojo/nls/dojo_ko-kr.js | 11 -
.../apache/struts2/static/dojo/nls/dojo_ko.js | 11 -
.../struts2/static/dojo/nls/dojo_pt-br.js | 11 -
.../apache/struts2/static/dojo/nls/dojo_pt.js | 11 -
.../apache/struts2/static/dojo/nls/dojo_xx.js | 11 -
.../struts2/static/dojo/nls/dojo_zh-cn.js | 11 -
.../struts2/static/dojo/nls/dojo_zh-tw.js | 11 -
.../apache/struts2/static/dojo/nls/dojo_zh.js | 11 -
.../struts2/static/dojo/src/AdapterRegistry.js | 44 -
.../apache/struts2/static/dojo/src/Deferred.js | 165 -
.../struts2/static/dojo/src/DeferredList.js | 77 -
.../org/apache/struts2/static/dojo/src/a11y.js | 54 -
.../apache/struts2/static/dojo/src/animation.js | 16 -
.../static/dojo/src/animation/Animation.js | 180 -
.../static/dojo/src/animation/AnimationEvent.js | 37 -
.../dojo/src/animation/AnimationSequence.js | 128 -
.../struts2/static/dojo/src/animation/Timer.js | 17 -
.../static/dojo/src/animation/__package__.js | 16 -
.../apache/struts2/static/dojo/src/behavior.js | 150 -
.../struts2/static/dojo/src/bootstrap1.js | 160 -
.../struts2/static/dojo/src/bootstrap2.js | 59 -
.../struts2/static/dojo/src/browser_debug.js | 135 -
.../struts2/static/dojo/src/browser_debug_xd.js | 38 -
.../struts2/static/dojo/src/cal/iCalendar.js | 567 -
.../static/dojo/src/cal/textDirectory.js | 57 -
.../struts2/static/dojo/src/charting/Axis.js | 132 -
.../struts2/static/dojo/src/charting/Chart.js | 64 -
.../struts2/static/dojo/src/charting/Plot.js | 82 -
.../static/dojo/src/charting/PlotArea.js | 137 -
.../static/dojo/src/charting/Plotters.js | 16 -
.../struts2/static/dojo/src/charting/README.txt | 46 -
.../struts2/static/dojo/src/charting/Series.js | 194 -
.../static/dojo/src/charting/__package__.js | 14 -
.../static/dojo/src/charting/svg/Axis.js | 188 -
.../static/dojo/src/charting/svg/PlotArea.js | 77 -
.../static/dojo/src/charting/svg/Plotters.js | 702 -
.../static/dojo/src/charting/vml/Axis.js | 239 -
.../static/dojo/src/charting/vml/PlotArea.js | 69 -
.../static/dojo/src/charting/vml/Plotters.js | 889 -
.../static/dojo/src/collections/ArrayList.js | 114 -
.../static/dojo/src/collections/BinaryTree.js | 257 -
.../static/dojo/src/collections/Collections.js | 92 -
.../static/dojo/src/collections/Dictionary.js | 101 -
.../static/dojo/src/collections/Graph.js | 151 -
.../static/dojo/src/collections/Queue.js | 67 -
.../struts2/static/dojo/src/collections/Set.js | 114 -
.../static/dojo/src/collections/SkipList.js | 169 -
.../static/dojo/src/collections/SortedList.js | 171 -
.../static/dojo/src/collections/Stack.js | 67 -
.../static/dojo/src/collections/Store.js | 293 -
.../static/dojo/src/collections/__package__.js | 15 -
.../apache/struts2/static/dojo/src/crypto.js | 16 -
.../struts2/static/dojo/src/crypto/Blowfish.js | 384 -
.../struts2/static/dojo/src/crypto/LICENSE | 11 -
.../struts2/static/dojo/src/crypto/MD5.js | 198 -
.../struts2/static/dojo/src/crypto/Rijndael.js | 23 -
.../struts2/static/dojo/src/crypto/SHA1.js | 171 -
.../struts2/static/dojo/src/crypto/SHA256.js | 21 -
.../static/dojo/src/crypto/__package__.js | 15 -
.../org/apache/struts2/static/dojo/src/data.js | 15 -
.../struts2/static/dojo/src/data/CsvStore.js | 115 -
.../struts2/static/dojo/src/data/OpmlStore.js | 166 -
.../struts2/static/dojo/src/data/RdfStore.js | 185 -
.../apache/struts2/static/dojo/src/data/Read.js | 224 -
.../struts2/static/dojo/src/data/Result.js | 158 -
.../struts2/static/dojo/src/data/Write.js | 169 -
.../struts2/static/dojo/src/data/YahooStore.js | 44 -
.../struts2/static/dojo/src/data/__package__.js | 14 -
.../struts2/static/dojo/src/data/core/Read.js | 55 -
.../static/dojo/src/data/core/RemoteStore.js | 354 -
.../struts2/static/dojo/src/data/core/Result.js | 36 -
.../struts2/static/dojo/src/data/core/Write.js | 44 -
.../static/dojo/src/data/csv/CsvStore.js | 220 -
.../struts2/static/dojo/src/data/csv/Result.js | 81 -
.../static/dojo/src/data/csv/__package__.js | 21 -
.../static/dojo/src/data/old/Attribute.js | 35 -
.../struts2/static/dojo/src/data/old/Item.js | 223 -
.../struts2/static/dojo/src/data/old/Kind.js | 19 -
.../static/dojo/src/data/old/Observable.js | 40 -
.../static/dojo/src/data/old/ResultSet.js | 52 -
.../struts2/static/dojo/src/data/old/Type.js | 19 -
.../struts2/static/dojo/src/data/old/Value.js | 35 -
.../static/dojo/src/data/old/__package__.js | 17 -
.../static/dojo/src/data/old/format/Csv.js | 81 -
.../static/dojo/src/data/old/format/Json.js | 71 -
.../static/dojo/src/data/old/provider/Base.js | 124 -
.../dojo/src/data/old/provider/Delicious.js | 33 -
.../dojo/src/data/old/provider/FlatFile.js | 113 -
.../dojo/src/data/old/provider/JotSpot.js | 19 -
.../static/dojo/src/data/old/provider/MySql.js | 19 -
.../struts2/static/dojo/src/data/old/to_do.txt | 45 -
.../org/apache/struts2/static/dojo/src/date.js | 15 -
.../struts2/static/dojo/src/date/common.js | 316 -
.../struts2/static/dojo/src/date/format.js | 713 -
.../struts2/static/dojo/src/date/serialize.js | 129 -
.../static/dojo/src/date/supplemental.js | 47 -
.../org/apache/struts2/static/dojo/src/debug.js | 85 -
.../struts2/static/dojo/src/debug/Firebug.js | 57 -
.../static/dojo/src/debug/arrow_hide.gif | Bin 163 -> 0 bytes
.../static/dojo/src/debug/arrow_show.gif | Bin 165 -> 0 bytes
.../struts2/static/dojo/src/debug/console.js | 97 -
.../struts2/static/dojo/src/debug/deep.html | 362 -
.../struts2/static/dojo/src/debug/spacer.gif | Bin 820 -> 0 bytes
.../struts2/static/dojo/src/dnd/DragAndDrop.js | 76 -
.../static/dojo/src/dnd/HtmlDragAndDrop.js | 369 -
.../struts2/static/dojo/src/dnd/HtmlDragCopy.js | 70 -
.../static/dojo/src/dnd/HtmlDragManager.js | 295 -
.../struts2/static/dojo/src/dnd/HtmlDragMove.js | 54 -
.../struts2/static/dojo/src/dnd/Sortable.js | 24 -
.../static/dojo/src/dnd/TreeDragAndDrop.js | 253 -
.../static/dojo/src/dnd/TreeDragAndDropV3.js | 218 -
.../struts2/static/dojo/src/dnd/__package__.js | 15 -
.../org/apache/struts2/static/dojo/src/docs.js | 671 -
.../org/apache/struts2/static/dojo/src/dom.js | 381 -
.../org/apache/struts2/static/dojo/src/event.js | 16 -
.../static/dojo/src/event/__package__.js | 15 -
.../struts2/static/dojo/src/event/browser.js | 491 -
.../struts2/static/dojo/src/event/common.js | 560 -
.../struts2/static/dojo/src/event/topic.js | 79 -
.../struts2/static/dojo/src/experimental.js | 22 -
.../org/apache/struts2/static/dojo/src/flash.js | 446 -
.../src/flash/flash6/DojoExternalInterface.as | 215 -
.../dojo/src/flash/flash6/flash6_gateway.fla | Bin 40448 -> 0 bytes
.../src/flash/flash8/DojoExternalInterface.as | 234 -
.../dojo/src/flash/flash8/ExpressInstall.as | 81 -
.../struts2/static/dojo/src/fx/__package__.js | 14 -
.../apache/struts2/static/dojo/src/fx/html.js | 565 -
.../apache/struts2/static/dojo/src/fx/svg.js | 100 -
.../struts2/static/dojo/src/gfx/Colorspace.js | 723 -
.../struts2/static/dojo/src/gfx/__package__.js | 17 -
.../apache/struts2/static/dojo/src/gfx/color.js | 150 -
.../struts2/static/dojo/src/gfx/color/hsl.js | 118 -
.../struts2/static/dojo/src/gfx/color/hsv.js | 210 -
.../struts2/static/dojo/src/gfx/common.js | 63 -
.../struts2/static/dojo/src/gfx/matrix.js | 148 -
.../apache/struts2/static/dojo/src/gfx/path.js | 268 -
.../apache/struts2/static/dojo/src/gfx/shape.js | 176 -
.../apache/struts2/static/dojo/src/gfx/svg.js | 473 -
.../apache/struts2/static/dojo/src/gfx/vml.js | 1010 -
.../static/dojo/src/graphics/Colorspace.js | 17 -
.../static/dojo/src/graphics/__package__.js | 14 -
.../struts2/static/dojo/src/graphics/color.js | 38 -
.../static/dojo/src/graphics/color/hsl.js | 32 -
.../static/dojo/src/graphics/color/hsv.js | 24 -
.../struts2/static/dojo/src/hostenv_adobesvg.js | 380 -
.../struts2/static/dojo/src/hostenv_browser.js | 417 -
.../static/dojo/src/hostenv_dashboard.js | 180 -
.../struts2/static/dojo/src/hostenv_jsc.js | 78 -
.../struts2/static/dojo/src/hostenv_rhino.js | 163 -
.../static/dojo/src/hostenv_spidermonkey.js | 50 -
.../struts2/static/dojo/src/hostenv_svg.js | 247 -
.../struts2/static/dojo/src/hostenv_wsh.js | 35 -
.../org/apache/struts2/static/dojo/src/html.js | 16 -
.../struts2/static/dojo/src/html/__package__.js | 15 -
.../struts2/static/dojo/src/html/color.js | 38 -
.../struts2/static/dojo/src/html/common.js | 182 -
.../struts2/static/dojo/src/html/display.js | 147 -
.../struts2/static/dojo/src/html/iframe.js | 84 -
.../static/dojo/src/html/images/shadowB.png | Bin 470 -> 0 bytes
.../static/dojo/src/html/images/shadowBL.png | Bin 272 -> 0 bytes
.../static/dojo/src/html/images/shadowBR.png | Bin 271 -> 0 bytes
.../static/dojo/src/html/images/shadowL.png | Bin 148 -> 0 bytes
.../static/dojo/src/html/images/shadowR.png | Bin 149 -> 0 bytes
.../static/dojo/src/html/images/shadowT.png | Bin 152 -> 0 bytes
.../static/dojo/src/html/images/shadowTL.png | Bin 271 -> 0 bytes
.../static/dojo/src/html/images/shadowTR.png | Bin 287 -> 0 bytes
.../struts2/static/dojo/src/html/layout.js | 388 -
.../struts2/static/dojo/src/html/metrics.js | 215 -
.../struts2/static/dojo/src/html/selection.js | 339 -
.../struts2/static/dojo/src/html/shadow.js | 17 -
.../struts2/static/dojo/src/html/style.js | 483 -
.../apache/struts2/static/dojo/src/html/util.js | 356 -
.../static/dojo/src/i18n/calendar/nls/README | 6 -
.../dojo/src/i18n/calendar/nls/de/gregorian.js | 13 -
.../dojo/src/i18n/calendar/nls/en/gregorian.js | 13 -
.../dojo/src/i18n/calendar/nls/es/gregorian.js | 13 -
.../dojo/src/i18n/calendar/nls/fi/gregorian.js | 13 -
.../dojo/src/i18n/calendar/nls/fr/gregorian.js | 13 -
.../dojo/src/i18n/calendar/nls/gregorian.js | 13 -
.../src/i18n/calendar/nls/gregorianExtras.js | 13 -
.../dojo/src/i18n/calendar/nls/hu/gregorian.js | 13 -
.../dojo/src/i18n/calendar/nls/it/gregorian.js | 13 -
.../dojo/src/i18n/calendar/nls/ja/gregorian.js | 13 -
.../src/i18n/calendar/nls/ja/gregorianExtras.js | 13 -
.../dojo/src/i18n/calendar/nls/ko/gregorian.js | 13 -
.../dojo/src/i18n/calendar/nls/nl/gregorian.js | 13 -
.../src/i18n/calendar/nls/pt-br/gregorian.js | 13 -
.../dojo/src/i18n/calendar/nls/pt/gregorian.js | 13 -
.../dojo/src/i18n/calendar/nls/sv/gregorian.js | 13 -
.../src/i18n/calendar/nls/zh-cn/gregorian.js | 13 -
.../src/i18n/calendar/nls/zh-hk/gregorian.js | 13 -
.../src/i18n/calendar/nls/zh-tw/gregorian.js | 13 -
.../dojo/src/i18n/calendar/nls/zh/gregorian.js | 13 -
.../src/i18n/calendar/nls/zh/gregorianExtras.js | 13 -
.../struts2/static/dojo/src/i18n/common.js | 44 -
.../struts2/static/dojo/src/i18n/currency.js | 138 -
.../static/dojo/src/i18n/currency/common.js | 138 -
.../static/dojo/src/i18n/currency/nls/EUR.js | 13 -
.../static/dojo/src/i18n/currency/nls/GBP.js | 13 -
.../static/dojo/src/i18n/currency/nls/INR.js | 13 -
.../static/dojo/src/i18n/currency/nls/ITL.js | 13 -
.../static/dojo/src/i18n/currency/nls/JPY.js | 13 -
.../static/dojo/src/i18n/currency/nls/README | 6 -
.../static/dojo/src/i18n/currency/nls/USD.js | 13 -
.../dojo/src/i18n/currency/nls/en-us/USD.js | 13 -
.../static/dojo/src/i18n/currency/nls/en/EUR.js | 13 -
.../static/dojo/src/i18n/currency/nls/en/GBP.js | 13 -
.../static/dojo/src/i18n/currency/nls/en/INR.js | 13 -
.../static/dojo/src/i18n/currency/nls/en/ITL.js | 13 -
.../static/dojo/src/i18n/currency/nls/en/JPY.js | 13 -
.../static/dojo/src/i18n/currency/nls/en/USD.js | 13 -
.../static/dojo/src/i18n/currency/nls/hi/EUR.js | 13 -
.../static/dojo/src/i18n/currency/nls/hi/GBP.js | 13 -
.../static/dojo/src/i18n/currency/nls/hi/INR.js | 13 -
.../static/dojo/src/i18n/currency/nls/hi/ITL.js | 13 -
.../static/dojo/src/i18n/currency/nls/hi/JPY.js | 13 -
.../static/dojo/src/i18n/currency/nls/hi/USD.js | 13 -
.../static/dojo/src/i18n/currency/nls/ja/EUR.js | 13 -
.../static/dojo/src/i18n/currency/nls/ja/GBP.js | 13 -
.../static/dojo/src/i18n/currency/nls/ja/INR.js | 13 -
.../static/dojo/src/i18n/currency/nls/ja/ITL.js | 13 -
.../static/dojo/src/i18n/currency/nls/ja/JPY.js | 13 -
.../static/dojo/src/i18n/currency/nls/ja/USD.js | 13 -
.../struts2/static/dojo/src/i18n/number.js | 151 -
.../apache/struts2/static/dojo/src/iCalendar.js | 15 -
.../org/apache/struts2/static/dojo/src/io.js | 16 -
.../struts2/static/dojo/src/io/BrowserIO.js | 495 -
.../struts2/static/dojo/src/io/IframeIO.js | 214 -
.../struts2/static/dojo/src/io/RepubsubIO.js | 337 -
.../struts2/static/dojo/src/io/RhinoIO.js | 116 -
.../struts2/static/dojo/src/io/ScriptSrcIO.js | 317 -
.../static/dojo/src/io/XhrIframeProxy.js | 152 -
.../struts2/static/dojo/src/io/__package__.js | 15 -
.../apache/struts2/static/dojo/src/io/cometd.js | 530 -
.../apache/struts2/static/dojo/src/io/common.js | 232 -
.../apache/struts2/static/dojo/src/io/cookie.js | 104 -
.../struts2/static/dojo/src/io/xip_client.html | 267 -
.../struts2/static/dojo/src/io/xip_server.html | 386 -
.../org/apache/struts2/static/dojo/src/json.js | 98 -
.../org/apache/struts2/static/dojo/src/lang.js | 16 -
.../struts2/static/dojo/src/lang/__package__.js | 15 -
.../struts2/static/dojo/src/lang/array.js | 176 -
.../struts2/static/dojo/src/lang/assert.js | 59 -
.../struts2/static/dojo/src/lang/common.js | 156 -
.../struts2/static/dojo/src/lang/declare.js | 109 -
.../struts2/static/dojo/src/lang/extras.js | 96 -
.../apache/struts2/static/dojo/src/lang/func.js | 135 -
.../apache/struts2/static/dojo/src/lang/repr.js | 68 -
.../static/dojo/src/lang/timing/Streamer.js | 67 -
.../static/dojo/src/lang/timing/Timer.js | 44 -
.../static/dojo/src/lang/timing/__package__.js | 14 -
.../apache/struts2/static/dojo/src/lang/type.js | 145 -
.../struts2/static/dojo/src/lfx/Animation.js | 404 -
.../struts2/static/dojo/src/lfx/__package__.js | 15 -
.../struts2/static/dojo/src/lfx/extras.js | 80 -
.../apache/struts2/static/dojo/src/lfx/html.js | 509 -
.../struts2/static/dojo/src/lfx/rounded.js | 444 -
.../struts2/static/dojo/src/lfx/shadow.js | 75 -
.../struts2/static/dojo/src/lfx/toggle.js | 41 -
.../apache/struts2/static/dojo/src/loader.js | 448 -
.../apache/struts2/static/dojo/src/loader_xd.js | 408 -
.../static/dojo/src/logging/ConsoleLogger.js | 86 -
.../struts2/static/dojo/src/logging/Logger.js | 216 -
.../static/dojo/src/logging/__package__.js | 15 -
.../org/apache/struts2/static/dojo/src/math.js | 108 -
.../struts2/static/dojo/src/math/__package__.js | 15 -
.../struts2/static/dojo/src/math/curves.js | 184 -
.../struts2/static/dojo/src/math/matrix.js | 303 -
.../struts2/static/dojo/src/math/points.js | 42 -
.../struts2/static/dojo/src/namespaces/dojo.js | 163 -
.../org/apache/struts2/static/dojo/src/ns.js | 100 -
.../apache/struts2/static/dojo/src/profile.js | 104 -
.../apache/struts2/static/dojo/src/regexp.js | 365 -
.../struts2/static/dojo/src/rpc/Deferred.js | 18 -
.../struts2/static/dojo/src/rpc/JotService.js | 27 -
.../struts2/static/dojo/src/rpc/JsonService.js | 71 -
.../struts2/static/dojo/src/rpc/RpcService.js | 74 -
.../struts2/static/dojo/src/rpc/YahooService.js | 41 -
.../struts2/static/dojo/src/rpc/__package__.js | 15 -
.../struts2/static/dojo/src/rpc/yahoo.smd | 289 -
.../static/dojo/src/selection/Selection.js | 316 -
.../apache/struts2/static/dojo/src/storage.js | 127 -
.../struts2/static/dojo/src/storage/Storage.as | 146 -
.../static/dojo/src/storage/__package__.js | 15 -
.../struts2/static/dojo/src/storage/browser.js | 550 -
.../static/dojo/src/storage/dashboard.js | 52 -
.../static/dojo/src/storage/storage_dialog.fla | Bin 344064 -> 0 bytes
.../apache/struts2/static/dojo/src/string.js | 15 -
.../struts2/static/dojo/src/string/Builder.js | 104 -
.../static/dojo/src/string/__package__.js | 15 -
.../struts2/static/dojo/src/string/common.js | 63 -
.../struts2/static/dojo/src/string/extras.js | 178 -
.../org/apache/struts2/static/dojo/src/style.js | 18 -
.../org/apache/struts2/static/dojo/src/svg.js | 259 -
.../struts2/static/dojo/src/text/__package__.js | 15 -
.../static/dojo/src/text/textDirectory.js | 15 -
.../struts2/static/dojo/src/undo/Manager.js | 150 -
.../struts2/static/dojo/src/undo/__package__.js | 15 -
.../struts2/static/dojo/src/undo/browser.js | 203 -
.../apache/struts2/static/dojo/src/uri/Uri.js | 115 -
.../struts2/static/dojo/src/uri/__package__.js | 15 -
.../apache/struts2/static/dojo/src/uri/cache.js | 32 -
.../dojo/src/uuid/LightweightGenerator.js | 42 -
.../static/dojo/src/uuid/NameBasedGenerator.js | 24 -
.../static/dojo/src/uuid/NilGenerator.js | 23 -
.../static/dojo/src/uuid/RandomGenerator.js | 24 -
.../static/dojo/src/uuid/TimeBasedGenerator.js | 245 -
.../apache/struts2/static/dojo/src/uuid/Uuid.js | 215 -
.../struts2/static/dojo/src/uuid/__package__.js | 15 -
.../apache/struts2/static/dojo/src/validate.js | 15 -
.../static/dojo/src/validate/__package__.js | 16 -
.../struts2/static/dojo/src/validate/check.js | 234 -
.../struts2/static/dojo/src/validate/common.js | 96 -
.../static/dojo/src/validate/creditCard.js | 64 -
.../static/dojo/src/validate/datetime.js | 92 -
.../struts2/static/dojo/src/validate/de.js | 19 -
.../struts2/static/dojo/src/validate/jp.js | 19 -
.../struts2/static/dojo/src/validate/us.js | 34 -
.../struts2/static/dojo/src/validate/web.js | 43 -
.../dojo/src/widget/AccordionContainer.js | 128 -
.../static/dojo/src/widget/AnimatedPng.js | 47 -
.../struts2/static/dojo/src/widget/Button.js | 259 -
.../struts2/static/dojo/src/widget/Chart.js | 233 -
.../struts2/static/dojo/src/widget/Checkbox.js | 103 -
.../struts2/static/dojo/src/widget/Clock.js | 142 -
.../static/dojo/src/widget/ColorPalette.js | 60 -
.../struts2/static/dojo/src/widget/ComboBox.js | 559 -
.../static/dojo/src/widget/ContentPane.js | 441 -
.../static/dojo/src/widget/CurrencyTextbox.js | 40 -
.../static/dojo/src/widget/DatePicker.js | 349 -
.../static/dojo/src/widget/DateTextbox.js | 47 -
.../static/dojo/src/widget/DebugConsole.js | 23 -
.../struts2/static/dojo/src/widget/Dialog.js | 300 -
.../struts2/static/dojo/src/widget/DocPane.js | 262 -
.../struts2/static/dojo/src/widget/DomWidget.js | 507 -
.../static/dojo/src/widget/DropdownContainer.js | 65 -
.../dojo/src/widget/DropdownDatePicker.js | 110 -
.../dojo/src/widget/DropdownTimePicker.js | 156 -
.../struts2/static/dojo/src/widget/Editor.js | 390 -
.../struts2/static/dojo/src/widget/Editor2.js | 412 -
.../widget/Editor2Plugin/AlwaysShowToolbar.js | 118 -
.../src/widget/Editor2Plugin/ContextMenu.js | 203 -
.../widget/Editor2Plugin/CreateLinkDialog.js | 63 -
.../src/widget/Editor2Plugin/FindReplace.js | 61 -
.../widget/Editor2Plugin/FindReplaceDialog.js | 34 -
.../widget/Editor2Plugin/InsertImageDialog.js | 55 -
.../widget/Editor2Plugin/InsertTableDialog.js | 131 -
.../Editor2Plugin/SimpleSignalCommands.js | 52 -
.../src/widget/Editor2Plugin/TableOperation.js | 120 -
.../widget/Editor2Plugin/ToolbarDndSupport.js | 46 -
.../src/widget/Editor2Plugin/__package__.js | 15 -
.../static/dojo/src/widget/Editor2Toolbar.js | 496 -
.../static/dojo/src/widget/FilteringTable.js | 710 -
.../static/dojo/src/widget/FisheyeList.js | 446 -
.../static/dojo/src/widget/FloatingPane.js | 249 -
.../struts2/static/dojo/src/widget/Form.js | 267 -
.../struts2/static/dojo/src/widget/GoogleMap.js | 169 -
.../static/dojo/src/widget/HtmlWidget.js | 101 -
.../static/dojo/src/widget/InlineEditBox.js | 156 -
.../static/dojo/src/widget/IntegerTextbox.js | 42 -
.../static/dojo/src/widget/InternetTextbox.js | 78 -
.../static/dojo/src/widget/LayoutContainer.js | 34 -
.../struts2/static/dojo/src/widget/LinkPane.js | 23 -
.../struts2/static/dojo/src/widget/Manager.js | 288 -
.../struts2/static/dojo/src/widget/Menu2.js | 455 -
.../static/dojo/src/widget/MonthlyCalendar.js | 149 -
.../static/dojo/src/widget/PageContainer.js | 202 -
.../struts2/static/dojo/src/widget/Parse.js | 227 -
.../static/dojo/src/widget/PopupContainer.js | 297 -
.../static/dojo/src/widget/ProgressBar.js | 187 -
.../static/dojo/src/widget/RadioGroup.js | 122 -
.../static/dojo/src/widget/RealNumberTextbox.js | 50 -
.../static/dojo/src/widget/RegexpTextbox.js | 27 -
.../dojo/src/widget/RemoteTabController.js | 28 -
.../struts2/static/dojo/src/widget/Repeater.js | 128 -
.../static/dojo/src/widget/ResizableTextarea.js | 35 -
.../static/dojo/src/widget/ResizeHandle.js | 68 -
.../struts2/static/dojo/src/widget/RichText.js | 1167 -
.../struts2/static/dojo/src/widget/Rounded.js | 529 -
.../struts2/static/dojo/src/widget/Select.js | 39 -
.../struts2/static/dojo/src/widget/Show.js | 211 -
.../static/dojo/src/widget/ShowAction.js | 20 -
.../struts2/static/dojo/src/widget/ShowSlide.js | 201 -
.../struts2/static/dojo/src/widget/SlideShow.js | 77 -
.../struts2/static/dojo/src/widget/Slider.js | 475 -
.../static/dojo/src/widget/SortableTable.js | 500 -
.../struts2/static/dojo/src/widget/Spinner.js | 526 -
.../static/dojo/src/widget/SplitContainer.js | 325 -
.../struts2/static/dojo/src/widget/SplitPane.js | 514 -
.../struts2/static/dojo/src/widget/SvgButton.js | 100 -
.../struts2/static/dojo/src/widget/SvgWidget.js | 71 -
.../struts2/static/dojo/src/widget/SwtWidget.js | 54 -
.../static/dojo/src/widget/TabContainer.js | 89 -
.../struts2/static/dojo/src/widget/TaskBar.js | 49 -
.../struts2/static/dojo/src/widget/Textbox.js | 52 -
.../static/dojo/src/widget/TimePicker.js | 278 -
.../struts2/static/dojo/src/widget/TitlePane.js | 43 -
.../struts2/static/dojo/src/widget/Toaster.js | 163 -
.../struts2/static/dojo/src/widget/Toggler.js | 26 -
.../struts2/static/dojo/src/widget/Toolbar.js | 724 -
.../struts2/static/dojo/src/widget/Tooltip.js | 107 -
.../struts2/static/dojo/src/widget/Tree.js | 236 -
.../dojo/src/widget/TreeBasicController.js | 154 -
.../dojo/src/widget/TreeBasicControllerV3.js | 461 -
.../static/dojo/src/widget/TreeCommon.js | 82 -
.../static/dojo/src/widget/TreeContextMenu.js | 110 -
.../static/dojo/src/widget/TreeContextMenuV3.js | 74 -
.../dojo/src/widget/TreeControllerExtension.js | 60 -
.../struts2/static/dojo/src/widget/TreeDemo.js | 85 -
.../dojo/src/widget/TreeDeselectOnDblselect.js | 23 -
.../dojo/src/widget/TreeDisableWrapExtension.js | 37 -
.../dojo/src/widget/TreeDndControllerV3.js | 71 -
.../dojo/src/widget/TreeDocIconExtension.js | 54 -
.../static/dojo/src/widget/TreeEditor.js | 67 -
.../dojo/src/widget/TreeEmphaseOnSelect.js | 43 -
.../dojo/src/widget/TreeEmphasizeOnSelect.js | 26 -
.../dojo/src/widget/TreeExpandOnSelect.js | 43 -
.../dojo/src/widget/TreeExpandToNodeOnSelect.js | 22 -
.../static/dojo/src/widget/TreeExtension.js | 19 -
.../static/dojo/src/widget/TreeLinkExtension.js | 46 -
.../dojo/src/widget/TreeLoadingController.js | 94 -
.../dojo/src/widget/TreeLoadingControllerV3.js | 250 -
.../struts2/static/dojo/src/widget/TreeNode.js | 246 -
.../static/dojo/src/widget/TreeNodeV3.js | 310 -
.../static/dojo/src/widget/TreeRPCController.js | 72 -
.../dojo/src/widget/TreeRpcControllerV3.js | 182 -
.../static/dojo/src/widget/TreeSelector.js | 102 -
.../static/dojo/src/widget/TreeSelectorV3.js | 160 -
.../dojo/src/widget/TreeTimeoutIterator.js | 88 -
.../dojo/src/widget/TreeToggleOnSelect.js | 23 -
.../struts2/static/dojo/src/widget/TreeV3.js | 135 -
.../static/dojo/src/widget/TreeWithNode.js | 115 -
.../struts2/static/dojo/src/widget/UsTextbox.js | 36 -
.../static/dojo/src/widget/ValidationTextbox.js | 124 -
.../struts2/static/dojo/src/widget/Widget.js | 312 -
.../struts2/static/dojo/src/widget/Wizard.js | 127 -
.../struts2/static/dojo/src/widget/YahooMap.js | 145 -
.../static/dojo/src/widget/__package__.js | 15 -
.../dojo/src/widget/demoEngine/DemoContainer.js | 75 -
.../dojo/src/widget/demoEngine/DemoItem.js | 52 -
.../dojo/src/widget/demoEngine/DemoNavigator.js | 134 -
.../dojo/src/widget/demoEngine/DemoPane.js | 33 -
.../dojo/src/widget/demoEngine/SourcePane.js | 35 -
.../dojo/src/widget/demoEngine/__package__.js | 15 -
.../demoEngine/templates/DemoContainer.css | 39 -
.../demoEngine/templates/DemoContainer.html | 25 -
.../widget/demoEngine/templates/DemoItem.css | 58 -
.../widget/demoEngine/templates/DemoItem.html | 21 -
.../demoEngine/templates/DemoNavigator.css | 28 -
.../demoEngine/templates/DemoNavigator.html | 24 -
.../widget/demoEngine/templates/DemoPane.css | 18 -
.../widget/demoEngine/templates/DemoPane.html | 3 -
.../widget/demoEngine/templates/SourcePane.css | 20 -
.../widget/demoEngine/templates/SourcePane.html | 3 -
.../src/widget/demoEngine/templates/general.css | 73 -
.../demoEngine/templates/images/test_thumb.gif | Bin 3198 -> 0 bytes
.../demoEngine/templates/images/viewDemo.png | Bin 859 -> 0 bytes
.../static/dojo/src/widget/html/layout.js | 94 -
.../static/dojo/src/widget/html/loader.js | 622 -
.../static/dojo/src/widget/html/stabile.js | 128 -
.../dojo/src/widget/nls/DropdownDatePicker.js | 13 -
.../dojo/src/widget/nls/DropdownTimePicker.js | 13 -
.../static/dojo/src/widget/nls/TimePicker.js | 13 -
.../static/dojo/src/widget/nls/fr/validate.js | 13 -
.../static/dojo/src/widget/nls/ja/validate.js | 13 -
.../static/dojo/src/widget/nls/validate.js | 13 -
.../dojo/src/widget/nls/zh-cn/validate.js | 13 -
.../struts2/static/dojo/src/widget/svg/Chart.js | 472 -
.../dojo/src/widget/templates/AccordionPane.css | 22 -
.../src/widget/templates/AccordionPane.html | 4 -
.../src/widget/templates/ButtonTemplate.css | 59 -
.../src/widget/templates/ButtonTemplate.html | 6 -
.../dojo/src/widget/templates/Checkbox.css | 26 -
.../dojo/src/widget/templates/Checkbox.html | 5 -
.../dojo/src/widget/templates/CheckboxA11y.html | 4 -
.../src/widget/templates/CiviCrmDatePicker.html | 12 -
.../dojo/src/widget/templates/ComboBox.css | 68 -
.../dojo/src/widget/templates/ComboBox.html | 16 -
.../widget/templates/ComboButtonTemplate.html | 18 -
.../dojo/src/widget/templates/DatePicker.css | 167 -
.../dojo/src/widget/templates/DatePicker.html | 95 -
.../dojo/src/widget/templates/DemoEngine.html | 24 -
.../dojo/src/widget/templates/Dialog.html | 7 -
.../dojo/src/widget/templates/DocPane.css | 49 -
.../dojo/src/widget/templates/DocPane.html | 79 -
.../templates/DropDownButtonTemplate.html | 9 -
.../templates/Editor2/Dialog/createlink.html | 15 -
.../widget/templates/Editor2/Dialog/find.html | 15 -
.../templates/Editor2/Dialog/insertimage.html | 114 -
.../templates/Editor2/Dialog/inserttable.html | 91 -
.../templates/Editor2/Dialog/replace.html | 15 -
.../widget/templates/Editor2/EditorDialog.html | 21 -
.../Editor2/EditorToolbar_FontName.html | 20 -
.../Editor2/EditorToolbar_FontSize.html | 31 -
.../Editor2/EditorToolbar_FormatBlock.html | 52 -
.../templates/Editor2/showtableborder_gecko.css | 19 -
.../templates/Editor2/showtableborder_ie.css | 4 -
.../dojo/src/widget/templates/EditorToolbar.css | 152 -
.../src/widget/templates/EditorToolbar.html | 153 -
.../widget/templates/EditorToolbarLight.html | 46 -
.../widget/templates/EditorToolbarOneline.html | 172 -
.../dojo/src/widget/templates/FisheyeList.css | 27 -
.../dojo/src/widget/templates/FloatingPane.css | 118 -
.../dojo/src/widget/templates/FloatingPane.html | 18 -
.../dojo/src/widget/templates/InlineEditBox.css | 29 -
.../src/widget/templates/InlineEditBox.html | 6 -
.../static/dojo/src/widget/templates/Menu.css | 60 -
.../static/dojo/src/widget/templates/Menu2.css | 116 -
.../src/widget/templates/MonthlyCalendar.css | 91 -
.../src/widget/templates/MonthlyCalendar.html | 110 -
.../dojo/src/widget/templates/PopUpButton.css | 35 -
.../dojo/src/widget/templates/ProgressBar.css | 23 -
.../dojo/src/widget/templates/ProgressBar.html | 5 -
.../src/widget/templates/RemoteTabControl.css | 61 -
.../src/widget/templates/ResizableTextarea.css | 15 -
.../src/widget/templates/ResizableTextarea.html | 14 -
.../dojo/src/widget/templates/ResizeHandle.css | 12 -
.../static/dojo/src/widget/templates/Show.css | 59 -
.../static/dojo/src/widget/templates/Show.html | 11 -
.../dojo/src/widget/templates/ShowSlide.css | 12 -
.../dojo/src/widget/templates/ShowSlide.html | 6 -
.../dojo/src/widget/templates/SlideShow.css | 9 -
.../dojo/src/widget/templates/SlideShow.html | 15 -
.../static/dojo/src/widget/templates/Slider.css | 61 -
.../dojo/src/widget/templates/Slider.html | 56 -
.../src/widget/templates/SliderHorizontal.html | 3 -
.../src/widget/templates/SliderVertical.html | 3 -
.../dojo/src/widget/templates/Spinner.css | 34 -
.../dojo/src/widget/templates/Spinner.html | 25 -
.../src/widget/templates/SplitContainer.css | 40 -
.../dojo/src/widget/templates/TabContainer.css | 163 -
.../dojo/src/widget/templates/TabContainer.html | 4 -
.../src/widget/templates/TabContainerA11y.css | 175 -
.../dojo/src/widget/templates/TaskBar.css | 29 -
.../widget/templates/TaskBarItemTemplate.html | 2 -
.../dojo/src/widget/templates/Textbox.html | 5 -
.../dojo/src/widget/templates/TimePicker.css | 179 -
.../dojo/src/widget/templates/TimePicker.html | 98 -
.../dojo/src/widget/templates/TitlePane.html | 4 -
.../dojo/src/widget/templates/Toaster.css | 42 -
.../dojo/src/widget/templates/Toolbar.css | 54 -
.../src/widget/templates/TooltipTemplate.css | 10 -
.../static/dojo/src/widget/templates/Tree.css | 29 -
.../src/widget/templates/TreeDisableWrap.css | 9 -
.../dojo/src/widget/templates/TreeDocIcon.css | 55 -
.../dojo/src/widget/templates/TreeEditor.css | 4 -
.../static/dojo/src/widget/templates/TreeV3.css | 82 -
.../dojo/src/widget/templates/Validate.css | 12 -
.../src/widget/templates/ValidationTextbox.html | 8 -
.../static/dojo/src/widget/templates/Wizard.css | 72 -
.../dojo/src/widget/templates/Wizard.html | 10 -
.../src/widget/templates/buttons/aggregate.gif | Bin 4360 -> 0 bytes
.../src/widget/templates/buttons/backcolor.gif | Bin 585 -> 0 bytes
.../src/widget/templates/buttons/bg-fade.png | Bin 177 -> 0 bytes
.../dojo/src/widget/templates/buttons/bold.gif | Bin 346 -> 0 bytes
.../src/widget/templates/buttons/cancel.gif | Bin 375 -> 0 bytes
.../dojo/src/widget/templates/buttons/copy.gif | Bin 210 -> 0 bytes
.../src/widget/templates/buttons/createlink.gif | Bin 1081 -> 0 bytes
.../dojo/src/widget/templates/buttons/cut.gif | Bin 112 -> 0 bytes
.../src/widget/templates/buttons/delete.gif | Bin 81 -> 0 bytes
.../src/widget/templates/buttons/forecolor.gif | Bin 574 -> 0 bytes
.../widget/templates/buttons/hilitecolor.gif | Bin 585 -> 0 bytes
.../src/widget/templates/buttons/indent.gif | Bin 83 -> 0 bytes
.../templates/buttons/inserthorizontalrule.gif | Bin 117 -> 0 bytes
.../widget/templates/buttons/insertimage.gif | Bin 595 -> 0 bytes
.../templates/buttons/insertorderedlist.gif | Bin 85 -> 0 bytes
.../widget/templates/buttons/inserttable.gif | Bin 233 -> 0 bytes
.../templates/buttons/insertunorderedlist.gif | Bin 98 -> 0 bytes
.../src/widget/templates/buttons/italic.gif | Bin 309 -> 0 bytes
.../widget/templates/buttons/justifycenter.gif | Bin 132 -> 0 bytes
.../widget/templates/buttons/justifyfull.gif | Bin 294 -> 0 bytes
.../widget/templates/buttons/justifyleft.gif | Bin 194 -> 0 bytes
.../widget/templates/buttons/justifyright.gif | Bin 190 -> 0 bytes
.../widget/templates/buttons/left_to_right.gif | Bin 138 -> 0 bytes
.../templates/buttons/list_bullet_indent.gif | Bin 98 -> 0 bytes
.../templates/buttons/list_bullet_outdent.gif | Bin 99 -> 0 bytes
.../templates/buttons/list_num_indent.gif | Bin 85 -> 0 bytes
.../templates/buttons/list_num_outdent.gif | Bin 85 -> 0 bytes
.../src/widget/templates/buttons/outdent.gif | Bin 84 -> 0 bytes
.../dojo/src/widget/templates/buttons/paste.gif | Bin 241 -> 0 bytes
.../dojo/src/widget/templates/buttons/redo.gif | Bin 543 -> 0 bytes
.../widget/templates/buttons/removeformat.gif | Bin 101 -> 0 bytes
.../widget/templates/buttons/right_to_left.gif | Bin 142 -> 0 bytes
.../dojo/src/widget/templates/buttons/save.gif | Bin 243 -> 0 bytes
.../dojo/src/widget/templates/buttons/sep.gif | Bin 58 -> 0 bytes
.../dojo/src/widget/templates/buttons/space.gif | Bin 43 -> 0 bytes
.../widget/templates/buttons/strikethrough.gif | Bin 329 -> 0 bytes
.../src/widget/templates/buttons/subscript.gif | Bin 76 -> 0 bytes
.../widget/templates/buttons/superscript.gif | Bin 77 -> 0 bytes
.../src/widget/templates/buttons/underline.gif | Bin 344 -> 0 bytes
.../dojo/src/widget/templates/buttons/undo.gif | Bin 541 -> 0 bytes
.../src/widget/templates/buttons/wikiword.gif | Bin 386 -> 0 bytes
.../static/dojo/src/widget/templates/check.gif | Bin 2024 -> 0 bytes
.../src/widget/templates/decrementMonth.gif | Bin 166 -> 0 bytes
.../dojo/src/widget/templates/decrementWeek.gif | Bin 160 -> 0 bytes
.../dojo/src/widget/templates/grabCorner.gif | Bin 77 -> 0 bytes
.../src/widget/templates/images/Tree/Tree.css | 36 -
.../src/widget/templates/images/Tree/blank.gif | Bin 55 -> 0 bytes
.../src/widget/templates/images/Tree/closed.gif | Bin 1078 -> 0 bytes
.../widget/templates/images/Tree/document.gif | Bin 240 -> 0 bytes
.../src/widget/templates/images/Tree/minus.gif | Bin 545 -> 0 bytes
.../src/widget/templates/images/Tree/plus.gif | Bin 539 -> 0 bytes
.../templates/images/Tree/transparent.gif | Bin 870 -> 0 bytes
.../templates/images/Tree/treenode_blank.gif | Bin 834 -> 0 bytes
.../templates/images/Tree/treenode_child.gif | Bin 73 -> 0 bytes
.../images/Tree/treenode_expand_minus.gif | Bin 547 -> 0 bytes
.../images/Tree/treenode_expand_plus.gif | Bin 542 -> 0 bytes
.../templates/images/Tree/treenode_grid_c.gif | Bin 60 -> 0 bytes
.../templates/images/Tree/treenode_grid_l.gif | Bin 68 -> 0 bytes
.../templates/images/Tree/treenode_grid_p.gif | Bin 63 -> 0 bytes
.../templates/images/Tree/treenode_grid_t.gif | Bin 74 -> 0 bytes
.../templates/images/Tree/treenode_grid_v.gif | Bin 71 -> 0 bytes
.../templates/images/Tree/treenode_grid_x.gif | Bin 60 -> 0 bytes
.../templates/images/Tree/treenode_grid_y.gif | Bin 67 -> 0 bytes
.../templates/images/Tree/treenode_grid_z.gif | Bin 60 -> 0 bytes
.../templates/images/Tree/treenode_loading.gif | Bin 1089 -> 0 bytes
.../templates/images/Tree/treenode_loading.jpg | Bin 1390 -> 0 bytes
.../widget/templates/images/TreeV3/closed.gif | Bin 162 -> 0 bytes
.../widget/templates/images/TreeV3/document.gif | Bin 342 -> 0 bytes
.../templates/images/TreeV3/expand_leaf.gif | Bin 68 -> 0 bytes
.../templates/images/TreeV3/expand_loading.gif | Bin 1081 -> 0 bytes
.../templates/images/TreeV3/expand_minus.gif | Bin 552 -> 0 bytes
.../templates/images/TreeV3/expand_plus.gif | Bin 552 -> 0 bytes
.../src/widget/templates/images/TreeV3/i.gif | Bin 71 -> 0 bytes
.../widget/templates/images/TreeV3/i_bhalf.gif | Bin 60 -> 0 bytes
.../widget/templates/images/TreeV3/i_half.gif | Bin 65 -> 0 bytes
.../widget/templates/images/TreeV3/i_long.gif | Bin 2113 -> 0 bytes
.../src/widget/templates/images/TreeV3/l.gif | Bin 74 -> 0 bytes
.../widget/templates/images/TreeV3/minus.gif | Bin 539 -> 0 bytes
.../src/widget/templates/images/TreeV3/open.gif | Bin 139 -> 0 bytes
.../src/widget/templates/images/TreeV3/plus.gif | Bin 539 -> 0 bytes
.../src/widget/templates/images/TreeV3/t.gif | Bin 80 -> 0 bytes
.../src/widget/templates/images/TreeV3/x.gif | Bin 68 -> 0 bytes
.../dojo/src/widget/templates/images/bar.gif | Bin 2458 -> 0 bytes
.../src/widget/templates/images/bdYearBg.1.gif | 0
.../src/widget/templates/images/bdYearBg.gif | Bin 74 -> 0 bytes
.../dojo/src/widget/templates/images/blank.gif | Bin 43 -> 0 bytes
.../dojo/src/widget/templates/images/clock.png | Bin 9422 -> 0 bytes
.../widget/templates/images/combo_box_arrow.png | Bin 336 -> 0 bytes
.../src/widget/templates/images/dateIcon.gif | Bin 392 -> 0 bytes
.../widget/templates/images/decrementMonth.gif | Bin 167 -> 0 bytes
.../widget/templates/images/decrementMonth.png | Bin 180 -> 0 bytes
.../dojo/src/widget/templates/images/dpBg.gif | Bin 522 -> 0 bytes
.../src/widget/templates/images/dpCurveBL.png | Bin 280 -> 0 bytes
.../src/widget/templates/images/dpCurveBR.png | Bin 275 -> 0 bytes
.../src/widget/templates/images/dpCurveTL.png | Bin 305 -> 0 bytes
.../src/widget/templates/images/dpCurveTR.png | Bin 295 -> 0 bytes
.../src/widget/templates/images/dpHorizLine.gif | Bin 43 -> 0 bytes
.../widget/templates/images/dpHorizLineFoot.gif | Bin 43 -> 0 bytes
.../src/widget/templates/images/dpMonthBg.gif | Bin 107 -> 0 bytes
.../src/widget/templates/images/dpMonthBg.png | Bin 169 -> 0 bytes
.../src/widget/templates/images/dpMonthBg2.png | Bin 169 -> 0 bytes
.../src/widget/templates/images/dpVertLine.gif | Bin 43 -> 0 bytes
.../src/widget/templates/images/dpYearBg.gif | Bin 74 -> 0 bytes
.../src/widget/templates/images/dpYearBg.png | Bin 142 -> 0 bytes
.../images/dropdownButtonsArrow-disabled.gif | Bin 816 -> 0 bytes
.../templates/images/dropdownButtonsArrow.gif | Bin 46 -> 0 bytes
.../templates/images/floatingPaneClose.gif | Bin 752 -> 0 bytes
.../templates/images/floatingPaneMaximize.gif | Bin 704 -> 0 bytes
.../templates/images/floatingPaneMinimize.gif | Bin 692 -> 0 bytes
.../templates/images/floatingPaneRestore.gif | Bin 701 -> 0 bytes
.../dojo/src/widget/templates/images/h-bar.gif | Bin 2668 -> 0 bytes
.../widget/templates/images/incrementMonth.gif | Bin 168 -> 0 bytes
.../widget/templates/images/incrementMonth.png | Bin 181 -> 0 bytes
.../dojo/src/widget/templates/images/no.gif | Bin 179 -> 0 bytes
.../dojo/src/widget/templates/images/no.svg | 11 -
.../widget/templates/images/scBackground.gif | Bin 715 -> 0 bytes
.../images/slider-bg-progress-vert.gif | Bin 1899 -> 0 bytes
.../widget/templates/images/slider-bg-vert.gif | Bin 1899 -> 0 bytes
.../src/widget/templates/images/slider-bg.gif | Bin 1102 -> 0 bytes
.../templates/images/slider-button-horz.png | Bin 439 -> 0 bytes
.../templates/images/slider-button-vert.png | Bin 432 -> 0 bytes
.../widget/templates/images/slider-button.png | Bin 381 -> 0 bytes
.../dojo/src/widget/templates/images/slider.gif | Bin 865 -> 0 bytes
.../templates/images/slider_down_arrow.png | Bin 382 -> 0 bytes
.../templates/images/slider_left_arrow.png | Bin 343 -> 0 bytes
.../templates/images/slider_right_arrow.png | Bin 366 -> 0 bytes
.../widget/templates/images/slider_up_arrow.png | Bin 378 -> 0 bytes
.../templates/images/soriaAccordionOff.gif | Bin 94 -> 0 bytes
.../templates/images/soriaAccordionSelected.gif | Bin 94 -> 0 bytes
.../widget/templates/images/soriaActive-c.gif | Bin 1420 -> 0 bytes
.../widget/templates/images/soriaActive-l.gif | Bin 1585 -> 0 bytes
.../widget/templates/images/soriaActive-r.gif | Bin 1587 -> 0 bytes
.../src/widget/templates/images/soriaBarBg.gif | Bin 155 -> 0 bytes
.../widget/templates/images/soriaButton-c.gif | Bin 848 -> 0 bytes
.../widget/templates/images/soriaButton-l.gif | Bin 1001 -> 0 bytes
.../widget/templates/images/soriaButton-r.gif | Bin 1001 -> 0 bytes
.../widget/templates/images/soriaDisabled-c.gif | Bin 743 -> 0 bytes
.../widget/templates/images/soriaDisabled-l.gif | Bin 894 -> 0 bytes
.../widget/templates/images/soriaDisabled-r.gif | Bin 895 -> 0 bytes
.../src/widget/templates/images/soriaMenuBg.gif | Bin 820 -> 0 bytes
.../widget/templates/images/soriaPressed-c.gif | Bin 1446 -> 0 bytes
.../widget/templates/images/soriaPressed-l.gif | Bin 1613 -> 0 bytes
.../widget/templates/images/soriaPressed-r.gif | Bin 1614 -> 0 bytes
.../templates/images/spinnerDecrement.gif | Bin 120 -> 0 bytes
.../templates/images/spinnerIncrement.gif | Bin 119 -> 0 bytes
.../templates/images/submenu_disabled.gif | Bin 53 -> 0 bytes
.../src/widget/templates/images/submenu_off.gif | Bin 828 -> 0 bytes
.../src/widget/templates/images/submenu_on.gif | Bin 828 -> 0 bytes
.../widget/templates/images/tab_bot_left.gif | Bin 296 -> 0 bytes
.../templates/images/tab_bot_left_curr.gif | Bin 429 -> 0 bytes
.../widget/templates/images/tab_bot_right.gif | Bin 974 -> 0 bytes
.../templates/images/tab_bot_right_curr.gif | Bin 1310 -> 0 bytes
.../src/widget/templates/images/tab_close.gif | Bin 312 -> 0 bytes
.../src/widget/templates/images/tab_close_h.gif | Bin 313 -> 0 bytes
.../src/widget/templates/images/tab_left.gif | Bin 635 -> 0 bytes
.../src/widget/templates/images/tab_left_r.gif | Bin 296 -> 0 bytes
.../widget/templates/images/tab_left_r_curr.gif | Bin 429 -> 0 bytes
.../src/widget/templates/images/tab_right.gif | Bin 2386 -> 0 bytes
.../src/widget/templates/images/tab_right_r.gif | Bin 974 -> 0 bytes
.../templates/images/tab_right_r_curr.gif | Bin 1310 -> 0 bytes
.../widget/templates/images/tab_top_left.gif | Bin 2384 -> 0 bytes
.../widget/templates/images/tab_top_right.gif | Bin 2386 -> 0 bytes
.../src/widget/templates/images/timeIcon.gif | Bin 211 -> 0 bytes
.../src/widget/templates/images/toolbar-bg.gif | Bin 180 -> 0 bytes
.../src/widget/templates/images/transparent.gif | Bin 870 -> 0 bytes
.../widget/templates/images/treenode_blank.gif | Bin 834 -> 0 bytes
.../widget/templates/images/treenode_child.gif | Bin 73 -> 0 bytes
.../templates/images/treenode_expand_minus.gif | Bin 547 -> 0 bytes
.../templates/images/treenode_expand_plus.gif | Bin 542 -> 0 bytes
.../widget/templates/images/treenode_grid_c.gif | Bin 60 -> 0 bytes
.../widget/templates/images/treenode_grid_l.gif | Bin 68 -> 0 bytes
.../widget/templates/images/treenode_grid_p.gif | Bin 63 -> 0 bytes
.../widget/templates/images/treenode_grid_t.gif | Bin 74 -> 0 bytes
.../widget/templates/images/treenode_grid_v.gif | Bin 71 -> 0 bytes
.../widget/templates/images/treenode_grid_x.gif | Bin 60 -> 0 bytes
.../widget/templates/images/treenode_grid_y.gif | Bin 67 -> 0 bytes
.../widget/templates/images/treenode_grid_z.gif | Bin 60 -> 0 bytes
.../widget/templates/images/treenode_node.gif | Bin 195 -> 0 bytes
.../src/widget/templates/images/verticalbar.gif | Bin 158 -> 0 bytes
.../widget/templates/images/whiteDownArrow.gif | Bin 46 -> 0 bytes
.../src/widget/templates/incrementMonth.gif | Bin 168 -> 0 bytes
.../dojo/src/widget/templates/incrementWeek.gif | Bin 159 -> 0 bytes
.../src/widget/templates/richtextframe.html | 24 -
.../struts2/static/dojo/src/widget/validate.js | 15 -
.../struts2/static/dojo/src/widget/vml/Chart.js | 527 -
.../apache/struts2/static/dojo/src/xml/Parse.js | 165 -
.../struts2/static/dojo/src/xml/XslTransform.js | 159 -
.../struts2/static/dojo/src/xml/__package__.js | 16 -
.../struts2/static/dojo/src/xml/svgUtil.js | 32 -
.../struts2/static/dojo/storage_dialog.swf | Bin 26921 -> 0 bytes
.../struts2/static/dojo/struts/ComboBox.css | 89 -
.../struts2/static/dojo/struts/widget/Bind.js | 464 -
.../static/dojo/struts/widget/BindAnchor.js | 42 -
.../static/dojo/struts/widget/BindDiv.js | 436 -
.../static/dojo/struts/widget/BindEvent.js | 59 -
.../static/dojo/struts/widget/ComboBox.js | 536 -
.../dojo/struts/widget/StrutsDatePicker.js | 94 -
.../dojo/struts/widget/StrutsTabContainer.js | 117 -
.../dojo/struts/widget/StrutsTimePicker.js | 101 -
.../static/dojo/struts/widget/StrutsTree.js | 80 -
.../static/dojo/struts/widget/StrutsTreeNode.js | 87 -
.../dojo/struts/widget/StrutsTreeSelector.js | 119 -
.../static/dojo/struts/widget/__package__.js | 35 -
.../apache/struts2/static/dojo/struts_dojo.js | 18794 ----------
.../static/dojo/struts_dojo.js.uncompressed.js | 31353 -----------------
.../org/apache/struts2/static/tree.css | 50 -
.../dojo/src/main/resources/struts-plugin.xml | 31 -
.../main/resources/template/ajax/a-close.ftl | 26 -
.../dojo/src/main/resources/template/ajax/a.ftl | 37 -
.../resources/template/ajax/ajax-common.ftl | 106 -
.../resources/template/ajax/autocompleter.ftl | 180 -
.../main/resources/template/ajax/bind-close.ftl | 25 -
.../src/main/resources/template/ajax/bind.ftl | 166 -
.../resources/template/ajax/controlheader.ftl | 34 -
.../resources/template/ajax/datetimepicker.ftl | 105 -
.../main/resources/template/ajax/div-close.ftl | 26 -
.../src/main/resources/template/ajax/div.ftl | 54 -
.../main/resources/template/ajax/dojoRequire.js | 30 -
.../src/main/resources/template/ajax/head.ftl | 81 -
.../resources/template/ajax/submit-close.ftl | 22 -
.../src/main/resources/template/ajax/submit.ftl | 105 -
.../main/resources/template/ajax/tab-close.ftl | 26 -
.../src/main/resources/template/ajax/tab.ftl | 45 -
.../template/ajax/tabbedpanel-close.ftl | 26 -
.../resources/template/ajax/tabbedpanel.ftl | 87 -
.../main/resources/template/ajax/textarea.ftl | 65 -
.../resources/template/ajax/theme.properties | 21 -
.../main/resources/template/ajax/tree-close.ftl | 36 -
.../src/main/resources/template/ajax/tree.ftl | 126 -
.../resources/template/ajax/treenode-close.ftl | 23 -
.../template/ajax/treenode-include.ftl | 29 -
.../main/resources/template/ajax/treenode.ftl | 28 -
plugins/dojo/src/profile/README | 14 -
plugins/dojo/src/profile/struts.profile.js | 36 -
plugins/dojo/src/site/site.xml | 57 -
.../org/apache/struts2/dojo/TestAction.java | 142 -
.../dojo/views/jsp/ui/AbstractTagTest.java | 139 -
.../dojo/views/jsp/ui/AbstractUITagTest.java | 358 -
.../struts2/dojo/views/jsp/ui/AnchorTest.java | 64 -
.../dojo/views/jsp/ui/AutocompleterTest.java | 87 -
.../struts2/dojo/views/jsp/ui/BindTest.java | 59 -
.../struts2/dojo/views/jsp/ui/Category.java | 106 -
.../views/jsp/ui/DateTimePickerTagTest.java | 217 -
.../struts2/dojo/views/jsp/ui/DivTest.java | 68 -
.../struts2/dojo/views/jsp/ui/HeadTagTest.java | 65 -
.../jsp/ui/StrutsMockHttpServletRequest.java | 210 -
.../jsp/ui/StrutsMockHttpServletResponse.java | 99 -
.../views/jsp/ui/StrutsMockHttpSession.java | 70 -
.../dojo/views/jsp/ui/StrutsMockJspWriter.java | 171 -
.../views/jsp/ui/StrutsMockPageContext.java | 83 -
.../views/jsp/ui/StrutsMockServletContext.java | 162 -
.../dojo/views/jsp/ui/SubmitAjaxTest.java | 127 -
.../dojo/views/jsp/ui/TabbedPanelTagTest.java | 67 -
.../struts2/dojo/views/jsp/ui/TreeTest.java | 135 -
.../dojo/views/jsp/ui/Autocompleter-1.txt | 27 -
.../dojo/views/jsp/ui/Autocompleter-2.txt | 21 -
.../apache/struts2/dojo/views/jsp/ui/Bind-1.txt | 29 -
.../views/jsp/ui/DateTimePickerTagTest-1.txt | 18 -
.../views/jsp/ui/DateTimePickerTagTest-2.txt | 19 -
.../struts2/dojo/views/jsp/ui/HeadTagTest-1.txt | 37 -
.../struts2/dojo/views/jsp/ui/HeadTagTest-2.txt | 33 -
.../struts2/dojo/views/jsp/ui/TabbedPanel-1.txt | 7 -
.../struts2/dojo/views/jsp/ui/TabbedPanel-2.txt | 18 -
.../struts2/dojo/views/jsp/ui/TabbedPanel-3.txt | 14 -
.../struts2/dojo/views/jsp/ui/TabbedPanel-4.txt | 10 -
.../apache/struts2/dojo/views/jsp/ui/div-1.txt | 28 -
.../apache/struts2/dojo/views/jsp/ui/href-1.txt | 25 -
.../struts2/dojo/views/jsp/ui/submit-ajax-1.txt | 29 -
.../struts2/dojo/views/jsp/ui/submit-ajax-2.txt | 22 -
.../struts2/dojo/views/jsp/ui/submit-ajax-3.txt | 25 -
.../apache/struts2/dojo/views/jsp/ui/tree-1.txt | 47 -
.../apache/struts2/dojo/views/jsp/ui/tree-2.txt | 68 -
.../dojo/src/test/resources/struts.properties | 38 -
plugins/jsf/pom.xml | 54 -
.../jsf/ApplyRequestValuesInterceptor.java | 79 -
.../apache/struts2/jsf/FacesInterceptor.java | 110 -
.../org/apache/struts2/jsf/FacesRender.java | 80 -
.../org/apache/struts2/jsf/FacesResult.java | 84 -
.../struts2/jsf/FacesSetupInterceptor.java | 589 -
.../org/apache/struts2/jsf/FacesSupport.java | 173 -
.../jsf/InvokeApplicationInterceptor.java | 79 -
.../jsf/ProcessValidationsInterceptor.java | 78 -
.../struts2/jsf/RestoreViewInterceptor.java | 229 -
.../struts2/jsf/StrutsNavigationHandler.java | 94 -
.../struts2/jsf/StrutsVariableResolver.java | 83 -
.../jsf/UpdateModelValuesInterceptor.java | 79 -
plugins/jsf/src/main/resources/LICENSE.txt | 174 -
plugins/jsf/src/main/resources/NOTICE.txt | 5 -
.../org/apache/struts2/jsf/package.html | 31 -
.../jsf/src/main/resources/struts-plugin.xml | 59 -
plugins/jsf/src/site/site.xml | 57 -
plugins/pom.xml | 4 -
plugins/struts1/pom.xml | 77 -
.../struts2/s1/ActionFormResetInterceptor.java | 65 -
.../s1/ActionFormValidationInterceptor.java | 234 -
.../struts2/s1/DynaBeanPropertyAccessor.java | 73 -
.../org/apache/struts2/s1/Struts1Action.java | 156 -
.../org/apache/struts2/s1/Struts1Factory.java | 150 -
.../apache/struts2/s1/WrapperActionForward.java | 60 -
.../apache/struts2/s1/WrapperActionMapping.java | 286 -
.../struts2/s1/WrapperExceptionConfig.java | 67 -
.../struts2/s1/WrapperMessageResources.java | 48 -
.../apache/struts2/s1/WrapperModuleConfig.java | 252 -
.../src/main/resources/ANTLR-LICENSE.txt | 26 -
plugins/struts1/src/main/resources/LICENSE.txt | 174 -
plugins/struts1/src/main/resources/NOTICE.txt | 8 -
.../src/main/resources/struts-plugin.xml | 51 -
plugins/struts1/src/site/site.xml | 57 -
.../s1/DynaBeanPropertyAccessorTest.java | 155 -
.../apache/struts2/s1/Struts1FactoryTest.java | 241 -
.../apache/struts2/s1/test-struts-factory.xml | 67 -
1070 files changed, 239 insertions(+), 158353 deletions(-)
----------------------------------------------------------------------
[03/11] struts git commit: WW-4402 JDK 8: build fails due to missing
apt tool
Posted by lu...@apache.org.
WW-4402 JDK 8: build fails due to missing apt tool
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/08fad71a
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/08fad71a
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/08fad71a
Branch: refs/heads/master
Commit: 08fad71aafb1215438d65f817412a04b3584f5bb
Parents: 0ad77d4
Author: Aaron Johnson <aa...@pearson.com>
Authored: Tue May 26 09:36:33 2015 -0500
Committer: Aaron Johnson <aa...@pearson.com>
Committed: Tue May 26 09:36:33 2015 -0500
----------------------------------------------------------------------
core/pom.xml | 47 +++++++++++++++++------------------------------
pom.xml | 2 +-
2 files changed, 18 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/08fad71a/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 6eed44f..6d63119 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -40,38 +40,25 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.myfaces.tobago</groupId>
- <artifactId>maven-apt-plugin</artifactId>
- <version>1.0.15</version>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <A>uri=/struts-tags,tlibVersion=${tlib.version},jspVersion=2.0,shortName=s,displayName=Struts Tags,
- outFile=${basedir}/target/classes/META-INF/struts-tags.tld,
- description="To make it easier to access dynamic data;
- the Apache Struts framework includes a library of custom tags.
- The tags interact with the framework's validation and internationalization features;
- to ensure that input is correct and output is localized.
- The Struts Tags can be used with JSP FreeMarker or Velocity.",
- outTemplatesDir=${basedir}/src/site/resources/tags
- </A>
- <resourceTargetPath>target</resourceTargetPath>
- <fork>false</fork>
- <force>true</force>
- <nocompile>true</nocompile>
- <showWarnings>true</showWarnings>
- <factory>org.apache.struts.annotations.taglib.apt.TLDAnnotationProcessorFactory</factory>
- <target>1.5</target>
- <includes>
- <include>**/*.java</include>
- </includes>
+ <compilerArgs>
+ <arg>-Auri=/struts-tags</arg>
+ <arg>-AtlibVersion=${tlib.version}</arg>
+ <arg>-AjspVersion=2.0</arg>
+ <arg>-AshortName=s</arg>
+ <arg>-AdisplayName=Struts Tags</arg>
+ <arg>-AoutFile=${basedir}/target/classes/META-INF/struts-tags.tld</arg>
+ <arg>-Adescription="To make it easier to access dynamic data;
+ the Apache Struts framework includes a library of custom tags.
+ The tags interact with the framework's validation and
+ internationalization features;
+ to ensure that input is correct and output is localized.
+ The Struts Tags can be used with JSP FreeMarker or Velocity."</arg>
+ <arg>-AoutTemplatesDir=${basedir}/src/site/resources/tags</arg>
+ </compilerArgs>
</configuration>
- <executions>
- <execution>
- <phase>compile</phase>
- <goals>
- <goal>execute</goal>
- </goals>
- </execution>
- </executions>
</plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/struts/blob/08fad71a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 83582ec..08e0d54 100644
--- a/pom.xml
+++ b/pom.xml
@@ -353,7 +353,7 @@
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts-annotations</artifactId>
- <version>1.0.5</version>
+ <version>1.0.6-SNAPSHOT</version>
</dependency>
<dependency>
[10/11] struts git commit: WW-4515 Convert try blocks to
try-with-resources
Posted by lu...@apache.org.
WW-4515 Convert try blocks to try-with-resources
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/0b19499f
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/0b19499f
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/0b19499f
Branch: refs/heads/master
Commit: 0b19499ffd78f44a6dd8b767e9995c980efeb01f
Parents: c71c3de
Author: Aaron Johnson <aa...@pearson.com>
Authored: Wed Jun 17 09:49:26 2015 -0500
Committer: Aaron Johnson <aa...@pearson.com>
Committed: Wed Jun 17 09:49:26 2015 -0500
----------------------------------------------------------------------
.../org/apache/struts2/views/jasperreports/JasperReportsResult.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/0b19499f/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java
----------------------------------------------------------------------
diff --git a/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java b/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java
index a64a48a..1beffbc 100644
--- a/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java
+++ b/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java
@@ -396,6 +396,7 @@ public class JasperReportsResult extends StrutsResultSupport implements JasperRe
*/
private void writeReport(HttpServletResponse response, ByteArrayOutputStream output) throws ServletException {
try (OutputStream outputStream = response.getOutputStream()) {
+ output.writeTo(output);
outputStream.flush();
} catch (IOException e) {
LOG.error("Error writing report output", e);
[11/11] struts git commit: WW-4515 Convert try blocks to
try-with-resources
Posted by lu...@apache.org.
WW-4515 Convert try blocks to try-with-resources
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/86da1ea8
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/86da1ea8
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/86da1ea8
Branch: refs/heads/master
Commit: 86da1ea8c2fec919bb3c94ceeb9c29f1acf04276
Parents: 0b19499
Author: Aaron Johnson <aa...@pearson.com>
Authored: Wed Jun 17 09:51:25 2015 -0500
Committer: Aaron Johnson <aa...@pearson.com>
Committed: Wed Jun 17 09:51:25 2015 -0500
----------------------------------------------------------------------
.../apache/struts2/views/jasperreports/JasperReportsResult.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/86da1ea8/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java
----------------------------------------------------------------------
diff --git a/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java b/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java
index 1beffbc..56cd4b0 100644
--- a/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java
+++ b/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java
@@ -396,7 +396,7 @@ public class JasperReportsResult extends StrutsResultSupport implements JasperRe
*/
private void writeReport(HttpServletResponse response, ByteArrayOutputStream output) throws ServletException {
try (OutputStream outputStream = response.getOutputStream()) {
- output.writeTo(output);
+ output.writeTo(outputStream);
outputStream.flush();
} catch (IOException e) {
LOG.error("Error writing report output", e);
[07/11] struts git commit: Merge branch 'master' of
github.com:apache/struts into feature/WW-4515
Posted by lu...@apache.org.
Merge branch 'master' of github.com:apache/struts into feature/WW-4515
# By Johannes Geppert
# Via Johannes Geppert
* 'master' of github.com:apache/struts:
Fiy typo in commons-digester artifact id
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/bf15ad20
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/bf15ad20
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/bf15ad20
Branch: refs/heads/master
Commit: bf15ad20b13da0ef81a3e30cf43c3999f13264c2
Parents: ebf4b17 3720bbf
Author: Aaron Johnson <aa...@pearson.com>
Authored: Wed Jun 17 08:35:24 2015 -0500
Committer: Aaron Johnson <aa...@pearson.com>
Committed: Wed Jun 17 08:35:24 2015 -0500
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/bf15ad20/pom.xml
----------------------------------------------------------------------
[08/11] struts git commit: WW-4515 Convert try blocks to
try-with-resources
Posted by lu...@apache.org.
WW-4515 Convert try blocks to try-with-resources
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/3fab155b
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/3fab155b
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/3fab155b
Branch: refs/heads/master
Commit: 3fab155b4cc530ca3ca0b69299ddcb348eb5f26d
Parents: bf15ad2
Author: Aaron Johnson <aa...@pearson.com>
Authored: Wed Jun 17 09:24:08 2015 -0500
Committer: Aaron Johnson <aa...@pearson.com>
Committed: Wed Jun 17 09:24:08 2015 -0500
----------------------------------------------------------------------
.../apache/struts2/components/Component.java | 11 +++---
.../struts2/config/PropertiesSettings.java | 12 +-----
.../struts2/dispatcher/PlainTextResult.java | 19 ++--------
.../apache/struts2/dispatcher/StreamResult.java | 16 ++------
.../JakartaStreamMultiPartRequest.java | 21 +---------
.../debugging/DebuggingInterceptor.java | 9 ++---
.../struts2/util/FastByteArrayOutputStream.java | 12 +-----
.../views/freemarker/FreemarkerManager.java | 15 +-------
.../struts2/views/jsp/StrutsBodyTagSupport.java | 10 ++---
.../test/java/org/apache/struts2/TestUtils.java | 13 +++----
.../struts2/dispatcher/PlainTextResultTest.java | 40 +++++---------------
.../struts2/views/jsp/AbstractUITagTest.java | 15 ++++----
.../jasperreports/JasperReportsResult.java | 38 ++++++-------------
.../struts2/convention/Java8ClassFinder.java | 5 +--
.../DefaultOValValidationManager.java | 20 ++++------
.../org/apache/struts2/sitegraph/SiteGraph.java | 21 +++++-----
.../sitegraph/entities/FileBasedView.java | 6 +--
.../apache/struts2/sitegraph/SiteGraphTest.java | 15 ++++----
.../xwork2/interceptor/ExceptionHolder.java | 25 +++++-------
.../xwork2/util/finder/DefaultClassFinder.java | 5 +--
.../xwork2/util/finder/ResourceFinder.java | 21 +---------
.../validator/DefaultValidatorFactory.java | 3 +-
.../opensymphony/xwork2/util/UrlUtilTest2.java | 8 +---
.../DefaultValidatorFileParserTest.java | 9 +----
24 files changed, 99 insertions(+), 270 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/3fab155b/core/src/main/java/org/apache/struts2/components/Component.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/components/Component.java b/core/src/main/java/org/apache/struts2/components/Component.java
index 1853ed8..b34178d 100644
--- a/core/src/main/java/org/apache/struts2/components/Component.java
+++ b/core/src/main/java/org/apache/struts2/components/Component.java
@@ -465,12 +465,11 @@ public class Component {
* @return the exception as a string.
*/
protected String toString(Throwable t) {
- FastByteArrayOutputStream bout = new FastByteArrayOutputStream();
- PrintWriter wrt = new PrintWriter(bout);
- t.printStackTrace(wrt);
- wrt.close();
-
- return bout.toString();
+ try (FastByteArrayOutputStream bout = new FastByteArrayOutputStream();
+ PrintWriter wrt = new PrintWriter(bout)) {
+ t.printStackTrace(wrt);
+ return bout.toString();
+ }
}
/**
http://git-wip-us.apache.org/repos/asf/struts/blob/3fab155b/core/src/main/java/org/apache/struts2/config/PropertiesSettings.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/config/PropertiesSettings.java b/core/src/main/java/org/apache/struts2/config/PropertiesSettings.java
index 06bc744..7a136cb 100644
--- a/core/src/main/java/org/apache/struts2/config/PropertiesSettings.java
+++ b/core/src/main/java/org/apache/struts2/config/PropertiesSettings.java
@@ -64,20 +64,10 @@ class PropertiesSettings implements Settings {
settings = new LocatableProperties(new LocationImpl(null, settingsUrl.toString()));
// Load settings
- InputStream in = null;
- try {
- in = settingsUrl.openStream();
+ try (InputStream in = settingsUrl.openStream()) {
settings.load(in);
} catch (IOException e) {
throw new StrutsException("Could not load " + name + ".properties: " + e, e);
- } finally {
- if(in != null) {
- try {
- in.close();
- } catch(IOException io) {
- LOG.warn("Unable to close input stream", io);
- }
- }
}
}
http://git-wip-us.apache.org/repos/asf/struts/blob/3fab155b/core/src/main/java/org/apache/struts2/dispatcher/PlainTextResult.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/dispatcher/PlainTextResult.java b/core/src/main/java/org/apache/struts2/dispatcher/PlainTextResult.java
index c27e078..8d36bf6 100644
--- a/core/src/main/java/org/apache/struts2/dispatcher/PlainTextResult.java
+++ b/core/src/main/java/org/apache/struts2/dispatcher/PlainTextResult.java
@@ -122,24 +122,11 @@ public class PlainTextResult extends StrutsResultSupport {
applyAdditionalHeaders(response);
String location = adjustLocation(finalLocation);
- PrintWriter writer = response.getWriter();
- InputStreamReader reader = null;
- try {
- InputStream resourceAsStream = readStream(invocation, location);
+ try (PrintWriter writer = response.getWriter();
+ InputStream resourceAsStream = readStream(invocation, location);
+ InputStreamReader reader = new InputStreamReader(resourceAsStream, charset == null ? Charset.defaultCharset() : charset)) {
logWrongStream(finalLocation, resourceAsStream);
- if (charset != null) {
- reader = new InputStreamReader(resourceAsStream, charset);
- } else {
- reader = new InputStreamReader(resourceAsStream);
- }
sendStream(writer, reader);
- } finally {
- if (reader != null)
- reader.close();
- if (writer != null) {
- writer.flush();
- writer.close();
- }
}
}
http://git-wip-us.apache.org/repos/asf/struts/blob/3fab155b/core/src/main/java/org/apache/struts2/dispatcher/StreamResult.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/dispatcher/StreamResult.java b/core/src/main/java/org/apache/struts2/dispatcher/StreamResult.java
index 13a5c3c..4d51223 100644
--- a/core/src/main/java/org/apache/struts2/dispatcher/StreamResult.java
+++ b/core/src/main/java/org/apache/struts2/dispatcher/StreamResult.java
@@ -221,9 +221,9 @@ public class StreamResult extends StrutsResultSupport {
// Override any parameters using values on the stack
resolveParamsFromStack(invocation.getStack(), invocation);
- OutputStream oOutput = null;
-
- try {
+ // Find the Response in context
+ HttpServletResponse oResponse = (HttpServletResponse) invocation.getInvocationContext().get(HTTP_RESPONSE);
+ try (OutputStream oOutput = oResponse.getOutputStream()) {
if (inputStream == null) {
// Find the inputstream from the invocation variable stack
inputStream = (InputStream) invocation.getStack().findValue(conditionalParse(inputName, invocation));
@@ -236,9 +236,6 @@ public class StreamResult extends StrutsResultSupport {
throw new IllegalArgumentException(msg);
}
- // Find the Response in context
- HttpServletResponse oResponse = (HttpServletResponse) invocation.getInvocationContext().get(HTTP_RESPONSE);
-
// Set the content type
if (contentCharSet != null && ! contentCharSet.equals("")) {
oResponse.setContentType(conditionalParse(contentType, invocation)+";charset="+contentCharSet);
@@ -273,9 +270,6 @@ public class StreamResult extends StrutsResultSupport {
oResponse.addHeader("Cache-Control", "no-cache");
}
- // Get the outputstream
- oOutput = oResponse.getOutputStream();
-
LOG.debug("Streaming result [{}] type=[{}] length=[{}] content-disposition=[{}] charset=[{}]",
inputName, contentType, contentLength, contentDisposition, contentCharSet);
@@ -291,10 +285,6 @@ public class StreamResult extends StrutsResultSupport {
// Flush
oOutput.flush();
}
- finally {
- if (inputStream != null) inputStream.close();
- if (oOutput != null) oOutput.close();
- }
}
/**
http://git-wip-us.apache.org/repos/asf/struts/blob/3fab155b/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaStreamMultiPartRequest.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaStreamMultiPartRequest.java b/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaStreamMultiPartRequest.java
index e65973f..2f92340 100644
--- a/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaStreamMultiPartRequest.java
+++ b/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaStreamMultiPartRequest.java
@@ -449,31 +449,14 @@ public class JakartaStreamMultiPartRequest implements MultiPartRequest {
*/
private boolean streamFileToDisk(FileItemStream itemStream, File file) throws IOException {
boolean result = false;
- InputStream input = itemStream.openStream();
- OutputStream output = null;
- try {
- output = new BufferedOutputStream(new FileOutputStream(file), bufferSize);
+ try (InputStream input = itemStream.openStream();
+ OutputStream output = new BufferedOutputStream(new FileOutputStream(file), bufferSize)) {
byte[] buffer = new byte[bufferSize];
LOG.debug("Streaming file using buffer size {}.", bufferSize);
for (int length = 0; ((length = input.read(buffer)) > 0); ) {
output.write(buffer, 0, length);
}
result = true;
- } finally {
- if (output != null) {
- try {
- output.close();
- } catch (IOException e) {
- LOG.warn("Error occurred during closing of OutputStream.", e);
- }
- }
- if (input != null) {
- try {
- input.close();
- } catch (IOException e) {
- LOG.warn("Error occurred during closing of InputStream.", e);
- }
- }
}
return result;
}
http://git-wip-us.apache.org/repos/asf/struts/blob/3fab155b/core/src/main/java/org/apache/struts2/interceptor/debugging/DebuggingInterceptor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/interceptor/debugging/DebuggingInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/debugging/DebuggingInterceptor.java
index 7ea1fed..5a88577 100644
--- a/core/src/main/java/org/apache/struts2/interceptor/debugging/DebuggingInterceptor.java
+++ b/core/src/main/java/org/apache/struts2/interceptor/debugging/DebuggingInterceptor.java
@@ -192,11 +192,9 @@ public class DebuggingInterceptor extends AbstractInterceptor {
HttpServletResponse res = ServletActionContext.getResponse();
res.setContentType("text/plain");
- try {
- PrintWriter writer =
- ServletActionContext.getResponse().getWriter();
+ try (PrintWriter writer =
+ ServletActionContext.getResponse().getWriter()) {
writer.print(stack.findValue(cmd));
- writer.close();
} catch (IOException ex) {
ex.printStackTrace();
}
@@ -213,8 +211,7 @@ public class DebuggingInterceptor extends AbstractInterceptor {
ValueStack stack = (ValueStack) ctx.get(ActionContext.VALUE_STACK);
Object rootObject = stack.findValue(rootObjectExpression);
- try {
- StringWriter writer = new StringWriter();
+ try (StringWriter writer = new StringWriter()) {
ObjectToHTMLWriter htmlWriter = new ObjectToHTMLWriter(writer);
htmlWriter.write(reflectionProvider, rootObject, rootObjectExpression);
String html = writer.toString();
http://git-wip-us.apache.org/repos/asf/struts/blob/3fab155b/core/src/main/java/org/apache/struts2/util/FastByteArrayOutputStream.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/util/FastByteArrayOutputStream.java b/core/src/main/java/org/apache/struts2/util/FastByteArrayOutputStream.java
index 00fb12f..8645df7 100644
--- a/core/src/main/java/org/apache/struts2/util/FastByteArrayOutputStream.java
+++ b/core/src/main/java/org/apache/struts2/util/FastByteArrayOutputStream.java
@@ -133,20 +133,10 @@ public class FastByteArrayOutputStream extends OutputStream {
* This method is need only for debug. And needed for tests generated files.
*/
private void writeToFile() {
- FileOutputStream fileOutputStream = null;
- try {
- fileOutputStream = new FileOutputStream(File.createTempFile(getClass().getName() + System.currentTimeMillis(), ".log"));
+ try (FileOutputStream fileOutputStream = new FileOutputStream(File.createTempFile(getClass().getName() + System.currentTimeMillis(), ".log"))){
writeTo(fileOutputStream);
} catch (IOException e) {
// Ignore
- } finally {
- if (fileOutputStream != null) {
- try {
- fileOutputStream.close();
- } catch (IOException e) {
- // Ignore
- }
- }
}
}
http://git-wip-us.apache.org/repos/asf/struts/blob/3fab155b/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java b/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java
index f32a5a6..375a726 100644
--- a/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java
+++ b/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java
@@ -436,12 +436,7 @@ public class FreemarkerManager {
* @see freemarker.template.Configuration#setSettings for the definition of valid settings
*/
protected void loadSettings(ServletContext servletContext) {
- InputStream in = null;
-
- try {
-
- in = fileManager.loadFile(ClassLoaderUtil.getResource("freemarker.properties", getClass()));
-
+ try (InputStream in = fileManager.loadFile(ClassLoaderUtil.getResource("freemarker.properties", getClass()))){
if (in != null) {
Properties p = new Properties();
p.load(in);
@@ -465,14 +460,6 @@ public class FreemarkerManager {
LOG.error("Error while loading freemarker settings from /freemarker.properties", e);
} catch (TemplateException e) {
LOG.error("Error while loading freemarker settings from /freemarker.properties", e);
- } finally {
- if (in != null) {
- try {
- in.close();
- } catch(IOException io) {
- LOG.warn("Unable to close input stream", io);
- }
- }
}
}
http://git-wip-us.apache.org/repos/asf/struts/blob/3fab155b/core/src/main/java/org/apache/struts2/views/jsp/StrutsBodyTagSupport.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/views/jsp/StrutsBodyTagSupport.java b/core/src/main/java/org/apache/struts2/views/jsp/StrutsBodyTagSupport.java
index 7dc9bd2..484c317 100644
--- a/core/src/main/java/org/apache/struts2/views/jsp/StrutsBodyTagSupport.java
+++ b/core/src/main/java/org/apache/struts2/views/jsp/StrutsBodyTagSupport.java
@@ -66,12 +66,12 @@ public class StrutsBodyTagSupport extends BodyTagSupport {
}
protected String toString(Throwable t) {
- FastByteArrayOutputStream bout = new FastByteArrayOutputStream();
- PrintWriter wrt = new PrintWriter(bout);
- t.printStackTrace(wrt);
- wrt.close();
+ try (FastByteArrayOutputStream bout = new FastByteArrayOutputStream();
+ PrintWriter wrt = new PrintWriter(bout)) {
+ t.printStackTrace(wrt);
- return bout.toString();
+ return bout.toString();
+ }
}
protected String getBody() {
http://git-wip-us.apache.org/repos/asf/struts/blob/3fab155b/core/src/test/java/org/apache/struts2/TestUtils.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/struts2/TestUtils.java b/core/src/test/java/org/apache/struts2/TestUtils.java
index 001f98d..02fe8b5 100644
--- a/core/src/test/java/org/apache/struts2/TestUtils.java
+++ b/core/src/test/java/org/apache/struts2/TestUtils.java
@@ -82,16 +82,15 @@ public class TestUtils {
}
StringBuilder buffer = new StringBuilder(128);
- InputStream in = url.openStream();
- byte[] buf = new byte[4096];
- int nbytes;
+ try (InputStream in = url.openStream()) {
+ byte[] buf = new byte[4096];
+ int nbytes;
- while((nbytes = in.read(buf)) > 0) {
- buffer.append(new String(buf, 0, nbytes));
+ while ((nbytes = in.read(buf)) > 0) {
+ buffer.append(new String(buf, 0, nbytes));
+ }
}
- in.close();
-
return buffer.toString();
}
}
http://git-wip-us.apache.org/repos/asf/struts/blob/3fab155b/core/src/test/java/org/apache/struts2/dispatcher/PlainTextResultTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/struts2/dispatcher/PlainTextResultTest.java b/core/src/test/java/org/apache/struts2/dispatcher/PlainTextResultTest.java
index b2fadaa..959458a 100644
--- a/core/src/test/java/org/apache/struts2/dispatcher/PlainTextResultTest.java
+++ b/core/src/test/java/org/apache/struts2/dispatcher/PlainTextResultTest.java
@@ -56,13 +56,11 @@ public class PlainTextResultTest extends StrutsInternalTestCase {
response.setExpectedContentType("text/plain");
response.setExpectedHeader("Content-Disposition", "inline");
- InputStream jspResourceInputStream =
+
+ try (InputStream jspResourceInputStream =
ClassLoaderUtil.getResourceAsStream(
"org/apache/struts2/dispatcher/someJspFile.jsp",
- PlainTextResultTest.class);
-
-
- try {
+ PlainTextResultTest.class)) {
servletContext.setResourceAsStream(jspResourceInputStream);
result.execute(invocation);
@@ -71,9 +69,6 @@ public class PlainTextResultTest extends StrutsInternalTestCase {
readAsString("org/apache/struts2/dispatcher/someJspFile.jsp"), true);
assertEquals(r, e);
}
- finally {
- jspResourceInputStream.close();
- }
}
public void testPlainTextWithoutSlash() throws Exception {
@@ -82,11 +77,9 @@ public class PlainTextResultTest extends StrutsInternalTestCase {
response.setExpectedContentType("text/plain");
response.setExpectedHeader("Content-Disposition", "inline");
- InputStream jspResourceInputStream =
- ClassLoaderUtil.getResourceAsStream("org/apache/struts2/dispatcher/someJspFile.jsp", PlainTextResultTest.class);
-
- try {
+ try (InputStream jspResourceInputStream =
+ ClassLoaderUtil.getResourceAsStream("org/apache/struts2/dispatcher/someJspFile.jsp", PlainTextResultTest.class)) {
servletContext.setResourceAsStream(jspResourceInputStream);
result.execute(invocation);
@@ -94,9 +87,6 @@ public class PlainTextResultTest extends StrutsInternalTestCase {
String e = AbstractUITagTest.normalize(readAsString("org/apache/struts2/dispatcher/someJspFile.jsp"), true);
assertEquals(r, e);
}
- finally {
- jspResourceInputStream.close();
- }
}
public void testPlainTextWithEncoding() throws Exception {
@@ -106,13 +96,11 @@ public class PlainTextResultTest extends StrutsInternalTestCase {
response.setExpectedContentType("text/plain; charset=UTF-8");
response.setExpectedHeader("Content-Disposition", "inline");
- InputStream jspResourceInputStream =
+
+ try (InputStream jspResourceInputStream =
ClassLoaderUtil.getResourceAsStream(
"org/apache/struts2/dispatcher/someJspFile.jsp",
- PlainTextResultTest.class);
-
-
- try {
+ PlainTextResultTest.class)) {
servletContext.setResourceAsStream(jspResourceInputStream);
result.execute(invocation);
@@ -121,15 +109,10 @@ public class PlainTextResultTest extends StrutsInternalTestCase {
readAsString("org/apache/struts2/dispatcher/someJspFile.jsp"), true);
assertEquals(r, e);
}
- finally {
- jspResourceInputStream.close();
- }
}
protected String readAsString(String resource) throws Exception {
- InputStream is = null;
- try {
- is = ClassLoaderUtil.getResourceAsStream(resource, PlainTextResultTest.class);
+ try (InputStream is = ClassLoaderUtil.getResourceAsStream(resource, PlainTextResultTest.class)) {
int sizeRead = 0;
byte[] buffer = new byte[1024];
StringBuilder stringBuilder = new StringBuilder();
@@ -138,11 +121,6 @@ public class PlainTextResultTest extends StrutsInternalTestCase {
}
return stringBuilder.toString();
}
- finally {
- if (is != null)
- is.close();
- }
-
}
http://git-wip-us.apache.org/repos/asf/struts/blob/3fab155b/core/src/test/java/org/apache/struts2/views/jsp/AbstractUITagTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/struts2/views/jsp/AbstractUITagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/AbstractUITagTest.java
index 106ba5f..02e1f96 100644
--- a/core/src/test/java/org/apache/struts2/views/jsp/AbstractUITagTest.java
+++ b/core/src/test/java/org/apache/struts2/views/jsp/AbstractUITagTest.java
@@ -251,16 +251,15 @@ public abstract class AbstractUITagTest extends AbstractTagTest {
}
StringBuilder buffer = new StringBuilder(128);
- InputStream in = url.openStream();
- byte[] buf = new byte[4096];
- int nbytes;
-
- while ((nbytes = in.read(buf)) > 0) {
- buffer.append(new String(buf, 0, nbytes));
+ try (InputStream in = url.openStream()) {
+ byte[] buf = new byte[4096];
+ int nbytes;
+
+ while ((nbytes = in.read(buf)) > 0) {
+ buffer.append(new String(buf, 0, nbytes));
+ }
}
- in.close();
-
/**
* compare the trimmed values of each buffer and make sure they're equivalent. however, let's make sure to
* normalize the strings first to account for line termination differences between platforms.
http://git-wip-us.apache.org/repos/asf/struts/blob/3fab155b/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java
----------------------------------------------------------------------
diff --git a/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java b/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java
index d113a39..a64a48a 100644
--- a/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java
+++ b/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java
@@ -23,9 +23,11 @@ package org.apache.struts2.views.jasperreports;
import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.util.ValueStack;
+
import net.sf.jasperreports.engine.*;
import net.sf.jasperreports.engine.export.*;
import net.sf.jasperreports.engine.util.JRLoader;
+
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -37,9 +39,11 @@ import javax.servlet.ServletException;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.IOException;
+import java.io.OutputStream;
import java.sql.Connection;
import java.util.HashMap;
import java.util.Map;
@@ -244,12 +248,9 @@ public class JasperReportsResult extends StrutsResultSupport implements JasperRe
// Handle IE special case: it sends a "contype" request first.
// TODO Set content type to config settings?
if ("contype".equals(request.getHeader("User-Agent"))) {
- try {
+ try (OutputStream outputStream = response.getOutputStream()) {
response.setContentType("application/pdf");
response.setContentLength(0);
-
- ServletOutputStream outputStream = response.getOutputStream();
- outputStream.close();
} catch (IOException e) {
LOG.error("Error writing report output", e);
throw new ServletException(e.getMessage(), e);
@@ -300,7 +301,7 @@ public class JasperReportsResult extends StrutsResultSupport implements JasperRe
parameters.putAll(reportParams);
}
- byte[] output;
+ ByteArrayOutputStream output;
JasperPrint jasperPrint;
// Fill the report and produce a print object
@@ -381,8 +382,7 @@ public class JasperReportsResult extends StrutsResultSupport implements JasperRe
throw new ServletException(e.getMessage(), e);
}
- response.setContentLength(output.length);
-
+ response.setContentLength(output.size());
// Will throw ServletException on IOException.
writeReport(response, output);
}
@@ -394,24 +394,12 @@ public class JasperReportsResult extends StrutsResultSupport implements JasperRe
* @param output Report bytes to write.
* @throws ServletException on stream IOException.
*/
- private void writeReport(HttpServletResponse response, byte[] output) throws ServletException {
- ServletOutputStream outputStream = null;
- try {
- outputStream = response.getOutputStream();
- outputStream.write(output);
+ private void writeReport(HttpServletResponse response, ByteArrayOutputStream output) throws ServletException {
+ try (OutputStream outputStream = response.getOutputStream()) {
outputStream.flush();
} catch (IOException e) {
LOG.error("Error writing report output", e);
throw new ServletException(e.getMessage(), e);
- } finally {
- try {
- if (outputStream != null) {
- outputStream.close();
- }
- } catch (IOException e) {
- LOG.error("Error closing report output stream", e);
- throw new ServletException(e.getMessage(), e);
- }
}
}
@@ -456,8 +444,7 @@ public class JasperReportsResult extends StrutsResultSupport implements JasperRe
* @throws net.sf.jasperreports.engine.JRException
* If there is a problem running the report
*/
- private byte[] exportReportToBytes(JasperPrint jasperPrint, JRExporter exporter) throws JRException {
- byte[] output;
+ private ByteArrayOutputStream exportReportToBytes(JasperPrint jasperPrint, JRExporter exporter) throws JRException {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
exporter.setParameter(JRExporterParameter.JASPER_PRINT, jasperPrint);
@@ -467,10 +454,7 @@ public class JasperReportsResult extends StrutsResultSupport implements JasperRe
}
exporter.exportReport();
-
- output = baos.toByteArray();
-
- return output;
+ return baos;
}
}
http://git-wip-us.apache.org/repos/asf/struts/blob/3fab155b/plugins/java8-support/src/main/java/org/apache/struts2/convention/Java8ClassFinder.java
----------------------------------------------------------------------
diff --git a/plugins/java8-support/src/main/java/org/apache/struts2/convention/Java8ClassFinder.java b/plugins/java8-support/src/main/java/org/apache/struts2/convention/Java8ClassFinder.java
index 76f9caa..28ad3ec 100644
--- a/plugins/java8-support/src/main/java/org/apache/struts2/convention/Java8ClassFinder.java
+++ b/plugins/java8-support/src/main/java/org/apache/struts2/convention/Java8ClassFinder.java
@@ -438,12 +438,9 @@ public class Java8ClassFinder implements ClassFinder {
try {
URL resource = classLoaderInterface.getResource(className);
if (resource != null) {
- InputStream in = resource.openStream();
- try {
+ try (InputStream in = resource.openStream()) {
ClassReader classReader = new ClassReader(in);
classReader.accept(new InfoBuildingClassVisitor(this), ClassReader.SKIP_DEBUG);
- } finally {
- in.close();
}
} else {
throw new XWorkException("Could not load " + className);
http://git-wip-us.apache.org/repos/asf/struts/blob/3fab155b/plugins/oval/src/main/java/org/apache/struts2/oval/interceptor/DefaultOValValidationManager.java
----------------------------------------------------------------------
diff --git a/plugins/oval/src/main/java/org/apache/struts2/oval/interceptor/DefaultOValValidationManager.java b/plugins/oval/src/main/java/org/apache/struts2/oval/interceptor/DefaultOValValidationManager.java
index fdd8aae..1c75d61 100644
--- a/plugins/oval/src/main/java/org/apache/struts2/oval/interceptor/DefaultOValValidationManager.java
+++ b/plugins/oval/src/main/java/org/apache/struts2/oval/interceptor/DefaultOValValidationManager.java
@@ -4,14 +4,19 @@ import com.opensymphony.xwork2.FileManager;
import com.opensymphony.xwork2.FileManagerFactory;
import com.opensymphony.xwork2.inject.Inject;
import com.opensymphony.xwork2.util.ClassLoaderUtil;
+
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
+
import net.sf.oval.configuration.Configurer;
import net.sf.oval.configuration.annotation.AnnotationsConfigurer;
import net.sf.oval.configuration.annotation.JPAAnnotationsConfigurer;
import net.sf.oval.configuration.xml.XMLConfigurer;
+
import org.apache.struts2.StrutsConstants;
+import java.io.IOException;
+import java.io.InputStream;
import java.net.URL;
import java.util.ArrayList;
import java.util.HashMap;
@@ -152,11 +157,8 @@ public class DefaultOValValidationManager implements OValValidationManager {
protected XMLConfigurer loadFile(String fileName, Class clazz, boolean checkFile) {
URL fileUrl = ClassLoaderUtil.getResource(fileName, clazz);
if ((checkFile && fileManager.fileNeedsReloading(fileUrl)) || !validatorFileCache.containsKey(fileName)) {
- java.io.InputStream is = null;
-
- try {
- is = fileManager.loadFile(fileUrl);
+ try (InputStream is = fileManager.loadFile(fileUrl)) {
if (is != null) {
LOG.debug("Loading validation xml file [{}]", fileName);
XMLConfigurer configurer = new XMLConfigurer();
@@ -164,14 +166,8 @@ public class DefaultOValValidationManager implements OValValidationManager {
validatorFileCache.put(fileName, configurer);
return configurer;
}
- } finally {
- if (is != null) {
- try {
- is.close();
- } catch (java.io.IOException e) {
- LOG.error("Unable to close input stream for [{}] ", fileName, e);
- }
- }
+ } catch (IOException e) {
+ LOG.error("Unable to close input stream for [{}] ", fileName, e);
}
} else {
return (XMLConfigurer) validatorFileCache.get(fileName);
http://git-wip-us.apache.org/repos/asf/struts/blob/3fab155b/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/SiteGraph.java
----------------------------------------------------------------------
diff --git a/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/SiteGraph.java b/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/SiteGraph.java
index accfd3b..00cb7e2 100644
--- a/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/SiteGraph.java
+++ b/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/SiteGraph.java
@@ -66,18 +66,17 @@ public class SiteGraph {
}
if (args.length != 8 && args.length != 6) {
- InputStream is = SiteGraph.class.getResourceAsStream("sitegraph-usage.txt");
- byte[] buffer = new byte[2048];
- int length;
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- while ((length = is.read(buffer)) != -1) {
- baos.write(buffer, 0, length);
+ try (InputStream is = SiteGraph.class.getResourceAsStream("sitegraph-usage.txt");
+ ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
+ byte[] buffer = new byte[2048];
+ int length;
+ while ((length = is.read(buffer)) != -1) {
+ baos.write(buffer, 0, length);
+ }
+
+ String usage = baos.toString();
+ System.out.println(usage.replaceAll("//.*", ""));
}
- is.close();
- baos.close();
-
- String usage = baos.toString();
- System.out.println(usage.replaceAll("//.*", ""));
return;
}
http://git-wip-us.apache.org/repos/asf/struts/blob/3fab155b/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/entities/FileBasedView.java
----------------------------------------------------------------------
diff --git a/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/entities/FileBasedView.java b/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/entities/FileBasedView.java
index 1ac2f3c..37efc13 100644
--- a/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/entities/FileBasedView.java
+++ b/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/entities/FileBasedView.java
@@ -85,9 +85,7 @@ public abstract class FileBasedView implements View {
protected abstract Pattern getFormPattern();
protected String readFile(File file) {
- try {
- BufferedReader in = new BufferedReader(new FileReader(file));
-
+ try (BufferedReader in = new BufferedReader(new FileReader(file))) {
String s;
StringBuilder buffer = new StringBuilder();
@@ -95,8 +93,6 @@ public abstract class FileBasedView implements View {
buffer.append(s).append('\n');
}
- in.close();
-
return buffer.toString();
} catch (FileNotFoundException e) {
if (LOG.isWarnEnabled()) {
http://git-wip-us.apache.org/repos/asf/struts/blob/3fab155b/plugins/sitegraph/src/test/java/org/apache/struts2/sitegraph/SiteGraphTest.java
----------------------------------------------------------------------
diff --git a/plugins/sitegraph/src/test/java/org/apache/struts2/sitegraph/SiteGraphTest.java b/plugins/sitegraph/src/test/java/org/apache/struts2/sitegraph/SiteGraphTest.java
index 04fe72c..71c3699 100644
--- a/plugins/sitegraph/src/test/java/org/apache/struts2/sitegraph/SiteGraphTest.java
+++ b/plugins/sitegraph/src/test/java/org/apache/struts2/sitegraph/SiteGraphTest.java
@@ -47,15 +47,14 @@ public class SiteGraphTest extends StrutsTestCase {
URL compare = SiteGraphTest.class.getResource("out.txt");
StringBuilder buffer = new StringBuilder(128);
- InputStream in = compare.openStream();
- byte[] buf = new byte[4096];
- int nbytes;
-
- while ((nbytes = in.read(buf)) > 0) {
- buffer.append(new String(buf, 0, nbytes));
+ try (InputStream in = compare.openStream()){
+ byte[] buf = new byte[4096];
+ int nbytes;
+
+ while ((nbytes = in.read(buf)) > 0) {
+ buffer.append(new String(buf, 0, nbytes));
+ }
}
-
- in.close();
assertEquals(buffer.toString().replaceAll("\r\n", "\n"), writer.toString().replaceAll("\r\n", "\n"));
}
}
http://git-wip-us.apache.org/repos/asf/struts/blob/3fab155b/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ExceptionHolder.java
----------------------------------------------------------------------
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ExceptionHolder.java b/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ExceptionHolder.java
index 90382b5..6959357 100644
--- a/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ExceptionHolder.java
+++ b/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ExceptionHolder.java
@@ -32,6 +32,7 @@ import java.io.Serializable;
*/
public class ExceptionHolder implements Serializable {
+ private static final long serialVersionUID = 1L;
private Exception exception;
/**
@@ -44,37 +45,29 @@ public class ExceptionHolder implements Serializable {
}
/**
- * Gets the holded exception
+ * Gets the held exception
*
- * @return the holded exception
+ * @return the held exception
*/
public Exception getException() {
return this.exception;
}
/**
- * Gets the holded exception stacktrace using {@link Exception#printStackTrace()}.
+ * Gets the held exception stack trace using {@link Exception#printStackTrace()}.
*
- * @return stacktrace
+ * @return stack trace
*/
public String getExceptionStack() {
String exceptionStack = null;
if (getException() != null) {
- StringWriter sw = new StringWriter();
- PrintWriter pw = new PrintWriter(sw);
-
- try {
+ try (StringWriter sw = new StringWriter();
+ PrintWriter pw = new PrintWriter(sw)) {
getException().printStackTrace(pw);
exceptionStack = sw.toString();
- }
- finally {
- try {
- sw.close();
- pw.close();
- } catch (IOException e) {
- // ignore
- }
+ } catch (IOException e) {
+ // Ignore exception generating stack trace.
}
}
http://git-wip-us.apache.org/repos/asf/struts/blob/3fab155b/xwork-core/src/main/java/com/opensymphony/xwork2/util/finder/DefaultClassFinder.java
----------------------------------------------------------------------
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/finder/DefaultClassFinder.java b/xwork-core/src/main/java/com/opensymphony/xwork2/util/finder/DefaultClassFinder.java
index b703639..2e140a7 100644
--- a/xwork-core/src/main/java/com/opensymphony/xwork2/util/finder/DefaultClassFinder.java
+++ b/xwork-core/src/main/java/com/opensymphony/xwork2/util/finder/DefaultClassFinder.java
@@ -450,12 +450,9 @@ public class DefaultClassFinder implements ClassFinder {
try {
URL resource = classLoaderInterface.getResource(className);
if (resource != null) {
- InputStream in = resource.openStream();
- try {
+ try (InputStream in = resource.openStream()) {
ClassReader classReader = new ClassReader(in);
classReader.accept(new InfoBuildingVisitor(this), ClassReader.SKIP_DEBUG);
- } finally {
- in.close();
}
} else {
throw new XWorkException("Could not load " + className);
http://git-wip-us.apache.org/repos/asf/struts/blob/3fab155b/xwork-core/src/main/java/com/opensymphony/xwork2/util/finder/ResourceFinder.java
----------------------------------------------------------------------
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/finder/ResourceFinder.java b/xwork-core/src/main/java/com/opensymphony/xwork2/util/finder/ResourceFinder.java
index e07503d..c7f9fd1 100644
--- a/xwork-core/src/main/java/com/opensymphony/xwork2/util/finder/ResourceFinder.java
+++ b/xwork-core/src/main/java/com/opensymphony/xwork2/util/finder/ResourceFinder.java
@@ -969,29 +969,18 @@ public class ResourceFinder {
}
private Properties loadProperties(URL resource) throws IOException {
- InputStream in = resource.openStream();
-
- BufferedInputStream reader = new BufferedInputStream(in);
- try {
+ try (InputStream reader = new BufferedInputStream(resource.openStream())) {
Properties properties = new Properties();
properties.load(reader);
return properties;
- } finally {
- try {
- in.close();
- reader.close();
- } catch (Exception e) {
- }
}
}
private String readContents(URL resource) throws IOException {
- InputStream in = resource.openStream();
StringBuilder sb = new StringBuilder();
- BufferedInputStream reader = new BufferedInputStream(in);
- try {
+ try (InputStream reader = new BufferedInputStream(resource.openStream())) {
int b = reader.read();
while (b != -1) {
sb.append((char) b);
@@ -999,12 +988,6 @@ public class ResourceFinder {
}
return sb.toString().trim();
- } finally {
- try {
- in.close();
- reader.close();
- } catch (Exception e) {
- }
}
}
http://git-wip-us.apache.org/repos/asf/struts/blob/3fab155b/xwork-core/src/main/java/com/opensymphony/xwork2/validator/DefaultValidatorFactory.java
----------------------------------------------------------------------
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/DefaultValidatorFactory.java b/xwork-core/src/main/java/com/opensymphony/xwork2/validator/DefaultValidatorFactory.java
index 9f8a1b9..d4d7ff7 100644
--- a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/DefaultValidatorFactory.java
+++ b/xwork-core/src/main/java/com/opensymphony/xwork2/validator/DefaultValidatorFactory.java
@@ -138,8 +138,7 @@ public class DefaultValidatorFactory implements ValidatorFactory {
// Ex: struts-app.jar -> MyApp.jar -> Login-validators.xml should be
// parsed and loaded.
ZipInputStream zipInputStream = null;
- try {
- InputStream inputStream = u.openStream();
+ try (InputStream inputStream = u.openStream()) {
if (inputStream instanceof ZipInputStream) {
zipInputStream = (ZipInputStream) inputStream;
} else {
http://git-wip-us.apache.org/repos/asf/struts/blob/3fab155b/xwork-core/src/test/java/com/opensymphony/xwork2/util/UrlUtilTest2.java
----------------------------------------------------------------------
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/util/UrlUtilTest2.java b/xwork-core/src/test/java/com/opensymphony/xwork2/util/UrlUtilTest2.java
index e039bde..bfc306b 100644
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/util/UrlUtilTest2.java
+++ b/xwork-core/src/test/java/com/opensymphony/xwork2/util/UrlUtilTest2.java
@@ -28,14 +28,8 @@ public class UrlUtilTest2 extends TestCase {
private void assertUrlCanBeOpened(URL url) throws IOException {
InputStream is = url.openStream();
- JarInputStream jarStream = null;
- try {
- jarStream = new JarInputStream(is);
+ try (JarInputStream jarStream = new JarInputStream(is)) {
assertNotNull(jarStream);
- } finally {
- if (jarStream != null)
- jarStream.close();
-
}
}
}
http://git-wip-us.apache.org/repos/asf/struts/blob/3fab155b/xwork-core/src/test/java/com/opensymphony/xwork2/validator/DefaultValidatorFileParserTest.java
----------------------------------------------------------------------
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/validator/DefaultValidatorFileParserTest.java b/xwork-core/src/test/java/com/opensymphony/xwork2/validator/DefaultValidatorFileParserTest.java
index 58b2c35..b900b55 100644
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/validator/DefaultValidatorFileParserTest.java
+++ b/xwork-core/src/test/java/com/opensymphony/xwork2/validator/DefaultValidatorFileParserTest.java
@@ -171,9 +171,7 @@ public class DefaultValidatorFileParserTest extends TestCase {
}
public void testValidatorWithI18nMessage() throws Exception {
- InputStream is = null;
- try {
- is = ClassLoaderUtil.getResourceAsStream(testFileName6, this.getClass());
+ try (InputStream is = ClassLoaderUtil.getResourceAsStream(testFileName6, this.getClass())) {
mockValidatorFactory.expectAndReturn("lookupRegisteredValidatorType", C.args(C.eq("requiredstring")), RequiredStringValidator.class.getName());
mockValidatorFactory.expectAndReturn("lookupRegisteredValidatorType", C.args(C.eq("requiredstring")), RequiredStringValidator.class.getName());
@@ -203,11 +201,6 @@ public class DefaultValidatorFileParserTest extends TestCase {
assertEquals(((ValidatorConfig)validatorConfigs.get(1)).getParams().get("anotherParam"), "anotherValue");
assertEquals(((ValidatorConfig)validatorConfigs.get(1)).getType(), "requiredstring");
}
- finally {
- if (is != null) {
- is.close();
- }
- }
}
[06/11] struts git commit: Merge branch 'master' of
github.com:apache/struts
Posted by lu...@apache.org.
Merge branch 'master' of github.com:apache/struts
# By Johannes Geppert (16) and others
# Via Johannes Geppert (2) and others
* 'master' of github.com:apache/struts: (27 commits)
Switch to latest commons-collections, commons-io, commons-lang3 and commons-digester versions
Minor code improvements's in the cdi, convention, jasperreports, junit, rest and sitemesh plugin
Minor code improvements's in the xwork-core module
Remove provider class generic to fix compile error which breaks the build
adjusted h1 to match page title
fixed display of last two fields
using java.util.Date instead of java.sql.Date
using ObjectFactory instead of Class.forName()
small updates to logging
WW-4513 Move mailreader app to struts2-examples
WW-4512 Move struts2 jboss-blank app to struts2-examples
WW-4511 Move struts2 blank app to struts2-examples
added some more eclipse specific directories to .gitignore
added testcase for action with method prefixed by 'do'
fixed some typos in javadoc
fixed some generics related warnings and did a little re-formatting
added missing jquery file
Minor code improvement's in the struts json plugin
Minor code improvement's in the struts spring plugin
Minor code improvements's in the struts core module
...
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/ebf4b170
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/ebf4b170
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/ebf4b170
Branch: refs/heads/master
Commit: ebf4b170c0515fcc094c698c0d19dabf08ad935f
Parents: 6c9ca62 bacc571
Author: Aaron Johnson <aa...@pearson.com>
Authored: Tue Jun 16 14:24:38 2015 -0500
Committer: Aaron Johnson <aa...@pearson.com>
Committed: Tue Jun 16 14:24:38 2015 -0500
----------------------------------------------------------------------
.gitignore | 2 +
apps/blank/README.txt | 16 -
apps/blank/pom.xml | 85 -
.../src/main/java/example/ExampleSupport.java | 30 -
.../blank/src/main/java/example/HelloWorld.java | 68 -
apps/blank/src/main/java/example/Login.java | 58 -
apps/blank/src/main/java/example/YesNo.java | 5 -
apps/blank/src/main/resources/LICENSE.txt | 174 --
apps/blank/src/main/resources/NOTICE.txt | 5 -
apps/blank/src/main/resources/example.xml | 25 -
.../main/resources/example/Login-validation.xml | 16 -
.../main/resources/example/package.properties | 7 -
.../resources/example/package_es.properties | 5 -
apps/blank/src/main/resources/log4j2.xml | 15 -
apps/blank/src/main/resources/struts.xml | 35 -
.../src/main/resources/velocity.properties | 1 -
.../blank/src/main/webapp/WEB-INF/jsp/error.jsp | 15 -
.../webapp/WEB-INF/jsp/example/HelloWorld.jsp | 30 -
.../main/webapp/WEB-INF/jsp/example/Login.jsp | 15 -
.../main/webapp/WEB-INF/jsp/example/Menu.jsp | 3 -
.../main/webapp/WEB-INF/jsp/example/Missing.jsp | 11 -
.../webapp/WEB-INF/jsp/example/Register.jsp | 3 -
.../main/webapp/WEB-INF/jsp/example/Welcome.jsp | 18 -
apps/blank/src/main/webapp/WEB-INF/web.xml | 39 -
apps/blank/src/main/webapp/index.html | 10 -
.../blank/src/test/java/example/ConfigTest.java | 96 -
.../src/test/java/example/HelloWorldTest.java | 37 -
apps/blank/src/test/java/example/LoginTest.java | 55 -
apps/jboss-blank/README.txt | 16 -
apps/jboss-blank/pom.xml | 69 -
.../src/main/java/example/ExampleSupport.java | 30 -
.../src/main/java/example/HelloWorld.java | 61 -
.../src/main/java/example/Login.java | 59 -
apps/jboss-blank/src/main/resources/LICENSE.txt | 174 --
apps/jboss-blank/src/main/resources/NOTICE.txt | 5 -
apps/jboss-blank/src/main/resources/example.xml | 25 -
.../main/resources/example/Login-validation.xml | 16 -
.../main/resources/example/package.properties | 5 -
.../resources/example/package_es.properties | 5 -
apps/jboss-blank/src/main/resources/log4j2.xml | 15 -
apps/jboss-blank/src/main/resources/struts.xml | 27 -
.../src/main/resources/velocity.properties | 1 -
.../webapp/WEB-INF/jsp/example/HelloWorld.jsp | 28 -
.../main/webapp/WEB-INF/jsp/example/Login.jsp | 15 -
.../main/webapp/WEB-INF/jsp/example/Menu.jsp | 3 -
.../main/webapp/WEB-INF/jsp/example/Missing.jsp | 11 -
.../webapp/WEB-INF/jsp/example/Register.jsp | 3 -
.../main/webapp/WEB-INF/jsp/example/Welcome.jsp | 18 -
.../jboss-blank/src/main/webapp/WEB-INF/web.xml | 37 -
apps/jboss-blank/src/main/webapp/index.html | 10 -
.../src/test/java/example/ConfigTest.java | 96 -
.../src/test/java/example/HelloWorldTest.java | 37 -
.../src/test/java/example/LoginTest.java | 55 -
apps/mailreader/README.txt | 23 -
apps/mailreader/pom.xml | 95 -
.../src/main/java/alternate.properties | 3 -
.../src/main/java/alternate_ja.properties | 1 -
.../src/main/java/mailreader-default.xml | 47 -
.../src/main/java/mailreader-support.xml | 63 -
.../java/mailreader2/ApplicationListener.java | 234 --
.../mailreader2/AuthenticationInterceptor.java | 52 -
.../src/main/java/mailreader2/Constants.java | 128 -
.../main/java/mailreader2/Login-validation.xml | 14 -
.../src/main/java/mailreader2/Login.java | 48 -
.../src/main/java/mailreader2/Logout.java | 35 -
.../java/mailreader2/MailreaderSupport.java | 583 -----
.../mailreader2/MailreaderSupport.properties | 97 -
.../mailreader2/MailreaderSupport_ja.properties | 89 -
.../mailreader2/MailreaderSupport_ru.properties | 89 -
...egistration-Registration_save-validation.xml | 28 -
.../mailreader2/Registration-validation.xml | 32 -
.../src/main/java/mailreader2/Registration.java | 122 -
...ubscription-Subscription_save-validation.xml | 23 -
.../mailreader2/Subscription-validation.xml | 11 -
.../src/main/java/mailreader2/Subscription.java | 145 -
.../src/main/java/mailreader2/Welcome.java | 49 -
apps/mailreader/src/main/java/struts.xml | 16 -
apps/mailreader/src/main/resources/LICENSE.txt | 174 --
apps/mailreader/src/main/resources/NOTICE.txt | 5 -
apps/mailreader/src/main/resources/log4j2.xml | 16 -
.../src/main/resources/velocity.properties | 1 -
.../src/main/webapp/META-INF/context.xml | 3 -
.../src/main/webapp/WEB-INF/database.xml | 9 -
.../main/webapp/WEB-INF/jsp/ChangePassword.jsp | 25 -
.../src/main/webapp/WEB-INF/jsp/Error.jsp | 40 -
.../src/main/webapp/WEB-INF/jsp/Footer.jsp | 6 -
.../src/main/webapp/WEB-INF/jsp/Login.jsp | 30 -
.../src/main/webapp/WEB-INF/jsp/MainMenu.jsp | 25 -
.../main/webapp/WEB-INF/jsp/Registration.jsp | 115 -
.../main/webapp/WEB-INF/jsp/Subscription.jsp | 60 -
.../src/main/webapp/WEB-INF/jsp/Welcome.jsp | 55 -
apps/mailreader/src/main/webapp/WEB-INF/web.xml | 47 -
.../src/main/webapp/css/mailreader.css | 46 -
apps/mailreader/src/main/webapp/index.html | 10 -
.../mailreader/src/main/webapp/struts-power.gif | Bin 1798 -> 0 bytes
apps/mailreader/src/main/webapp/tour.html | 2470 ------------------
apps/pom.xml | 3 -
apps/portlet/pom.xml | 6 +-
.../pluto-portal-driver-services-config.xml | 155 ++
.../main/webapp/WEB-INF/applicationContext.xml | 10 +-
.../src/test/java/JettyPlutoLauncher.java | 8 +-
.../struts2/portlet/test/BasePortletTest.java | 8 +-
apps/showcase/pom.xml | 9 +
.../validation/BeanValidationExampleAction.java | 2 +-
.../WEB-INF/bean-validation/bean-validation.jsp | 2 +-
.../successFieldValidatorsExample.jsp | 8 +-
.../src/main/webapp/js/jquery-2.1.4.min.js | 4 +
.../resources/archetype-resources/README.txt | 2 +-
core/pom.xml | 9 +
.../java/org/apache/struts2/RequestUtils.java | 10 +-
.../struts2/components/ActionComponent.java | 20 +-
.../struts2/components/ActionMessage.java | 2 +-
.../org/apache/struts2/components/Anchor.java | 10 +-
.../struts2/components/AppendIterator.java | 19 +-
.../org/apache/struts2/components/Checkbox.java | 10 -
.../apache/struts2/components/CheckboxList.java | 11 -
.../org/apache/struts2/components/ComboBox.java | 22 +-
.../apache/struts2/components/Component.java | 27 +-
.../components/ComponentUrlProvider.java | 2 +-
.../apache/struts2/components/ContextBean.java | 6 +-
.../org/apache/struts2/components/Date.java | 26 +-
.../org/apache/struts2/components/Else.java | 9 +-
.../org/apache/struts2/components/ElseIf.java | 15 +-
.../apache/struts2/components/FieldError.java | 2 +-
.../org/apache/struts2/components/File.java | 19 +-
.../org/apache/struts2/components/Form.java | 17 +-
.../org/apache/struts2/components/I18n.java | 22 +-
.../org/apache/struts2/components/Include.java | 58 +-
.../struts2/components/InputTransferSelect.java | 31 +-
.../struts2/components/IteratorComponent.java | 6 +-
.../apache/struts2/components/ListUIBean.java | 17 +-
.../struts2/components/MergeIterator.java | 21 +-
.../components/OptionTransferSelect.java | 21 +-
.../org/apache/struts2/components/Param.java | 3 +-
.../org/apache/struts2/components/Property.java | 8 +-
.../org/apache/struts2/components/Radio.java | 11 -
.../struts2/components/ServletUrlRenderer.java | 20 +-
.../org/apache/struts2/components/Text.java | 6 +-
.../org/apache/struts2/components/TextArea.java | 9 +-
.../org/apache/struts2/components/UIBean.java | 38 +-
.../java/org/apache/struts2/components/URL.java | 4 +-
.../apache/struts2/components/UpDownSelect.java | 26 +-
.../apache/struts2/components/UrlRenderer.java | 5 +-
.../components/template/BaseTemplateEngine.java | 19 +-
.../template/FreemarkerTemplateEngine.java | 44 +-
.../components/template/JspTemplateEngine.java | 21 +-
.../struts2/components/template/Template.java | 2 +-
.../template/TemplateEngineManager.java | 20 +-
.../template/VelocityTemplateEngine.java | 28 +-
.../config/AbstractBeanSelectionProvider.java | 11 +-
.../apache/struts2/config/DefaultSettings.java | 6 +-
.../struts2/config/DelegatingSettings.java | 3 +-
.../struts2/config/PropertiesSettings.java | 10 +-
.../config/StrutsXmlConfigurationProvider.java | 27 +-
.../dispatcher/ActionContextCleanUp.java | 25 +-
.../struts2/dispatcher/ApplicationMap.java | 8 +-
.../struts2/dispatcher/ContainerHolder.java | 2 +-
.../DefaultDispatcherErrorHandler.java | 19 +-
.../dispatcher/DefaultStaticContentLoader.java | 33 +-
.../apache/struts2/dispatcher/Dispatcher.java | 45 +-
.../struts2/dispatcher/FilterDispatcher.java | 26 +-
.../struts2/dispatcher/HttpHeaderResult.java | 10 +-
.../struts2/dispatcher/PlainTextResult.java | 15 +-
.../apache/struts2/dispatcher/RequestMap.java | 3 +-
.../dispatcher/ServletDispatcherResult.java | 10 +-
.../dispatcher/ServletRedirectResult.java | 12 +-
.../apache/struts2/dispatcher/SessionMap.java | 13 +-
.../apache/struts2/dispatcher/StreamResult.java | 31 +-
.../struts2/dispatcher/StrutsResultSupport.java | 21 +-
.../struts2/dispatcher/VelocityResult.java | 4 +-
.../mapper/CompositeActionMapper.java | 55 +-
.../dispatcher/mapper/DefaultActionMapper.java | 34 +-
.../mapper/PrefixBasedActionMapper.java | 37 +-
.../dispatcher/mapper/Restful2ActionMapper.java | 13 +-
.../dispatcher/mapper/RestfulActionMapper.java | 8 +-
.../multipart/JakartaMultiPartRequest.java | 43 +-
.../JakartaStreamMultiPartRequest.java | 120 +-
.../dispatcher/multipart/MultiPartRequest.java | 2 +-
.../multipart/MultiPartRequestWrapper.java | 23 +-
.../struts2/dispatcher/ng/InitOperations.java | 12 +-
.../dispatcher/ng/PrepareOperations.java | 9 +-
.../ng/filter/StrutsExecuteFilter.java | 11 +-
.../impl/PrefixBasedActionProxyFactory.java | 6 +-
.../struts2/impl/StrutsObjectFactory.java | 2 +-
.../ActionMappingParametersInteceptor.java | 14 +-
.../interceptor/CheckboxInterceptor.java | 10 +-
.../interceptor/ClearSessionInterceptor.java | 12 +-
.../struts2/interceptor/CookieInterceptor.java | 22 +-
.../interceptor/CreateSessionInterceptor.java | 6 +-
.../interceptor/DateTextFieldInterceptor.java | 33 +-
.../interceptor/DeprecationInterceptor.java | 9 +-
.../interceptor/ExecuteAndWaitInterceptor.java | 28 +-
.../interceptor/FileUploadInterceptor.java | 25 +-
.../interceptor/MessageStoreInterceptor.java | 46 +-
.../interceptor/MultiselectInterceptor.java | 2 +-
.../ProfilingActivationInterceptor.java | 8 +-
.../struts2/interceptor/RolesInterceptor.java | 6 +-
.../struts2/interceptor/ScopeInterceptor.java | 70 +-
.../struts2/interceptor/TokenInterceptor.java | 4 +-
.../debugging/DebuggingInterceptor.java | 73 +-
.../debugging/ObjectToHTMLWriter.java | 24 +-
.../debugging/PrettyPrintWriter.java | 4 +-
.../AnnotationValidationInterceptor.java | 17 +-
.../struts2/util/FastByteArrayOutputStream.java | 15 +-
.../apache/struts2/util/IteratorGenerator.java | 12 +-
.../struts2/util/RegexPatternMatcher.java | 2 +-
.../apache/struts2/util/SortIteratorFilter.java | 16 +-
.../struts2/util/StrutsTestCaseHelper.java | 12 +-
.../org/apache/struts2/util/StrutsUtil.java | 15 +-
.../apache/struts2/util/TextProviderHelper.java | 12 +-
.../org/apache/struts2/util/TokenHelper.java | 31 +-
.../views/freemarker/FreemarkerManager.java | 48 +-
.../views/freemarker/ScopesHashModel.java | 2 +-
.../jsp/iterator/IteratorGeneratorTag.java | 11 +-
.../views/jsp/iterator/SubsetIteratorTag.java | 15 +-
.../struts2/views/jsp/ui/AbstractUITag.java | 2 +-
.../views/jsp/ui/AbstractUITagBeanInfo.java | 4 +-
.../apache/struts2/views/jsp/ui/AnchorTag.java | 16 +-
.../struts2/views/util/DefaultUrlHelper.java | 15 +-
.../struts2/views/velocity/VelocityManager.java | 43 +-
.../struts2/views/xslt/AbstractAdapterNode.java | 30 +-
.../struts2/views/xslt/AdapterFactory.java | 54 +-
.../apache/struts2/views/xslt/ArrayAdapter.java | 15 +-
.../apache/struts2/views/xslt/BeanAdapter.java | 26 +-
.../struts2/views/xslt/CollectionAdapter.java | 15 +-
.../apache/struts2/views/xslt/MapAdapter.java | 11 +-
.../struts2/views/xslt/ProxyElementAdapter.java | 20 +-
.../struts2/views/xslt/ProxyNodeAdapter.java | 19 +-
.../struts2/views/xslt/ServletURIResolver.java | 15 +-
.../struts2/views/xslt/SimpleNodeList.java | 14 +-
.../struts2/views/xslt/StringAdapter.java | 19 +-
.../apache/struts2/views/xslt/XSLTResult.java | 34 +-
.../main/resources/template/simple/checkbox.ftl | 3 -
.../main/resources/template/simple/radiomap.ftl | 3 -
core/src/site/resources/tags/a.html | 2 +-
core/src/site/resources/tags/actionmessage.html | 2 +-
core/src/site/resources/tags/checkbox.html | 8 -
core/src/site/resources/tags/checkboxlist.html | 12 +-
core/src/site/resources/tags/combobox.html | 6 +-
core/src/site/resources/tags/doubleselect.html | 4 +-
.../resources/tags/inputtransferselect.html | 4 +-
.../resources/tags/optiontransferselect.html | 4 +-
core/src/site/resources/tags/radio.html | 12 +-
core/src/site/resources/tags/select.html | 4 +-
core/src/site/resources/tags/text.html | 2 +-
core/src/site/resources/tags/updownselect.html | 4 +-
.../struts2/dispatcher/StreamResultTest.java | 25 +-
.../interceptor/FileUploadInterceptorTest.java | 18 +-
core/src/test/resources/log4j.properties | 27 -
core/src/test/resources/log4j2.xml | 13 +
.../beanvalidation/constraints/FieldMatch.java | 2 +-
.../validation/constant/ValidatorConstants.java | 2 +-
.../interceptor/BeanValidationInterceptor.java | 9 +-
.../interceptor/BeanValidationManager.java | 2 +-
.../DefaultBeanValidationManager.java | 35 +-
.../BeanValidationInterceptorTest.java | 15 +
.../actions/FieldActionDoExecute.java | 23 +
.../src/test/resources/bean-validation-test.xml | 4 +
.../apache/struts2/cdi/CdiObjectFactory.java | 18 +-
.../resources/config-browser/page-footer.ftl | 7 +-
.../struts2/convention/ActionConfigBuilder.java | 2 +-
.../ClasspathConfigurationProvider.java | 14 +-
.../convention/ConventionUnknownHandler.java | 60 +-
.../convention/ConventionsServiceImpl.java | 2 +-
.../DefaultInterceptorMapBuilder.java | 26 +-
.../convention/DefaultResultMapBuilder.java | 18 +-
.../PackageBasedActionConfigBuilder.java | 153 +-
.../struts2/convention/ReflectionTools.java | 16 +-
.../apache/struts2/convention/StringTools.java | 12 +-
.../ConventionUnknownHandlerTest.java | 8 +-
.../convention/DefaultResultMapBuilderTest.java | 37 +-
.../PackageBasedActionConfigBuilderTest.java | 54 +-
plugins/embeddedjsp/pom.xml | 9 +
.../jasperreports/JasperReportsResult.java | 42 +-
.../jasperreports/ValueStackShadowMap.java | 2 +-
plugins/jfreechart/pom.xml | 9 +
.../struts2/dispatcher/ChartResultTest.java | 18 +-
plugins/json/pom.xml | 9 +
.../org/apache/struts2/json/JSONCleaner.java | 29 +-
.../apache/struts2/json/JSONInterceptor.java | 64 +-
.../org/apache/struts2/json/JSONPopulator.java | 65 +-
.../org/apache/struts2/json/JSONResult.java | 10 +-
.../java/org/apache/struts2/json/JSONUtil.java | 31 +-
.../org/apache/struts2/json/JSONWriter.java | 16 +-
.../struts2/json/bridge/StringBridge.java | 4 +-
.../java/org/apache/struts2/json/smd/SMD.java | 4 +-
.../struts2/json/StrutsMockServletContext.java | 150 +-
plugins/junit/pom.xml | 9 +
.../apache/struts2/StrutsJUnit4TestCase.java | 15 +-
plugins/portlet/pom.xml | 9 +
plugins/rest/pom.xml | 9 +
.../rest/DefaultContentTypeHandlerManager.java | 4 +-
.../org/apache/struts2/rest/HttpHeaders.java | 2 +-
.../struts2/rest/RestActionInvocation.java | 49 +-
.../apache/struts2/rest/RestActionMapper.java | 36 +-
.../struts2/rest/RestWorkflowInterceptor.java | 11 +-
.../struts2/rest/DefaultHttpHeadersTest.java | 11 +-
plugins/sitegraph/pom.xml | 9 +
.../sitemesh/FreemarkerDecoratorServlet.java | 31 +-
.../struts2/sitemesh/StrutsSiteMeshFactory.java | 8 +-
.../sitemesh/VelocityDecoratorServlet.java | 14 +-
plugins/spring/pom.xml | 8 +
.../spring/ClassReloadingBeanFactory.java | 20 +-
.../ClassReloadingXMLWebApplicationContext.java | 30 +-
.../spring/StrutsSpringObjectFactory.java | 29 +-
.../spring/StrutsSpringObjectFactoryTest.java | 8 +-
plugins/testng/pom.xml | 9 +
pom.xml | 15 +-
xwork-core/pom.xml | 1 +
.../opensymphony/xwork2/ActionChainResult.java | 13 +-
.../com/opensymphony/xwork2/ActionContext.java | 4 +-
.../com/opensymphony/xwork2/ActionSupport.java | 2 -
.../xwork2/CompositeTextProvider.java | 18 +-
.../xwork2/DefaultActionInvocation.java | 17 +-
.../xwork2/DefaultLocaleProvider.java | 4 +-
.../xwork2/DefaultTextProvider.java | 2 +-
.../xwork2/DefaultUnknownHandlerManager.java | 17 +-
.../xwork2/TextProviderSupport.java | 2 +-
.../xwork2/ValidationAwareSupport.java | 14 +-
.../com/opensymphony/xwork2/XWorkException.java | 2 +-
.../xwork2/config/ConfigurationManager.java | 8 +-
.../xwork2/config/ConfigurationUtil.java | 11 +-
.../xwork2/config/entities/ActionConfig.java | 19 +-
.../config/entities/ExceptionMappingConfig.java | 4 +-
.../config/entities/InterceptorConfig.java | 7 +-
.../config/entities/InterceptorStackConfig.java | 2 +-
.../xwork2/config/entities/PackageConfig.java | 44 +-
.../xwork2/config/entities/ResultConfig.java | 2 +-
.../config/entities/ResultTypeConfig.java | 2 +-
.../xwork2/config/impl/AbstractMatcher.java | 36 +-
.../xwork2/config/impl/ActionConfigMatcher.java | 2 +-
.../config/impl/DefaultConfiguration.java | 122 +-
.../xwork2/config/impl/MockConfiguration.java | 17 +-
.../xwork2/config/providers/CycleDetector.java | 4 +-
.../config/providers/InterceptorBuilder.java | 14 +-
.../providers/XmlConfigurationProvider.java | 133 +-
.../xwork2/config/providers/XmlHelper.java | 9 +-
.../DefaultConversionAnnotationProcessor.java | 10 +-
.../impl/DefaultConversionFileProcessor.java | 6 +-
.../impl/DefaultObjectTypeDeterminer.java | 36 +-
.../conversion/impl/DefaultTypeConverter.java | 32 +-
.../impl/DefaultTypeConverterHolder.java | 8 +-
.../impl/InstantiatingNullHandler.java | 18 +-
.../xwork2/conversion/impl/StringConverter.java | 8 +-
.../xwork2/conversion/impl/XWorkConverter.java | 42 +-
.../factory/DefaultInterceptorFactory.java | 2 +-
.../xwork2/inject/ConstructionContext.java | 13 +-
.../xwork2/inject/ContainerBuilder.java | 953 ++++---
.../xwork2/inject/ContainerImpl.java | 1164 ++++-----
.../xwork2/inject/ExternalContext.java | 77 +-
.../xwork2/inject/InternalContext.java | 9 +-
.../com/opensymphony/xwork2/inject/Key.java | 88 +-
.../com/opensymphony/xwork2/inject/Scope.java | 333 ++-
.../xwork2/inject/util/ReferenceCache.java | 283 +-
.../xwork2/inject/util/ReferenceMap.java | 967 ++++---
.../xwork2/interceptor/AliasInterceptor.java | 12 +-
.../interceptor/ConversionErrorInterceptor.java | 2 +-
.../interceptor/DefaultWorkflowInterceptor.java | 5 +-
.../xwork2/interceptor/I18nInterceptor.java | 9 +-
.../xwork2/interceptor/LoggingInterceptor.java | 4 +-
.../interceptor/MethodFilterInterceptor.java | 8 +-
.../MethodFilterInterceptorUtil.java | 4 +-
.../interceptor/ParameterFilterInterceptor.java | 19 +-
.../ParameterRemoverInterceptor.java | 18 +-
.../interceptor/ParametersInterceptor.java | 31 +-
.../ScopedModelDrivenInterceptor.java | 2 +-
.../StaticParametersInterceptor.java | 30 +-
.../xwork2/interceptor/TimerInterceptor.java | 5 +-
.../AnnotationParameterFilterIntereptor.java | 5 +-
.../AnnotationWorkflowInterceptor.java | 5 +-
.../xwork2/mock/MockActionInvocation.java | 4 +-
.../xwork2/mock/MockActionProxy.java | 3 +-
.../opensymphony/xwork2/mock/MockResult.java | 6 +-
.../xwork2/ognl/OgnlTypeConverterWrapper.java | 8 +-
.../com/opensymphony/xwork2/ognl/OgnlUtil.java | 64 +-
.../xwork2/ognl/OgnlValueStack.java | 20 +-
.../xwork2/ognl/OgnlValueStackFactory.java | 7 +-
.../xwork2/ognl/SecurityMemberAccess.java | 15 +-
.../ognl/accessor/CompoundRootAccessor.java | 22 +-
.../XWorkCollectionPropertyAccessor.java | 51 +-
.../ognl/accessor/XWorkEnumerationAccessor.java | 1 -
.../accessor/XWorkIteratorPropertyAccessor.java | 1 -
.../accessor/XWorkListPropertyAccessor.java | 13 +-
.../ognl/accessor/XWorkMapPropertyAccessor.java | 27 +-
.../ognl/accessor/XWorkMethodAccessor.java | 39 +-
.../DefaultAcceptedPatternsChecker.java | 8 +-
.../DefaultExcludedPatternsChecker.java | 8 +-
.../xwork2/spring/SpringObjectFactory.java | 36 +-
.../spring/SpringProxyableObjectFactory.java | 33 +-
.../ActionAutowiringInterceptor.java | 6 +-
.../xwork2/util/AnnotationUtils.java | 41 +-
.../opensymphony/xwork2/util/ArrayUtils.java | 2 +
.../xwork2/util/ClassLoaderUtil.java | 4 +-
.../xwork2/util/ClassPathFinder.java | 12 +-
.../com/opensymphony/xwork2/util/DomHelper.java | 7 +-
.../xwork2/util/LocalizedTextUtil.java | 25 +-
.../util/NamedVariablePatternMatcher.java | 2 +-
.../xwork2/util/PropertiesReader.java | 265 +-
.../opensymphony/xwork2/util/TextParseUtil.java | 16 +-
.../com/opensymphony/xwork2/util/URLUtil.java | 14 +-
.../com/opensymphony/xwork2/util/XWorkList.java | 29 +-
.../xwork2/util/XWorkTestCaseHelper.java | 3 +-
.../util/classloader/AbstractResourceStore.java | 50 +
.../util/classloader/FileResourceStore.java | 30 +-
.../util/classloader/JarResourceStore.java | 23 +-
.../util/classloader/ReloadingClassLoader.java | 7 +-
.../classloader/ResourceStoreClassLoader.java | 6 -
.../xwork2/util/finder/ClassFinder.java | 16 +-
.../xwork2/util/finder/DefaultClassFinder.java | 61 +-
.../xwork2/util/finder/ResourceFinder.java | 97 +-
.../opensymphony/xwork2/util/finder/UrlSet.java | 38 +-
.../xwork2/util/fs/DefaultFileManager.java | 12 +-
.../util/fs/DefaultFileManagerFactory.java | 6 +-
.../util/location/LocatableProperties.java | 4 +-
.../xwork2/util/location/LocationImpl.java | 12 +-
.../xwork2/util/location/LocationUtils.java | 8 +-
.../xwork2/util/profiling/ObjectProfiler.java | 62 +-
.../util/profiling/ProfilingTimerBean.java | 42 +-
.../xwork2/util/profiling/UtilTimerStack.java | 424 ++-
.../util/reflection/ReflectionContextState.java | 20 +-
.../AnnotationActionValidatorManager.java | 73 +-
...nnotationValidationConfigurationBuilder.java | 92 +-
.../DefaultActionValidatorManager.java | 48 +-
.../validator/DefaultValidatorFactory.java | 28 +-
.../validator/DelegatingValidatorContext.java | 8 +-
.../xwork2/validator/ValidationInterceptor.java | 20 +-
.../xwork2/validator/ValidatorConfig.java | 4 +-
.../ConditionalVisitorFieldValidator.java | 2 +-
.../ConversionErrorFieldValidator.java | 5 +-
.../validators/FieldExpressionValidator.java | 2 +-
...ateConversionErrorFieldValidatorSupport.java | 12 +-
.../validators/StringLengthFieldValidator.java | 2 +-
.../validator/validators/ValidatorSupport.java | 15 +-
.../opensymphony/xwork2/ActionContextTest.java | 14 +-
.../xwork2/ActionInvocationTest.java | 4 +-
.../opensymphony/xwork2/ActionNestingTest.java | 2 +-
.../opensymphony/xwork2/ActionSupportTest.java | 4 +-
.../opensymphony/xwork2/ChainResultTest.java | 2 +-
.../xwork2/DefaultActionInvocationTest.java | 2 +-
.../xwork2/DefaultTextProviderTest.java | 4 +-
.../com/opensymphony/xwork2/GenericsBean.java | 6 +-
.../xwork2/ProxyInvocationTest.java | 4 +-
.../com/opensymphony/xwork2/SimpleAction.java | 16 +-
.../xwork2/SimpleAnnotationAction.java | 2 +-
.../com/opensymphony/xwork2/StubValueStack.java | 2 +-
.../xwork2/TextProviderSupportTest.java | 2 +-
.../xwork2/UnknownHandlerManagerMock.java | 2 +-
.../com/opensymphony/xwork2/VoidResult.java | 6 +-
.../xwork2/config/ConfigurationTest.java | 4 +-
.../config/impl/ActionConfigMatcherTest.java | 6 +-
.../config/impl/NamespaceMatcherTest.java | 2 +-
.../providers/MockConfigurationProvider.java | 44 +-
.../XmlConfigurationProviderActionsTest.java | 24 +-
...ConfigurationProviderAllowedMethodsTest.java | 8 -
...figurationProviderExceptionMappingsTest.java | 8 +-
...mlConfigurationProviderInterceptorsTest.java | 20 +-
.../XmlConfigurationProviderResultsTest.java | 10 +-
.../providers/XmlConfigurationProviderTest.java | 2 +-
.../impl/AnnotationXWorkConverterTest.java | 22 +-
.../conversion/impl/NumberConverterTest.java | 4 +-
.../impl/XWorkBasicConverterTest.java | 18 +-
.../conversion/impl/XWorkConverterTest.java | 51 +-
.../interceptor/AliasInterceptorTest.java | 2 +-
.../interceptor/ChainingInterceptorTest.java | 6 +-
.../ConversionErrorInterceptorTest.java | 2 +-
.../DefaultWorkflowInterceptorTest.java | 15 +-
.../ExceptionMappingInterceptorTest.java | 2 +-
.../xwork2/interceptor/I18nInterceptorTest.java | 8 +-
.../MethodFilterInterceptorUtilTest.java | 10 +-
.../ParameterFilterInterceptorTest.java | 6 +-
.../ParameterRemoverInterceptorTest.java | 10 +-
.../interceptor/ParametersInterceptorTest.java | 97 +-
.../interceptor/PreResultListenerTest.java | 8 +-
.../ScopedModelDrivenInterceptorTest.java | 2 +-
...onInterceptorPrefixMethodInvocationTest.java | 8 +-
.../annotations/AllowingByDefaultModel.java | 1 -
.../AnnotationParameterFilterUnitTest.java | 28 +-
.../AnnotationWorkflowInterceptorTest.java | 6 +-
.../DefaultExcludedPatternsCheckerTest.java | 4 +-
.../xwork2/spring/SpringObjectFactoryTest.java | 14 +-
.../ActionAutowiringInterceptorTest.java | 6 +-
.../xwork2/util/ClassLoaderUtilTest.java | 16 +-
.../com/opensymphony/xwork2/util/Indexed.java | 2 +-
.../xwork2/util/MyBeanActionTest.java | 12 +-
.../util/NamedVariablePatternMatcherTest.java | 12 +-
.../xwork2/util/ResolverUtilTest.java | 4 +-
.../xwork2/util/TextParseUtilTest.java | 19 +-
.../opensymphony/xwork2/util/URLUtilTest.java | 8 +-
.../xwork2/util/WildcardHelperTest.java | 2 +-
.../xwork2/util/WildcardUtilTest.java | 1 -
.../opensymphony/xwork2/util/XWorkListTest.java | 6 +-
.../ConversionErrorFieldValidatorTest.java | 2 +-
.../validator/DateRangeValidatorTest.java | 11 +-
.../validator/DoubleRangeValidatorTest.java | 13 +-
.../validator/ExpressionValidatorTest.java | 11 +-
.../validator/GenericValidatorContext.java | 10 +-
.../xwork2/validator/IntRangeValidatorTest.java | 4 +-
.../validator/LongRangeValidatorTest.java | 4 +-
.../validator/ModelDrivenValidationTest.java | 4 +-
.../validator/ShortRangeValidatorTest.java | 4 +-
.../validator/SimpleActionValidationTest.java | 18 +-
.../xwork2/validator/URLValidatorTest.java | 1 -
.../validator/ValidatorAnnotationTest.java | 24 +-
.../validator/VisitorFieldValidatorTest.java | 8 +-
.../validator/VisitorValidatorTestAction.java | 2 +-
.../xwork2/spring/actionContext-spring.xml | 15 +-
506 files changed, 5222 insertions(+), 13174 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/ebf4b170/core/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/ebf4b170/pom.xml
----------------------------------------------------------------------