struts-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lukaszlen...@apache.org
Subject [06/11] struts git commit: Merge branch 'master' of github.com:apache/struts
Date Wed, 17 Jun 2015 18:13:26 GMT
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 <aaron.johnson@pearson.com>
Authored: Tue Jun 16 14:24:38 2015 -0500
Committer: Aaron Johnson <aaron.johnson@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
----------------------------------------------------------------------


Mime
View raw message