Author: mrdon
Date: Sat Sep 9 22:28:16 2006
New Revision: 441909
URL: http://svn.apache.org/viewvc?view=rev&rev=441909
Log:
Extracted the oscore dependency, enabled multiple struts config files of the
same name
to be automatically loaded, made the JSF interceptors more quiet when JSF isn't
around
XW-414 XW-413 WW-1424
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Bean.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Property.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Text.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/template/BaseTemplateEngine.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/template/FreemarkerTemplateEngine.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/StrutsXMLConfigurationProvider.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/jsf/FacesSetupInterceptor.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr168Dispatcher.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/sitegraph/entities/FileBasedView.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/StrutsUtil.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/TokenHelper.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/StrutsClassTemplateLoader.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/StringAdapter.java
struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/PlainTextResultTest.java
struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/StreamResultTest.java
struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/FileUploadInterceptorTest.java
struts/struts2/trunk/core/src/test/java/org/apache/struts2/portlet/util/StrutsUtilTest.java
struts/struts2/trunk/core/src/test/java/org/apache/struts2/sitegraph/SiteGraphTest.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Bean.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Bean.java?view=diff&rev=441909&r1=441908&r2=441909
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Bean.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Bean.java
Sat Sep 9 22:28:16 2006
@@ -22,7 +22,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import com.opensymphony.util.ClassLoaderUtil;
+import com.opensymphony.xwork2.util.ClassLoaderUtil;
import com.opensymphony.xwork2.ObjectFactory;
import com.opensymphony.xwork2.util.OgnlUtil;
import com.opensymphony.xwork2.util.OgnlValueStack;
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Property.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Property.java?view=diff&rev=441909&r1=441908&r2=441909
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Property.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Property.java
Sat Sep 9 22:28:16 2006
@@ -23,8 +23,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import com.opensymphony.util.TextUtils;
import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.util.TextUtils;
/**
* <!-- START SNIPPET: javadoc -->
@@ -55,7 +55,7 @@
* <!-- Example 1: -->
* <s:property value="myBeanProperty" />
*
- * <!-- Example 2: -->
+ * <!-- Example 2: -->TextUtils
* <s:property value="myBeanProperty" default="a default value" />
* </s:push>
*
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Text.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Text.java?view=diff&rev=441909&r1=441908&r2=441909
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Text.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Text.java
Sat Sep 9 22:28:16 2006
@@ -27,7 +27,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import com.opensymphony.util.TextUtils;
+import com.opensymphony.xwork2.util.TextUtils;
import com.opensymphony.xwork2.TextProvider;
import com.opensymphony.xwork2.util.OgnlValueStack;
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/template/BaseTemplateEngine.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/template/BaseTemplateEngine.java?view=diff&rev=441909&r1=441908&r2=441909
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/template/BaseTemplateEngine.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/template/BaseTemplateEngine.java
Sat Sep 9 22:28:16 2006
@@ -29,7 +29,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import com.opensymphony.util.ClassLoaderUtil;
+import com.opensymphony.xwork2.util.ClassLoaderUtil;
/**
* Base class for template engines.
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/template/FreemarkerTemplateEngine.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/template/FreemarkerTemplateEngine.java?view=diff&rev=441909&r1=441908&r2=441909
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/template/FreemarkerTemplateEngine.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/template/FreemarkerTemplateEngine.java
Sat Sep 9 22:28:16 2006
@@ -32,7 +32,7 @@
import org.apache.struts2.ServletActionContext;
import org.apache.struts2.views.freemarker.FreemarkerManager;
-import com.opensymphony.util.ClassLoaderUtil;
+import com.opensymphony.xwork2.util.ClassLoaderUtil;
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.util.OgnlValueStack;
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/StrutsXMLConfigurationProvider.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/StrutsXMLConfigurationProvider.java?view=diff&rev=441909&r1=441908&r2=441909
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/StrutsXMLConfigurationProvider.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/StrutsXMLConfigurationProvider.java
Sat Sep 9 22:28:16 2006
@@ -6,8 +6,14 @@
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
+import java.io.IOException;
import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
import java.util.Map;
import org.apache.commons.logging.Log;
@@ -57,21 +63,26 @@
* @param fileName The file name to retrieve
* @see
com.opensymphony.xwork2.config.providers.XmlConfigurationProvider#getInputStream(java.lang.String)
*/
- protected InputStream getInputStream(String fileName) {
- InputStream is = null;
+ @Override
+ protected Iterator<URL> getConfigurationUrls(String fileName) throws
IOException {
+ URL url = null;
if (baseDir != null) {
- is = findInFileSystem(fileName);
- if (is == null) {
- is = super.getInputStream(fileName);
+ url = findInFileSystem(fileName);
+ if (url == null) {
+ return super.getConfigurationUrls(fileName);
}
+ }
+ if (url != null) {
+ List<URL> list = new ArrayList<URL>();
+ list.add(url);
+ return list.iterator();
} else {
- is = super.getInputStream(fileName);
+ return super.getConfigurationUrls(fileName);
}
- return is;
}
- protected InputStream findInFileSystem(String fileName) {
- InputStream is = null;
+ protected URL findInFileSystem(String fileName) throws IOException {
+ URL url = null;
File file = new File(fileName);
if (LOG.isDebugEnabled()) {
LOG.debug("Trying to load file " + file);
@@ -83,13 +94,11 @@
}
if (file.exists()) {
try {
- is = new FileInputStream(file);
- } catch (FileNotFoundException ex) {
- throw new StrutsException("File not found: "+file, ex);
+ url = file.toURL();
+ } catch (MalformedURLException e) {
+ throw new IOException("Unable to convert "+file+" to a URL");
}
- } else {
-
- }
- return is;
+ }
+ return url;
}
}
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java?view=diff&rev=441909&r1=441908&r2=441909
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
Sat Sep 9 22:28:16 2006
@@ -47,8 +47,8 @@
import org.apache.struts2.util.ObjectFactoryInitializable;
import org.apache.struts2.views.freemarker.FreemarkerManager;
-import com.opensymphony.util.ClassLoaderUtil;
-import com.opensymphony.util.FileManager;
+import com.opensymphony.xwork2.util.ClassLoaderUtil;
+import com.opensymphony.xwork2.util.FileManager;
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionProxy;
import com.opensymphony.xwork2.ActionProxyFactory;
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java?view=diff&rev=441909&r1=441908&r2=441909
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java
Sat Sep 9 22:28:16 2006
@@ -50,7 +50,7 @@
import org.apache.struts2.dispatcher.mapper.ActionMapping;
import com.opensymphony.module.sitemesh.RequestConstants;
-import com.opensymphony.util.ClassLoaderUtil;
+import com.opensymphony.xwork2.util.ClassLoaderUtil;
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.XWorkException;
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/jsf/FacesSetupInterceptor.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/jsf/FacesSetupInterceptor.java?view=diff&rev=441909&r1=441908&r2=441909
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/jsf/FacesSetupInterceptor.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/jsf/FacesSetupInterceptor.java
Sat Sep 9 22:28:16 2006
@@ -131,6 +131,7 @@
.getFactory(FactoryFinder.FACES_CONTEXT_FACTORY);
} catch (Exception ex) {
log.debug("Unable to initialize faces", ex);
+ return;
}
// Javadoc says: Lifecycle instance is shared across multiple
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr168Dispatcher.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr168Dispatcher.java?view=diff&rev=441909&r1=441908&r2=441909
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr168Dispatcher.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr168Dispatcher.java
Sat Sep 9 22:28:16 2006
@@ -53,8 +53,8 @@
import org.apache.struts2.util.AttributeMap;
import org.apache.struts2.util.ObjectFactoryInitializable;
-import com.opensymphony.util.ClassLoaderUtil;
-import com.opensymphony.util.FileManager;
+import com.opensymphony.xwork2.util.ClassLoaderUtil;
+import com.opensymphony.xwork2.util.FileManager;
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionProxy;
import com.opensymphony.xwork2.ActionProxyFactory;
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/sitegraph/entities/FileBasedView.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/sitegraph/entities/FileBasedView.java?view=diff&rev=441909&r1=441908&r2=441909
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/sitegraph/entities/FileBasedView.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/sitegraph/entities/FileBasedView.java
Sat Sep 9 22:28:16 2006
@@ -17,28 +17,34 @@
*/
package org.apache.struts2.sitegraph.entities;
+import java.io.BufferedReader;
import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.IOException;
import java.util.Set;
import java.util.TreeSet;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.struts2.StrutsConstants;
import org.apache.struts2.config.Settings;
import org.apache.struts2.sitegraph.model.Link;
-import com.opensymphony.util.FileUtils;
-
/**
*/
public abstract class FileBasedView implements View {
private String name;
private String contents;
+
+ private static final Log log = LogFactory.getLog(FileBasedView.class);
public FileBasedView(File file) {
this.name = file.getName();
// get the contents as a single line
- this.contents = FileUtils.readFile(file).replaceAll("[\r\n ]+", " ");
+ this.contents = readFile(file).replaceAll("[\r\n ]+", " ");
}
public String getName() {
@@ -77,4 +83,27 @@
protected abstract Pattern getActionPattern();
protected abstract Pattern getFormPattern();
+
+ protected String readFile(File file) {
+ try {
+ BufferedReader in = new BufferedReader(new FileReader(file));
+
+ String s = new String();
+ StringBuffer buffer = new StringBuffer();
+
+ while ((s = in.readLine()) != null) {
+ buffer.append(s + "\n");
+ }
+
+ in.close();
+
+ return buffer.toString();
+ } catch (FileNotFoundException e) {
+ log.warn("File not found");
+ } catch (IOException e) {
+ log.error(e);
+ }
+
+ return null;
+ }
}
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?view=diff&rev=441909&r1=441908&r2=441909
==============================================================================
---
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
Sat Sep 9 22:28:16 2006
@@ -41,7 +41,7 @@
import org.apache.struts2.views.jsp.ui.OgnlTool;
import org.apache.struts2.views.util.UrlHelper;
-import com.opensymphony.util.TextUtils;
+import com.opensymphony.xwork2.util.TextUtils;
import com.opensymphony.xwork2.ObjectFactory;
import com.opensymphony.xwork2.util.OgnlValueStack;
@@ -118,10 +118,6 @@
e.printStackTrace();
throw e;
}
- }
-
- public String textToHtml(String s) {
- return TextUtils.plainTextToHtml(s);
}
public String urlEncode(String s) {
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/TokenHelper.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/TokenHelper.java?view=diff&rev=441909&r1=441908&r2=441909
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/TokenHelper.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/TokenHelper.java
Sat Sep 9 22:28:16 2006
@@ -17,12 +17,13 @@
*/
package org.apache.struts2.util;
+import java.math.BigInteger;
import java.util.Map;
+import java.util.Random;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import com.opensymphony.util.GUID;
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.util.LocalizedTextUtil;
@@ -36,12 +37,13 @@
* The default name to map the token value
*/
public static final String DEFAULT_TOKEN_NAME = "struts.token";
-
+
/**
* The name of the field which will hold the token name
*/
public static final String TOKEN_NAME_FIELD = "struts.token.name";
private static final Log LOG = LogFactory.getLog(TokenHelper.class);
+ private static final Random RANDOM = new Random();
/**
@@ -61,7 +63,7 @@
*/
public static String setToken(String tokenName) {
Map session = ActionContext.getContext().getSession();
- String token = GUID.generateGUID();
+ String token = generateGUID();
try {
session.put(tokenName, token);
}
@@ -173,5 +175,9 @@
session.remove(tokenName);
return true;
+ }
+
+ public static String generateGUID() {
+ return new BigInteger(165, RANDOM).toString(36).toUpperCase();
}
}
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?view=diff&rev=441909&r1=441908&r2=441909
==============================================================================
---
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
Sat Sep 9 22:28:16 2006
@@ -37,7 +37,7 @@
import org.apache.struts2.views.freemarker.tags.StrutsModels;
import org.apache.struts2.views.util.ContextUtil;
-import com.opensymphony.util.FileManager;
+import com.opensymphony.xwork2.util.FileManager;
import com.opensymphony.xwork2.ObjectFactory;
import com.opensymphony.xwork2.util.OgnlValueStack;
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/StrutsClassTemplateLoader.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/StrutsClassTemplateLoader.java?view=diff&rev=441909&r1=441908&r2=441909
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/StrutsClassTemplateLoader.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/StrutsClassTemplateLoader.java
Sat Sep 9 22:28:16 2006
@@ -19,7 +19,7 @@
import java.net.URL;
-import com.opensymphony.util.ClassLoaderUtil;
+import com.opensymphony.xwork2.util.ClassLoaderUtil;
import freemarker.cache.URLTemplateLoader;
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/StringAdapter.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/StringAdapter.java?view=diff&rev=441909&r1=441908&r2=441909
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/StringAdapter.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/StringAdapter.java
Sat Sep 9 22:28:16 2006
@@ -18,6 +18,7 @@
package org.apache.struts2.views.xslt;
import java.io.IOException;
+import java.io.StringReader;
import java.util.ArrayList;
import java.util.List;
@@ -27,9 +28,10 @@
import org.apache.commons.logging.LogFactory;
import org.apache.struts2.StrutsException;
import org.w3c.dom.Node;
+import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
-import com.opensymphony.util.XMLUtils;
+import com.opensymphony.xwork2.util.DomHelper;
/**
* StringAdapter adapts a Java String value to a DOM Element with the specified
@@ -74,15 +76,7 @@
if (getParseStringAsXML()) {
log.debug("parsing string as xml: " + getStringValue());
// Parse the String to a DOM, then proxy that as our child
- try {
- node = XMLUtils.parse(getStringValue());
- } catch (ParserConfigurationException e) {
- throw new StrutsException(e);
- } catch (IOException e) {
- throw new StrutsException(e);
- } catch (SAXException e) {
- throw new StrutsException(e);
- }
+ node = DomHelper.parse(new InputSource(new
StringReader(getStringValue())));
node = getAdapterFactory().proxyNode(this, node);
} else {
log.debug("using string as is: " + getStringValue());
Modified:
struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/PlainTextResultTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/PlainTextResultTest.java?view=diff&rev=441909&r1=441908&r2=441909
==============================================================================
---
struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/PlainTextResultTest.java
(original)
+++
struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/PlainTextResultTest.java
Sat Sep 9 22:28:16 2006
@@ -28,7 +28,7 @@
import org.apache.struts2.views.jsp.StrutsMockHttpServletResponse;
import org.apache.struts2.views.jsp.StrutsMockServletContext;
-import com.opensymphony.util.ClassLoaderUtil;
+import com.opensymphony.xwork2.util.ClassLoaderUtil;
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.mock.MockActionInvocation;
import com.opensymphony.xwork2.util.OgnlValueStack;
Modified:
struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/StreamResultTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/StreamResultTest.java?view=diff&rev=441909&r1=441908&r2=441909
==============================================================================
---
struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/StreamResultTest.java
(original)
+++
struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/StreamResultTest.java
Sat Sep 9 22:28:16 2006
@@ -28,7 +28,7 @@
import org.apache.struts2.ServletActionContext;
import org.springframework.mock.web.MockHttpServletResponse;
-import com.opensymphony.util.ClassLoaderUtil;
+import com.opensymphony.xwork2.util.ClassLoaderUtil;
import com.opensymphony.xwork2.Action;
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.mock.MockActionInvocation;
Modified:
struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/FileUploadInterceptorTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/FileUploadInterceptorTest.java?view=diff&rev=441909&r1=441908&r2=441909
==============================================================================
---
struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/FileUploadInterceptorTest.java
(original)
+++
struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/FileUploadInterceptorTest.java
Sat Sep 9 22:28:16 2006
@@ -33,7 +33,7 @@
import org.apache.struts2.dispatcher.multipart.MultiPartRequestWrapper;
import org.springframework.mock.web.MockHttpServletRequest;
-import com.opensymphony.util.ClassLoaderUtil;
+import com.opensymphony.xwork2.util.ClassLoaderUtil;
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionSupport;
import com.opensymphony.xwork2.ValidationAwareSupport;
Modified:
struts/struts2/trunk/core/src/test/java/org/apache/struts2/portlet/util/StrutsUtilTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/portlet/util/StrutsUtilTest.java?view=diff&rev=441909&r1=441908&r2=441909
==============================================================================
---
struts/struts2/trunk/core/src/test/java/org/apache/struts2/portlet/util/StrutsUtilTest.java
(original)
+++
struts/struts2/trunk/core/src/test/java/org/apache/struts2/portlet/util/StrutsUtilTest.java
Sat Sep 9 22:28:16 2006
@@ -91,12 +91,6 @@
}
- public void testTextToHtmlMethod() throws Exception {
- assertEquals(
- strutsUtil.textToHtml("<html><head><title>some
title</title><body>some content</body></html>"),
- "<html><head><title>some
title</title><body>some content</body></html>");
- }
-
public void testUrlEncodeMethod() throws Exception {
assertEquals(
strutsUtil.urlEncode("http://www.opensymphony.com/action2/index.jsp?param1=value1";),
Modified:
struts/struts2/trunk/core/src/test/java/org/apache/struts2/sitegraph/SiteGraphTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/sitegraph/SiteGraphTest.java?view=diff&rev=441909&r1=441908&r2=441909
==============================================================================
---
struts/struts2/trunk/core/src/test/java/org/apache/struts2/sitegraph/SiteGraphTest.java
(original)
+++
struts/struts2/trunk/core/src/test/java/org/apache/struts2/sitegraph/SiteGraphTest.java
Sat Sep 9 22:28:16 2006
@@ -25,7 +25,7 @@
import org.apache.struts2.StrutsTestCase;
import org.apache.struts2.dispatcher.Dispatcher;
-import com.opensymphony.util.ClassLoaderUtil;
+import com.opensymphony.xwork2.util.ClassLoaderUtil;
/**
*/
