date:20220614

[struts] branch master updated: Added async and velocity plugin to bom

2022-06-14 Thread lukaszlenart

This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/struts.git


The following commit(s) were added to refs/heads/master by this push:
 new 0c3534e8b Added async and velocity plugin to bom
 new ba041e1ee Merge pull request #568 from tobiasstadler/master
0c3534e8b is described below

commit 0c3534e8b4ebcb5e05a76e9748ff576ecf779015
Author: Tobias Stadler 
AuthorDate: Tue Jun 14 09:53:10 2022 +0200

Added async and velocity plugin to bom
---
 bom/pom.xml | 10 ++
 1 file changed, 10 insertions(+)

diff --git a/bom/pom.xml b/bom/pom.xml
index b2a8a9555..e25ca89dd 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -56,6 +56,11 @@
 struts2-core
 ${struts-version.version}
 
+
+org.apache.struts
+struts2-async-plugin
+${struts-version.version}
+
 
 org.apache.struts
 struts2-bean-validation-plugin
@@ -171,6 +176,11 @@
 struts2-tiles-plugin
 ${struts-version.version}
 
+
+org.apache.struts
+struts2-velocity-plugin
+${struts-version.version}
+

[struts] branch WW-5188-since-6 created (now c7e69aae8)

2022-06-14 Thread lukaszlenart

This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a change to branch WW-5188-since-6
in repository https://gitbox.apache.org/repos/asf/struts.git


  at c7e69aae8 WW-5188 Replaces since 2.6 with 6.0

This branch includes the following new commits:

 new c7e69aae8 WW-5188 Replaces since 2.6 with 6.0

The 1 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.

[struts] 01/01: WW-5188 Replaces since 2.6 with 6.0

2022-06-14 Thread lukaszlenart

This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a commit to branch WW-5188-since-6
in repository https://gitbox.apache.org/repos/asf/struts.git

commit c7e69aae83f8209cc364c433560bef597c99e3f1
Author: Lukasz Lenart 
AuthorDate: Tue Jun 14 13:27:46 2022 +0200

WW-5188 Replaces since 2.6 with 6.0
---
 bundles/admin/pom.xml  |  2 +-
 bundles/demo/pom.xml   |  2 +-
 bundles/pom.xml|  2 +-
 core/pom.xml   |  2 +-
 .../java/com/opensymphony/xwork2/AsyncManager.java |  2 +-
 .../NotExcludedAcceptedPatternsChecker.java|  2 +-
 .../xwork2/util/AbstractLocalizedTextProvider.java | 10 -
 .../java/org/apache/struts2/StrutsConstants.java   | 26 +++---
 .../org/apache/struts2/action/CookiesAware.java|  4 ++--
 .../org/apache/struts2/action/ParametersAware.java |  2 +-
 .../apache/struts2/action/ServletContextAware.java |  2 +-
 .../org/apache/struts2/components/Component.java   |  4 ++--
 .../java/org/apache/struts2/components/Date.java   |  2 +-
 .../config/StrutsXmlConfigurationProvider.java |  6 ++---
 .../org/apache/struts2/result/StreamResult.java|  2 +-
 .../org/apache/struts2/views/jsp/ui/AnchorTag.java |  2 +-
 .../org/apache/struts2/views/jsp/ui/SubmitTag.java |  2 +-
 .../resources/{struts-2.6.dtd => struts-6.0.dtd}   |  4 ++--
 core/src/main/resources/struts-default.xml |  4 ++--
 .../util/StrutsLocalizedTextProviderTest.java  |  6 ++---
 .../apache/struts2/dispatcher/ng/struts-no-op.xml  |  6 ++---
 .../org/apache/struts2/views/jsp/WW3090-struts.xml | 12 +-
 core/src/test/resources/struts-escape-body.xml |  4 ++--
 core/src/test/resources/struts.xml | 12 +-
 .../java/org/apache/struts2/async/AsyncAction.java |  2 +-
 .../apache/struts2/async/DefaultAsyncManager.java  |  2 +-
 plugins/embeddedjsp/pom.xml|  2 +-
 plugins/gxp/pom.xml|  2 +-
 .../views/jasperreports/JasperReportsResult.java   |  2 +-
 plugins/osgi/pom.xml   |  2 +-
 .../apache/struts2/osgi/action/ServiceAware.java   |  2 +-
 plugins/oval/pom.xml   |  2 +-
 plugins/plexus/pom.xml |  2 +-
 plugins/portlet-mocks/pom.xml  |  2 +-
 plugins/portlet-tiles/pom.xml  |  2 +-
 plugins/portlet/pom.xml|  2 +-
 .../portlet/action/PortletContextAware.java|  2 +-
 .../portlet/action/PortletPreferencesAware.java|  2 +-
 .../portlet/action/PortletRequestAware.java|  2 +-
 .../portlet/action/PortletResponseAware.java   |  2 +-
 plugins/sitemesh/pom.xml   |  2 +-
 .../views/velocity/StrutsVelocityContext.java  |  2 +-
 .../velocity/src/main/resources/struts-plugin.xml  | 12 +-
 43 files changed, 85 insertions(+), 85 deletions(-)

diff --git a/bundles/admin/pom.xml b/bundles/admin/pom.xml
index 358a31212..395dcb80f 100644
--- a/bundles/admin/pom.xml
+++ b/bundles/admin/pom.xml
@@ -29,7 +29,7 @@
 
 struts2-osgi-admin-bundle
 bundle
-DEPRECATED: Struts 2 OSGi Admin Bundle - since 2.6
+DEPRECATED: Struts 2 OSGi Admin Bundle - since 6.0.0
 
 
 
diff --git a/bundles/demo/pom.xml b/bundles/demo/pom.xml
index 6c878046b..7258e0dd7 100644
--- a/bundles/demo/pom.xml
+++ b/bundles/demo/pom.xml
@@ -29,7 +29,7 @@
 
 struts2-osgi-demo-bundle
 bundle
-DEPRECATED: Struts 2 OSGi Demo Bundle - since 2.6
+DEPRECATED: Struts 2 OSGi Demo Bundle - since 6.0.0
 
 
 
diff --git a/bundles/pom.xml b/bundles/pom.xml
index cf23b9673..af4fd2d53 100755
--- a/bundles/pom.xml
+++ b/bundles/pom.xml
@@ -29,7 +29,7 @@
 
 struts2-osgi-bundles
 pom
-DEPRECATED: Struts 2 OSGi Bundles - since 2.6
+DEPRECATED: Struts 2 OSGi Bundles - since 6.0.0
 
 
 admin
diff --git a/core/pom.xml b/core/pom.xml
index 137c34801..d7cee0c16 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -31,7 +31,7 @@
 Struts 2 Core
 
 
-2.6
+6.0
 UTF-8
 
 
diff --git a/core/src/main/java/com/opensymphony/xwork2/AsyncManager.java 
b/core/src/main/java/com/opensymphony/xwork2/AsyncManager.java
index 5bada9c77..a4dd07161 100644
--- a/core/src/main/java/com/opensymphony/xwork2/AsyncManager.java
+++ b/core/src/main/java/com/opensymphony/xwork2/AsyncManager.java
@@ -24,7 +24,7 @@ import java.util.concurrent.Callable;
  * Adds support for invoke async actions. This allows us to support action 
methods that return {@link Callable}
  * as well as invoking them in separate not-container thread then executing 
the result in another container thread.
  *
- * @since 2.6
+ * @since 6.0.0
  */
 public interface AsyncManager {
 boolean hasAsyncActionResult();
diff --git 
a/core/src/main/java/com/opensymphony/xwork2/s

[struts] branch WW-5187-velocity created (now fc2aebd10)

2022-06-14 Thread lukaszlenart

This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a change to branch WW-5187-velocity
in repository https://gitbox.apache.org/repos/asf/struts.git


  at fc2aebd10 WW-5187 Comments out Velocity based PageFilter

This branch includes the following new commits:

 new fc2aebd10 WW-5187 Comments out Velocity based PageFilter

The 1 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.

[struts] 01/01: WW-5187 Comments out Velocity based PageFilter

2022-06-14 Thread lukaszlenart

This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a commit to branch WW-5187-velocity
in repository https://gitbox.apache.org/repos/asf/struts.git

commit fc2aebd10afcf6201572b209fe94a16fadbecac8
Author: Lukasz Lenart 
AuthorDate: Tue Jun 14 13:17:19 2022 +0200

WW-5187 Comments out Velocity based PageFilter
---
 .../main/java/org/apache/struts2/sitemesh/VelocityPageFilter.java| 2 +-
 plugins/sitemesh/src/main/resources/struts-plugin.xml| 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git 
a/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityPageFilter.java
 
b/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityPageFilter.java
index a57c8ed47..22de2c60a 100644
--- 
a/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityPageFilter.java
+++ 
b/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityPageFilter.java
@@ -50,7 +50,7 @@ public class VelocityPageFilter extends SiteMeshFilter {
 // TODO: Remove heavy coupling on horrible SM2 Factory
 Factory factory = Factory.getInstance(new Config(filterConfig));
 factory.refresh();
-return new 
FreemarkerMapper2DecoratorSelector(factory.getDecoratorMapper());
+return new 
VelocityMapper2DecoratorSelector(factory.getDecoratorMapper());
 }
 
 }
diff --git a/plugins/sitemesh/src/main/resources/struts-plugin.xml 
b/plugins/sitemesh/src/main/resources/struts-plugin.xml
index c5fcd5d88..406a73a0f 100644
--- a/plugins/sitemesh/src/main/resources/struts-plugin.xml
+++ b/plugins/sitemesh/src/main/resources/struts-plugin.xml
@@ -22,8 +22,9 @@
 http://struts.apache.org/dtds/struts-2.5.dtd";>
-
+
 
 
-
+
+

[struts] branch WW-5188-since-6 updated (c7e69aae8 -> b6b74a46e)

2022-06-14 Thread lukaszlenart

This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a change to branch WW-5188-since-6
in repository https://gitbox.apache.org/repos/asf/struts.git


 discard c7e69aae8 WW-5188 Replaces since 2.6 with 6.0
 new b6b74a46e WW-5188 Replaces since 2.6 with 6.0

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (c7e69aae8)
\
 N -- N -- N   refs/heads/WW-5188-since-6 (b6b74a46e)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 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:
 .../java/org/apache/struts2/config/StrutsXmlConfigurationProvider.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[struts] 01/01: WW-5188 Replaces since 2.6 with 6.0

2022-06-14 Thread lukaszlenart

This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a commit to branch WW-5188-since-6
in repository https://gitbox.apache.org/repos/asf/struts.git

commit b6b74a46eaeb2dab8a52ffc30f0807bf1c0d9429
Author: Lukasz Lenart 
AuthorDate: Tue Jun 14 13:27:46 2022 +0200

WW-5188 Replaces since 2.6 with 6.0
---
 bundles/admin/pom.xml  |  2 +-
 bundles/demo/pom.xml   |  2 +-
 bundles/pom.xml|  2 +-
 core/pom.xml   |  2 +-
 .../java/com/opensymphony/xwork2/AsyncManager.java |  2 +-
 .../NotExcludedAcceptedPatternsChecker.java|  2 +-
 .../xwork2/util/AbstractLocalizedTextProvider.java | 10 -
 .../java/org/apache/struts2/StrutsConstants.java   | 26 +++---
 .../org/apache/struts2/action/CookiesAware.java|  4 ++--
 .../org/apache/struts2/action/ParametersAware.java |  2 +-
 .../apache/struts2/action/ServletContextAware.java |  2 +-
 .../org/apache/struts2/components/Component.java   |  4 ++--
 .../java/org/apache/struts2/components/Date.java   |  2 +-
 .../config/StrutsXmlConfigurationProvider.java |  6 ++---
 .../org/apache/struts2/result/StreamResult.java|  2 +-
 .../org/apache/struts2/views/jsp/ui/AnchorTag.java |  2 +-
 .../org/apache/struts2/views/jsp/ui/SubmitTag.java |  2 +-
 .../resources/{struts-2.6.dtd => struts-6.0.dtd}   |  4 ++--
 core/src/main/resources/struts-default.xml |  4 ++--
 .../util/StrutsLocalizedTextProviderTest.java  |  6 ++---
 .../apache/struts2/dispatcher/ng/struts-no-op.xml  |  6 ++---
 .../org/apache/struts2/views/jsp/WW3090-struts.xml | 12 +-
 core/src/test/resources/struts-escape-body.xml |  4 ++--
 core/src/test/resources/struts.xml | 12 +-
 .../java/org/apache/struts2/async/AsyncAction.java |  2 +-
 .../apache/struts2/async/DefaultAsyncManager.java  |  2 +-
 plugins/embeddedjsp/pom.xml|  2 +-
 plugins/gxp/pom.xml|  2 +-
 .../views/jasperreports/JasperReportsResult.java   |  2 +-
 plugins/osgi/pom.xml   |  2 +-
 .../apache/struts2/osgi/action/ServiceAware.java   |  2 +-
 plugins/oval/pom.xml   |  2 +-
 plugins/plexus/pom.xml |  2 +-
 plugins/portlet-mocks/pom.xml  |  2 +-
 plugins/portlet-tiles/pom.xml  |  2 +-
 plugins/portlet/pom.xml|  2 +-
 .../portlet/action/PortletContextAware.java|  2 +-
 .../portlet/action/PortletPreferencesAware.java|  2 +-
 .../portlet/action/PortletRequestAware.java|  2 +-
 .../portlet/action/PortletResponseAware.java   |  2 +-
 plugins/sitemesh/pom.xml   |  2 +-
 .../views/velocity/StrutsVelocityContext.java  |  2 +-
 .../velocity/src/main/resources/struts-plugin.xml  | 12 +-
 43 files changed, 85 insertions(+), 85 deletions(-)

diff --git a/bundles/admin/pom.xml b/bundles/admin/pom.xml
index 358a31212..395dcb80f 100644
--- a/bundles/admin/pom.xml
+++ b/bundles/admin/pom.xml
@@ -29,7 +29,7 @@
 
 struts2-osgi-admin-bundle
 bundle
-DEPRECATED: Struts 2 OSGi Admin Bundle - since 2.6
+DEPRECATED: Struts 2 OSGi Admin Bundle - since 6.0.0
 
 
 
diff --git a/bundles/demo/pom.xml b/bundles/demo/pom.xml
index 6c878046b..7258e0dd7 100644
--- a/bundles/demo/pom.xml
+++ b/bundles/demo/pom.xml
@@ -29,7 +29,7 @@
 
 struts2-osgi-demo-bundle
 bundle
-DEPRECATED: Struts 2 OSGi Demo Bundle - since 2.6
+DEPRECATED: Struts 2 OSGi Demo Bundle - since 6.0.0
 
 
 
diff --git a/bundles/pom.xml b/bundles/pom.xml
index cf23b9673..af4fd2d53 100755
--- a/bundles/pom.xml
+++ b/bundles/pom.xml
@@ -29,7 +29,7 @@
 
 struts2-osgi-bundles
 pom
-DEPRECATED: Struts 2 OSGi Bundles - since 2.6
+DEPRECATED: Struts 2 OSGi Bundles - since 6.0.0
 
 
 admin
diff --git a/core/pom.xml b/core/pom.xml
index 137c34801..d7cee0c16 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -31,7 +31,7 @@
 Struts 2 Core
 
 
-2.6
+6.0
 UTF-8
 
 
diff --git a/core/src/main/java/com/opensymphony/xwork2/AsyncManager.java 
b/core/src/main/java/com/opensymphony/xwork2/AsyncManager.java
index 5bada9c77..a4dd07161 100644
--- a/core/src/main/java/com/opensymphony/xwork2/AsyncManager.java
+++ b/core/src/main/java/com/opensymphony/xwork2/AsyncManager.java
@@ -24,7 +24,7 @@ import java.util.concurrent.Callable;
  * Adds support for invoke async actions. This allows us to support action 
methods that return {@link Callable}
  * as well as invoking them in separate not-container thread then executing 
the result in another container thread.
  *
- * @since 2.6
+ * @since 6.0.0
  */
 public interface AsyncManager {
 boolean hasAsyncActionResult();
diff --git 
a/core/src/main/java/com/opensymphony/xwork2/s

[struts] branch master updated: Added async and velocity plugin to bom

[struts] branch WW-5188-since-6 created (now c7e69aae8)

[struts] 01/01: WW-5188 Replaces since 2.6 with 6.0

[struts] branch WW-5187-velocity created (now fc2aebd10)

[struts] 01/01: WW-5187 Comments out Velocity based PageFilter

[struts] branch WW-5188-since-6 updated (c7e69aae8 -> b6b74a46e)

[struts] 01/01: WW-5188 Replaces since 2.6 with 6.0

7 matches

Site Navigation

Mail list logo

Footer information