This is an automated email from the ASF dual-hosted git repository. tv pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/turbine-core.git
commit dec2005c340485b13366db5c751ccc290e161ece Merge: 473d2b16 a0096b4c Author: Thomas Vandahl <[email protected]> AuthorDate: Wed Jan 15 15:32:36 2025 +0100 Merge branch 'trunk' of https://gitbox.apache.org/repos/asf/turbine-core.git into trunk .gitignore | 6 + README.md | 2 +- conf/test/CompleteTurbineResources.properties | 33 +++- conf/test/TorqueTest.properties | 15 +- .../CompleteTurbineResources.properties | 1 + conf/test/fulcrumComponentConfiguration.xml | 2 + conf/test/fulcrumRoleConfiguration.xml | 13 ++ conf/test/fulcrumRundataRoleConfiguration.xml | 53 +++++ conf/test/log4j2-test.xml | 4 + conf/test/rundataTemplateService.properties | 23 +++ .../services/security/torque/GroupPeerManager.java | 2 +- .../services/security/torque/package-info.java | 6 + pom.xml | 219 +++++++++++++-------- .../src/java/org/apache/turbine/Turbine.java | 4 +- .../apache/turbine/services/osgi/package-info.java | 6 + src/changes/changes.xml | 38 +++- src/java/org/apache/turbine/Turbine.java | 30 +-- src/java/org/apache/turbine/TurbineConstants.java | 6 + .../turbine/annotation/AnnotationProcessor.java | 151 ++++++++++++-- .../apache/turbine/annotation/TurbineService.java | 6 +- .../{TurbineService.java => TurbineTool.java} | 24 +-- .../package-info.java} | 18 +- src/java/org/apache/turbine/modules/Assembler.java | 3 + src/java/org/apache/turbine/modules/Loader.java | 2 +- .../{Assembler.java => actions/package-info.java} | 18 +- .../apache/turbine/modules/actions/package.html | 29 --- .../sessionvalidator/package-info.java} | 18 +- .../modules/actions/sessionvalidator/package.html | 29 --- .../turbine/modules/layouts/VelocityLayout.java | 2 +- .../{Assembler.java => layouts/package-info.java} | 18 +- .../apache/turbine/modules/layouts/package.html | 29 --- .../package-info.java} | 18 +- .../turbine/modules/navigations/package.html | 29 --- .../modules/{Assembler.java => package-info.java} | 17 +- src/java/org/apache/turbine/modules/package.html | 27 --- .../org/apache/turbine/modules/pages/JspPage.java | 2 +- .../{Assembler.java => pages/package-info.java} | 18 +- .../org/apache/turbine/modules/pages/package.html | 29 --- .../apache/turbine/modules/screens/JSONScreen.java | 6 +- .../screens/PlainJSONSecureAnnotatedScreen.java | 1 - .../error/package-info.java} | 18 +- .../turbine/modules/screens/error/package.html | 29 --- .../{Assembler.java => screens/package-info.java} | 18 +- .../apache/turbine/modules/screens/package.html | 29 --- src/java/org/apache/turbine/om/OMTool.java | 2 +- .../turbine/om/security/DefaultUserImpl.java | 4 +- src/java/org/apache/turbine/om/security/User.java | 2 +- .../security/package-info.java} | 18 +- .../org/apache/turbine/om/security/package.html | 29 --- .../{modules/Assembler.java => package-info.java} | 18 +- src/java/org/apache/turbine/package.html | 29 --- .../apache/turbine/pipeline/DefaultLoginValve.java | 2 +- .../turbine/pipeline/DefaultSetEncodingValve.java | 2 +- .../apache/turbine/pipeline/TurbinePipeline.java | 14 +- src/java/org/apache/turbine/pipeline/XmlValve.java | 8 +- .../apache/turbine/pipeline/XmlValveAdapter.java | 6 +- .../org/apache/turbine/pipeline/package-info.java | 59 ++++++ src/java/org/apache/turbine/pipeline/package.html | 65 ------ .../turbine/services/BaseInitableBroker.java | 11 +- .../apache/turbine/services/BaseServiceBroker.java | 45 +++-- .../services/FieldAnnotatedTurbineBaseService.java | 63 ++++++ .../MethodAnnotatedTurbineBaseService.java | 59 ++++++ .../apache/turbine/services/ServiceManager.java | 18 ++ .../assemblerbroker/package-info.java} | 18 +- .../turbine/services/assemblerbroker/package.html | 29 --- .../assemblerbroker/util/java/package-info.java} | 18 +- .../assemblerbroker/util/java/package.html | 29 --- .../assemblerbroker/util/package-info.java} | 18 +- .../services/assemblerbroker/util/package.html | 29 --- .../assemblerbroker/util/python/package-info.java} | 18 +- .../assemblerbroker/util/python/package.html | 29 --- .../avaloncomponent/package-info.java} | 18 +- .../turbine/services/avaloncomponent/package.html | 29 --- .../apache/turbine/services/intake/IntakeTool.java | 2 +- .../intake/package-info.java} | 18 +- .../turbine/services/jsonrpc/JSONProcessor.java | 2 +- .../turbine/services/jsonrpc/JsonRpcService.java | 4 +- .../services/jsonrpc/TurbineJsonRpcService.java | 4 +- .../jsonrpc/package-info.java} | 18 +- .../apache/turbine/services/jsonrpc/package.html | 29 --- .../apache/turbine/services/jsp/JspService.java | 2 +- .../turbine/services/jsp/TurbineJspService.java | 10 +- .../jsp/package-info.java} | 18 +- .../org/apache/turbine/services/jsp/package.html | 29 --- .../jsp/util/package-info.java} | 18 +- .../localization/DateTimeFormatterInterface.java | 100 +++++++--- .../localization/DateTimeFormatterService.java | 164 +++++++++++---- .../services/localization/LocalizationTool.java | 4 +- .../RundataLocalizationInterface.java} | 28 +-- .../localization/RundataLocalizationService.java | 79 ++++++++ .../localization/package-info.java} | 18 +- .../naming/package-info.java} | 18 +- .../apache/turbine/services/naming/package.html | 29 --- .../org/apache/turbine/services/package-info.java | 115 +++++++++++ src/java/org/apache/turbine/services/package.html | 118 ----------- .../turbine/services/pull/TurbinePullService.java | 2 +- .../pull/package-info.java} | 18 +- .../org/apache/turbine/services/pull/package.html | 29 --- .../turbine/services/pull/tools/TemplateLink.java | 22 ++- .../pull/tools/package-info.java} | 18 +- .../turbine/services/pull/tools/package.html | 29 --- .../services/pull/util/DateTimeFormatterTool.java | 98 +++++++-- .../pull/util/package-info.java} | 18 +- .../services/rundata/DefaultTurbineRunData.java | 12 +- .../turbine/services/rundata/RunDataService.java | 6 +- .../services/rundata/TurbineRunDataService.java | 8 +- .../rundata/package-info.java} | 18 +- .../apache/turbine/services/rundata/package.html | 29 --- .../schedule/AbstractSchedulerService.java | 2 +- .../services/schedule/QuartzSchedulerService.java | 2 +- .../schedule/package-info.java} | 18 +- .../apache/turbine/services/schedule/package.html | 29 --- .../services/security/DefaultSecurityService.java | 2 +- .../services/security/DefaultUserManager.java | 15 +- .../security/package-info.java} | 18 +- .../apache/turbine/services/security/package.html | 29 --- .../security/passive/package-info.java} | 18 +- .../turbine/services/security/passive/package.html | 29 --- .../turbine/services/servlet/ServletService.java | 4 +- .../services/servlet/TurbineServletService.java | 10 +- .../servlet/package-info.java} | 18 +- .../apache/turbine/services/servlet/package.html | 29 --- .../turbine/services/session/SessionListener.java | 8 +- .../turbine/services/session/SessionService.java | 2 +- .../turbine/services/session/SessionTool.java | 2 +- .../services/session/TurbineSessionService.java | 2 +- .../session/package-info.java} | 18 +- .../apache/turbine/services/session/package.html | 29 --- .../services/template/TemplateEngineService.java | 2 +- .../template/mapper/package-info.java} | 18 +- .../turbine/services/template/mapper/package.html | 29 --- .../template/package-info.java} | 18 +- .../apache/turbine/services/template/package.html | 29 --- .../ui/package-info.java} | 18 +- .../org/apache/turbine/services/ui/package.html | 29 --- .../uniqueid/package-info.java} | 18 +- .../apache/turbine/services/uniqueid/package.html | 29 --- .../urlmapper/TurbineURLMapperService.java | 6 +- .../services/urlmapper/model/URLMapEntry.java | 10 +- .../urlmapper/model/URLMappingContainer.java | 12 +- .../urlmapper/model/XmlParameterAdapter.java | 6 +- .../services/urlmapper/model/XmlParameterList.java | 10 +- .../urlmapper/model/XmlPatternAdapter.java | 6 +- .../urlmapper/model/package-info.java} | 18 +- .../urlmapper/package-info.java} | 18 +- .../apache/turbine/services/urlmapper/package.html | 29 --- .../velocity/package-info.java} | 18 +- .../apache/turbine/services/velocity/package.html | 29 --- .../org/apache/turbine/util/BrowserDetector.java | 2 +- src/java/org/apache/turbine/util/HttpUtils.java | 2 +- src/java/org/apache/turbine/util/ObjectUtils.java | 39 +++- src/java/org/apache/turbine/util/RunData.java | 10 +- src/java/org/apache/turbine/util/ServerData.java | 2 +- src/java/org/apache/turbine/util/ServletUtils.java | 4 +- .../org/apache/turbine/util/TurbineConfig.java | 130 ++++++------ .../Assembler.java => util/package-info.java} | 18 +- src/java/org/apache/turbine/util/package.html | 29 --- .../template/package-info.java} | 18 +- .../org/apache/turbine/util/template/package.html | 29 --- src/java/org/apache/turbine/util/uri/BaseURI.java | 2 +- .../Assembler.java => util/uri/package-info.java} | 18 +- src/java/org/apache/turbine/util/uri/package.html | 29 --- .../turbine/util/velocity/VelocityEmail.java | 4 +- .../util/velocity/VelocityEmailException.java | 2 +- .../turbine/util/velocity/VelocityHtmlEmail.java | 20 +- .../velocity/package-info.java} | 18 +- .../org/apache/turbine/util/velocity/package.html | 29 --- src/site/site.xml | 51 +++-- {xdocs => src/site/xdoc}/changes-pre24.xml | 0 {xdocs => src/site/xdoc}/features.xml | 2 +- {xdocs => src/site/xdoc}/fsd.xml | 12 +- {xdocs => src/site/xdoc}/getting-started.xml | 0 {xdocs => src/site/xdoc}/how-to-build.xml | 3 + {xdocs => src/site/xdoc}/how-to-help.xml | 0 .../site/xdoc}/howto/action-event-howto.xml | 0 {xdocs => src/site/xdoc}/howto/annotations.xml | 16 ++ .../site/xdoc}/howto/configuration-howto.xml | 0 {xdocs => src/site/xdoc}/howto/context-howto.xml | 0 .../site/xdoc}/howto/extend-user-howto.xml | 0 {xdocs => src/site/xdoc}/howto/hibernate-howto.xml | 0 .../site/xdoc}/howto/ide-vaj-wte-howto.xml | 0 {xdocs => src/site/xdoc}/howto/index.xml | 0 {xdocs => src/site/xdoc}/howto/intake-howto.xml | 0 {xdocs => src/site/xdoc}/howto/jboss-howto.xml | 0 {xdocs => src/site/xdoc}/howto/jsp-howto.xml | 0 {xdocs => src/site/xdoc}/howto/ldap-howto.xml | 0 .../site/xdoc}/howto/migrate-from-2_1-howto.xml | 0 .../site/xdoc}/howto/migrate-from-2_2-howto.xml | 0 .../site/xdoc}/howto/migrate-from-2_3-howto.xml | 0 .../site/xdoc}/howto/migrate-from-4_0-howto.xml | 0 {xdocs => src/site/xdoc}/howto/pullmodel-howto.xml | 0 {xdocs => src/site/xdoc}/howto/python-howto.xml | 0 {xdocs => src/site/xdoc}/howto/security-howto.xml | 0 {xdocs => src/site/xdoc}/howto/services-howto.xml | 0 .../site/xdoc}/howto/url-mapper-howto.xml | 0 .../site/xdoc}/howto/url-rewriting-howto.xml | 0 .../site/xdoc}/howto/velocity-site-howto.xml | 0 .../site/xdoc}/howto/velocityonlylayout-howto.xml | 0 {xdocs => src/site/xdoc}/index.xml | 11 +- {xdocs => src/site/xdoc}/j2ee-integration.xml | 0 {xdocs => src/site/xdoc}/model2+1.xml | 0 {xdocs => src/site/xdoc}/project-map.xml | 0 {xdocs => src/site/xdoc}/proposals.xml | 0 .../site/xdoc}/proposals/application-service.xml | 0 .../xdoc}/proposals/browser-bound-app-context.xml | 0 {xdocs => src/site/xdoc}/proposals/i18n.xml | 0 .../site/xdoc}/proposals/naming-service.xml | 0 {xdocs => src/site/xdoc}/proposals/pp.xml | 0 .../site/xdoc}/proposals/resources-service.xml | 0 .../site/xdoc}/proposals/reusable-components.xml | 0 .../site/xdoc}/proposals/security-service.xml | 0 .../site/xdoc}/proposals/services-framework.xml | 0 .../site/xdoc}/proposals/services-repository.xml | 0 .../site/xdoc}/proposals/unified-templating.xml | 0 {xdocs => src/site/xdoc}/pullmodel.xml | 0 {xdocs => src/site/xdoc}/related-projects.xml | 0 .../xdoc}/services/assemblerbroker-service.xml | 0 .../xdoc}/services/avalon-component-service.xml | 0 {xdocs => src/site/xdoc}/services/index.xml | 0 .../site/xdoc}/services/jsonrpc-service.xml | 0 {xdocs => src/site/xdoc}/services/jsp-service.xml | 0 .../site/xdoc}/services/naming-service.xml | 0 {xdocs => src/site/xdoc}/services/pull-service.xml | 0 .../site/xdoc}/services/rundata-service.xml | 0 .../site/xdoc}/services/scheduler-service.xml | 0 .../site/xdoc}/services/security-service.xml | 0 .../site/xdoc}/services/servlet-service.xml | 0 .../site/xdoc}/services/session-service.xml | 0 .../site/xdoc}/services/template-service.xml | 0 {xdocs => src/site/xdoc}/services/ui-service.xml | 0 .../site/xdoc}/services/uniqueid-service.xml | 0 .../site/xdoc}/services/urlmapper-service.xml | 0 .../site/xdoc}/services/velocity-service.xml | 0 {xdocs => src/site/xdoc}/todo.xml | 0 {xdocs => src/site/xdoc}/turbine-experiment.xml | 0 {xdocs => src/site/xdoc}/turbine-schema.xml | 0 src/test/org/apache/turbine/TurbineConfigTest.java | 4 +- src/test/org/apache/turbine/TurbineTest.java | 4 +- .../annotation/AnnotationProcessorTest.java | 18 ++ .../apache/turbine/modules/ActionLoaderTest.java | 27 ++- .../apache/turbine/modules/LayoutLoaderTest.java | 6 +- ...VelocityActionWithExtendedServiceInjection.java | 64 ++++++ .../pipeline/DefaultACLCreationValveTest.java | 6 +- .../turbine/pipeline/DefaultLoginValveTest.java | 8 +- .../pipeline/DefaultSessionTimeoutValveTest.java | 6 +- .../DefaultSessionValidationValveTest.java | 6 +- .../pipeline/DefaultSetEncodingValveTest.java | 6 +- .../turbine/pipeline/DetermineActionValveTest.java | 6 +- .../turbine/pipeline/DetermineTargetValveTest.java | 6 +- .../turbine/pipeline/ExecutePageValveTest.java | 8 +- .../turbine/pipeline/PipelineCreationTest.java | 6 +- .../services/ServiceWithServiceInjection.java | 88 +++++++++ .../services/ServiceWithServiceInjection2.java | 61 ++++++ .../turbine/services/intake/IntakeToolTest.java | 6 +- .../turbine/services/localization/BarBundle.java} | 28 ++- .../services/localization/BarBundle_de.java} | 28 ++- .../localization/DateTimeFormatterServiceTest.java | 138 ++++++++----- .../localization/LocalizationToolTest.java | 31 +-- ...lTest.java => RundataLocalizationToolTest.java} | 88 +++++---- .../urlmapper/TurbineURLMapperJSONServiceTest.java | 6 +- .../urlmapper/TurbineURLMapperServiceTest.java | 4 +- .../urlmapper/TurbineURLMapperYAMLServiceTest.java | 6 +- .../urlmapper/model/URLMappingContainerTest.java | 4 +- src/test/org/apache/turbine/test/BaseTestCase.java | 8 +- .../org/apache/turbine/util/ObjectUtilsTest.java | 96 +++++++++ .../apache/turbine/util/uri/TurbineURITest.java | 2 +- suppression-owasp-fp.xml | 28 +++ 267 files changed, 2325 insertions(+), 2488 deletions(-)
