date:20120223

svn commit: r1292705 [2/2] - in /struts/struts2/trunk: ./ apps/portlet/ apps/portlet/src/main/java/org/apache/struts2/portlet/example/spring/ core/src/main/java/org/apache/struts2/components/ core/src

2012-02-23 Thread lukaszlenart

Modified: struts/struts2/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/pom.xml?rev=1292705&r1=1292704&r2=1292705&view=diff
==
--- struts/struts2/trunk/pom.xml (original)
+++ struts/struts2/trunk/pom.xml Thu Feb 23 08:40:53 2012
@@ -523,9 +523,9 @@
 2.0.1
 
 
-commons-lang
-commons-lang
-2.5
+org.apache.commons
+commons-lang3
+3.1
 
 
 commons-digester

Modified: struts/struts2/trunk/xwork-core/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/pom.xml?rev=1292705&r1=1292704&r2=1292705&view=diff
==
--- struts/struts2/trunk/xwork-core/pom.xml (original)
+++ struts/struts2/trunk/xwork-core/pom.xml Thu Feb 23 08:40:53 2012
@@ -178,8 +178,8 @@
 true
 
 
-commons-lang
-commons-lang
+org.apache.commons
+commons-lang3
 
 
 commons-io

Modified: 
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/DefaultActionProxy.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/DefaultActionProxy.java?rev=1292705&r1=1292704&r2=1292705&view=diff
==
--- 
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/DefaultActionProxy.java
 (original)
+++ 
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/DefaultActionProxy.java
 Thu Feb 23 08:40:53 2012
@@ -28,8 +28,8 @@ import com.opensymphony.xwork2.util.Loca
 import com.opensymphony.xwork2.util.logging.Logger;
 import com.opensymphony.xwork2.util.logging.LoggerFactory;
 import com.opensymphony.xwork2.util.profiling.UtilTimerStack;
-import org.apache.commons.lang.StringEscapeUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringEscapeUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import java.io.Serializable;
 import java.util.Locale;
@@ -80,10 +80,10 @@ public class DefaultActionProxy implemen
 LOG.debug("Creating an DefaultActionProxy for namespace " + 
namespace + " and action name " + actionName);
 }
 
-this.actionName = StringEscapeUtils.escapeHtml(actionName);
+this.actionName = StringEscapeUtils.escapeHtml4(actionName);
 this.namespace = namespace;
 this.executeResult = executeResult;
-this.method = 
StringEscapeUtils.escapeJavaScript(StringEscapeUtils.escapeHtml(methodName));
+this.method = 
StringEscapeUtils.escapeEcmaScript(StringEscapeUtils.escapeHtml4(methodName));
 }
 
 @Inject

Modified: 
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/ActionConfig.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/ActionConfig.java?rev=1292705&r1=1292704&r2=1292705&view=diff
==
--- 
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/ActionConfig.java
 (original)
+++ 
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/ActionConfig.java
 Thu Feb 23 08:40:53 2012
@@ -17,7 +17,7 @@ package com.opensymphony.xwork2.config.e
 
 import com.opensymphony.xwork2.util.location.Located;
 import com.opensymphony.xwork2.util.location.Location;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import java.io.Serializable;
 import java.util.ArrayList;

Modified: 
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/config/impl/AbstractMatcher.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/config/impl/AbstractMatcher.java?rev=1292705&r1=1292704&r2=1292705&view=diff
==
--- 
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/config/impl/AbstractMatcher.java
 (original)
+++ 
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/config/impl/AbstractMatcher.java
 Thu Feb 23 08:40:53 2012
@@ -20,11 +20,14 @@ package com.opensymphony.xwork2.config.i
 import com.opensymphony.xwork2.util.PatternMatcher;
 import com.opensymphony.xwork2.util.logging.Logger;
 import com.opensymphony.xwork2.util.logging.LoggerFactory;
+import org.apache.commons.lang3.math.NumberUtils;
 
 import java.io.Serializable;
-import java.util.*;
-
-import org.apache.commons.lang.math.NumberUtils;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.LinkedHash

svn commit: r1292722 - in /struts/struts2/trunk/core/src: main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java test/java/org/apache/struts2/views/freemarker/FreemarkerManagerTest.java

2012-02-23 Thread lukaszlenart

Author: lukaszlenart
Date: Thu Feb 23 09:28:13 2012
New Revision: 1292722

URL: http://svn.apache.org/viewvc?rev=1292722&view=rev
Log:
WW-3761 - improves loading templates from file path

Modified:

struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java

struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/freemarker/FreemarkerManagerTest.java

Modified: 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java?rev=1292722&r1=1292721&r2=1292722&view=diff
==
--- 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java
 (original)
+++ 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java
 Thu Feb 23 09:28:13 2012
@@ -27,13 +27,21 @@ import com.opensymphony.xwork2.util.File
 import com.opensymphony.xwork2.util.ValueStack;
 import com.opensymphony.xwork2.util.logging.Logger;
 import com.opensymphony.xwork2.util.logging.LoggerFactory;
-import freemarker.cache.*;
+import freemarker.cache.ClassTemplateLoader;
+import freemarker.cache.FileTemplateLoader;
+import freemarker.cache.MultiTemplateLoader;
+import freemarker.cache.TemplateLoader;
+import freemarker.cache.WebappTemplateLoader;
 import freemarker.ext.jsp.TaglibFactory;
 import freemarker.ext.servlet.HttpRequestHashModel;
 import freemarker.ext.servlet.HttpRequestParametersHashModel;
 import freemarker.ext.servlet.HttpSessionHashModel;
 import freemarker.ext.servlet.ServletContextHashModel;
-import freemarker.template.*;
+import freemarker.template.Configuration;
+import freemarker.template.ObjectWrapper;
+import freemarker.template.TemplateException;
+import freemarker.template.TemplateExceptionHandler;
+import freemarker.template.TemplateModel;
 import freemarker.template.utility.StringUtil;
 import org.apache.struts2.StrutsConstants;
 import org.apache.struts2.views.JspSupportServlet;
@@ -49,7 +57,13 @@ import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.Calendar;
+import java.util.Collections;
+import java.util.GregorianCalendar;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
 
 
 /**
@@ -382,7 +396,7 @@ public class FreemarkerManager {
  // substring(7) is intentional as we "reuse" the last 
slash
  templatePathLoader = new ClassTemplateLoader(getClass(), 
templatePath.substring(7));
  } else if (templatePath.startsWith("file://")) {
- templatePathLoader = new FileTemplateLoader(new 
File(templatePath));
+ templatePathLoader = new FileTemplateLoader(new 
File(templatePath.substring(7)));
  }
  }
  } catch (IOException e) {

Modified: 
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/freemarker/FreemarkerManagerTest.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/freemarker/FreemarkerManagerTest.java?rev=1292722&r1=1292721&r2=1292722&view=diff
==
--- 
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/freemarker/FreemarkerManagerTest.java
 (original)
+++ 
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/freemarker/FreemarkerManagerTest.java
 Thu Feb 23 09:28:13 2012
@@ -21,12 +21,12 @@
 
 package org.apache.struts2.views.freemarker;
 
+import org.apache.commons.io.FileUtils;
 import org.apache.struts2.StrutsTestCase;
 import org.apache.struts2.views.jsp.StrutsMockServletContext;
 
 /**
  * Test case for FreemarkerManager
- *
  */
 public class FreemarkerManagerTest extends StrutsTestCase {
 
@@ -38,4 +38,27 @@ public class FreemarkerManagerTest exten
 freemarker.template.Configuration conf = 
mgr.getConfiguration(servletContext);
 assertEquals(conf.getDefaultEncoding(), "UTF-8");
 }
+
+public void testTemplateLoaderBaseOnFile() throws Exception {
+// given
+DummyFreemarkerManager manager = new DummyFreemarkerManager();
+StrutsMockServletContext servletContext = new 
StrutsMockServletContext();
+
servletContext.setAttribute(FreemarkerManager.CONFIG_SERVLET_CONTEXT_KEY, null);
+
+String tmpPath = "file://" + FileUtils.getTempDirectoryPath();
+
+// when
+manager.load(servletContext, tmpPath);
+
+// then
+assertTrue(true); // should pass
+}
+}
+
+class DummyFreemarkerManager extends FreemarkerManager {
+
+public void load(StrutsMockServletContext servletContext, String path) {
+crea

[CONF] Confluence Changes in the last 24 hours

2012-02-23 Thread confluence

This is a daily summary of all recent changes in Confluence.

-
Updated Spaces:
-


Apache ActiveMQ (https://cwiki.apache.org/confluence/display/ACTIVEMQ)

Pages
-
Java Service Wrapper edited by  tabish121  (08:39 AM)
https://cwiki.apache.org/confluence/display/ACTIVEMQ/Java+Service+Wrapper



Apache BVal (https://cwiki.apache.org/confluence/display/BeanValidation)

Pages
-
Version Info edited by  mbenson  (04:49 PM)
https://cwiki.apache.org/confluence/display/BeanValidation/Version+Info

Found a Bug edited by  mbenson  (04:49 PM)
https://cwiki.apache.org/confluence/display/BeanValidation/Found+a+Bug

Samples edited by  mbenson  (04:44 PM)
https://cwiki.apache.org/confluence/display/BeanValidation/Samples

Roadmap edited by  mbenson  (04:26 PM)
https://cwiki.apache.org/confluence/display/BeanValidation/Roadmap

Release Process edited by  mbenson  (04:17 PM)
https://cwiki.apache.org/confluence/display/BeanValidation/Release+Process

Release Management edited by  mbenson  (04:01 PM)
https://cwiki.apache.org/confluence/display/BeanValidation/Release+Management

Privacy Policy edited by  mbenson  (03:50 PM)
https://cwiki.apache.org/confluence/display/BeanValidation/Privacy+Policy



Apache Camel (https://cwiki.apache.org/confluence/display/CAMEL)

Pages
-
Camel 2.10.0 Release edited by  davsclaus  (07:40 AM)
https://cwiki.apache.org/confluence/display/CAMEL/Camel+2.10.0+Release

Simple edited by  davsclaus  (06:56 AM)
https://cwiki.apache.org/confluence/display/CAMEL/Simple

Dozer Type Conversion edited by  davsclaus  (02:05 AM)
https://cwiki.apache.org/confluence/display/CAMEL/Dozer+Type+Conversion



Apache Geronimo v2.2 (https://cwiki.apache.org/confluence/display/GMOxDOC22)

Pages
-
Configuring multiple repositories edited by  rglaue  (11:24 AM)
https://cwiki.apache.org/confluence/display/GMOxDOC22/Configuring+multiple+repositories



Apache Geronimo v3.0 (https://cwiki.apache.org/confluence/display/GMOxDOC30)

Pages
-
Configuring multiple repositories edited by  rglaue  (11:26 AM)
https://cwiki.apache.org/confluence/display/GMOxDOC30/Configuring+multiple+repositories



OODT (https://cwiki.apache.org/confluence/display/OODT)

Pages
-
Workflow and CAS-PGE world edited by  sherylj  (08:37 PM)
https://cwiki.apache.org/confluence/display/OODT/Workflow+and+CAS-PGE+world

Home edited by  sherylj  (03:07 PM)
https://cwiki.apache.org/confluence/display/OODT/Home



Apache Openmeetings (https://cwiki.apache.org/confluence/display/OPENMEETINGS)

Pages
-
NewAudioVideoComponents edited by  seba.wag...@gmail.com  (01:32 PM)
https://cwiki.apache.org/confluence/display/OPENMEETINGS/NewAudioVideoComponents

WebStart Application for Screensharing and Recording edited by  
seba.wag...@gmail.com  (10:30 AM)
https://cwiki.apache.org/confluence/display/OPENMEETINGS/WebStart+Application+for+Screensharing+and+Recording



Apache Sqoop (https://cwiki.apache.org/confluence/display/SQOOP)

Pages
-
How to Release edited by  jarcec  (02:08 PM)
https://cwiki.apache.org/confluence/display/SQOOP/How+to+Release



Apache Tapestry (https://cwiki.apache.org/confluence/display/TAPESTRY)

Pages
-
Release Process edited by  hlship  (05:33 PM)
https://cwiki.apache.org/confluence/display/TAPESTRY/Release+Process



UIMA (https://cwiki.apache.org/confluence/display/UIMA)

Pages
-
Configuring UIMA Pipelines for a particular run edited by  schor  (05:45 PM)
https://cwiki.apache.org/confluence/display/UIMA/Configuring+UIMA+Pipelines+for+a+particular+run



Apache Whirr (https://cwiki.apache.org/confluence/display/WHIRR)

Pages
-
Presentations edited by  andreisavu  (04:57 AM)
https://cwiki.apache.org/confluence/display/WHIRR/Presentations



Apache Wicket (https://cwiki.apache.org/confluence/display/WICKET)

Pages
-
Migration to Wicket 6.0 edited by  mgrigorov  (05:54 AM)
https://cwiki.apache.org/confluence/display/WICKET/Migration+to+Wicket+6.0




Change your notification preferences: 
https://cwiki.apache.org/confluence/users/viewnotifications.action

svn commit: r1292705 [2/2] - in /struts/struts2/trunk: ./ apps/portlet/ apps/portlet/src/main/java/org/apache/struts2/portlet/example/spring/ core/src/main/java/org/apache/struts2/components/ core/src

svn commit: r1292722 - in /struts/struts2/trunk/core/src: main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java test/java/org/apache/struts2/views/freemarker/FreemarkerManagerTest.java

[CONF] Confluence Changes in the last 24 hours

3 matches

Site Navigation

Mail list logo

Footer information