[2/2] git commit: WW-4282 Adds WARN level when DTD cannot be resolved locally

2014-01-15 Thread lukaszlenart 
WW-4282 Adds WARN level when DTD cannot be resolved locally


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/b1d3401c
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/b1d3401c
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/b1d3401c

Branch: refs/heads/master
Commit: b1d3401c32dba235fda2624124da6b304911017d
Parents: 750d680
Author: Lukasz Lenart 
Authored: Wed Jan 15 09:13:39 2014 +0100
Committer: Lukasz Lenart 
Committed: Wed Jan 15 09:13:39 2014 +0100

--
 .../src/main/java/com/opensymphony/xwork2/util/DomHelper.java  | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/b1d3401c/xwork-core/src/main/java/com/opensymphony/xwork2/util/DomHelper.java
--
diff --git 
a/xwork-core/src/main/java/com/opensymphony/xwork2/util/DomHelper.java 
b/xwork-core/src/main/java/com/opensymphony/xwork2/util/DomHelper.java
index 15a88d8..71ecc82 100644
--- a/xwork-core/src/main/java/com/opensymphony/xwork2/util/DomHelper.java
+++ b/xwork-core/src/main/java/com/opensymphony/xwork2/util/DomHelper.java
@@ -346,8 +346,10 @@ public class DomHelper {
 @Override
 public InputSource resolveEntity(String publicId, String systemId) {
 if (dtdMappings != null && dtdMappings.containsKey(publicId)) {
-String val = dtdMappings.get(publicId).toString();
-return new 
InputSource(ClassLoaderUtil.getResourceAsStream(val, DomHelper.class));
+String dtdFile = dtdMappings.get(publicId);
+return new 
InputSource(ClassLoaderUtil.getResourceAsStream(dtdFile, DomHelper.class));
+} else if (LOG.isWarnEnabled()) {
+LOG.warn("Local DTD is missing for publicID: #0 - defined 
mappings: #1", publicId, dtdMappings);
 }
 return null;
 }

[1/2] git commit: WW-4244 Uses ObjectFactory to instantiate action in config-browser

2014-01-15 Thread lukaszlenart 
Updated Branches:
  refs/heads/master f62ea507f -> b1d3401c3


WW-4244 Uses ObjectFactory to instantiate action in config-browser


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/750d6800
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/750d6800
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/750d6800

Branch: refs/heads/master
Commit: 750d68009cfebd50bbfd4cf32f9ba7a29143262a
Parents: f62ea50
Author: Lukasz Lenart 
Authored: Wed Jan 15 09:12:23 2014 +0100
Committer: Lukasz Lenart 
Committed: Wed Jan 15 09:12:23 2014 +0100

--
 .../org/apache/struts2/config_browser/ShowConfigAction.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/750d6800/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowConfigAction.java
--
diff --git 
a/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowConfigAction.java
 
b/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowConfigAction.java
index 1b3b932..faecb86 100644
--- 
a/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowConfigAction.java
+++ 
b/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowConfigAction.java
@@ -1,4 +1,5 @@
 /*
+ * $Id: ShowConfigAction.java 1536698 2013-10-29 13:00:58Z lukaszlenart $
  * $Id$
  *
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -106,8 +107,8 @@ public class ShowConfigAction extends ActionNamesAction {
 config = configHelper.getActionConfig(namespace, actionName);
 actionNames = new 
TreeSet(configHelper.getActionNames(namespace));
 try {
-Class clazz = 
objectFactory.getClassInstance(getConfig().getClassName());
-properties = 
reflectionProvider.getPropertyDescriptors(clazz.newInstance());
+Object action = objectFactory.buildAction(actionName, namespace, 
config, null);
+properties = reflectionProvider.getPropertyDescriptors(action);
 } catch (Exception e) {
 LOG.error("Unable to get properties for action " + actionName, e);
 addActionError("Unable to retrieve action properties: " + 
e.toString());

git commit: Escapes error messages

2014-01-15 Thread lukaszlenart 
Updated Branches:
  refs/heads/master b1d3401c3 -> cfac7388c


Escapes error messages


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/cfac7388
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/cfac7388
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/cfac7388

Branch: refs/heads/master
Commit: cfac7388c58f4d9bd601b31508aae49e54af5a8f
Parents: b1d3401
Author: Lukasz Lenart 
Authored: Wed Jan 15 11:03:21 2014 +0100
Committer: Lukasz Lenart 
Committed: Wed Jan 15 11:03:21 2014 +0100

--
 .../resources/org/apache/struts2/dispatcher/error.ftl   | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/cfac7388/core/src/main/resources/org/apache/struts2/dispatcher/error.ftl
--
diff --git a/core/src/main/resources/org/apache/struts2/dispatcher/error.ftl 
b/core/src/main/resources/org/apache/struts2/dispatcher/error.ftl
index 1b89aad..090bb92 100644
--- a/core/src/main/resources/org/apache/struts2/dispatcher/error.ftl
+++ b/core/src/main/resources/org/apache/struts2/dispatcher/error.ftl
@@ -65,17 +65,17 @@
 
 <#list msgs as msg>
 <#if (msg?is_method)>
-${msg[0]}
+${msg[0]?html}
 <#else>
-${msg}
+${msg?html}
 
 
 
 <#elseif (msgs?size == 1)>
 <#if (msgs[0]?is_method)>
-${msgs[0][0]}
+${msgs[0][0]?html}
 <#else>
-${msgs[0]}
+${msgs[0]?html}
 
 
 
@@ -126,11 +126,11 @@
 Stacktraces
 <#list chain as ex>
 
-${ex}
+${ex?html}
 
 
 <#list ex.stackTrace as frame>
-${frame}
+${frame?html}

[CONF] Confluence Changes in the last 24 hours

2014-01-15 Thread Anonymous (Confluence) 
















  Confluence Changes in the last 24 hours  




 BatchEE (incubating) 

Pages

 Page: 2014-01 created by Mark Struberg [11:16 AM] 


 Apache Camel 

Pages

 Page: Twitter edited by willem jiang [06:57 AM] (View Changes) 


 Apache Cloudstack 

Pages

 Page: Region level VPC and guest network spanning multiple zones edited by Murali Reddy [06:22 PM] (View Changes) 
 Page: DevCloud edited by Sebastien Goasguen [06:16 PM] (View Changes) 


 Apache Hive 

Pages

 Home page: Home edited by Lefty Leverenz [09:36 PM] (View Changes) 


 OFBiz Project Administration Workspace 

Pages

 Page: OFBiz Documentation Index edited by Jacques Le Roux [09:16 AM] (View Changes) 


 OFBiz (Open For Business) Project Open Wiki 

Pages

 Page: Create Expense Declaration created by Pierre Smits [03:35 PM] 
 Page: Reject Expense Item created by Pierre Smits [03:34 PM] 
 Page: Approve Expense Item created by Pierre Smits [03:33 PM] 
 Page: Remove Expense Item created by Pierre Smits [03:32 PM] 
 Page: Add Expense Item created by Pierre Smits [03:31 PM] 
 Page: View Expense Declaration created by Pierre Smits [03:31 PM] 
 Page: Use Cases created by Pierre Smits [01:26 PM] 
 Page: Expense Declaration edited by Pierre Smits [02:06 PM] (View Changes) 
 Page: Expense Declaration - Glossary created by Pierre Smits [01:25 PM] 


 Apache Qpid 

Pages

 Page: Proton Architecture edited by Rafael H. Schloming [06:32 PM] (View Changes) 


 Apache Sentry 

Pag