[struts] branch WW-5233-tiles updated: WW-5233 Marks Velocity dependencies as optional
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch WW-5233-tiles in repository https://gitbox.apache.org/repos/asf/struts.git The following commit(s) were added to refs/heads/WW-5233-tiles by this push: new 34f30be74 WW-5233 Marks Velocity dependencies as optional 34f30be74 is described below commit 34f30be749ca2a976d17f01363b3b28a18004010 Author: Lukasz Lenart AuthorDate: Wed Oct 19 09:06:54 2022 +0200 WW-5233 Marks Velocity dependencies as optional --- plugins/tiles/pom.xml | 36 +--- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/plugins/tiles/pom.xml b/plugins/tiles/pom.xml index 5426306fa..613229fdc 100644 --- a/plugins/tiles/pom.xml +++ b/plugins/tiles/pom.xml @@ -30,7 +30,7 @@ struts2-tiles-plugin jar Struts 2 Tiles Plugin - + @@ -80,29 +80,35 @@ jsp-api provided - -org.easymock -easymock -test - - -org.apache.logging.log4j -log4j-jcl -test - org.apache.velocity velocity-engine-core +true -org.apache.velocity -velocity-tools -2.0 -provided +org.apache.velocity.tools +velocity-tools-view +true + + +org.apache.velocity.tools +velocity-tools-view-jsp +true com.thoughtworks.xstream xstream +true + + +org.easymock +easymock +test + + +org.apache.logging.log4j +log4j-jcl +test
[struts] 01/01: Merge pull request #618 from apache/WW-5245-jackson-databind
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 commit 738d27952f3c9fe89d6c2161e7ae8d6145e44bbb Merge: 3d7f66f42 984f8eff2 Author: Lukasz Lenart AuthorDate: Wed Oct 19 09:07:57 2022 +0200 Merge pull request #618 from apache/WW-5245-jackson-databind [WW-5245] Upgrades Jackson Databind to version 2.13.4.2 pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
[struts] branch master updated (3d7f66f42 -> 738d27952)
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.git from 3d7f66f42 Merge pull request #614 from apache/WW-5244-commons-text add 984f8eff2 WW-5245 Upgrades Jackson Databind to version 2.13.4.2 new 738d27952 Merge pull request #618 from apache/WW-5245-jackson-databind 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: pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
[struts] branch WW-5230-ognl created (now 01164c4d7)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch WW-5230-ognl in repository https://gitbox.apache.org/repos/asf/struts.git at 01164c4d7 WW-5230 Upgrades OGNL to version 3.3.4 This branch includes the following new commits: new 01164c4d7 WW-5230 Upgrades OGNL to version 3.3.4 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-5230 Upgrades OGNL to version 3.3.4
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch WW-5230-ognl in repository https://gitbox.apache.org/repos/asf/struts.git commit 01164c4d7461d4b42b49aec84762f7b8562638fe Author: Lukasz Lenart AuthorDate: Wed Oct 19 11:38:50 2022 +0200 WW-5230 Upgrades OGNL to version 3.3.4 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 944b1ed2a..5a8fa9af7 100644 --- a/pom.xml +++ b/pom.xml @@ -113,7 +113,7 @@ 2.13.4 2.13.4.2 2.19.0 -3.3.3 +3.3.4 1.7.32 5.3.23 3.0.8
[struts] branch WW-3529-named-pattern created (now 993c4c4ca)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch WW-3529-named-pattern in repository https://gitbox.apache.org/repos/asf/struts.git at 993c4c4ca WW-3529 Fixes using RegEx related characters in named pattern This branch includes the following new commits: new 993c4c4ca WW-3529 Fixes using RegEx related characters in named pattern 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-3529 Fixes using RegEx related characters in named pattern
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch WW-3529-named-pattern
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 993c4c4cab21ace8970d094da03291b21547ab83
Author: Lukasz Lenart
AuthorDate: Wed Oct 19 12:22:31 2022 +0200
WW-3529 Fixes using RegEx related characters in named pattern
---
.../xwork2/util/NamedVariablePatternMatcher.java | 67 +-
.../util/NamedVariablePatternMatcherTest.java | 27 +++--
2 files changed, 61 insertions(+), 33 deletions(-)
diff --git
a/core/src/main/java/com/opensymphony/xwork2/util/NamedVariablePatternMatcher.java
b/core/src/main/java/com/opensymphony/xwork2/util/NamedVariablePatternMatcher.java
index cb848868d..24e5e9b35 100644
---
a/core/src/main/java/com/opensymphony/xwork2/util/NamedVariablePatternMatcher.java
+++
b/core/src/main/java/com/opensymphony/xwork2/util/NamedVariablePatternMatcher.java
@@ -18,6 +18,8 @@
*/
package com.opensymphony.xwork2.util;
+import org.apache.commons.lang3.StringUtils;
+
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -57,7 +59,7 @@ import java.util.regex.Pattern;
*
*
*
- * Excaping hasn't been implemented since the intended use of these patterns
will be in matching URLs.
+ * Escaping hasn't been implemented since the intended use of these patterns
will be in matching URLs.
*
*
* @since 2.1
@@ -75,38 +77,47 @@ public class NamedVariablePatternMatcher implements
PatternMatcher 0) {
-List varNames = new ArrayList<>();
-StringBuilder varName = null;
-for (int x=0; x varNames = new ArrayList<>();
+int s = 0;
+while (s < len) {
+int e = data.indexOf('{', s);
+if (e < 0 && data.indexOf('}') > -1) {
+throw new IllegalArgumentException("Missing openning '{' in ["
+ data + "]!");
+}
+if (e < 0) {
+regex.append(Pattern.quote(data.substring(s)));
+break;
+}
+if (e > s) {
+regex.append(Pattern.quote(data.substring(s, e)));
+}
+s = e + 1;
+e = data.indexOf('}', s);
+if (e < 0) {
+return null;
+}
+String varName = data.substring(s, e);
+if (StringUtils.isEmpty(varName)) {
+throw new IllegalArgumentException("Missing variable name in
[" + data + "]!");
}
-return new CompiledPattern(Pattern.compile(regex.toString()),
varNames);
+varNames.add(varName);
+regex.append("([^/]+)");
+s = e + 1;
}
-return null;
+return new CompiledPattern(Pattern.compile(regex.toString()),
varNames);
}
/**
* Tries to process the data against the compiled expression. If
successful, the map will contain
* the matched data, using the specified variable names in the original
pattern.
*
- * @param map The map of variables
+ * @param map The map of variables
* @param data The data to match
* @param expr The compiled pattern
* @return True if matched, false if not matched, the data was null, or
the data was an empty string
@@ -116,8 +127,8 @@ public class NamedVariablePatternMatcher implements
PatternMatcher 0) {
Matcher matcher = expr.getPattern().matcher(data);
if (matcher.matches()) {
-for (int x=0; x variableNames;
+private final Pattern pattern;
+private final List variableNames;
public CompiledPattern(Pattern pattern, List variableNames) {
diff --git
a/core/src/test/java/com/opensymphony/xwork2/util/NamedVariablePatternMatcherTest.java
b/core/src/test/java/com/opensymphony/xwork2/util/NamedVariablePatternMatcherTest.java
index e11fb6870..b5eda4f0a 100644
---
a/core/src/test/java/com/opensymphony/xwork2/util/NamedVariablePatternMatcherTest.java
+++
b/core/src/test/java/com/opensymphony/xwork2/util/NamedVariablePatternMatcherTest.java
@@ -37,15 +37,18 @@ public class NamedVariablePatternMatcherTest {
assertNull(matcher.compilePattern(null));
assertNull(matcher.compilePattern(""));
-CompiledPattern pattern = matcher.compilePattern("foo");
-assertEquals("foo", pattern.getPattern().pattern());
+CompiledPattern pattern = matcher.compilePattern("action.{format}");
+assertEquals("\\Qaction.\\E([^/]+)", pattern.getPattern().pattern());
+
+pattern = matcher.compilePattern("foo");
+assertEquals("\\Qfoo\\E", pattern.getPattern().pattern());
pattern = matcher.compilePattern("foo{jim}");
-assertEquals("foo([^/]+)", pattern.getPattern().pattern());
+assertEquals("\\Qfoo\\E([^/]+)", pattern.getPattern().pattern());
assertEquals("jim", pattern.getVariableNames().get(0));
pattern = matcher.
[struts] branch WW-3737-custom-separator created (now c41f05fe6)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch WW-3737-custom-separator in repository https://gitbox.apache.org/repos/asf/struts.git at c41f05fe6 WW-3737 Allows to define a custom separator used to split patterns This branch includes the following new commits: new c41f05fe6 WW-3737 Allows to define a custom separator used to split patterns 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-3737 Allows to define a custom separator used to split patterns
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch WW-3737-custom-separator
in repository https://gitbox.apache.org/repos/asf/struts.git
commit c41f05fe68c4f89ba5042747a43bb74e108ce550
Author: Lukasz Lenart
AuthorDate: Wed Oct 19 13:57:59 2022 +0200
WW-3737 Allows to define a custom separator used to split patterns
---
.../com/opensymphony/xwork2/XWorkTestCase.java | 31 ++--
.../opensymphony/xwork2/inject/ContainerImpl.java | 175 +
.../java/org/apache/struts2/StrutsConstants.java | 3 +
.../apache/struts2/dispatcher/InitOperations.java | 37 +++--
.../struts2/dispatcher/InitOperationsTest.java | 86 ++
5 files changed, 202 insertions(+), 130 deletions(-)
diff --git a/core/src/main/java/com/opensymphony/xwork2/XWorkTestCase.java
b/core/src/main/java/com/opensymphony/xwork2/XWorkTestCase.java
index 330e96412..ec7a8d755 100644
--- a/core/src/main/java/com/opensymphony/xwork2/XWorkTestCase.java
+++ b/core/src/main/java/com/opensymphony/xwork2/XWorkTestCase.java
@@ -34,22 +34,22 @@ import java.util.Locale;
import java.util.Map;
/**
- * Base JUnit TestCase to extend for XWork specific JUnit tests. Uses
+ * Base JUnit TestCase to extend for XWork specific JUnit tests. Uses
* the generic test setup for logic.
*
* @author plightbo
*/
public abstract class XWorkTestCase extends TestCase {
-
+
protected ConfigurationManager configurationManager;
protected Configuration configuration;
protected Container container;
protected ActionProxyFactory actionProxyFactory;
-
+
public XWorkTestCase() {
super();
}
-
+
@Override
protected void setUp() throws Exception {
configurationManager = XWorkTestCaseHelper.setUp();
@@ -57,7 +57,7 @@ public abstract class XWorkTestCase extends TestCase {
container = configuration.getContainer();
actionProxyFactory = container.getInstance(ActionProxyFactory.class);
}
-
+
@Override
protected void tearDown() throws Exception {
XWorkTestCaseHelper.tearDown(configurationManager);
@@ -66,34 +66,33 @@ public abstract class XWorkTestCase extends TestCase {
container = null;
actionProxyFactory = null;
}
-
+
protected void loadConfigurationProviders(ConfigurationProvider...
providers) {
configurationManager =
XWorkTestCaseHelper.loadConfigurationProviders(configurationManager, providers);
configuration = configurationManager.getConfiguration();
container = configuration.getContainer();
actionProxyFactory = container.getInstance(ActionProxyFactory.class);
}
-
-protected void loadButAdd(final Class type, final Object impl) {
+
+protected void loadButAdd(final Class type, final T impl) {
loadButAdd(type, Container.DEFAULT_NAME, impl);
}
-
-protected void loadButAdd(final Class type, final String name, final
Object impl) {
+
+protected void loadButAdd(final Class type, final String name,
final T impl) {
loadConfigurationProviders(new StubConfigurationProvider() {
@Override
-public void register(ContainerBuilder builder,
-LocatableProperties props) throws ConfigurationException {
+public void register(ContainerBuilder builder, LocatableProperties
props) throws ConfigurationException {
if (impl instanceof String ||
ClassUtils.isPrimitiveOrWrapper(impl.getClass())) {
props.setProperty(name, "" + impl);
} else {
-builder.factory(type, name, new Factory() {
-public Object create(Context context) throws Exception
{
+builder.factory(type, name, new Factory() {
+public T create(Context context) throws Exception {
return impl;
}
@Override
-public Class type() {
-return impl.getClass();
+public Class type() {
+return (Class) impl.getClass();
}
}, Scope.SINGLETON);
}
diff --git
a/core/src/main/java/com/opensymphony/xwork2/inject/ContainerImpl.java
b/core/src/main/java/com/opensymphony/xwork2/inject/ContainerImpl.java
index ad3d43c2f..455f8a449 100644
--- a/core/src/main/java/com/opensymphony/xwork2/inject/ContainerImpl.java
+++ b/core/src/main/java/com/opensymphony/xwork2/inject/ContainerImpl.java
@@ -19,10 +19,26 @@ import com.opensymphony.xwork2.inject.util.ReferenceCache;
import java.io.Serializable;
import java.lang.annotation.Annotation;
-import java.lang.reflect.*;
+import java.lang.reflect.AccessibleObject;
+import java.lang.reflect.AnnotatedElement;
+import java.lang.reflect.Constructor;
+import ja
[struts-site] branch results updated: Uses Dockerfile with dedicate UID
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch results
in repository https://gitbox.apache.org/repos/asf/struts-site.git
The following commit(s) were added to refs/heads/results by this push:
new 764d6bc3c Uses Dockerfile with dedicate UID
764d6bc3c is described below
commit 764d6bc3c2aa2ccb80886e1093fc89663962f4b9
Author: Lukasz Lenart
AuthorDate: Wed Oct 19 14:10:15 2022 +0200
Uses Dockerfile with dedicate UID
---
Dockerfile | 11 +++
Jenkinsfile | 15 ++-
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0..58c20bb0b
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,11 @@
+FROM jekyll/builder:4.2.2
+
+USER 910
+
+ENV GEM_HOME="$WORKSPACE/.gems"
+ENV PATH="$GEM_HOME/bin:$PATH"
+ENV BUNDLE_USER_HOME="$WORKSPACE/.bundle"
+
+RUN bundle config set --local path $GEM_HOME
+RUN bundle install
+RUN bundle exec jekyll build
diff --git a/Jenkinsfile b/Jenkinsfile
index e87de3b18..3a0abbe69 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -13,22 +13,11 @@ pipeline {
stages {
stage('Build a staged website') {
agent {
-docker {
- image 'jekyll/builder:4.2.2'
- args "-v ${env.WORKSPACE}:/dest:rw,z"
-}
+dockerfile true
+args "-v ${env.WORKSPACE}:/dest:rw,z"
}
steps {
sh '''
- export GEM_HOME="$WORKSPACE/.gems"
- export PATH="$GEM_HOME/bin:$PATH"
- export BUNDLE_USER_HOME="$WORKSPACE/.bundle"
-
- bundle config set --local path $GEM_HOME
- bundle install
- bundle exec jekyll build
- ls -l /dest
- ls -l
mv ./_site /dest
'''
}
[struts-site] branch results updated: Uses proper dockerfile syntax in pipeline
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch results
in repository https://gitbox.apache.org/repos/asf/struts-site.git
The following commit(s) were added to refs/heads/results by this push:
new 36b8cab79 Uses proper dockerfile syntax in pipeline
36b8cab79 is described below
commit 36b8cab79d2429eae3e7f48648817e77a1765354
Author: Lukasz Lenart
AuthorDate: Wed Oct 19 14:15:10 2022 +0200
Uses proper dockerfile syntax in pipeline
---
Jenkinsfile | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 3a0abbe69..5ac7c1834 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -13,8 +13,9 @@ pipeline {
stages {
stage('Build a staged website') {
agent {
-dockerfile true
-args "-v ${env.WORKSPACE}:/dest:rw,z"
+dockerfile {
+ args "-v ${env.WORKSPACE}:/dest:rw,z"
+}
}
steps {
sh '''
[struts-site] branch results updated: Moves building site into pipeline
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch results
in repository https://gitbox.apache.org/repos/asf/struts-site.git
The following commit(s) were added to refs/heads/results by this push:
new 51fe84f8e Moves building site into pipeline
51fe84f8e is described below
commit 51fe84f8e06ef58f2c6d01bae9352f7eb1aa683f
Author: Lukasz Lenart
AuthorDate: Wed Oct 19 14:18:53 2022 +0200
Moves building site into pipeline
---
Dockerfile | 2 --
Jenkinsfile | 7 ++-
2 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 58c20bb0b..7fc28be9d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,5 +7,3 @@ ENV PATH="$GEM_HOME/bin:$PATH"
ENV BUNDLE_USER_HOME="$WORKSPACE/.bundle"
RUN bundle config set --local path $GEM_HOME
-RUN bundle install
-RUN bundle exec jekyll build
diff --git a/Jenkinsfile b/Jenkinsfile
index 5ac7c1834..68dbe705a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -19,6 +19,8 @@ pipeline {
}
steps {
sh '''
+ bundle install
+ bundle exec jekyll build
mv ./_site /dest
'''
}
@@ -28,9 +30,6 @@ pipeline {
sh '''
echo "Pushing changes into stage site"
- pwd
- ls -la
-
if ! git config remote.asf.url > /dev/null; then
git remote add asf
https://gitbox.apache.org/repos/asf/struts-site.git
fi
@@ -39,8 +38,6 @@ pipeline {
git checkout asf-staging
git pull asf asf-staging
- ls -la
-
cp -r _site/* content
cp -r _site/.htaccess content/.htaccess
[struts-site] branch results updated: Defines proper WORKSPACE env
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch results
in repository https://gitbox.apache.org/repos/asf/struts-site.git
The following commit(s) were added to refs/heads/results by this push:
new ae7acd5b1 Defines proper WORKSPACE env
ae7acd5b1 is described below
commit ae7acd5b1d48550ace4b7b52463c39aea692d132
Author: Lukasz Lenart
AuthorDate: Wed Oct 19 14:24:31 2022 +0200
Defines proper WORKSPACE env
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 68dbe705a..43f3c9e6a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -14,7 +14,7 @@ pipeline {
stage('Build a staged website') {
agent {
dockerfile {
- args "-v ${env.WORKSPACE}:/dest:rw,z"
+ args "-v ${env.WORKSPACE}:/dest:rw,z -e WORKSPACE=${env.WORKSPACE}"
}
}
steps {
[struts-site] branch results updated: Moves building commands back to pipeline
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch results
in repository https://gitbox.apache.org/repos/asf/struts-site.git
The following commit(s) were added to refs/heads/results by this push:
new 415ffd76f Moves building commands back to pipeline
415ffd76f is described below
commit 415ffd76fb7504c7d201622a102d98680877b51f
Author: Lukasz Lenart
AuthorDate: Wed Oct 19 14:46:19 2022 +0200
Moves building commands back to pipeline
---
Dockerfile | 6 --
Jenkinsfile | 7 ++-
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 7fc28be9d..e580a8dfc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,9 +1,3 @@
FROM jekyll/builder:4.2.2
USER 910
-
-ENV GEM_HOME="$WORKSPACE/.gems"
-ENV PATH="$GEM_HOME/bin:$PATH"
-ENV BUNDLE_USER_HOME="$WORKSPACE/.bundle"
-
-RUN bundle config set --local path $GEM_HOME
diff --git a/Jenkinsfile b/Jenkinsfile
index 43f3c9e6a..b49771e7c 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -14,11 +14,16 @@ pipeline {
stage('Build a staged website') {
agent {
dockerfile {
- args "-v ${env.WORKSPACE}:/dest:rw,z -e WORKSPACE=${env.WORKSPACE}"
+ args "-v ${env.WORKSPACE}:/dest:rw,z"
}
}
steps {
sh '''
+ export GEM_HOME="$WORKSPACE/.gems"
+ export PATH="$GEM_HOME/bin:$PATH"
+ export BUNDLE_USER_HOME="$WORKSPACE/.bundle"
+
+ bundle config set --local path $GEM_HOME
bundle install
bundle exec jekyll build
mv ./_site /dest
[struts-site] branch results updated: Uses proper GID
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch results in repository https://gitbox.apache.org/repos/asf/struts-site.git The following commit(s) were added to refs/heads/results by this push: new 91511d333 Uses proper GID 91511d333 is described below commit 91511d33380daac9570c3d6e20501597f94df0d2 Author: Lukasz Lenart AuthorDate: Wed Oct 19 14:54:22 2022 +0200 Uses proper GID --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e580a8dfc..054452fad 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,3 +1,3 @@ FROM jekyll/builder:4.2.2 -USER 910 +USER 910:910
[struts-site] branch results updated: Reverts to non-Docker build
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch results
in repository https://gitbox.apache.org/repos/asf/struts-site.git
The following commit(s) were added to refs/heads/results by this push:
new bdefa4cb4 Reverts to non-Docker build
bdefa4cb4 is described below
commit bdefa4cb458ea9791c1c8e10f5b57939d10c74d5
Author: Lukasz Lenart
AuthorDate: Wed Oct 19 15:02:54 2022 +0200
Reverts to non-Docker build
---
Jenkinsfile | 23 +--
1 file changed, 13 insertions(+), 10 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index b49771e7c..694b8e34f 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -10,23 +10,26 @@ pipeline {
disableConcurrentBuilds()
skipStagesAfterUnstable()
}
+ environment {
+RUBY_PATH="${env.WORKSPACE}/.rvm"
+GEM_HOME="${RUBY_PATH}/gems"
+PATH="${GEM_HOME}/bin:${RUBY_PATH}/bin:${env.PATH}"
+ }
stages {
stage('Build a staged website') {
- agent {
-dockerfile {
- args "-v ${env.WORKSPACE}:/dest:rw,z"
-}
- }
steps {
sh '''
- export GEM_HOME="$WORKSPACE/.gems"
- export PATH="$GEM_HOME/bin:$PATH"
- export BUNDLE_USER_HOME="$WORKSPACE/.bundle"
+ echo Generating a new version of website
- bundle config set --local path $GEM_HOME
+ curl -sSL https://get.rvm.io | bash -s -- --path ${RUBY_PATH}
+ mkdir -p ${GEM_HOME}
+
+ rvm install 2.7.6
+ gem install --install-dir ${GEM_HOME} bundler -v '2.3.13'
+
+ bundle config set --local path ${GEM_HOME}
bundle install
bundle exec jekyll build
- mv ./_site /dest
'''
}
}
[struts-site] branch results updated: Stops installing ruby
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch results
in repository https://gitbox.apache.org/repos/asf/struts-site.git
The following commit(s) were added to refs/heads/results by this push:
new 16445b286 Stops installing ruby
16445b286 is described below
commit 16445b28679e0cfe8a94525fdde18e89fe84cfe6
Author: Lukasz Lenart
AuthorDate: Wed Oct 19 15:08:06 2022 +0200
Stops installing ruby
---
Jenkinsfile | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 694b8e34f..0c6485711 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -23,9 +23,8 @@ pipeline {
curl -sSL https://get.rvm.io | bash -s -- --path ${RUBY_PATH}
mkdir -p ${GEM_HOME}
-
- rvm install 2.7.6
- gem install --install-dir ${GEM_HOME} bundler -v '2.3.13'
+
+ gem install --install-dir ${GEM_HOME} bundler -v '2.3.23'
bundle config set --local path ${GEM_HOME}
bundle install
[struts-site] branch results updated: Pushes changed Gemfile.lock
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch results
in repository https://gitbox.apache.org/repos/asf/struts-site.git
The following commit(s) were added to refs/heads/results by this push:
new bf879622e Pushes changed Gemfile.lock
bf879622e is described below
commit bf879622eaaa0177da8d671db24b3e9cc53a86cd
Author: Lukasz Lenart
AuthorDate: Wed Oct 19 15:15:21 2022 +0200
Pushes changed Gemfile.lock
---
Dockerfile | 3 ---
Jenkinsfile | 4
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/Dockerfile b/Dockerfile
deleted file mode 100644
index 054452fad..0
--- a/Dockerfile
+++ /dev/null
@@ -1,3 +0,0 @@
-FROM jekyll/builder:4.2.2
-
-USER 910:910
diff --git a/Jenkinsfile b/Jenkinsfile
index 0c6485711..b23b03749 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -41,6 +41,10 @@ pipeline {
git remote add asf
https://gitbox.apache.org/repos/asf/struts-site.git
fi
+ git add Gemfile.lock
+ git commit -m "Updates Gemfile.lock"
+ git push
+
git fetch asf
git checkout asf-staging
git pull asf asf-staging
[struts-site] branch results updated: Adds remote refs where to push
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch results
in repository https://gitbox.apache.org/repos/asf/struts-site.git
The following commit(s) were added to refs/heads/results by this push:
new 2290f2182 Adds remote refs where to push
2290f2182 is described below
commit 2290f2182d87d700f6522a275bf26c56f3688954
Author: Lukasz Lenart
AuthorDate: Wed Oct 19 15:22:16 2022 +0200
Adds remote refs where to push
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index b23b03749..a3f98e0f1 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -43,7 +43,7 @@ pipeline {
git add Gemfile.lock
git commit -m "Updates Gemfile.lock"
- git push
+ git push asf
git fetch asf
git checkout asf-staging
[struts-site] branch results updated: Adds branch to push
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch results
in repository https://gitbox.apache.org/repos/asf/struts-site.git
The following commit(s) were added to refs/heads/results by this push:
new 77716e04c Adds branch to push
77716e04c is described below
commit 77716e04cad72e5f068183d0d2484b2a2cbc5bb0
Author: Lukasz Lenart
AuthorDate: Wed Oct 19 15:27:15 2022 +0200
Adds branch to push
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index a3f98e0f1..69c0f0c8a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -43,7 +43,7 @@ pipeline {
git add Gemfile.lock
git commit -m "Updates Gemfile.lock"
- git push asf
+ git push asf master
git fetch asf
git checkout asf-staging
[struts-site] branch results updated: Shows bundler version
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch results
in repository https://gitbox.apache.org/repos/asf/struts-site.git
The following commit(s) were added to refs/heads/results by this push:
new df28c190a Shows bundler version
df28c190a is described below
commit df28c190ab74dc397762b76843e18b30b7481dc3
Author: Lukasz Lenart
AuthorDate: Wed Oct 19 15:38:26 2022 +0200
Shows bundler version
---
Gemfile.lock | 1 +
Jenkinsfile | 1 +
2 files changed, 2 insertions(+)
diff --git a/Gemfile.lock b/Gemfile.lock
index f82d005c9..712360637 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -59,6 +59,7 @@ GEM
unicode-display_width (1.8.0)
PLATFORMS
+ x86_64-darwin-21
x86_64-linux-musl
DEPENDENCIES
diff --git a/Jenkinsfile b/Jenkinsfile
index 69c0f0c8a..3bcb3d7a6 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -26,6 +26,7 @@ pipeline {
gem install --install-dir ${GEM_HOME} bundler -v '2.3.23'
+ bundle -v
bundle config set --local path ${GEM_HOME}
bundle install
bundle exec jekyll build
[struts-site] branch results updated: Show git changes
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch results
in repository https://gitbox.apache.org/repos/asf/struts-site.git
The following commit(s) were added to refs/heads/results by this push:
new e648338e5 Show git changes
e648338e5 is described below
commit e648338e5406413783e3372b6480095770c81020
Author: Lukasz Lenart
AuthorDate: Wed Oct 19 15:38:45 2022 +0200
Show git changes
---
Jenkinsfile | 1 +
1 file changed, 1 insertion(+)
diff --git a/Jenkinsfile b/Jenkinsfile
index 3bcb3d7a6..14b9318e9 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -42,6 +42,7 @@ pipeline {
git remote add asf
https://gitbox.apache.org/repos/asf/struts-site.git
fi
+ git status
git add Gemfile.lock
git commit -m "Updates Gemfile.lock"
git push asf master
[struts-site] branch results updated: Restores Gemfile.lock
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch results
in repository https://gitbox.apache.org/repos/asf/struts-site.git
The following commit(s) were added to refs/heads/results by this push:
new 98f083bfb Restores Gemfile.lock
98f083bfb is described below
commit 98f083bfb0b981a475eb3eed975ede1571a3fbce
Author: Lukasz Lenart
AuthorDate: Wed Oct 19 15:44:41 2022 +0200
Restores Gemfile.lock
---
Jenkinsfile | 5 +
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 14b9318e9..c47fc47f0 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -42,10 +42,7 @@ pipeline {
git remote add asf
https://gitbox.apache.org/repos/asf/struts-site.git
fi
- git status
- git add Gemfile.lock
- git commit -m "Updates Gemfile.lock"
- git push asf master
+ git restore Gemfile.lock
git fetch asf
git checkout asf-staging
[struts-site] branch results updated: Uses checkout to restore file
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch results
in repository https://gitbox.apache.org/repos/asf/struts-site.git
The following commit(s) were added to refs/heads/results by this push:
new 939d4adda Uses checkout to restore file
939d4adda is described below
commit 939d4addad4010a1e101440440f0f628759709e5
Author: Lukasz Lenart
AuthorDate: Wed Oct 19 15:48:46 2022 +0200
Uses checkout to restore file
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index c47fc47f0..e1a29e778 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -42,7 +42,7 @@ pipeline {
git remote add asf
https://gitbox.apache.org/repos/asf/struts-site.git
fi
- git restore Gemfile.lock
+ git checkout Gemfile.lock
git fetch asf
git checkout asf-staging
[struts-site] branch results updated: Adds ToC
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch results
in repository https://gitbox.apache.org/repos/asf/struts-site.git
The following commit(s) were added to refs/heads/results by this push:
new b3807124a Adds ToC
b3807124a is described below
commit b3807124a512f960f52137fca9c293fc1fdb23b2
Author: Lukasz Lenart
AuthorDate: Wed Oct 19 15:53:01 2022 +0200
Adds ToC
---
source/core-developers/result-types.md | 8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/source/core-developers/result-types.md
b/source/core-developers/result-types.md
index 31d9b59d9..3986735c1 100644
--- a/source/core-developers/result-types.md
+++ b/source/core-developers/result-types.md
@@ -4,6 +4,10 @@ title: Result Types
---
# Result Types
+{:.no_toc}
+
+* Will be replaced with the ToC, excluding a header
+{:toc}
Most use cases can be divided into two phases. First, we need to change or
query the application's state, and then we need
to present an updated view of the application. The Action class manages the
application's state, and the Result Type
@@ -70,7 +74,7 @@ If you action method returns `success`, which is a default
name of the result, y
/WEB-INF/index.jsp
```
-## Default Parameters
+## Default parameters
To minimize configuration, Results can be configured with a single value,
which will be converted into a parameter,
and each Result can specify which parameter this value should be set as. For
example, here is a result defined in XML
@@ -92,7 +96,7 @@ Since probably 95% of your actions won't need results that
contain multiple para
a significant amount of configuration. It also follows that if you have
specified the default parameter, you don't need
to set the same parameter as a specifically-named parameter.
-## Registering Result Types
+## Registering result types
All Result Types are plugged in via the [Result
Configuration](result-configuration).
[struts-site] branch asf-staging updated: Updates stage by Jenkins
This is an automated email from the ASF dual-hosted git repository. git-site-role pushed a commit to branch asf-staging in repository https://gitbox.apache.org/repos/asf/struts-site.git The following commit(s) were added to refs/heads/asf-staging by this push: new b48c8c79b Updates stage by Jenkins b48c8c79b is described below commit b48c8c79ba8e501245e5196616d077cfa9da10e9 Author: jenkins AuthorDate: Wed Oct 19 13:54:33 2022 + Updates stage by Jenkins --- content/core-developers/result-types.html | 16 +--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/content/core-developers/result-types.html b/content/core-developers/result-types.html index 123754168..2f9dce3f4 100644 --- a/content/core-developers/result-types.html +++ b/content/core-developers/result-types.html @@ -129,7 +129,17 @@ << back to Core Developers Guide https://github.com/apache/struts-site/edit/master/source/core-developers/result-types.md"; title="Edit this page on GitHub">Edit on GitHub -Result Types +Result Types + + + Predefined Result Types + How to use results + Default result type + Default result name + Default parameters + Registering result types + Extending + Most use cases can be divided into two phases. First, we need to change or query the application’s state, and then we need to present an updated view of the application. The Action class manages the application’s state, and the Result Type @@ -241,7 +251,7 @@ specify the type attri/WEB-INF/index.jsp -Default Parameters +Default parameters To minimize configuration, Results can be configured with a single value, which will be converted into a parameter, and each Result can specify which parameter this value should be set as. For example, here is a result defined in XML @@ -261,7 +271,7 @@ that uses a default parameter: a significant amount of configuration. It also follows that if you have specified the default parameter, you don’t need to set the same parameter as a specifically-named parameter. -Registering Result Types +Registering result types All Result Types are plugged in via the Result Configuration.
[struts-site] branch results updated: Cleans up page
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch results
in repository https://gitbox.apache.org/repos/asf/struts-site.git
The following commit(s) were added to refs/heads/results by this push:
new 9a1ac4204 Cleans up page
9a1ac4204 is described below
commit 9a1ac4204fcd01885ae73f742a2f1cb18d8e4157
Author: Lukasz Lenart
AuthorDate: Wed Oct 19 15:56:03 2022 +0200
Cleans up page
---
source/core-developers/result-types.md | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/source/core-developers/result-types.md
b/source/core-developers/result-types.md
index 3986735c1..c8511f774 100644
--- a/source/core-developers/result-types.md
+++ b/source/core-developers/result-types.md
@@ -6,13 +6,13 @@ title: Result Types
# Result Types
{:.no_toc}
-* Will be replaced with the ToC, excluding a header
-{:toc}
-
Most use cases can be divided into two phases. First, we need to change or
query the application's state, and then we need
to present an updated view of the application. The Action class manages the
application's state, and the Result Type
manages the view.
+* Will be replaced with the ToC, excluding a header
+{:toc}
+
## Predefined Result Types
The framework provides several implementations of the
`com.opensymphony.xwork2.Result` interface, ready to use in your
@@ -40,7 +40,7 @@ interface. Custom Result Types might include generating an
email or JMS message,
## How to use results
Once your action has been executed it must either return a result name (as
`java.lang.String`) or instance
-of `com.opensymphony.xwork2.Result` and the result will be executed directly.
+of `com.opensymphony.xwork2.Result` and then the result will be executed
directly.
If a String has been returned, the framework will try to find a matching
result in the configuration and then it will
execute the result of a given type, see example:
@@ -49,7 +49,7 @@ execute the result of a given type, see example:
/WEB-INF/index.jsp
```
-You can define many results per action distinguishing them by different names.
+You can define many results per action distinguishing them by different names:
```xml
/WEB-INF/index.jsp
@@ -60,7 +60,7 @@ You can define many results per action distinguishing them by
different names.
## Default result type
In `struts-default.xml` the Dispatcher result type is registered as a default
result type, which means you don't have to
-specify the `type` attribute if yoy want to use it:
+specify the `type` attribute if you want to use it:
```xml
/WEB-INF/index.jsp
@@ -109,7 +109,7 @@ Check [Define dedicated factory](object-factory) to see how
to do it.
Struts 2 provides one such extension for you:
`ParamNameAwareResult` interface when used with `StrutsResultBuilder` can
limit parameters assigned to the result.
-So you can simple extend existing result with such a functionality as below:
+So you can simply extend existing result with such a functionality as below:
```java
public class MyResult extends ServletDispatcherResult implements
ParamNameAwareResult {
[struts-site] branch asf-staging updated: Updates stage by Jenkins
This is an automated email from the ASF dual-hosted git repository. git-site-role pushed a commit to branch asf-staging in repository https://gitbox.apache.org/repos/asf/struts-site.git The following commit(s) were added to refs/heads/asf-staging by this push: new 64bff49d4 Updates stage by Jenkins 64bff49d4 is described below commit 64bff49d4f4663b2b9cbae22adcb0f2738580c47 Author: jenkins AuthorDate: Wed Oct 19 13:58:06 2022 + Updates stage by Jenkins --- content/core-developers/result-types.html | 16 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/content/core-developers/result-types.html b/content/core-developers/result-types.html index 2f9dce3f4..3378c3a60 100644 --- a/content/core-developers/result-types.html +++ b/content/core-developers/result-types.html @@ -131,6 +131,10 @@ https://github.com/apache/struts-site/edit/master/source/core-developers/result-types.md"; title="Edit this page on GitHub">Edit on GitHub Result Types +Most use cases can be divided into two phases. First, we need to change or query the application’s state, and then we need +to present an updated view of the application. The Action class manages the application’s state, and the Result Type +manages the view. + Predefined Result Types How to use results @@ -141,10 +145,6 @@ Extending -Most use cases can be divided into two phases. First, we need to change or query the application’s state, and then we need -to present an updated view of the application. The Action class manages the application’s state, and the Result Type -manages the view. - Predefined Result Types The framework provides several implementations of the com.opensymphony.xwork2.Result interface, ready to use in your @@ -221,7 +221,7 @@ interface. Custom Result Types might include generating an email or JMS message, How to use results Once your action has been executed it must either return a result name (as java.lang.String) or instance -of com.opensymphony.xwork2.Result and the result will be executed directly. +of com.opensymphony.xwork2.Result and then the result will be executed directly. If a String has been returned, the framework will try to find a matching result in the configuration and then it will execute the result of a given type, see example: @@ -229,7 +229,7 @@ execute the result of a given type, see example:/WEB-INF/index.jsp -You can define many results per action distinguishing them by different names. +You can define many results per action distinguishing them by different names:/WEB-INF/index.jsp /WEB-INF/form.jsp @@ -239,7 +239,7 @@ execute the result of a given type, see example: Default result type In struts-default.xml the Dispatcher result type is registered as a default result type, which means you don’t have to -specify the type attribute if yoy want to use it: +specify the type attribute if you want to use it:/WEB-INF/index.jsp @@ -284,7 +284,7 @@ Check Define dedicated factory to see how to do it. Struts 2 provides one such extension for you: ParamNameAwareResult interface when used with StrutsResultBuilder can limit parameters assigned to the result. -So you can simple extend existing result with such a functionality as below: +So you can simply extend existing result with such a functionality as below: public class MyResult extends ServletDispatcherResult implements ParamNameAwareResult {
[struts-site] branch results updated: Cleans up page
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch results in repository https://gitbox.apache.org/repos/asf/struts-site.git The following commit(s) were added to refs/heads/results by this push: new 072e39e5c Cleans up page 072e39e5c is described below commit 072e39e5c69c4dc52b8c490d1bb8ee4c7eceb4fa Author: Lukasz Lenart AuthorDate: Wed Oct 19 16:01:52 2022 +0200 Cleans up page --- source/core-developers/result-types.md | 2 +- source/plugins/index.md| 53 +- 2 files changed, 28 insertions(+), 27 deletions(-) diff --git a/source/core-developers/result-types.md b/source/core-developers/result-types.md index c8511f774..3ec5b0da3 100644 --- a/source/core-developers/result-types.md +++ b/source/core-developers/result-types.md @@ -27,7 +27,7 @@ own applications. |[Stream Result](stream-result)|Used to stream an InputStream back to the browser (usually for file downloads)| |[Velocity Result](velocity-result)|Used for _Velocity_ integration| |[XSL Result](xsl-result)|Used for XML/XSLT integration| -|[Plain Result](plain-result)|A plain result which all you to write directly to a HttpResponse using a simplified API (since Struts 2.6)| +|[Plain Result](plain-result)|A plain result which all you to write directly to a HttpResponse using a simplified API (since Struts 6.x)| |[PlainText Result](plaintext-result)|Used to display the raw content of a particular file/page (i.e jsp, HTML)| |[Tiles Result](../plugins/tiles/)|Used to provide Tiles integration| |[Postback Result](postback-result)|Used to postback request parameters as a form to the specified destination| diff --git a/source/plugins/index.md b/source/plugins/index.md index 13b2176af..a11e72f29 100644 --- a/source/plugins/index.md +++ b/source/plugins/index.md @@ -5,44 +5,45 @@ title: Plugins # Plugin Developers Guide -Apache Struts 2 provides a simple [plugin architecture](plugins-architecture) so that developers can extend the framework just by -adding a JAR to the application's classpath. Since plugins are contained in a JAR, they are easy to share with others. -Several plugins are bundled with the framework, and others are available from third-party sources. +Apache Struts 2 provides a simple [plugin architecture](plugins-architecture) so that developers can extend the +framework just by adding a JAR to the application's classpath. Since plugins are contained in a JAR, they are easy +to share with others. Several plugins are bundled with the framework, and others are available from third-party sources. - [Plugins Architecture](plugins-architecture) - [Extending an Application with Custom Plugins](extending-an-application-with-custom-plugins) ## Bundled Plugins -| Name | Versions | Note | -|---|--|| -| [Bean Validation Plugin](bean-validation) | 2.5+ | -| [CDI (JSR 299) Plugin](cdi) | 2.3.1+ | -| [Codebehind Plugin](codebehind) | < 2.5| removed since 2.5, use [Convention Plugin](convention) | +| Name | Versions | Note | +|---||---| +| [Bean Validation Plugin](bean-validation) | 2.5+ | +| [CDI (JSR 299) Plugin](cdi) | 2.3.1+ | +| [Codebehind Plugin](codebehind) | < 2.5 | removed since 2.5, use [Convention Plugin](convention)| | [Config Browser Plugin](config-browser) ||| -| [Convention Plugin](convention) | 2.1.3+ || +| [Convention Plugin](convention) | 2.1.3+ || | [DWR Plugin](dwr) ||| -| [Embedded JSP Plugin](embedded-jsp) | 2.1.7+ | deprecated since 2.6 | +| [Embedded JSP Plugin](embedded-jsp) | 2.1.7+ | deprecated since 6.0.0| | [JasperReports Plugin](jasperreports) ||| -| [Java 8 Support Plugin](java-8-support) | 2.3.21 - 2.5.2 || -| [Javatemplates Plugin](javatemplates) | 2.1.3+ || +| [Java 8 Support Plugin](java-8-support) | 2.3.21 - 2.5.2 || +| [Javatemplates Plugin](javatemplates) | 2.1.3+ || | [JFreeChart Plugin](jfreechart) ||| -| [JSF Plugin](jsf) | < 2.5| removed since 2.5
[struts-site] branch asf-staging updated: Updates stage by Jenkins
This is an automated email from the ASF dual-hosted git repository. git-site-role pushed a commit to branch asf-staging in repository https://gitbox.apache.org/repos/asf/struts-site.git The following commit(s) were added to refs/heads/asf-staging by this push: new bdecafb85 Updates stage by Jenkins bdecafb85 is described below commit bdecafb85f29c3afe3aaf30f7acb03f439dc41b2 Author: jenkins AuthorDate: Wed Oct 19 14:03:36 2022 + Updates stage by Jenkins --- content/core-developers/result-types.html | 2 +- content/plugins/index.html| 25 + 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/content/core-developers/result-types.html b/content/core-developers/result-types.html index 3378c3a60..4f1fcded3 100644 --- a/content/core-developers/result-types.html +++ b/content/core-developers/result-types.html @@ -190,7 +190,7 @@ own applications. Plain Result - A plain result which all you to write directly to a HttpResponse using a simplified API (since Struts 2.6) + A plain result which all you to write directly to a HttpResponse using a simplified API (since Struts 6.x) PlainText Result diff --git a/content/plugins/index.html b/content/plugins/index.html index 04f7751cd..1c5b6723d 100644 --- a/content/plugins/index.html +++ b/content/plugins/index.html @@ -131,9 +131,9 @@ Plugin Developers Guide -Apache Struts 2 provides a simple plugin architecture so that developers can extend the framework just by -adding a JAR to the application’s classpath. Since plugins are contained in a JAR, they are easy to share with others. -Several plugins are bundled with the framework, and others are available from third-party sources. +Apache Struts 2 provides a simple plugin architecture so that developers can extend the +framework just by adding a JAR to the application’s classpath. Since plugins are contained in a JAR, they are easy +to share with others. Several plugins are bundled with the framework, and others are available from third-party sources. Plugins Architecture @@ -184,7 +184,7 @@ Several plugins are bundled with the framework, and others are available from th Embedded JSP Plugin 2.1.7+ - deprecated since 2.6 + deprecated since 6.0.0 JasperReports Plugin @@ -224,27 +224,27 @@ Several plugins are bundled with the framework, and others are available from th OVal Plugin 2.1.7+ - deprecated since 2.6, use Bean Validation Plugin + deprecated since 6.0.0, use Bean Validation Plugin OSGi Plugin 2.1.7+ - deprecated since 2.6 + deprecated since 6.0.0 Plexus Plugin - deprecated since 2.6 + deprecated since 6.0.0 Portlet Plugin - deprecated since 2.6 + deprecated since 6.0.0 Portlet Tiles Plugin 2.3.5+ - deprecated since 2.6 + deprecated since 6.0.0 REST Plugin @@ -259,7 +259,7 @@ Several plugins are bundled with the framework, and others are available from th SiteMesh Plugin - deprecated since 2.6 + deprecated since 6.0.0 Spring Plugin @@ -288,14 +288,15 @@ Several plugins are bundled with the framework, and others are available from th Velocity Plugin - < 6.0.0 + - For a complete list of bundled and third-party plugins, visit the http://cwiki.apache.org/S2PLUGINS/Home";>Plugin Registry. + For a complete list of bundled and third-party plugins, visit +the http://cwiki.apache.org/S2PLUGINS/Home";>Plugin Registry.
[struts-site] branch master updated: Update Results page (#172)
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-site.git
The following commit(s) were added to refs/heads/master by this push:
new ee1bdd84c Update Results page (#172)
ee1bdd84c is described below
commit ee1bdd84ca234acf5c50d579292554c702422298
Author: Lukasz Lenart
AuthorDate: Wed Oct 19 16:04:58 2022 +0200
Update Results page (#172)
* Cleans up navigation and content
* Explains how to use results
* Cleans up content
* Includes _site again
* Adds missing parent header
* Excludes _site
* Lists folder
* Stops using docker
* Reverts build to version before starts using Docker
* Fixes typo in env name
* Defines envs in script
* Avoids using env prefix
* Sets proper envs
* Reverts to Docker again
* List folders after Docker ends
* Performs all git operations in Docker
* Puts back Docker
* Cleans up workspace and add missing git user data
* Uses local git config
* Builds with Docker and moves content out of Docker
* Uses full path
* Uses context path
* Maps dedicated folder to store generated site
* Uses Dockerfile with dedicate UID
* Uses proper dockerfile syntax in pipeline
* Moves building site into pipeline
* Defines proper WORKSPACE env
* Moves building commands back to pipeline
* Uses proper GID
* Reverts to non-Docker build
* Stops installing ruby
* Pushes changed Gemfile.lock
* Adds remote refs where to push
* Adds branch to push
* Shows bundler version
* Show git changes
* Restores Gemfile.lock
* Uses checkout to restore file
* Adds ToC
* Cleans up page
* Cleans up page
---
Gemfile.lock | 1 +
Jenkinsfile| 30 ++--
source/core-developers/chain-result.md | 4 +-
source/core-developers/dispatcher-result.md| 4 +-
.../execute-and-wait-interceptor.md| 152 +++--
source/core-developers/freemarker-result.md| 4 +-
source/core-developers/httpheader-result.md| 4 +-
source/core-developers/plain-result.md | 4 +-
source/core-developers/plaintext-result.md | 4 +-
source/core-developers/postback-result.md | 88 +++-
source/core-developers/redirect-action-result.md | 4 +-
source/core-developers/redirect-result.md | 4 +-
source/core-developers/result-types.md | 55 ++--
source/core-developers/stream-result.md| 4 +-
source/core-developers/velocity-result.md | 3 +
source/core-developers/xsl-result.md | 4 +-
source/plugins/index.md| 53 +++
17 files changed, 214 insertions(+), 208 deletions(-)
diff --git a/Gemfile.lock b/Gemfile.lock
index f82d005c9..712360637 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -59,6 +59,7 @@ GEM
unicode-display_width (1.8.0)
PLATFORMS
+ x86_64-darwin-21
x86_64-linux-musl
DEPENDENCIES
diff --git a/Jenkinsfile b/Jenkinsfile
index ef5004548..e1a29e778 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -10,20 +10,24 @@ pipeline {
disableConcurrentBuilds()
skipStagesAfterUnstable()
}
+ environment {
+RUBY_PATH="${env.WORKSPACE}/.rvm"
+GEM_HOME="${RUBY_PATH}/gems"
+PATH="${GEM_HOME}/bin:${RUBY_PATH}/bin:${env.PATH}"
+ }
stages {
stage('Build a staged website') {
- agent {
-docker {
- image 'jekyll/builder:4.2.2'
-}
- }
steps {
sh '''
- export GEM_HOME="$WORKSPACE/.gems"
- export PATH="$GEM_HOME/bin:$PATH"
- export BUNDLE_USER_HOME="$WORKSPACE/.bundle"
+ echo Generating a new version of website
+
+ curl -sSL https://get.rvm.io | bash -s -- --path ${RUBY_PATH}
+ mkdir -p ${GEM_HOME}
- bundle config set --local path $GEM_HOME
+ gem install --install-dir ${GEM_HOME} bundler -v '2.3.23'
+
+ bundle -v
+ bundle config set --local path ${GEM_HOME}
bundle install
bundle exec jekyll build
'''
@@ -31,17 +35,19 @@ pipeline {
}
stage('Deploy to stage area') {
steps {
-sh """
+sh '''
echo "Pushing changes into stage site"
if ! git config remote.asf.url > /dev/null; then
git remote add asf
https://gitbox.apache.org/repos/asf/struts-site.git
fi
+ git checkout Gemfile.lock
+
git fetch asf
git checkout asf-staging
git pull asf asf-staging
-
+
[struts-site] branch asf-site updated: Automatic Site Publish by Buildbot
This is an automated email from the ASF dual-hosted git repository. git-site-role pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/struts-site.git The following commit(s) were added to refs/heads/asf-site by this push: new 8e8f1a2fc Automatic Site Publish by Buildbot 8e8f1a2fc is described below commit 8e8f1a2fceeeb1a71f624488a7379bd6ff08ae5a Author: buildbot AuthorDate: Wed Oct 19 14:05:35 2022 + Automatic Site Publish by Buildbot --- output/core-developers/chain-result.html | 2 +- output/core-developers/dispatcher-result.html | 2 +- .../execute-and-wait-interceptor.html | 149 ++--- output/core-developers/freemarker-result.html | 2 +- output/core-developers/httpheader-result.html | 2 +- output/core-developers/plain-result.html | 2 +- output/core-developers/plaintext-result.html | 2 +- output/core-developers/postback-result.html| 97 +++--- output/core-developers/redirect-action-result.html | 2 +- output/core-developers/redirect-result.html| 2 +- output/core-developers/result-types.html | 65 ++--- output/core-developers/stream-result.html | 2 +- output/core-developers/xsl-result.html | 2 +- output/plugins/index.html | 25 ++-- 14 files changed, 192 insertions(+), 164 deletions(-) diff --git a/output/core-developers/chain-result.html b/output/core-developers/chain-result.html index 640b94819..a8af6a94c 100644 --- a/output/core-developers/chain-result.html +++ b/output/core-developers/chain-result.html @@ -129,7 +129,7 @@ https://github.com/apache/struts-site/edit/master/source/core-developers/chain-result.md"; title="Edit this page on GitHub">Edit on GitHub -<< back to Core Developers Guide +<< back to Result types Chain Result diff --git a/output/core-developers/dispatcher-result.html b/output/core-developers/dispatcher-result.html index dd2b223da..7b7c751ed 100644 --- a/output/core-developers/dispatcher-result.html +++ b/output/core-developers/dispatcher-result.html @@ -129,7 +129,7 @@ https://github.com/apache/struts-site/edit/master/source/core-developers/dispatcher-result.md"; title="Edit this page on GitHub">Edit on GitHub -<< back to Core Developers Guide +<< back to Result types Dispatcher Result diff --git a/output/core-developers/execute-and-wait-interceptor.html b/output/core-developers/execute-and-wait-interceptor.html index d66a395a0..d90537c0b 100644 --- a/output/core-developers/execute-and-wait-interceptor.html +++ b/output/core-developers/execute-and-wait-interceptor.html @@ -133,36 +133,36 @@ Execute and Wait Interceptor -The ExecuteAndWaitInterceptor is great for running long-lived actions in the background while showing the user a nice +The ExecuteAndWaitInterceptor is great for running long-lived actions in the background while showing the user a nice progress meter. This also prevents the HTTP request from timing out when the action takes more than 5 or 10 minutes. -Using this interceptor is pretty straight forward. Assuming that you are including struts-default.xml, this interceptor -is already configured but is not part of any of the default stacks. Because of the nature of this interceptor, it must +Using this interceptor is pretty straight forward. Assuming that you are including struts-default.xml, this interceptor +is already configured but is not part of any of the default stacks. Because of the nature of this interceptor, it must be the last interceptor in the stack. -This interceptor works on a per-session basis. That means that the same action name (myLongRunningAction, in +This interceptor works on a per-session basis. That means that the same action name (myLongRunningAction, in the above example) cannot be run more than once at a time in a given session. On the initial request or any subsequent requests (before the action has completed), the wait result will be returned. - The wait result is responsible for issuing a subsequent request back to the action, giving the effect + The wait result is responsible for issuing a subsequent request back to the action, giving the effect of a self-updating progress meter. -If no wait result is found, Struts will automatically generate a wait result on the fly. This result is written -in FreeMarker and cannot run unless FreeMarker is installed. If you don’t wish to deploy with FreeMarker, you must +If no wait result is found, Struts will automatically generate a wait result on the fly. This result is written +in FreeMarker and cannot run unless FreeMarker is installed. If you don’t wish to deploy with FreeMarker, you must provide your own wait result. This is generally a good thing to do anyway, as the default wait page is very plain. -Whenever the wait r
[struts-site] branch asf-staging updated: Updates stage by Jenkins
This is an automated email from the ASF dual-hosted git repository. git-site-role pushed a commit to branch asf-staging in repository https://gitbox.apache.org/repos/asf/struts-site.git The following commit(s) were added to refs/heads/asf-staging by this push: new 2452fe3e0 Updates stage by Jenkins 2452fe3e0 is described below commit 2452fe3e0850147bd40f4174b737c8aaf805cbde Author: jenkins AuthorDate: Wed Oct 19 14:09:00 2022 + Updates stage by Jenkins
[struts-site] branch master updated: Drops installing rvm
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-site.git
The following commit(s) were added to refs/heads/master by this push:
new 7f936a4b0 Drops installing rvm
7f936a4b0 is described below
commit 7f936a4b0a2d0c42f3274bf0b2c9b36da8c365a7
Author: Lukasz Lenart
AuthorDate: Thu Oct 20 07:46:16 2022 +0200
Drops installing rvm
---
Jenkinsfile | 8 +++-
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index e1a29e778..2f252e62d 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -21,12 +21,10 @@ pipeline {
sh '''
echo Generating a new version of website
- curl -sSL https://get.rvm.io | bash -s -- --path ${RUBY_PATH}
- mkdir -p ${GEM_HOME}
-
- gem install --install-dir ${GEM_HOME} bundler -v '2.3.23'
-
bundle -v
+ gem install --install-dir ${GEM_HOME} bundler -v '2.3.23'
+ bundle -v
+
bundle config set --local path ${GEM_HOME}
bundle install
bundle exec jekyll build
[struts-site] branch master updated: Drops checking Bundler version
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-site.git
The following commit(s) were added to refs/heads/master by this push:
new 55f905f65 Drops checking Bundler version
55f905f65 is described below
commit 55f905f65cbd23099c0dcffde8e330890325cae5
Author: Lukasz Lenart
AuthorDate: Thu Oct 20 07:50:32 2022 +0200
Drops checking Bundler version
---
Jenkinsfile | 2 --
1 file changed, 2 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 2f252e62d..7c7c1896d 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -21,9 +21,7 @@ pipeline {
sh '''
echo Generating a new version of website
- bundle -v
gem install --install-dir ${GEM_HOME} bundler -v '2.3.23'
- bundle -v
bundle config set --local path ${GEM_HOME}
bundle install
[struts-site] branch asf-staging updated: Updates stage by Jenkins
This is an automated email from the ASF dual-hosted git repository. git-site-role pushed a commit to branch asf-staging in repository https://gitbox.apache.org/repos/asf/struts-site.git The following commit(s) were added to refs/heads/asf-staging by this push: new e90962f47 Updates stage by Jenkins e90962f47 is described below commit e90962f473caf90ae37009be25319871123f48a8 Author: jenkins AuthorDate: Thu Oct 20 05:52:11 2022 + Updates stage by Jenkins
[struts-site] branch test-build created (now b878163e8)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch test-build in repository https://gitbox.apache.org/repos/asf/struts-site.git at b878163e8 Shows content of Gemfile.lock This branch includes the following new commits: new b878163e8 Shows content of Gemfile.lock 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-site] 01/01: Shows content of Gemfile.lock
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch test-build
in repository https://gitbox.apache.org/repos/asf/struts-site.git
commit b878163e804c3c1fd42ed6b3f7079e669c5ec93b
Author: Lukasz Lenart
AuthorDate: Thu Oct 20 08:25:26 2022 +0200
Shows content of Gemfile.lock
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 7c7c1896d..4bd81350b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -37,7 +37,7 @@ pipeline {
if ! git config remote.asf.url > /dev/null; then
git remote add asf
https://gitbox.apache.org/repos/asf/struts-site.git
fi
-
+ cat Gemfile.lock
git checkout Gemfile.lock
git fetch asf
[struts-site] branch asf-staging updated: Updates stage by Jenkins
This is an automated email from the ASF dual-hosted git repository. git-site-role pushed a commit to branch asf-staging in repository https://gitbox.apache.org/repos/asf/struts-site.git The following commit(s) were added to refs/heads/asf-staging by this push: new 8fcbc375c Updates stage by Jenkins 8fcbc375c is described below commit 8fcbc375c82e4d5c5373e2960d1393063ea5f5fa Author: jenkins AuthorDate: Thu Oct 20 06:35:48 2022 + Updates stage by Jenkins
[struts-site] 01/02: Uses proper Gemfile.lock
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch test-build in repository https://gitbox.apache.org/repos/asf/struts-site.git commit 51a785cd530af2e5ec9ef82b1202f50b956ac189 Author: Lukasz Lenart AuthorDate: Thu Oct 20 08:38:10 2022 +0200 Uses proper Gemfile.lock --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 712360637..471d19761 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -45,7 +45,7 @@ GEM mercenary (0.4.0) pathutil (0.16.2) forwardable-extended (~> 2.6) -public_suffix (5.0.0) +public_suffix (4.0.7) rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) @@ -60,7 +60,7 @@ GEM PLATFORMS x86_64-darwin-21 - x86_64-linux-musl + x86_64-linux DEPENDENCIES jekyll
[struts-site] 02/02: Stops reverting Gemfile.lock
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch test-build
in repository https://gitbox.apache.org/repos/asf/struts-site.git
commit 20a430705250a277c6f4a3e7b88c996c84330095
Author: Lukasz Lenart
AuthorDate: Thu Oct 20 08:38:54 2022 +0200
Stops reverting Gemfile.lock
---
Jenkinsfile | 2 --
1 file changed, 2 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 4bd81350b..b74c44ebb 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -37,8 +37,6 @@ pipeline {
if ! git config remote.asf.url > /dev/null; then
git remote add asf
https://gitbox.apache.org/repos/asf/struts-site.git
fi
- cat Gemfile.lock
- git checkout Gemfile.lock
git fetch asf
git checkout asf-staging
[struts-site] branch test-build updated (b878163e8 -> 20a430705)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch test-build in repository https://gitbox.apache.org/repos/asf/struts-site.git from b878163e8 Shows content of Gemfile.lock new 51a785cd5 Uses proper Gemfile.lock new 20a430705 Stops reverting Gemfile.lock The 2 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: Gemfile.lock | 4 ++-- Jenkinsfile | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-)
[struts-site] branch asf-staging updated: Updates stage by Jenkins
This is an automated email from the ASF dual-hosted git repository. git-site-role pushed a commit to branch asf-staging in repository https://gitbox.apache.org/repos/asf/struts-site.git The following commit(s) were added to refs/heads/asf-staging by this push: new 285002dc6 Updates stage by Jenkins 285002dc6 is described below commit 285002dc693d2a178cf42fa96c9a41e5cde16856 Author: jenkins AuthorDate: Thu Oct 20 06:39:58 2022 + Updates stage by Jenkins
[struts-site] branch master updated: Uses proper Gemfile.lock (#173)
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-site.git
The following commit(s) were added to refs/heads/master by this push:
new c366b4d85 Uses proper Gemfile.lock (#173)
c366b4d85 is described below
commit c366b4d85e63828dcc64d6b854b9e732d4b4
Author: Lukasz Lenart
AuthorDate: Thu Oct 20 08:42:39 2022 +0200
Uses proper Gemfile.lock (#173)
* Shows content of Gemfile.lock
* Uses proper Gemfile.lock
* Stops reverting Gemfile.lock
---
Gemfile.lock | 4 ++--
Jenkinsfile | 2 --
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/Gemfile.lock b/Gemfile.lock
index 712360637..471d19761 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -45,7 +45,7 @@ GEM
mercenary (0.4.0)
pathutil (0.16.2)
forwardable-extended (~> 2.6)
-public_suffix (5.0.0)
+public_suffix (4.0.7)
rb-fsevent (0.11.2)
rb-inotify (0.10.1)
ffi (~> 1.0)
@@ -60,7 +60,7 @@ GEM
PLATFORMS
x86_64-darwin-21
- x86_64-linux-musl
+ x86_64-linux
DEPENDENCIES
jekyll
diff --git a/Jenkinsfile b/Jenkinsfile
index 7c7c1896d..b74c44ebb 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -38,8 +38,6 @@ pipeline {
git remote add asf
https://gitbox.apache.org/repos/asf/struts-site.git
fi
- git checkout Gemfile.lock
-
git fetch asf
git checkout asf-staging
git pull asf asf-staging
[struts-site] branch asf-staging updated: Updates stage by Jenkins
This is an automated email from the ASF dual-hosted git repository. git-site-role pushed a commit to branch asf-staging in repository https://gitbox.apache.org/repos/asf/struts-site.git The following commit(s) were added to refs/heads/asf-staging by this push: new 36c002f02 Updates stage by Jenkins 36c002f02 is described below commit 36c002f02b27de474f9d8b6a17bd5b7e24489960 Author: jenkins AuthorDate: Thu Oct 20 06:43:54 2022 + Updates stage by Jenkins
