Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-07 07:37:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

WW-2623 Struts 2.1.3 omnibus ticket

Browse Source 
o optimzed imports

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@666756 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Rainer Hermanns
2008-06-11 18:11:00 +00:00
parent 7140edf5e5
commit f54ce89923
9 changed files with 27 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/rest/src/main/java/org/apache/struts2/rest/ContentTypeHandlerManager.java
-1
View File
@@ -32,7 +32,6 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import static javax.servlet.http.HttpServletResponse.SC_NOT_MODIFIED;
import static javax.servlet.http.HttpServletResponse.SC_OK;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.StringWriter;
import java.util.HashMap;
plugins/rest/src/main/java/org/apache/struts2/rest/ContentTypeInterceptor.java
+7 -9
View File
@@ -21,19 +21,17 @@
package org.apache.struts2.rest;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.Reader;
import javax.servlet.http.HttpServletRequest;
import org.apache.struts2.ServletActionContext;
import org.apache.struts2.rest.handler.ContentTypeHandler;
import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.ModelDriven;
import com.opensymphony.xwork2.inject.Inject;
import com.opensymphony.xwork2.interceptor.Interceptor;
import org.apache.struts2.ServletActionContext;
import org.apache.struts2.rest.handler.ContentTypeHandler;
import javax.servlet.http.HttpServletRequest;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.Reader;
/**
* Uses the content handler to apply the request body to the action
plugins/rest/src/main/java/org/apache/struts2/rest/DefaultHttpHeaders.java
+1 -3
View File
@@ -23,9 +23,7 @@ package org.apache.struts2.rest;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import static javax.servlet.http.HttpServletResponse.SC_NOT_MODIFIED;
import static javax.servlet.http.HttpServletResponse.SC_OK;
import static javax.servlet.http.HttpServletResponse.SC_CREATED;
import static javax.servlet.http.HttpServletResponse.*;
import java.util.Date;
/**
plugins/rest/src/main/java/org/apache/struts2/rest/RestActionInvocation.java
+1 -31
View File
@@ -21,49 +21,19 @@
package org.apache.struts2.rest;
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionEventListener;
import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.ActionProxy;
import com.opensymphony.xwork2.DefaultActionInvocation;
import com.opensymphony.xwork2.ModelDriven;
import com.opensymphony.xwork2.ObjectFactory;
import com.opensymphony.xwork2.Result;
import com.opensymphony.xwork2.UnknownHandler;
import com.opensymphony.xwork2.config.ConfigurationException;
import com.opensymphony.xwork2.config.entities.ActionConfig;
import com.opensymphony.xwork2.config.entities.InterceptorMapping;
import com.opensymphony.xwork2.config.entities.ResultConfig;
import com.opensymphony.xwork2.conversion.impl.XWorkConverter;
import com.opensymphony.xwork2.inject.Container;
import com.opensymphony.xwork2.inject.Inject;
import com.opensymphony.xwork2.interceptor.PreResultListener;
import com.opensymphony.xwork2.util.ValueStack;
import com.opensymphony.xwork2.util.ValueStackFactory;
import com.opensymphony.xwork2.util.logging.Logger;
import com.opensymphony.xwork2.util.logging.LoggerFactory;
import com.opensymphony.xwork2.util.profiling.UtilTimerStack;
import com.opensymphony.xwork2.util.logging.Logger;
import org.apache.struts2.ServletActionContext;
import org.apache.struts2.rest.handler.ContentTypeHandler;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
/**
plugins/rest/src/main/java/org/apache/struts2/rest/RestActionProxyFactory.java
+2 -5
View File
@@ -21,14 +21,11 @@
package org.apache.struts2.rest;
import java.util.Map;
import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.ActionProxy;
import com.opensymphony.xwork2.DefaultActionInvocation;
import com.opensymphony.xwork2.DefaultActionProxyFactory;
import com.opensymphony.xwork2.inject.Container;
import com.opensymphony.xwork2.inject.Inject;
import java.util.Map;
/**
plugins/rest/src/main/java/org/apache/struts2/rest/RestWorkflowInterceptor.java
+5 -7
View File
@@ -21,12 +21,6 @@
package org.apache.struts2.rest;
import java.util.HashMap;
import java.util.Map;
import org.apache.struts2.ServletActionContext;
import org.apache.struts2.dispatcher.mapper.ActionMapping;
import com.opensymphony.xwork2.Action;
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionInvocation;
@@ -35,8 +29,12 @@ import com.opensymphony.xwork2.inject.Inject;
import com.opensymphony.xwork2.interceptor.MethodFilterInterceptor;
import com.opensymphony.xwork2.util.logging.Logger;
import com.opensymphony.xwork2.util.logging.LoggerFactory;
import org.apache.struts2.ServletActionContext;
import org.apache.struts2.dispatcher.mapper.ActionMapping;
import static javax.servlet.http.HttpServletResponse.*;
import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST;
import java.util.HashMap;
import java.util.Map;
/**
* <!-- START SNIPPET: description -->
plugins/rest/src/main/java/org/apache/struts2/rest/handler/ContentTypeHandler.java
+3 -3
View File
@@ -21,9 +21,9 @@
package org.apache.struts2.rest.handler;
import java.io.*;
import com.opensymphony.xwork2.ActionInvocation;
import java.io.IOException;
import java.io.Reader;
import java.io.Writer;
/**
* Handles transferring content to and from objects for a specific content type
plugins/rest/src/main/java/org/apache/struts2/rest/handler/JsonLibHandler.java
+6 -4
View File
@@ -21,12 +21,14 @@
package org.apache.struts2.rest.handler;
import java.io.*;
import java.util.Collection;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
import net.sf.json.JsonConfig;
import net.sf.json.JSONArray;
import java.io.IOException;
import java.io.Reader;
import java.io.Writer;
import java.util.Collection;
/**
* Handles JSON content using json-lib
plugins/rest/src/main/java/org/apache/struts2/rest/handler/XStreamHandler.java
+2 -2
View File
@@ -21,12 +21,12 @@
package org.apache.struts2.rest.handler;
import com.thoughtworks.xstream.XStream;
import java.io.IOException;
import java.io.Reader;
import java.io.Writer;
import com.thoughtworks.xstream.XStream;
/**
* Handles XML content
*/