You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by jo...@apache.org on 2015/06/07 21:04:25 UTC
[6/6] struts git commit: Correct some urls to the docs to the right
location
Correct some urls to the docs to the right location
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/b074c088
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/b074c088
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/b074c088
Branch: refs/heads/master
Commit: b074c088842a9c6fed6c0f6442d7f9030b469c5e
Parents: 243c92b
Author: Johannes Geppert <jo...@gmail.com>
Authored: Sun Jun 7 21:03:54 2015 +0200
Committer: Johannes Geppert <jo...@gmail.com>
Committed: Sun Jun 7 21:03:54 2015 +0200
----------------------------------------------------------------------
.../src/main/resources/archetype-resources/README.txt | 2 +-
.../struts2/dispatcher/ActionContextCleanUp.java | 13 ++++---------
.../apache/struts2/dispatcher/FilterDispatcher.java | 14 ++++----------
.../dispatcher/mapper/CompositeActionMapper.java | 4 ++--
.../dispatcher/mapper/Restful2ActionMapper.java | 4 ++--
.../dispatcher/mapper/RestfulActionMapper.java | 4 ++--
.../src/main/resources/config-browser/page-footer.ftl | 7 +++++--
7 files changed, 20 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/b074c088/archetypes/struts2-archetype-plugin/src/main/resources/archetype-resources/README.txt
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-plugin/src/main/resources/archetype-resources/README.txt b/archetypes/struts2-archetype-plugin/src/main/resources/archetype-resources/README.txt
index dfc213d..72cac9a 100644
--- a/archetypes/struts2-archetype-plugin/src/main/resources/archetype-resources/README.txt
+++ b/archetypes/struts2-archetype-plugin/src/main/resources/archetype-resources/README.txt
@@ -5,6 +5,6 @@ plugin.
For more on Struts plugins, see
-* http://struts.apache.org/2.x/docs/plugins.html
+* http://struts.apache.org/docs/plugins.html
----------------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/b074c088/core/src/main/java/org/apache/struts2/dispatcher/ActionContextCleanUp.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/dispatcher/ActionContextCleanUp.java b/core/src/main/java/org/apache/struts2/dispatcher/ActionContextCleanUp.java
index 8664b64..528e611 100644
--- a/core/src/main/java/org/apache/struts2/dispatcher/ActionContextCleanUp.java
+++ b/core/src/main/java/org/apache/struts2/dispatcher/ActionContextCleanUp.java
@@ -22,16 +22,11 @@
package org.apache.struts2.dispatcher;
import com.opensymphony.xwork2.ActionContext;
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.LogManager;
import com.opensymphony.xwork2.util.profiling.UtilTimerStack;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
+import javax.servlet.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
@@ -150,7 +145,7 @@ public class ActionContextCleanUp implements Filter {
"* This can be a source of unpredictable problems! *\n" +
"* *\n" +
"* Please refer to the docs for more details! *\n" +
- "* http://struts.apache.org/2.x/docs/webxml.html *\n" +
+ "* http://struts.apache.org/docs/webxml.html *\n" +
"* *\n" +
"***************************************************************************\n\n";
System.out.println(msg);
http://git-wip-us.apache.org/repos/asf/struts/blob/b074c088/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java b/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java
index 715ad94..6fbbd0b 100644
--- a/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java
+++ b/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java
@@ -29,22 +29,16 @@ import com.opensymphony.xwork2.util.ClassLoaderUtil;
import com.opensymphony.xwork2.util.ValueStack;
import com.opensymphony.xwork2.util.ValueStackFactory;
import com.opensymphony.xwork2.util.logging.LoggerFactory;
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.LogManager;
import com.opensymphony.xwork2.util.profiling.UtilTimerStack;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.apache.struts2.RequestUtils;
import org.apache.struts2.StrutsStatics;
import org.apache.struts2.dispatcher.mapper.ActionMapper;
import org.apache.struts2.dispatcher.mapper.ActionMapping;
import org.apache.struts2.dispatcher.ng.filter.FilterHostConfig;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
+import javax.servlet.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
@@ -457,7 +451,7 @@ public class FilterDispatcher implements StrutsStatics, Filter {
"* This can be a source of unpredictable problems! *\n" +
"* *\n" +
"* Please refer to the docs for more details! *\n" +
- "* http://struts.apache.org/2.x/docs/webxml.html *\n" +
+ "* http://struts.apache.org/docs/webxml.html *\n" +
"* *\n" +
"***********************************************************************\n\n";
System.out.println(msg);
http://git-wip-us.apache.org/repos/asf/struts/blob/b074c088/core/src/main/java/org/apache/struts2/dispatcher/mapper/CompositeActionMapper.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/dispatcher/mapper/CompositeActionMapper.java b/core/src/main/java/org/apache/struts2/dispatcher/mapper/CompositeActionMapper.java
index 17a4611..a648590 100644
--- a/core/src/main/java/org/apache/struts2/dispatcher/mapper/CompositeActionMapper.java
+++ b/core/src/main/java/org/apache/struts2/dispatcher/mapper/CompositeActionMapper.java
@@ -24,8 +24,8 @@ package org.apache.struts2.dispatcher.mapper;
import com.opensymphony.xwork2.config.ConfigurationManager;
import com.opensymphony.xwork2.inject.Container;
import com.opensymphony.xwork2.inject.Inject;
-import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.apache.struts2.StrutsConstants;
import javax.servlet.http.HttpServletRequest;
@@ -38,7 +38,7 @@ import java.util.List;
* A composite action mapper that is capable of delegating to a series of {@link ActionMapper} if the former
* failed to obtained a valid {@link ActionMapping} or uri.
*
- * More details: http://struts.apache.org/2.x/docs/actionmapper.html
+ * More details: http://struts.apache.org/docs/actionmapper.html
*
* @see ActionMapper
* @see ActionMapping
http://git-wip-us.apache.org/repos/asf/struts/blob/b074c088/core/src/main/java/org/apache/struts2/dispatcher/mapper/Restful2ActionMapper.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/dispatcher/mapper/Restful2ActionMapper.java b/core/src/main/java/org/apache/struts2/dispatcher/mapper/Restful2ActionMapper.java
index d00d797..996d257 100644
--- a/core/src/main/java/org/apache/struts2/dispatcher/mapper/Restful2ActionMapper.java
+++ b/core/src/main/java/org/apache/struts2/dispatcher/mapper/Restful2ActionMapper.java
@@ -23,8 +23,8 @@ package org.apache.struts2.dispatcher.mapper;
import com.opensymphony.xwork2.config.ConfigurationManager;
import com.opensymphony.xwork2.inject.Inject;
-import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.apache.struts2.StrutsConstants;
import javax.servlet.http.HttpServletRequest;
@@ -34,7 +34,7 @@ import java.util.StringTokenizer;
/**
* Extended version of {@link RestfulActionMapper}, see documentation for more details
- * http://struts.apache.org/2.x/docs/restfulactionmapper.html
+ * http://struts.apache.org/docs/restfulactionmapper.html
*/
public class Restful2ActionMapper extends DefaultActionMapper {
http://git-wip-us.apache.org/repos/asf/struts/blob/b074c088/core/src/main/java/org/apache/struts2/dispatcher/mapper/RestfulActionMapper.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/dispatcher/mapper/RestfulActionMapper.java b/core/src/main/java/org/apache/struts2/dispatcher/mapper/RestfulActionMapper.java
index 7af01c3..13ede87 100644
--- a/core/src/main/java/org/apache/struts2/dispatcher/mapper/RestfulActionMapper.java
+++ b/core/src/main/java/org/apache/struts2/dispatcher/mapper/RestfulActionMapper.java
@@ -22,8 +22,8 @@
package org.apache.struts2.dispatcher.mapper;
import com.opensymphony.xwork2.config.ConfigurationManager;
-import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.apache.struts2.RequestUtils;
import javax.servlet.http.HttpServletRequest;
@@ -35,7 +35,7 @@ import java.util.StringTokenizer;
/**
* Simple Restfull Action Mapper to support REST application
* See docs for more information
- * http://struts.apache.org/2.x/docs/restfulactionmapper.html
+ * http://struts.apache.org/docs/restfulactionmapper.html
*/
public class RestfulActionMapper implements ActionMapper {
protected static final Logger LOG = LogManager.getLogger(RestfulActionMapper.class);
http://git-wip-us.apache.org/repos/asf/struts/blob/b074c088/plugins/config-browser/src/main/resources/config-browser/page-footer.ftl
----------------------------------------------------------------------
diff --git a/plugins/config-browser/src/main/resources/config-browser/page-footer.ftl b/plugins/config-browser/src/main/resources/config-browser/page-footer.ftl
index 56ed87b..b69f775 100644
--- a/plugins/config-browser/src/main/resources/config-browser/page-footer.ftl
+++ b/plugins/config-browser/src/main/resources/config-browser/page-footer.ftl
@@ -28,8 +28,11 @@
<div id="breadcrumbs">
<table border="0" cellspacing="0" cellpadding="4" width="100%">
<tr>
- <td align="center">
- <a href="http://struts.apache.org/">Apache Struts Project</a> <a href="http://struts.apache.org/2.0">Struts</a> © 2003 - 2006 | <a href="http://issues.apache.org/struts/">Bugs</a> | <a href="http://struts.apache.org/mail.html">Mailing Lists</a>
+ <td align="center">
+ <a href="http://struts.apache.org/">Apache Struts Project</a> <a
+ href="http://struts.apache.org">Struts</a> © 2003 - 2015 | <a
+ href="https://issues.apache.org/jira/browse/WW/">Bugs</a> | <a
+ href="http://struts.apache.org/mail.html">Mailing Lists</a>
</td>
</tr>
</table>