svn commit: r1534936 - in /struts/struts2/trunk: core/src/main/java/org/apache/struts2/impl/ core/src/main/resources/ xwork-core/src/main/java/com/opensymphony/xwork2/

[lukaszlenart]

Author: lukaszlenart
Date: Wed Oct 23 07:33:44 2013
New Revision: 1534936

URL: http://svn.apache.org/r1534936
Log:
WW-4131 Implements new ActionProxyFactory to cooperate with 
PrefixBasedActionMapper

Added:

struts/struts2/trunk/core/src/main/java/org/apache/struts2/impl/PrefixBasedActionProxyFactory.java
Modified:

struts/struts2/trunk/core/src/main/java/org/apache/struts2/impl/StrutsActionProxyFactory.java
struts/struts2/trunk/core/src/main/resources/struts-default.xml

struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/DefaultActionProxyFactory.java

Added: 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/impl/PrefixBasedActionProxyFactory.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/impl/PrefixBasedActionProxyFactory.java?rev=1534936&view=auto
==
--- 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/impl/PrefixBasedActionProxyFactory.java
 (added)
+++ 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/impl/PrefixBasedActionProxyFactory.java
 Wed Oct 23 07:33:44 2013
@@ -0,0 +1,87 @@
+package org.apache.struts2.impl;
+
+import com.opensymphony.xwork2.ActionProxy;
+import com.opensymphony.xwork2.ActionProxyFactory;
+import com.opensymphony.xwork2.DefaultActionProxyFactory;
+import com.opensymphony.xwork2.inject.Container;
+import com.opensymphony.xwork2.inject.Inject;
+import com.opensymphony.xwork2.util.logging.Logger;
+import com.opensymphony.xwork2.util.logging.LoggerFactory;
+import org.apache.struts2.StrutsConstants;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 
+ * Prefix based factory should be used with {@link 
org.apache.struts2.dispatcher.mapper.PrefixBasedActionMapper}
+ * to use appropriate {@link com.opensymphony.xwork2.ActionProxyFactory} 
connected with given
+ * {@link org.apache.struts2.dispatcher.mapper.ActionMapper}
+ *
+ * Add below entry to struts.xml to enable the factory:
+ * 
+ *
+ * The factory will use the same set of patterns as defined with:
+ * 
+ * 
+ */
+public class PrefixBasedActionProxyFactory extends DefaultActionProxyFactory {
+
+private static final Logger LOG = 
LoggerFactory.getLogger(PrefixBasedActionProxyFactory.class);
+
+private Map actionProxyFactories = new 
HashMap();
+private ActionProxyFactory defaultFactory;
+
+@Inject
+public void setContainer(Container container) {
+this.container = container;
+}
+
+@Inject(StrutsConstants.STRUTS_ACTIONPROXYFACTORY)
+public void setActionProxyFactory(ActionProxyFactory factory) {
+this.defaultFactory = factory;
+}
+
+@Inject(StrutsConstants.PREFIX_BASED_MAPPER_CONFIGURATION)
+public void setPrefixBasedActionProxyFactories(String list) {
+if (list != null) {
+String[] factories = list.split(",");
+for (String factory : factories) {
+String[] thisFactory = factory.split(":");
+if ((thisFactory != null) && (thisFactory.length == 2)) {
+String factoryPrefix = thisFactory[0].trim();
+String factoryName = thisFactory[1].trim();
+ActionProxyFactory obj = 
container.getInstance(ActionProxyFactory.class, factoryName);
+if (obj != null) {
+actionProxyFactories.put(factoryPrefix, obj);
+} else if (LOG.isWarnEnabled()) {
+LOG.warn("Invalid PrefixBasedActionProxyFactory config 
entry: [#0]", factory);
+}
+}
+}
+}
+}
+
+public ActionProxy createActionProxy(String namespace, String actionName, 
String methodName,
+ Map extraContext, 
boolean executeResult, boolean cleanupContext) {
+
+String uri = namespace + (namespace.endsWith("/") ? actionName : "/" + 
actionName);
+for (int lastIndex = uri.lastIndexOf('/'); lastIndex > (-1); lastIndex 
= uri.lastIndexOf('/', lastIndex - 1)) {
+String key = uri.substring(0, lastIndex);
+ActionProxyFactory actionProxyFactory = 
actionProxyFactories.get(key);
+if (actionProxyFactory != null) {
+if (LOG.isDebugEnabled()) {
+LOG.debug("Using ActionProxyFactory [#0] for prefix [#1]", 
actionProxyFactory, key);
+}
+return actionProxyFactory.createActionProxy(namespace, 
actionName, methodName, extraContext, executeResult, cleanupContext);
+} else if (LOG.isDebugEnabled()) {
+LOG.debug("No ActionProxyFactory defined for [#1]", key);
+}
+}
+if (LOG.isDebugEnabled()){
+LOG.debug("Cannot find any matching ActionProxyFactory, falli

svn commit: r1534938 - /struts/struts2/trunk/core/src/main/java/org/apache/struts2/impl/PrefixBasedActionProxyFactory.java

[lukaszlenart]

Author: lukaszlenart
Date: Wed Oct 23 07:36:28 2013
New Revision: 1534938

URL: http://svn.apache.org/r1534938
Log:
WW-4131 Polishes JavaDoc a bit

Modified:

struts/struts2/trunk/core/src/main/java/org/apache/struts2/impl/PrefixBasedActionProxyFactory.java

Modified: 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/impl/PrefixBasedActionProxyFactory.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/impl/PrefixBasedActionProxyFactory.java?rev=1534938&r1=1534937&r2=1534938&view=diff
==
--- 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/impl/PrefixBasedActionProxyFactory.java
 (original)
+++ 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/impl/PrefixBasedActionProxyFactory.java
 Wed Oct 23 07:36:28 2013
@@ -14,15 +14,18 @@ import java.util.Map;
 
 /**
  * 
- * Prefix based factory should be used with {@link 
org.apache.struts2.dispatcher.mapper.PrefixBasedActionMapper}
+ * Prefix based factory should be used with {{{@link 
org.apache.struts2.dispatcher.mapper.PrefixBasedActionMapper}}}
  * to use appropriate {@link com.opensymphony.xwork2.ActionProxyFactory} 
connected with given
  * {@link org.apache.struts2.dispatcher.mapper.ActionMapper}
  *
  * Add below entry to struts.xml to enable the factory:
+ * 
  * 
- *
+ * 
  * The factory will use the same set of patterns as defined with:
+ * 
  * 
+ * 
  * 
  */
 public class PrefixBasedActionProxyFactory extends DefaultActionProxyFactory {

svn commit: r1534941 - /struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java

[lukaszlenart]

Author: lukaszlenart
Date: Wed Oct 23 07:40:35 2013
New Revision: 1534941

URL: http://svn.apache.org/r1534941
Log:
Updates description about method: and action: prefixes

Modified:

struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java

Modified: 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java?rev=1534941&r1=1534940&r2=1534941&view=diff
==
--- 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
 (original)
+++ 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
 Wed Oct 23 07:40:35 2013
@@ -84,7 +84,7 @@ import java.util.regex.Pattern;
  *  
  *  
  *  
- *  
+ *  
  *  
  *  
  * 
@@ -103,7 +103,7 @@ import java.util.regex.Pattern;
  *  
  *  
  *  
- *  
+ *  
  *  
  *  
  * 

svn commit: r1534942 - /struts/struts2/trunk/core/src/main/java/org/apache/struts2/impl/PrefixBasedActionProxyFactory.java

[lukaszlenart]

Author: lukaszlenart
Date: Wed Oct 23 07:41:57 2013
New Revision: 1534942

URL: http://svn.apache.org/r1534942
Log:
WW-4131 Polishes JavaDoc a bit

Modified:

struts/struts2/trunk/core/src/main/java/org/apache/struts2/impl/PrefixBasedActionProxyFactory.java

Modified: 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/impl/PrefixBasedActionProxyFactory.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/impl/PrefixBasedActionProxyFactory.java?rev=1534942&r1=1534941&r2=1534942&view=diff
==
--- 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/impl/PrefixBasedActionProxyFactory.java
 (original)
+++ 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/impl/PrefixBasedActionProxyFactory.java
 Wed Oct 23 07:41:57 2013
@@ -14,15 +14,18 @@ import java.util.Map;
 
 /**
  * 
- * Prefix based factory should be used with {{{@link 
org.apache.struts2.dispatcher.mapper.PrefixBasedActionMapper}}}
+ * Prefix based factory should be used with {@link 
org.apache.struts2.dispatcher.mapper.PrefixBasedActionMapper}
  * to use appropriate {@link com.opensymphony.xwork2.ActionProxyFactory} 
connected with given
  * {@link org.apache.struts2.dispatcher.mapper.ActionMapper}
  *
  * Add below entry to struts.xml to enable the factory:
+ *
  * 
  * 
  * 
+ *
  * The factory will use the same set of patterns as defined with:
+ *
  * 
  * 
  * 

svn commit: r1534943 - /struts/struts2/trunk/core/src/main/java/org/apache/struts2/impl/PrefixBasedActionProxyFactory.java

[lukaszlenart]

Author: lukaszlenart
Date: Wed Oct 23 07:43:25 2013
New Revision: 1534943

URL: http://svn.apache.org/r1534943
Log:
WW-4131 Polishes JavaDoc a bit

Modified:

struts/struts2/trunk/core/src/main/java/org/apache/struts2/impl/PrefixBasedActionProxyFactory.java

Modified: 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/impl/PrefixBasedActionProxyFactory.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/impl/PrefixBasedActionProxyFactory.java?rev=1534943&r1=1534942&r2=1534943&view=diff
==
--- 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/impl/PrefixBasedActionProxyFactory.java
 (original)
+++ 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/impl/PrefixBasedActionProxyFactory.java
 Wed Oct 23 07:43:25 2013
@@ -14,18 +14,18 @@ import java.util.Map;
 
 /**
  * 
- * Prefix based factory should be used with {@link 
org.apache.struts2.dispatcher.mapper.PrefixBasedActionMapper}
+ * Prefix based factory should be used with {@link 
org.apache.struts2.dispatcher.mapper.PrefixBasedActionMapper}
  * to use appropriate {@link com.opensymphony.xwork2.ActionProxyFactory} 
connected with given
  * {@link org.apache.struts2.dispatcher.mapper.ActionMapper}
  *
  * Add below entry to struts.xml to enable the factory:
- *
+ * 
  * 
  * 
  * 
  *
  * The factory will use the same set of patterns as defined with:
- *
+ * 
  * 
  * 
  * 

svn commit: r1534977 - in /struts/struts2/trunk/core/src/main: java/org/apache/struts2/util/AttributeMap.java java/org/apache/struts2/util/StrutsUtil.java resources/template/simple/debug.ftl

[lukaszlenart]

Author: lukaszlenart
Date: Wed Oct 23 10:32:02 2013
New Revision: 1534977

URL: http://svn.apache.org/r1534977
Log:
WW-4223 Uses safe toString method to avoid exception during generating debug 
info

Modified:

struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/AttributeMap.java

struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/StrutsUtil.java
struts/struts2/trunk/core/src/main/resources/template/simple/debug.ftl

Modified: 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/AttributeMap.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/AttributeMap.java?rev=1534977&r1=1534976&r2=1534977&view=diff
==
--- 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/AttributeMap.java
 (original)
+++ 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/AttributeMap.java
 Wed Oct 23 10:32:02 2013
@@ -21,15 +21,14 @@
 
 package org.apache.struts2.util;
 
+import org.apache.struts2.ServletActionContext;
+
+import javax.servlet.jsp.PageContext;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Map;
 import java.util.Set;
 
-import javax.servlet.jsp.PageContext;
-
-import org.apache.struts2.ServletActionContext;
-
 
 /**
  * A Map that holds 4 levels of scope.
@@ -48,15 +47,12 @@ public class AttributeMap implements Map
 
 protected static final String UNSUPPORTED = "method makes no sense for a 
simplified map";
 
-
 Map context;
 
-
 public AttributeMap(Map context) {
 this.context = context;
 }
 
-
 public boolean isEmpty() {
 throw new UnsupportedOperationException(UNSUPPORTED);
 }
@@ -135,4 +131,25 @@ public class AttributeMap implements Map
 private PageContext getPageContext() {
 return (PageContext) context.get(ServletActionContext.PAGE_CONTEXT);
 }
+
+@Override
+public String toString() {
+return "AttributeMap {" +
+"request=" + toStringSafe(context.get("request")) +
+", session=" +  toStringSafe(context.get("session")) +
+", application=" + toStringSafe(context.get("application")) +
+'}';
+}
+
+private String toStringSafe(Object obj) {
+try {
+if (obj != null) {
+return String.valueOf(obj);
+}
+return "";
+} catch (Exception e) {
+return "Exception thrown: " + e;
+}
+}
+
 }

Modified: 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/StrutsUtil.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/StrutsUtil.java?rev=1534977&r1=1534976&r2=1534977&view=diff
==
--- 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/StrutsUtil.java 
(original)
+++ 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/StrutsUtil.java 
Wed Oct 23 10:32:02 2013
@@ -250,6 +250,16 @@ public class StrutsUtil {
 return Integer.toString(anInt);
 }
 
+public String toStringSafe(Object obj) {
+try {
+if (obj != null) {
+return String.valueOf(obj);
+}
+return "";
+} catch (Exception e) {
+return "Exception thrown: " + e;
+}
+}
 
 static class ResponseWrapper extends HttpServletResponseWrapper {
 StringWriter strout;

Modified: struts/struts2/trunk/core/src/main/resources/template/simple/debug.ftl
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/debug.ftl?rev=1534977&r1=1534976&r2=1534977&view=diff
==
--- struts/struts2/trunk/core/src/main/resources/template/simple/debug.ftl 
(original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/debug.ftl Wed 
Oct 23 10:32:02 2013
@@ -43,7 +43,7 @@
 
 
 Value Stack Contents
-
+
 ObjectProperty NameProperty Value
 
 <#assign index=1>
@@ -65,7 +65,7 @@
 
 Stack Context
 These items are available using the #key notation
-
+
 
 KeyValue
 
@@ -73,9 +73,10 @@
 <#assign index=1>
 <#list stack.context.keySet() as contextKey>
 
-${contextKey}<#if 
stack.context.get(contextKey)??>${stack.context.get(contextKey).toString()?html}<#else>null
+${contextKey}
+<#if 
stack.context.get(contextKey)??>${struts.toStringSafe(stack.context.get(contextKey))?html}<#else>null
 
 <#assign index= index + 1>
 
 
-
\ No newline at end of file
+

svn commit: r1534982 - in /struts/struts2/trunk: ./ apps/ apps/blank/ apps/jboss-blank/ apps/mailreader/ apps/portlet/ apps/rest-showcase/ apps/showcase/ archetypes/ archetypes/struts2-archetype-angul

[lukaszlenart]

Author: lukaszlenart
Date: Wed Oct 23 10:56:53 2013
New Revision: 1534982

URL: http://svn.apache.org/r1534982
Log:
WW-4233 Adds UTF-8 encoding property to all poms

Modified:
struts/struts2/trunk/apps/blank/pom.xml
struts/struts2/trunk/apps/jboss-blank/pom.xml
struts/struts2/trunk/apps/mailreader/pom.xml
struts/struts2/trunk/apps/pom.xml
struts/struts2/trunk/apps/portlet/pom.xml
struts/struts2/trunk/apps/rest-showcase/pom.xml
struts/struts2/trunk/apps/showcase/pom.xml
struts/struts2/trunk/archetypes/pom.xml
struts/struts2/trunk/archetypes/struts2-archetype-angularjs/pom.xml

struts/struts2/trunk/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/pom.xml
struts/struts2/trunk/archetypes/struts2-archetype-blank/pom.xml

struts/struts2/trunk/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/pom.xml
struts/struts2/trunk/archetypes/struts2-archetype-convention/pom.xml

struts/struts2/trunk/archetypes/struts2-archetype-convention/src/main/resources/archetype-resources/pom.xml
struts/struts2/trunk/archetypes/struts2-archetype-dbportlet/pom.xml

struts/struts2/trunk/archetypes/struts2-archetype-dbportlet/src/main/resources/archetype-resources/pom.xml
struts/struts2/trunk/archetypes/struts2-archetype-plugin/pom.xml

struts/struts2/trunk/archetypes/struts2-archetype-plugin/src/main/resources/archetype-resources/pom.xml
struts/struts2/trunk/archetypes/struts2-archetype-portlet/pom.xml
struts/struts2/trunk/archetypes/struts2-archetype-starter/pom.xml

struts/struts2/trunk/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/pom.xml
struts/struts2/trunk/assembly/pom.xml
struts/struts2/trunk/bundles/admin/pom.xml
struts/struts2/trunk/bundles/demo/pom.xml
struts/struts2/trunk/bundles/pom.xml
struts/struts2/trunk/core/pom.xml
struts/struts2/trunk/plugins/cdi/pom.xml
struts/struts2/trunk/plugins/codebehind/pom.xml
struts/struts2/trunk/plugins/config-browser/pom.xml
struts/struts2/trunk/plugins/convention/pom.xml
struts/struts2/trunk/plugins/dojo/pom.xml
struts/struts2/trunk/plugins/dwr/pom.xml
struts/struts2/trunk/plugins/embeddedjsp/pom.xml
struts/struts2/trunk/plugins/gxp/pom.xml
struts/struts2/trunk/plugins/jasperreports/pom.xml
struts/struts2/trunk/plugins/javatemplates/pom.xml
struts/struts2/trunk/plugins/jfreechart/pom.xml
struts/struts2/trunk/plugins/jsf/pom.xml
struts/struts2/trunk/plugins/json/pom.xml
struts/struts2/trunk/plugins/junit/pom.xml
struts/struts2/trunk/plugins/osgi/pom.xml
struts/struts2/trunk/plugins/oval/pom.xml
struts/struts2/trunk/plugins/pell-multipart/pom.xml
struts/struts2/trunk/plugins/plexus/pom.xml
struts/struts2/trunk/plugins/pom.xml
struts/struts2/trunk/plugins/portlet-tiles/pom.xml
struts/struts2/trunk/plugins/portlet/pom.xml
struts/struts2/trunk/plugins/rest/pom.xml
struts/struts2/trunk/plugins/sitegraph/pom.xml
struts/struts2/trunk/plugins/sitemesh/pom.xml
struts/struts2/trunk/plugins/spring/pom.xml
struts/struts2/trunk/plugins/struts1/pom.xml
struts/struts2/trunk/plugins/testng/pom.xml
struts/struts2/trunk/plugins/tiles/pom.xml
struts/struts2/trunk/plugins/tiles3/pom.xml
struts/struts2/trunk/pom.xml
struts/struts2/trunk/xwork-core/pom.xml

Modified: struts/struts2/trunk/apps/blank/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/blank/pom.xml?rev=1534982&r1=1534981&r2=1534982&view=diff
==
--- struts/struts2/trunk/apps/blank/pom.xml (original)
+++ struts/struts2/trunk/apps/blank/pom.xml Wed Oct 23 10:56:53 2013
@@ -88,4 +88,7 @@
 
 
 
+
+   UTF-8
+
 

Modified: struts/struts2/trunk/apps/jboss-blank/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/jboss-blank/pom.xml?rev=1534982&r1=1534981&r2=1534982&view=diff
==
--- struts/struts2/trunk/apps/jboss-blank/pom.xml (original)
+++ struts/struts2/trunk/apps/jboss-blank/pom.xml Wed Oct 23 10:56:53 2013
@@ -61,4 +61,7 @@
 
 
 
-
\ No newline at end of file
+
+   UTF-8
+
+

Modified: struts/struts2/trunk/apps/mailreader/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/mailreader/pom.xml?rev=1534982&r1=1534981&r2=1534982&view=diff
==
--- struts/struts2/trunk/apps/mailreader/pom.xml (original)
+++ struts/struts2/trunk/apps/mailreader/pom.xml Wed Oct 23 10:56:53 2013
@@ -100,4 +100,7 @@
 
 
 
+
+   UTF-8
+
 

Modified: struts/struts2/trunk/apps/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/pom.xml?rev=1534982&r1=1534981&r2=1534982&view=diff
=

svn commit: r1535002 - in /struts/struts2/trunk/core/src/main: java/org/apache/struts2/ java/org/apache/struts2/components/template/ java/org/apache/struts2/interceptor/ resources/

[lukaszlenart]

Author: lukaszlenart
Date: Wed Oct 23 12:36:22 2013
New Revision: 1535002

URL: http://svn.apache.org/r1535002
Log:
WW-4232 Implements new DeprecationInterceptor and adds it to basicStack and 
defaultStack

Added:

struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/DeprecationInterceptor.java
Modified:

struts/struts2/trunk/core/src/main/java/org/apache/struts2/StrutsConstants.java

struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/template/TemplateEngineManager.java
struts/struts2/trunk/core/src/main/resources/struts-default.xml

Modified: 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/StrutsConstants.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/StrutsConstants.java?rev=1535002&r1=1535001&r2=1535002&view=diff
==
--- 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/StrutsConstants.java 
(original)
+++ 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/StrutsConstants.java 
Wed Oct 23 12:36:22 2013
@@ -277,4 +277,6 @@ public final class StrutsConstants {
 /** enables access to actions in other namespaces than current with 
action: prefix **/
 public static final String STRUTS_MAPPER_ACTION_PREFIX_CROSSNAMESPACES = 
"struts.mapper.action.prefix.crossNamespaces";
 
+public static final String DEFAULT_TEMPLATE_TYPE_CONFIG_KEY = 
"struts.ui.templateSuffix";
+
 }

Modified: 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/template/TemplateEngineManager.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/template/TemplateEngineManager.java?rev=1535002&r1=1535001&r2=1535002&view=diff
==
--- 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/template/TemplateEngineManager.java
 (original)
+++ 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/template/TemplateEngineManager.java
 Wed Oct 23 12:36:22 2013
@@ -21,20 +21,20 @@
 
 package org.apache.struts2.components.template;
 
+import com.opensymphony.xwork2.config.ConfigurationException;
+import com.opensymphony.xwork2.inject.Container;
+import com.opensymphony.xwork2.inject.Inject;
+import org.apache.struts2.StrutsConstants;
+
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
 
-import com.opensymphony.xwork2.config.ConfigurationException;
-import com.opensymphony.xwork2.inject.Container;
-import com.opensymphony.xwork2.inject.Inject;
-
 /**
  * The TemplateEngineManager will return a template engine for the template
  */
 public class TemplateEngineManager {
-public static final String DEFAULT_TEMPLATE_TYPE_CONFIG_KEY = 
"struts.ui.templateSuffix";
 
 /** The default template extenstion is ftl. */
 public static final String DEFAULT_TEMPLATE_TYPE = "ftl";
@@ -44,7 +44,7 @@ public class TemplateEngineManager {
 Container container;
 String defaultTemplateType;
 
-@Inject(DEFAULT_TEMPLATE_TYPE_CONFIG_KEY)
+@Inject(StrutsConstants.DEFAULT_TEMPLATE_TYPE_CONFIG_KEY)
 public void setDefaultTemplateType(String type) {
 this.defaultTemplateType = type;
 }

Added: 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/DeprecationInterceptor.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/DeprecationInterceptor.java?rev=1535002&view=auto
==
--- 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/DeprecationInterceptor.java
 (added)
+++ 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/DeprecationInterceptor.java
 Wed Oct 23 12:36:22 2013
@@ -0,0 +1,105 @@
+package org.apache.struts2.interceptor;
+
+import com.opensymphony.xwork2.ActionInvocation;
+import com.opensymphony.xwork2.XWorkConstants;
+import com.opensymphony.xwork2.inject.Container;
+import com.opensymphony.xwork2.inject.Inject;
+import com.opensymphony.xwork2.interceptor.AbstractInterceptor;
+import com.opensymphony.xwork2.util.logging.Logger;
+import com.opensymphony.xwork2.util.logging.LoggerFactory;
+import org.apache.struts2.StrutsConstants;
+
+import java.lang.reflect.Field;
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * 
+ * In devMode checks if application uses deprecated or unknown constants and 
displays warning
+ * when logging level is set to DEBUG
+ * 
+ *
+ * 
+ * no special parameters yet
+ * 
+ */
+public class DeprecationInterceptor extends AbstractInterceptor {
+
+private static final Logger LOG = 
LoggerFactory.getLogger(DeprecationInterceptor.class);
+
+private Container container;
+private boolean devMode;
+
+@Override
+public String intercept(Act

[CONF] Confluence Changes in the last 24 hours

[Anonymous (Confluence)]

   Apache ActiveMQ


Pages

 Page:
 SSL Transport Reference
edited by Torsten Mielke[03:39 PM]
(view changes)



   Apache Ambari (Incubating)


Pages

 Page:
 Build and Install Ambari 1.4.1
created by Siddharth Wagle[09:44 PM]

 Page:
 Install Ambari from public repository
created by Siddharth Wagle[09:47 PM]

 Page:
 Instructions for installing Ambari-1.4.1 bits
edited by Siddharth Wagle[09:50 PM]
(view changes)



   BatchEE (incubating)


Pages

 Home page:
 Index
created by Ulrich Stärk[12:06 PM]



   Apache Camel


Pages

 Page:
 Camel 2.13.0 Release
edited by Claus Ibsen[02:05 PM]
(view changes)

 Page:
 Crypto
edited by Franz Forsthofer[09:43 AM]
(view changes)

 Page:
 ETL Example
edited by Babak Vahdat[07:48 AM]
(view changes)



   Apache Cloudstack


Pages

 Page:
 Release Management
edited by Animesh[11:46 PM]
(view changes)

 Page:
 Improve SystemVm upgrades
edited by Kishan Kavala[01:16 PM]
(view changes)

 Page:
 GPU and vGPU support for CloudStack Guest VMs
created by Saksham Srivastava[06:54 AM]

 Page:
 Baremetal KickStart
edited by Jijun[07:31 AM]
(view changes)

 Page:
 Security response procedure
edited by John Kinsella[02:45 AM]
(view changes)



   Apache CXF


Pages

 Page:
 Migration Guide 1.1
edited by Oliver Wulff[06:10 AM]
(view changes)



   Apache Hive


Pages

 Page:
 Tutorial
edited by Lefty Leverenz[09:47 AM]
(view changes)

 Page:
 GettingStarted
edited by Lefty Leverenz[09:34 AM]
(view changes)

 Page:
 LanguageManual DML
edited by Lefty Leverenz[09:28 AM]
(view changes)

 Page:
 StorageHandlers