You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@turbine.apache.org by tv...@apache.org on 2025/09/17 14:52:26 UTC
(turbine-core) branch trunk updated (cabf7050 -> 0f7883f2)
This is an automated email from the ASF dual-hosted git repository.
tv pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/turbine-core.git
from cabf7050 Merge pull request #11 from apache/dependabot/maven/org.apache.commons-commons-lang3-3.18.0
new 473d2b16 Try to fix pool object lifecycle
new dec2005c Merge branch 'trunk' of https://gitbox.apache.org/repos/asf/turbine-core.git into trunk
new d8f14393 Merge branch 'trunk' of https://gitbox.apache.org/repos/asf/turbine-core.git into trunk
new 0f7883f2 Merge branch 'trunk' of https://gitbox.apache.org/repos/asf/turbine-core.git into trunk
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../apache/turbine/services/intake/IntakeTool.java | 66 ++++++++++++++--------
.../turbine/services/intake/IntakeToolTest.java | 12 ++++
2 files changed, 56 insertions(+), 22 deletions(-)
(turbine-core) 01/04: Try to fix pool object lifecycle
Posted by tv...@apache.org.
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 473d2b16f7208811616a274b433aea125e3a99c9
Author: Thomas Vandahl <tv...@apache.org>
AuthorDate: Wed Jan 15 15:32:26 2025 +0100
Try to fix pool object lifecycle
---
.../apache/turbine/services/intake/IntakeTool.java | 66 ++++++++++++++--------
.../turbine/services/intake/IntakeToolTest.java | 12 ++++
2 files changed, 56 insertions(+), 22 deletions(-)
diff --git a/src/java/org/apache/turbine/services/intake/IntakeTool.java b/src/java/org/apache/turbine/services/intake/IntakeTool.java
index 4a19f831..4ff098fc 100644
--- a/src/java/org/apache/turbine/services/intake/IntakeTool.java
+++ b/src/java/org/apache/turbine/services/intake/IntakeTool.java
@@ -1,6 +1,5 @@
package org.apache.turbine.services.intake;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -20,7 +19,7 @@ package org.apache.turbine.services.intake;
* under the License.
*/
-
+import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -47,7 +46,7 @@ import org.apache.turbine.util.RunData;
* @author <a href="mailto:hps@intermeta.de">Henning P. Schmiedehausen</a>
* @author <a href="mailto:quintonm@bellsouth.net">Quinton McCombs</a>
* @author <a href="mailto:epugh@upstate.com">Eric Pugh</a>
- * @version $Id$
+ * @version $Id: IntakeTool.java 1886259 2021-02-06 16:54:03Z tv $
*/
public class IntakeTool
implements ApplicationTool, Recyclable
@@ -129,10 +128,12 @@ public class IntakeTool
for (int i = groupNames.length - 1; i >= 0; i--)
{
+ Group foundGroup = null;
+
try
{
- List<Group> foundGroups = intakeService.getGroup(groupNames[i])
- .getObjects(pp);
+ foundGroup = intakeService.getGroup(groupNames[i]);
+ List<Group> foundGroups = foundGroup.getObjects(pp);
if (foundGroups != null)
{
@@ -144,6 +145,20 @@ public class IntakeTool
{
log.error(e);
}
+ finally
+ {
+ if (foundGroup != null)
+ {
+ try
+ {
+ intakeService.releaseGroup(foundGroup);
+ }
+ catch (IntakeException intakeException)
+ {
+ log.error(intakeException, intakeException);
+ }
+ }
+ }
}
}
@@ -227,10 +242,7 @@ public class IntakeTool
public void newForm()
{
declaredGroups.clear();
- for (Group group : groups.values())
- {
- group.resetDeclared();
- }
+ groups.values().forEach(Group::resetDeclared);
}
/**
@@ -300,6 +312,24 @@ public class IntakeTool
Group g = null;
String inputKey = intakeService.getGroupKey(groupName) + key;
+// g = groups.computeIfAbsent(inputKey, k -> {
+// if (create)
+// {
+// try
+// {
+// Group gg = intakeService.getGroup(groupName);
+// gg.init(key, pp);
+// return gg;
+// }
+// catch (IntakeException e)
+// {
+// // TODO Auto-generated catch block
+// e.printStackTrace();
+// }
+// }
+//
+// return null;
+// });
if (groups.containsKey(inputKey))
{
g = groups.get(inputKey);
@@ -381,6 +411,7 @@ public class IntakeTool
public boolean isAllValid()
{
boolean allValid = true;
+ // TODO: fail fast?
for (Group group : groups.values())
{
allValid &= group.isAllValid();
@@ -445,13 +476,9 @@ public class IntakeTool
if (groupKeys != null)
{
- for (String groupKey : groupKeys)
- {
- if (!groupKey.equals(group.getGID()))
- {
- pp.add(INTAKE_GRP, groupKey);
- }
- }
+ Arrays.stream(groupKeys)
+ .filter(groupKey -> !groupKey.equals(group.getGID()))
+ .forEach(groupKey -> pp.add(INTAKE_GRP, groupKey));
}
try
@@ -472,12 +499,7 @@ public class IntakeTool
*/
public void removeAll()
{
- Object[] allGroups = groups.values().toArray();
- for (int i = allGroups.length - 1; i >= 0; i--)
- {
- Group group = (Group) allGroups[i];
- remove(group);
- }
+ groups.values().forEach(this::remove);
}
/**
diff --git a/src/test/org/apache/turbine/services/intake/IntakeToolTest.java b/src/test/org/apache/turbine/services/intake/IntakeToolTest.java
index cc445f26..6dbfab4b 100644
--- a/src/test/org/apache/turbine/services/intake/IntakeToolTest.java
+++ b/src/test/org/apache/turbine/services/intake/IntakeToolTest.java
@@ -74,6 +74,18 @@ public class IntakeToolTest extends BaseTestCase
assertEquals("LoginGroup", group.getIntakeGroupName());
}
+ @Test
+ public void testRemove() throws Exception
+ {
+ File file = new File("./target/appData.ser");
+ assertTrue("Make sure serialized data file exists:" + file, file.exists());
+ Group group = intakeTool.get("LoginGroup", "loginGroupKey");
+ assertNotNull(group);
+ assertEquals(1, intakeTool.groups.size());
+ intakeTool.remove(group);
+ assertTrue(intakeTool.groups.isEmpty());
+ }
+
/**
* Make sure refresh DOESN'T do anything
*
(turbine-core) 02/04: Merge branch 'trunk' of https://gitbox.apache.org/repos/asf/turbine-core.git into trunk
Posted by tv...@apache.org.
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 <tv...@apache.org>
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(-)
(turbine-core) 03/04: Merge branch 'trunk' of https://gitbox.apache.org/repos/asf/turbine-core.git into trunk
Posted by tv...@apache.org.
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 d8f14393c207275c5d89638eaff6b9dbb8440fdb
Merge: dec2005c 8a6536d9
Author: Thomas Vandahl <tv...@apache.org>
AuthorDate: Thu Jun 12 10:26:36 2025 +0200
Merge branch 'trunk' of https://gitbox.apache.org/repos/asf/turbine-core.git into trunk
.asf.yaml | 15 +++--
README.md | 17 +++---
conf/test/TorqueTest.properties | 2 +
pom.xml | 21 +++----
src/changes/changes.xml | 17 +++++-
.../turbine/annotation/AnnotationProcessor.java | 4 +-
.../turbine/pipeline/DetermineActionValve.java | 10 ++++
.../turbine/pipeline/DetermineTargetValve.java | 8 +++
.../turbine/services/BaseInitableBroker.java | 65 +++++++++++-----------
.../TurbineAssemblerBrokerService.java | 10 ++++
.../localization/DateTimeFormatterService.java | 6 +-
.../services/servlet/TurbineServletService.java | 2 +-
src/java/org/apache/turbine/util/HttpUtils.java | 36 +++++++++++-
src/site/site.xml | 14 ++---
src/site/xdoc/features.xml | 4 +-
src/site/xdoc/how-to-build.xml | 4 +-
src/site/xdoc/index.xml | 2 +-
src/site/xdoc/todo.xml | 4 +-
18 files changed, 160 insertions(+), 81 deletions(-)
(turbine-core) 04/04: Merge branch 'trunk' of https://gitbox.apache.org/repos/asf/turbine-core.git into trunk
Posted by tv...@apache.org.
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 0f7883f26e11540509bbfeec94573995f0ccf21e
Merge: d8f14393 cabf7050
Author: Thomas Vandahl <tv...@apache.org>
AuthorDate: Wed Sep 17 15:29:41 2025 +0200
Merge branch 'trunk' of https://gitbox.apache.org/repos/asf/turbine-core.git into trunk
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)