[struts-examples] branch master updated: WW-5173 Example app using custom cache implementations
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-examples.git
The following commit(s) were added to refs/heads/master by this push:
new 50013f1 WW-5173 Example app using custom cache implementations
50013f1 is described below
commit 50013f1beb1b159d5e8fffc962d1bb1f929fbc0d
Author: Lukasz Lenart
AuthorDate: Mon Aug 8 10:25:34 2022 +0200
WW-5173 Example app using custom cache implementations
---
expression-cache/pom.xml | 63 ++
.../java/org/apache/struts/cache/CustomOEC.java| 34
.../org/apache/struts/cache/CustomOECFactory.java | 56 +++
.../java/org/apache/struts/cache/CustomOELRUC.java | 37 +
.../java/org/apache/struts/cache/IndexAction.java | 25 +
expression-cache/src/main/resources/log4j2.xml | 33
expression-cache/src/main/resources/struts.xml | 54 +++
expression-cache/src/main/webapp/WEB-INF/index.jsp | 32 +++
expression-cache/src/main/webapp/WEB-INF/web.xml | 46
pom.xml| 1 +
10 files changed, 381 insertions(+)
diff --git a/expression-cache/pom.xml b/expression-cache/pom.xml
new file mode 100644
index 000..e7fb4d3
--- /dev/null
+++ b/expression-cache/pom.xml
@@ -0,0 +1,63 @@
+
+
+http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+4.0.0
+
+
+org.apache.struts
+struts-examples
+1.1.0
+
+
+expression-cache
+war
+Expression Cache
+
+
+UTF-8
+6.1.0-SNAPSHOT
+
+
+
+
+
+
+org.eclipse.jetty
+jetty-maven-plugin
+${jetty-plugin.version}
+
+
+/${project.artifactId}
+
+CTRL+C
+8999
+10
+
+
src/main/webapp/WEB-INF/web.xml
+
+
+
+
+
+
+
diff --git
a/expression-cache/src/main/java/org/apache/struts/cache/CustomOEC.java
b/expression-cache/src/main/java/org/apache/struts/cache/CustomOEC.java
new file mode 100644
index 000..8aab971
--- /dev/null
+++ b/expression-cache/src/main/java/org/apache/struts/cache/CustomOEC.java
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.struts.cache;
+
+import com.opensymphony.xwork2.ognl.OgnlDefaultCache;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public class CustomOEC extends OgnlDefaultCache {
+
+private static final Logger LOG = LogManager.getLogger(CustomOEC.class);
+
+public CustomOEC(int evictionLimit, int initialCapacity, float loadFactor)
{
+super(evictionLimit, initialCapacity, loadFactor);
+LOG.info("Custom cache has been created");
+}
+
+}
diff --git
a/expression-cache/src/main/java/org/apache/struts/cache/CustomOECFactory.java
b/expression-cache/src/main/java/org/apache/struts/cache/CustomOECFactory.java
new file mode 100644
index 000..4a0ef75
--- /dev/null
+++
b/expression-cache/src/main/java/org/apache/struts/cache/CustomOECFactory.java
@@ -0,0 +1,56 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIO
[struts-examples] branch master updated: Switches Travis build to OpenJDK 11
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-examples.git The following commit(s) were added to refs/heads/master by this push: new ab5e847 Switches Travis build to OpenJDK 11 ab5e847 is described below commit ab5e847f7c97decd19e9d64f093ac2efd6f5c8ec Author: Lukasz Lenart AuthorDate: Mon Aug 8 10:35:49 2022 +0200 Switches Travis build to OpenJDK 11 --- .travis.yml | 7 +-- 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 11811ac..337d71d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,12 +1,7 @@ -dist: trusty language: java -sudo: false jdk: - - oraclejdk11 - -install: true -script: ./mvnw test + - openjdk11 cache: directories:
[struts-examples] branch master updated: Updates bagdes with build statuses
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-examples.git The following commit(s) were added to refs/heads/master by this push: new 867cc49 Updates bagdes with build statuses 867cc49 is described below commit 867cc49135219baeb563a1c1d3a12e589ca5124f Author: Lukasz Lenart AuthorDate: Mon Aug 8 10:38:07 2022 +0200 Updates bagdes with build statuses --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 0eb7231..51b4617 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ Struts Examples --- -[](https://ci-builds.apache.org/job/Struts/job/Struts-examples-master/) -[](https://travis-ci.org/apache/struts-examples) +[](https://ci-builds.apache.org/job/Struts/job/Struts-examples-master/) +[](https://app.travis-ci.com/apache/struts-examples) [](http://www.apache.org/licenses/LICENSE-2.0.html)
[struts-examples] branch dependabot/maven/quarkus-plugin.version-2.11.2.Final updated (b58058b -> dd7aa0b)
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a change to branch
dependabot/maven/quarkus-plugin.version-2.11.2.Final
in repository https://gitbox.apache.org/repos/asf/struts-examples.git
discard b58058b Bump quarkus-plugin.version from 2.11.1.Final to 2.11.2.Final
add 50013f1 WW-5173 Example app using custom cache implementations
add ab5e847 Switches Travis build to OpenJDK 11
add 867cc49 Updates bagdes with build statuses
add dd7aa0b Bump quarkus-plugin.version from 2.11.1.Final to 2.11.2.Final
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 (b58058b)
\
N -- N -- N
refs/heads/dependabot/maven/quarkus-plugin.version-2.11.2.Final (dd7aa0b)
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.
No new revisions were added by this update.
Summary of changes:
.travis.yml| 7 +--
README.md | 4 +-
{bean-validation => expression-cache}/pom.xml | 46 +++---
.../java/org/apache/struts/cache/CustomOEC.java| 15 +++---
.../org/apache/struts/cache/CustomOECFactory.java | 56 ++
.../java/org/apache/struts/cache/CustomOELRUC.java | 24 --
.../java/org/apache/struts/cache/IndexAction.java | 9 ++--
.../src/main/resources/log4j2.xml | 23 +
expression-cache/src/main/resources/struts.xml | 54 +
.../src/main/webapp/WEB-INF/index.jsp | 4 +-
.../src/main/webapp/WEB-INF/web.xml| 34 +
pom.xml| 1 +
12 files changed, 205 insertions(+), 72 deletions(-)
copy {bean-validation => expression-cache}/pom.xml (53%)
mode change 100755 => 100644
copy message-store/src/main/java/org/apache/struts/example/HelloWorld1.java =>
expression-cache/src/main/java/org/apache/struts/cache/CustomOEC.java (61%)
create mode 100644
expression-cache/src/main/java/org/apache/struts/cache/CustomOECFactory.java
copy json/src/main/java/org/demo/ProduceAction.java =>
expression-cache/src/main/java/org/apache/struts/cache/CustomOELRUC.java (60%)
copy blank/src/main/java/example/ExampleSupport.java =>
expression-cache/src/main/java/org/apache/struts/cache/IndexAction.java (87%)
copy jfreechart/src/main/webapp/index.html =>
expression-cache/src/main/resources/log4j2.xml (69%)
create mode 100644 expression-cache/src/main/resources/struts.xml
copy {jfreechart => expression-cache}/src/main/webapp/WEB-INF/index.jsp (92%)
copy jfreechart/src/main/webapp/index.html =>
expression-cache/src/main/webapp/WEB-INF/web.xml (50%)
[struts-examples] branch dependabot/maven/org.hibernate-hibernate-validator-7.0.5.Final updated (cffe8c1 -> 35abb44)
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a change to branch
dependabot/maven/org.hibernate-hibernate-validator-7.0.5.Final
in repository https://gitbox.apache.org/repos/asf/struts-examples.git
omit cffe8c1 Bump hibernate-validator from 4.3.2.Final to 7.0.5.Final
add 50013f1 WW-5173 Example app using custom cache implementations
add ab5e847 Switches Travis build to OpenJDK 11
add 867cc49 Updates bagdes with build statuses
add 35abb44 Bump hibernate-validator from 4.3.2.Final to 7.0.5.Final
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 (cffe8c1)
\
N -- N -- N
refs/heads/dependabot/maven/org.hibernate-hibernate-validator-7.0.5.Final
(35abb44)
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.
No new revisions were added by this update.
Summary of changes:
.travis.yml| 7 +--
README.md | 4 +-
{bean-validation => expression-cache}/pom.xml | 46 +++---
.../java/org/apache/struts/cache/CustomOEC.java| 15 +++---
.../org/apache/struts/cache/CustomOECFactory.java | 56 ++
.../java/org/apache/struts/cache/CustomOELRUC.java | 24 --
.../java/org/apache/struts/cache/IndexAction.java | 9 ++--
.../src/main/resources/log4j2.xml | 23 +
expression-cache/src/main/resources/struts.xml | 54 +
.../src/main/webapp/WEB-INF/index.jsp | 4 +-
.../src/main/webapp/WEB-INF/web.xml| 34 +
pom.xml| 1 +
12 files changed, 205 insertions(+), 72 deletions(-)
copy {bean-validation => expression-cache}/pom.xml (53%)
copy message-store/src/main/java/org/apache/struts/example/HelloWorld1.java =>
expression-cache/src/main/java/org/apache/struts/cache/CustomOEC.java (61%)
create mode 100644
expression-cache/src/main/java/org/apache/struts/cache/CustomOECFactory.java
copy json/src/main/java/org/demo/ProduceAction.java =>
expression-cache/src/main/java/org/apache/struts/cache/CustomOELRUC.java (60%)
copy blank/src/main/java/example/ExampleSupport.java =>
expression-cache/src/main/java/org/apache/struts/cache/IndexAction.java (87%)
copy jfreechart/src/main/webapp/index.html =>
expression-cache/src/main/resources/log4j2.xml (69%)
create mode 100644 expression-cache/src/main/resources/struts.xml
copy {jfreechart => expression-cache}/src/main/webapp/WEB-INF/index.jsp (92%)
copy jfreechart/src/main/webapp/index.html =>
expression-cache/src/main/webapp/WEB-INF/web.xml (50%)
[struts-examples] 01/01: Merge pull request #156 from apache/dependabot/maven/quarkus-plugin.version-2.11.2.Final
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-examples.git commit 3ca749be59b986ec31a03b4712a53faa19f8b868 Merge: 867cc49 dd7aa0b Author: Lukasz Lenart AuthorDate: Mon Aug 8 11:30:53 2022 +0200 Merge pull request #156 from apache/dependabot/maven/quarkus-plugin.version-2.11.2.Final Bump quarkus-plugin.version from 2.11.1.Final to 2.11.2.Final quarkus/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[struts-examples] branch master updated (867cc49 -> 3ca749b)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/struts-examples.git from 867cc49 Updates bagdes with build statuses add dd7aa0b Bump quarkus-plugin.version from 2.11.1.Final to 2.11.2.Final new 3ca749b Merge pull request #156 from apache/dependabot/maven/quarkus-plugin.version-2.11.2.Final 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: quarkus/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[struts-examples] branch master updated: Uses proper package for Hibernate Validator
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-examples.git The following commit(s) were added to refs/heads/master by this push: new 2932424 Uses proper package for Hibernate Validator 2932424 is described below commit 29324244609ea6cea97b605b8fdaaf6ad0f63a72 Author: Lukasz Lenart AuthorDate: Mon Aug 8 11:32:50 2022 +0200 Uses proper package for Hibernate Validator --- bean-validation/pom.xml | 4 ++-- rest-angular/pom.xml| 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bean-validation/pom.xml b/bean-validation/pom.xml index 70bef07..6bd122d 100755 --- a/bean-validation/pom.xml +++ b/bean-validation/pom.xml @@ -15,9 +15,9 @@ -org.hibernate +org.hibernate.validator hibernate-validator -4.3.2.Final +6.1.2.Final diff --git a/rest-angular/pom.xml b/rest-angular/pom.xml index c61f36f..da5e5e3 100644 --- a/rest-angular/pom.xml +++ b/rest-angular/pom.xml @@ -61,9 +61,9 @@ -org.hibernate +org.hibernate.validator hibernate-validator -4.3.2.Final +6.1.2.Final
[struts-examples] branch dependabot/maven/rest-angular/org.hibernate.validator-hibernate-validator-6.1.5.Final created (now 3cfc0e1)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/rest-angular/org.hibernate.validator-hibernate-validator-6.1.5.Final in repository https://gitbox.apache.org/repos/asf/struts-examples.git at 3cfc0e1 Bump hibernate-validator in /rest-angular No new revisions were added by this update.
[struts-examples] branch dependabot/maven/bean-validation/org.hibernate.validator-hibernate-validator-6.1.5.Final created (now 8292c61)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/bean-validation/org.hibernate.validator-hibernate-validator-6.1.5.Final in repository https://gitbox.apache.org/repos/asf/struts-examples.git at 8292c61 Bump hibernate-validator in /bean-validation No new revisions were added by this update.
[struts-examples] branch master updated (2932424 -> 6559913)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/struts-examples.git from 2932424 Uses proper package for Hibernate Validator add 3cfc0e1 Bump hibernate-validator in /rest-angular add 6559913 Merge pull request #158 from apache/dependabot/maven/rest-angular/org.hibernate.validator-hibernate-validator-6.1.5.Final No new revisions were added by this update. Summary of changes: rest-angular/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[struts-examples] branch master updated (6559913 -> 9851f2f)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/struts-examples.git from 6559913 Merge pull request #158 from apache/dependabot/maven/rest-angular/org.hibernate.validator-hibernate-validator-6.1.5.Final add 8292c61 Bump hibernate-validator in /bean-validation new 9851f2f Merge pull request #159 from apache/dependabot/maven/bean-validation/org.hibernate.validator-hibernate-validator-6.1.5.Final 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: bean-validation/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) mode change 100755 => 100644 bean-validation/pom.xml
[struts-examples] 01/01: Merge pull request #159 from apache/dependabot/maven/bean-validation/org.hibernate.validator-hibernate-validator-6.1.5.Final
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-examples.git commit 9851f2f8e6c0937357a240ddc38fa2a3833eef22 Merge: 6559913 8292c61 Author: Lukasz Lenart AuthorDate: Mon Aug 8 11:47:09 2022 +0200 Merge pull request #159 from apache/dependabot/maven/bean-validation/org.hibernate.validator-hibernate-validator-6.1.5.Final Bump hibernate-validator from 6.1.2.Final to 6.1.5.Final in /bean-validation bean-validation/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[struts-examples] branch master updated: Upgrades Hibernate Validator and uses proper packages
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-examples.git The following commit(s) were added to refs/heads/master by this push: new 7feecf8 Upgrades Hibernate Validator and uses proper packages 7feecf8 is described below commit 7feecf8b66adc3eed0b3a0aec3d034fd8aed8b02 Author: Lukasz Lenart AuthorDate: Mon Aug 8 16:36:30 2022 +0200 Upgrades Hibernate Validator and uses proper packages --- bean-validation/pom.xml | 8 +++- rest-angular/pom.xml| 8 +++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/bean-validation/pom.xml b/bean-validation/pom.xml index 729e805..57e347b 100644 --- a/bean-validation/pom.xml +++ b/bean-validation/pom.xml @@ -17,7 +17,13 @@ org.hibernate.validator hibernate-validator -6.1.5.Final +6.2.3.Final + + + +org.glassfish +javax.el +3.0.1-b11 diff --git a/rest-angular/pom.xml b/rest-angular/pom.xml index e569def..7965599 100644 --- a/rest-angular/pom.xml +++ b/rest-angular/pom.xml @@ -63,7 +63,13 @@ org.hibernate.validator hibernate-validator -6.1.5.Final +6.2.3.Final + + + +org.glassfish +javax.el +3.0.1-b11
[struts] branch master updated: Reverting injection refactor of internal bean
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 3119eb65d Reverting injection refactor of internal bean
new 3c9465b85 Merge pull request #580 from rproserpio/patch-1
3119eb65d is described below
commit 3119eb65dbdc04467dcd103afc7790a87f86fff7
Author: rproserpio <48475312+rproser...@users.noreply.github.com>
AuthorDate: Mon Jul 25 01:11:46 2022 +0200
Reverting injection refactor of internal bean
In commit e9d0a5518cd0671d9ad0353a2c87246ef0d2061b
ContentTypeHandlerManager has been changed from setter-injected to
constructor-injected.
However, at least with spring as the object factory, that bean was an
internal bean not available from the factory, injected post construction.
In the 6.0.0 implementation ContentTypeInterceptor cannot be instantiated
since its dependency cannot be resolved:
```
org.springframework.beans.factory.UnsatisfiedDependencyException
Error creating bean with name
'org.apache.struts2.rest.ContentTypeInterceptor': Unsatisfied dependency
expressed through constructor parameter 0; nested exception is
org.springframework.beans.factory.NoSuchBeanDefinitionException: No qualifying
bean of type 'org.apache.struts2.rest.ContentTypeHandlerManager' available:
expected at least 1 bean which qualifies as autowire candidate. Dependency
annotations: {}
```
This commit attempts to revert that change.
---
.../src/main/java/org/apache/struts2/rest/ContentTypeInterceptor.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/plugins/rest/src/main/java/org/apache/struts2/rest/ContentTypeInterceptor.java
b/plugins/rest/src/main/java/org/apache/struts2/rest/ContentTypeInterceptor.java
index 1c49d36f8..40924fc5a 100644
---
a/plugins/rest/src/main/java/org/apache/struts2/rest/ContentTypeInterceptor.java
+++
b/plugins/rest/src/main/java/org/apache/struts2/rest/ContentTypeInterceptor.java
@@ -34,10 +34,10 @@ import java.io.InputStreamReader;
*/
public class ContentTypeInterceptor extends AbstractInterceptor {
-private final ContentTypeHandlerManager selector;
+private ContentTypeHandlerManager selector;
@Inject
-public ContentTypeInterceptor(ContentTypeHandlerManager selector) {
+public void setContentTypeHandlerSelector(ContentTypeHandlerManager
selector) {
this.selector = selector;
}
[struts] branch WW-5207-asm-9 created (now 86b45e96f)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch WW-5207-asm-9 in repository https://gitbox.apache.org/repos/asf/struts.git at 86b45e96f WW-5207 Uses ASM 9 by default This branch includes the following new commits: new 86b45e96f WW-5207 Uses ASM 9 by default 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.
