[struts-site] branch master updated: Uses jekyll builder and adds missing volume mapping
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 3de9bee50 Uses jekyll builder and adds missing volume mapping
3de9bee50 is described below
commit 3de9bee50a48e30b96f795b27b5ceec083064e34
Author: Lukasz Lenart
AuthorDate: Fri Oct 7 09:10:28 2022 +0200
Uses jekyll builder and adds missing volume mapping
---
Jenkinsfile | 3 ++-
docker-build.sh | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 5a7eca8a5..c6c02aa39 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -18,7 +18,8 @@ pipeline {
stage('Build a staged website') {
agent {
docker {
- image 'jekyll/jekyll:4.2.2'
+ image 'jekyll/builder:4.2.2'
+ args '-v $WORKSPACE:/srv/jekyll'
}
}
steps {
diff --git a/docker-build.sh b/docker-build.sh
index 95277602e..69ea74716 100755
--- a/docker-build.sh
+++ b/docker-build.sh
@@ -1,5 +1,5 @@
#!/bin/sh
export JEKYLL_VERSION=4.2.2
-docker run --rm -v $PWD:/srv/jekyll -it jekyll/jekyll:$JEKYLL_VERSION jekyll
build
+docker run --rm -v $PWD:/srv/jekyll -it jekyll/builder:$JEKYLL_VERSION jekyll
build
[struts-site] branch master updated: Simplifies docker command
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 ca9f7447e Simplifies docker command
ca9f7447e is described below
commit ca9f7447e7a885608fa29e4327d14678ab56cb09
Author: Lukasz Lenart
AuthorDate: Fri Oct 7 09:21:06 2022 +0200
Simplifies docker command
---
Jenkinsfile | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index c6c02aa39..6c8317b2c 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -19,12 +19,11 @@ pipeline {
agent {
docker {
image 'jekyll/builder:4.2.2'
- args '-v $WORKSPACE:/srv/jekyll'
}
}
steps {
sh """
- bundle exec jekyll build
+ jekyll build
"""
}
}
[struts-site] branch master updated: Installs gems
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 5172cafd6 Installs gems
5172cafd6 is described below
commit 5172cafd66d38f3caa615909338a0fe95a1969ae
Author: Lukasz Lenart
AuthorDate: Fri Oct 7 09:27:14 2022 +0200
Installs gems
---
Jenkinsfile | 8 ++--
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 6c8317b2c..ef6aea419 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -16,13 +16,9 @@ pipeline {
}
stages {
stage('Build a staged website') {
- agent {
-docker {
- image 'jekyll/builder:4.2.2'
-}
- }
- steps {
+ docker.image('jekyll/builder:4.2.2').inside('-v $WORKSPACE:/srv/jekyll')
{
sh """
+ bundle install
jekyll build
"""
}
[struts-site] branch master updated: Adds missing steps
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 5d8c324ed Adds missing steps
5d8c324ed is described below
commit 5d8c324ed95e8317e18ba164155885ec892d9a42
Author: Lukasz Lenart
AuthorDate: Fri Oct 7 09:35:08 2022 +0200
Adds missing steps
---
Jenkinsfile | 12 +++-
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index ef6aea419..89f1cd44f 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -16,11 +16,13 @@ pipeline {
}
stages {
stage('Build a staged website') {
- docker.image('jekyll/builder:4.2.2').inside('-v $WORKSPACE:/srv/jekyll')
{
-sh """
- bundle install
- jekyll build
-"""
+ steps {
+docker.image('jekyll/builder:4.2.2').inside('-v
$WORKSPACE:/srv/jekyll') {
+ sh """
+bundle install
+bundle exec jekyll build
+ """
+}
}
}
stage('Deploy to stage area') {
[struts-site] branch master updated: Simplifies docker usage
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 4e99532c2 Simplifies docker usage
4e99532c2 is described below
commit 4e99532c27f6d407255d1c07292f2644cbb35377
Author: Lukasz Lenart
AuthorDate: Fri Oct 7 09:41:47 2022 +0200
Simplifies docker usage
---
Jenkinsfile | 15 +--
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 89f1cd44f..2c33f00ad 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -16,14 +16,17 @@ pipeline {
}
stages {
stage('Build a staged website') {
- steps {
-docker.image('jekyll/builder:4.2.2').inside('-v
$WORKSPACE:/srv/jekyll') {
- sh """
-bundle install
-bundle exec jekyll build
- """
+ agent {
+docker {
+ image 'jekyll/builder:4.2.2'
}
}
+ steps {
+sh """
+ bundle install
+ bundle exec jekyll build
+"""
+ }
}
stage('Deploy to stage area') {
steps {
[struts-site] branch master updated: Maps jekkyl path
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 3f5bde201 Maps jekkyl path
3f5bde201 is described below
commit 3f5bde2012bf305b8ef2978df845d92714732064
Author: Lukasz Lenart
AuthorDate: Fri Oct 7 09:56:30 2022 +0200
Maps jekkyl path
---
Jenkinsfile | 1 +
1 file changed, 1 insertion(+)
diff --git a/Jenkinsfile b/Jenkinsfile
index 2c33f00ad..b2c0971d8 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -19,6 +19,7 @@ pipeline {
agent {
docker {
image 'jekyll/builder:4.2.2'
+ args '-v $WORKSPACE:/srv/jekyll'
}
}
steps {
[struts-site] branch master updated: Maps /tmp
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 b3442eda0 Maps /tmp
b3442eda0 is described below
commit b3442eda0c902c2da2108b095ee2936a6fe3c81f
Author: Lukasz Lenart
AuthorDate: Fri Oct 7 09:59:26 2022 +0200
Maps /tmp
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index b2c0971d8..f785b420c 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -19,7 +19,7 @@ pipeline {
agent {
docker {
image 'jekyll/builder:4.2.2'
- args '-v $WORKSPACE:/srv/jekyll'
+ args "-v ${env.WORKSPACE}:/srv/jekyll -v ${env.WORKSPACE_TMP}:/tmp"
}
}
steps {
[struts-site] branch master updated: Sets proper Ruby envs
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 3c699c0dc Sets proper Ruby envs
3c699c0dc is described below
commit 3c699c0dc5b5b1dfc73f983d417bbea3c43024fe
Author: Lukasz Lenart
AuthorDate: Fri Oct 7 10:04:34 2022 +0200
Sets proper Ruby envs
---
Jenkinsfile | 10 +++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index f785b420c..9a885643e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -23,10 +23,14 @@ pipeline {
}
}
steps {
-sh """
- bundle install
+sh '''
+ export RUBY_PATH="/tmp/.rvm"
+ export GEM_HOME="$RUBY_PATH/gems"
+ export PATH="$GEM_HOME/bin:$PATH"
+
+ bundle install --path $GEM_HOME
bundle exec jekyll build
-"""
+'''
}
}
stage('Deploy to stage area') {
[struts-site] branch master updated: Sets Bundler global path variable
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 2a9920b64 Sets Bundler global path variable
2a9920b64 is described below
commit 2a9920b644393b586b77b6212b53af3e14f013b9
Author: Lukasz Lenart
AuthorDate: Fri Oct 7 10:29:15 2022 +0200
Sets Bundler global path variable
---
Jenkinsfile | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 9a885643e..1396ab769 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -19,7 +19,7 @@ pipeline {
agent {
docker {
image 'jekyll/builder:4.2.2'
- args "-v ${env.WORKSPACE}:/srv/jekyll -v ${env.WORKSPACE_TMP}:/tmp"
+ args "-v ${env.WORKSPACE}:/srv/jekyll:rw -v
${env.WORKSPACE_TMP}:/tmp:rw"
}
}
steps {
@@ -28,7 +28,8 @@ pipeline {
export GEM_HOME="$RUBY_PATH/gems"
export PATH="$GEM_HOME/bin:$PATH"
- bundle install --path $GEM_HOME
+ bundle config set --local path $GEM_HOME
+ bundle install
bundle exec jekyll build
'''
}
[struts] branch WW-5233-tiles updated: Add missing classes and tld definition.
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 b3f1c1e6d Add missing classes and tld definition.
new f71e32202 Merge pull request #610 from gregh3269/WW-5233-tiles
b3f1c1e6d is described below
commit b3f1c1e6d267e4110176fe5617799b1b908a6abd
Author: Greg Huber
AuthorDate: Fri Oct 7 09:57:10 2022 +0100
Add missing classes and tld definition.
---
.../apache/tiles/template/GetAsStringModel.java| 9 +
.../tiles/web/jsp/taglib/AddAttributeTag.java | 166
.../tiles/web/jsp/taglib/AddListAttributeTag.java | 88 ++
.../apache/tiles/web/jsp/taglib/DefinitionTag.java | 185 +
.../tiles/web/jsp/taglib/GetAsStringTag.java | 266 ++
.../tiles/web/jsp/taglib/ImportAttributeTag.java | 167
.../tiles/web/jsp/taglib/InsertAttributeTag.java | 303 +++
.../tiles/web/jsp/taglib/InsertDefinitionTag.java | 260 ++
.../tiles/web/jsp/taglib/InsertTemplateTag.java| 233 ++
.../tiles/web/jsp/taglib/PutAttributeTag.java | 234 ++
.../tiles/web/jsp/taglib/PutListAttributeTag.java | 164
.../web/jsp/taglib/SetCurrentContainerTag.java | 81 ++
.../tiles/web/jsp/taglib/UseAttributeTag.java | 21 +-
.../apache/tiles/web/jsp/taglib/package-info.java | 4 +-
.../resources/META-INF/tld/tiles-extras-jsp.tld| 16 +-
.../src/main/resources/META-INF/tld/tiles-jsp.tld | 894 +
16 files changed, 3067 insertions(+), 24 deletions(-)
diff --git
a/plugins/tiles/src/main/java/org/apache/tiles/template/GetAsStringModel.java
b/plugins/tiles/src/main/java/org/apache/tiles/template/GetAsStringModel.java
index b2d7db437..1bf1de742 100644
---
a/plugins/tiles/src/main/java/org/apache/tiles/template/GetAsStringModel.java
+++
b/plugins/tiles/src/main/java/org/apache/tiles/template/GetAsStringModel.java
@@ -56,6 +56,15 @@ public class GetAsStringModel {
* The attribute resolver to use.
*/
private final AttributeResolver attributeResolver;
+
+/**
+ * Constructor that uses the defaut attribute resolver.
+ *
+ * @since 3.0.0
+ */
+public GetAsStringModel() {
+this(new DefaultAttributeResolver());
+}
/**
* Constructor.
diff --git
a/plugins/tiles/src/main/java/org/apache/tiles/web/jsp/taglib/AddAttributeTag.java
b/plugins/tiles/src/main/java/org/apache/tiles/web/jsp/taglib/AddAttributeTag.java
new file mode 100644
index 0..a5bd36b04
--- /dev/null
+++
b/plugins/tiles/src/main/java/org/apache/tiles/web/jsp/taglib/AddAttributeTag.java
@@ -0,0 +1,166 @@
+/*
+ * 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.tiles.web.jsp.taglib;
+
+import java.io.IOException;
+
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.tagext.SimpleTagSupport;
+
+import org.apache.tiles.autotag.core.runtime.ModelBody;
+import org.apache.tiles.request.Request;
+import org.apache.tiles.request.jsp.autotag.JspAutotagRuntime;
+import org.apache.tiles.template.AddAttributeModel;
+import org.apache.tiles.autotag.core.runtime.AutotagRuntime;
+
+/**
+ *
+ * Add an element to the surrounding list. Equivalent to 'putAttribute', but
for
+ * list element.
+ *
+ *
+ *
+ * Add an element to the surrounding list. This tag can only be used inside
+ * 'putListAttribute' or 'addListAttribute' tags. Value can come from a direct
+ * assignment (value="aValue")
+ *
+ */
+public class AddAttributeTag extends SimpleTagSupport {
+
+/**
+ * The template model.
+ */
+private AddAttributeModel model = new AddAttributeModel();
+
+/**
+ * The value of the attribute. Use this parameter, or expression, or body.
+ */
+private Object value;
+
+/**
+ * The expression to calculate the value from. Use this parameter, or
value, or
+ * body.
+ */
+private String expression;
+
+/**
+ * A comma-separated list of roles. If present, the attribute will be
rendered
+ * only if the current user belongs to one of the roles.
+ */
+private String
