svn commit: r1536598 - /struts/struts2/trunk/plugins/tiles3/src/main/java/org/apache/struts2/views/tiles/TilesResult.java
Author: lukaszlenart
Date: Tue Oct 29 07:01:49 2013
New Revision: 1536598
URL: http://svn.apache.org/r1536598
Log:
WW-4044 Solves problem with infinitive loop when used with tag and
attribute executeResult is set to "true"
Modified:
struts/struts2/trunk/plugins/tiles3/src/main/java/org/apache/struts2/views/tiles/TilesResult.java
Modified:
struts/struts2/trunk/plugins/tiles3/src/main/java/org/apache/struts2/views/tiles/TilesResult.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/tiles3/src/main/java/org/apache/struts2/views/tiles/TilesResult.java?rev=1536598&r1=1536597&r2=1536598&view=diff
==
---
struts/struts2/trunk/plugins/tiles3/src/main/java/org/apache/struts2/views/tiles/TilesResult.java
(original)
+++
struts/struts2/trunk/plugins/tiles3/src/main/java/org/apache/struts2/views/tiles/TilesResult.java
Tue Oct 29 07:01:49 2013
@@ -59,16 +59,23 @@ public class TilesResult extends Servlet
@Override
public void doExecute(String location, ActionInvocation invocation) throws
Exception {
-setLocation(location);
ServletContext context = ServletActionContext.getServletContext();
-ApplicationContext applicationContext =
ServletUtil.getApplicationContext(context);
-TilesContainer container =
TilesAccess.getContainer(applicationContext);
-
HttpServletRequest request = ServletActionContext.getRequest();
HttpServletResponse response = ServletActionContext.getResponse();
+ApplicationContext applicationContext =
ServletUtil.getApplicationContext(context);
ServletRequest servletRequest = new ServletRequest(applicationContext,
request, response);
+
+TilesContainer container = initTilesContainer(applicationContext,
servletRequest);
+
+container.startContext(servletRequest);
container.render(location, servletRequest);
}
+protected TilesContainer initTilesContainer(ApplicationContext
applicationContext, ServletRequest servletRequest) {
+TilesContainer container =
TilesAccess.getContainer(applicationContext);
+TilesAccess.setCurrentContainer(servletRequest, container);
+return container;
+}
+
}
svn commit: r1536631 - /struts/site/trunk/content/xdoc/dev/builds.xml
Author: lukaszlenart Date: Tue Oct 29 09:51:56 2013 New Revision: 1536631 URL: http://svn.apache.org/r1536631 Log: Uses proper link to CI Modified: struts/site/trunk/content/xdoc/dev/builds.xml Modified: struts/site/trunk/content/xdoc/dev/builds.xml URL: http://svn.apache.org/viewvc/struts/site/trunk/content/xdoc/dev/builds.xml?rev=1536631&r1=1536630&r2=1536631&view=diff == --- struts/site/trunk/content/xdoc/dev/builds.xml (original) +++ struts/site/trunk/content/xdoc/dev/builds.xml Tue Oct 29 09:51:56 2013 @@ -197,7 +197,7 @@ limitations under the License. As part of our continuous integration practice, we also make available each morning the -https://builds.apache.org/job/Struts2/lastStableBuild/org.apache.struts$struts2-assembly/";> +https://builds.apache.org/view/S-Z/view/Struts/job/Struts2-JDK6/";> latest stable development build. Again: Use at your own risk!
svn commit: r884620 - in /websites/production/struts/content: ./ development/ release/
Author: lukaszlenart Date: Tue Oct 29 10:01:23 2013 New Revision: 884620 Log: Push changes Added: websites/production/struts/content/ - copied from r884619, websites/staging/struts/trunk/content/ websites/production/struts/content/development/ - copied from r884619, websites/production/struts/content/development/ websites/production/struts/content/release/ - copied from r884619, websites/production/struts/content/release/
svn commit: r884621 - in /websites/staging/struts/trunk/content: ./ dev/
Author: buildbot Date: Tue Oct 29 10:08:08 2013 New Revision: 884621 Log: Staging update by buildbot for struts Modified: websites/staging/struts/trunk/content/ (props changed) websites/staging/struts/trunk/content/announce-2002.html websites/staging/struts/trunk/content/announce-2003.html websites/staging/struts/trunk/content/announce-2004.html websites/staging/struts/trunk/content/announce-2005.html websites/staging/struts/trunk/content/announce-2006.html websites/staging/struts/trunk/content/announce-2007.html websites/staging/struts/trunk/content/announce-2008.html websites/staging/struts/trunk/content/announce-2009.html websites/staging/struts/trunk/content/announce-2010.html websites/staging/struts/trunk/content/announce-2011.html websites/staging/struts/trunk/content/announce-2012.html websites/staging/struts/trunk/content/announce.html websites/staging/struts/trunk/content/birdseye.html websites/staging/struts/trunk/content/dev/builds.html websites/staging/struts/trunk/content/dev/bylaws.html websites/staging/struts/trunk/content/dev/dev-mail.html websites/staging/struts/trunk/content/dev/git-for-struts.html websites/staging/struts/trunk/content/dev/releases.html websites/staging/struts/trunk/content/dev/troubleshooting-git-svn.html websites/staging/struts/trunk/content/dev/volunteers.html websites/staging/struts/trunk/content/download.html websites/staging/struts/trunk/content/downloads.html websites/staging/struts/trunk/content/faqs.html websites/staging/struts/trunk/content/helping.html websites/staging/struts/trunk/content/index.html websites/staging/struts/trunk/content/javadoc.html websites/staging/struts/trunk/content/kickstart.html websites/staging/struts/trunk/content/mail.html websites/staging/struts/trunk/content/primer.html websites/staging/struts/trunk/content/release-checklist.html websites/staging/struts/trunk/content/roadmap.html websites/staging/struts/trunk/content/security.html websites/staging/struts/trunk/content/struts1eol-announcement.html websites/staging/struts/trunk/content/struts1eol-press.html websites/staging/struts/trunk/content/youatstruts.html Propchange: websites/staging/struts/trunk/content/ -- --- cms:source-revision (original) +++ cms:source-revision Tue Oct 29 10:08:08 2013 @@ -1 +1 @@ -1533220 +1536635 Modified: websites/staging/struts/trunk/content/announce-2002.html == --- websites/staging/struts/trunk/content/announce-2002.html (original) +++ websites/staging/struts/trunk/content/announce-2002.html Tue Oct 29 10:08:08 2013 @@ -1,13 +1,13 @@ http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en"> - + Announcements - 2002 and prior @@ -167,7 +167,7 @@ - Last Published: 2013-10-17 + Last Published: 2013-10-29 Modified: websites/staging/struts/trunk/content/announce-2003.html == --- websites/staging/struts/trunk/content/announce-2003.html (original) +++ websites/staging/struts/trunk/content/announce-2003.html Tue Oct 29 10:08:08 2013 @@ -1,13 +1,13 @@ http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en"> - + Announcements - 2003 @@ -167,7 +167,7 @@ - Last Published: 2013-10-17 + Last Published: 2013-10-29 Modified: websites/staging/struts/trunk/content/announce-2004.html == --- websites/staging/struts/trunk/content/announce-2004.html (original) +++ websites/staging/struts/trunk/content/announce-2004.html Tue Oct 29 10:08:08 2013 @@ -1,13 +1,13 @@ http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en"> - + Announcements - 2004 @@ -167,7 +167,7 @@ - Last Published: 2013-10-17 + Last Published: 2013-10-29 Modified: websites/staging/struts/trunk/content/announce-2005.html == --- websites/staging/struts/trunk/content/announce-2005.html (original) +++ websites/staging/struts/trunk/content/announce-2005.html Tue Oct 29 10:08:08 2013 @@ -1,13 +1,13 @@ http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en"> - +
svn commit: r884629 - in /websites/production/struts/content: ./ development/ release/
Author: lukaszlenart Date: Tue Oct 29 10:38:58 2013 New Revision: 884629 Log: Push chnages Added: websites/production/struts/content/ - copied from r884628, websites/staging/struts/trunk/content/ websites/production/struts/content/development/ - copied from r884628, websites/production/struts/content/development/ websites/production/struts/content/release/ - copied from r884628, websites/production/struts/content/release/
svn commit: r1536698 - in /struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser: ActionNamesAction.java ShowConfigAction.java
Author: lukaszlenart
Date: Tue Oct 29 13:00:58 2013
New Revision: 1536698
URL: http://svn.apache.org/r1536698
Log:
WW-4213 Non-breaking sanitise mechanism
Modified:
struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ActionNamesAction.java
struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowConfigAction.java
Modified:
struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ActionNamesAction.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ActionNamesAction.java?rev=1536698&r1=1536697&r2=1536698&view=diff
==
---
struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ActionNamesAction.java
(original)
+++
struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ActionNamesAction.java
Tue Oct 29 13:00:58 2013
@@ -54,11 +54,11 @@ public class ActionNamesAction extends A
}
public String getNamespace() {
-return namespace;
+return StringEscapeUtils.escapeHtml4(namespace);
}
public void setNamespace(String namespace) {
-this.namespace = StringEscapeUtils.escapeEcmaScript(namespace);
+this.namespace = namespace;
}
@Inject(StrutsConstants.STRUTS_ACTION_EXTENSION)
Modified:
struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowConfigAction.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowConfigAction.java?rev=1536698&r1=1536697&r2=1536698&view=diff
==
---
struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowConfigAction.java
(original)
+++
struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowConfigAction.java
Tue Oct 29 13:00:58 2013
@@ -64,7 +64,7 @@ public class ShowConfigAction extends Ac
}
public String getNamespace() {
-return namespace;
+return StringEscapeUtils.escapeHtml4(namespace);
}
@Inject
@@ -82,7 +82,7 @@ public class ShowConfigAction extends Ac
}
public void setNamespace(String namespace) {
-this.namespace = StringEscapeUtils.escapeEcmaScript(namespace);
+this.namespace = namespace;
}
public String getActionName() {
[CONF] Confluence Changes in the last 24 hours
Apache ActiveMQ Pages Page: OSGi Integration edited by Hiram Chirino[08:43 PM] (view changes) Page: Replicated LevelDB Store edited by Hiram Chirino[08:29 PM] (view changes) Apache Camel Pages Page: VirtualBox edited by Henryk Konsek[03:10 PM] (view changes) Page: Component List External edited by Henryk Konsek[02:42 PM] (view changes) Apache Cloudstack Pages Page: Proposal - Replicable QA Infra Design created by Amogh Vasekar[06:22 PM] Page: Migration of NFS Secondary Storage to Object Store created by Min Chen[09:53 PM] Page: Marvin and Automation Team Tasks created by Santhosh Kumar Edukulla[05:38 PM] Page: GPU and vGPU support for CloudStack Guest VMs edited by Sanjay Tripathi[09:44 AM] (view changes) Page: Dynamic Compute Offering FS edited by Bharat Kumar[08:43 AM] (view changes) Page: Report CPU sockets edited by Harikrishna Patnala[08:22 AM] (view changes) Page: Monitoring VR services edited by jayapal[08:20 AM] (view changes) Page: Improve SystemVm upgrades edited by Kishan Kavala[04:12 AM] (view changes) Apache Curator Pages Page: Third Party Articles edited by Jordan Zimmerman[07:13 AM] (view changes) Apache Flex Comments Page: Adobe Flash Builder 'New Project' Bug has 2 new comments [ Raghav Kulshrestha, Alex Harui] Apache Geronimo v3.0 Pages Page: Developing a Simple JavaServer Faces application edited by Jarek Gawor[02:12 PM] (view changes) Page: Developing user interface with JSF edited by Jarek Gawor[03:06 AM] (view changes) Apache Hive Pages Page: Jenkins Script edited by Brock Noland[04:01 PM] (view changes)
svn commit: r1536985 - /struts/site/trunk/pom.xml
Author: lukaszlenart
Date: Wed Oct 30 06:46:06 2013
New Revision: 1536985
URL: http://svn.apache.org/r1536985
Log:
INFRA-6350 Adds SiteExporter to site build
Modified:
struts/site/trunk/pom.xml
Modified: struts/site/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/struts/site/trunk/pom.xml?rev=1536985&r1=1536984&r2=1536985&view=diff
==
--- struts/site/trunk/pom.xml (original)
+++ struts/site/trunk/pom.xml Wed Oct 30 06:46:06 2013
@@ -196,6 +196,35 @@
+
+org.codehaus.mojo
+exec-maven-plugin
+1.2
+
+
+cwiki-docs
+site
+
+java
+
+
+runtime
+
true
+
org.apache.cxf.cwiki.SiteExporter
+
+-force
+-d
+${site.output}
+-password
+${confluence.password}
+-user
+${confluence.user}
+
${basedir}/src/etc/docs.cfg
+
+
+
+
+
@@ -212,53 +241,6 @@
-
-
-update-draft-docs
-
-
-
-org.codehaus.mojo
-exec-maven-plugin
-1.2
-
-
-cwiki-docs
-prepare-package
-
-java
-
-
-runtime
-
true
-
org.apache.cxf.cwiki.SiteExporter
-
--force
--d
-
${project.build.directory}/cwiki/WW
--password
-
${confluence.password}
--user
-${confluence.user}
-
${basedir}/src/etc/docs.cfg
-
-
-
-
-
-
-
-
-
-org.apache.cxf.site-export
-cxf-site-export
-1.0-SNAPSHOT
-runtime
-
-
-
-
-
${site.output}
@@ -277,4 +259,13 @@
+
+
+org.apache.cxf.site-export
+cxf-site-export
+1.0-SNAPSHOT
+runtime
+
+
+
buildbot failure in ASF Buildbot on struts-site-staging
The Buildbot has detected a new failure on builder struts-site-staging while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/struts-site-staging/builds/105 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-cms-slave Build Reason: scheduler Build Source Stamp: [branch struts/site] 1536985 Blamelist: lukaszlenart BUILD FAILED: failed compile sincerely, -The Buildbot
svn commit: r1536989 - in /struts/site/trunk: build_cms.sh scripts/update-draft-docs.sh
Author: lukaszlenart Date: Wed Oct 30 06:56:24 2013 New Revision: 1536989 URL: http://svn.apache.org/r1536989 Log: INFRA-6350 Removes unused script Removed: struts/site/trunk/scripts/update-draft-docs.sh Modified: struts/site/trunk/build_cms.sh Modified: struts/site/trunk/build_cms.sh URL: http://svn.apache.org/viewvc/struts/site/trunk/build_cms.sh?rev=1536989&r1=1536988&r2=1536989&view=diff == --- struts/site/trunk/build_cms.sh (original) +++ struts/site/trunk/build_cms.sh Wed Oct 30 06:56:24 2013 @@ -1,4 +1,3 @@ #!/bin/sh -# Update draft docs -scripts/update-draft-docs.sh +mvn clean site
