knguyen 2005/05/25 11:26:31 CEST
Modified files: (Branch: JAHIA-4-1-BRANCH)
src/java/org/jahia/params SerializableParamBean.java
Added files: (Branch: JAHIA-4-1-BRANCH)
src/java/org/jahia/params DummyServletRequestWrapper.java
Log:
- make serializable ParamBean use a dummy httpServletRequest because we are
out of Servlet context.
Revision Changes Path
1.1.2.1 +241 -0
jahia/src/java/org/jahia/params/DummyServletRequestWrapper.java (new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/params/DummyServletRequestWrapper.java?rev=1.1.2.1&content-type=text/plain
1.1.2.2 +15 -0
jahia/src/java/org/jahia/params/SerializableParamBean.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/params/SerializableParamBean.java.diff?r1=1.1.2.1&r2=1.1.2.2&f=h
Index: SerializableParamBean.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/params/Attic/SerializableParamBean.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- SerializableParamBean.java 20 May 2005 13:31:15 -0000 1.1.2.1
+++ SerializableParamBean.java 25 May 2005 09:26:30 -0000 1.1.2.2
@@ -158,6 +158,8 @@
private static org.apache.log4j.Logger logger =
org.apache.log4j.Logger.getLogger(SerializableParamBean.class);
+ private DummyServletRequestWrapper dummyRequest;
+
/**
* jParams should not be null !
*
@@ -174,8 +176,21 @@
super(null, null, Jahia.getStaticServletConfig().getServletContext(),
Jahia.getSettings(), System.currentTimeMillis(),
ParamBean.POST_METHOD, jParams.getSite(), jParams.getUser(),
jParams.getContentPage());
+ this.dummyRequest = new
DummyServletRequestWrapper(jParams.getUser());
+ }
+
+ public HttpServletRequest getRequest(){
+ return (HttpServletRequest)this.dummyRequest;
}
+ public ServletIncludeRequestWrapper getRequestWrapper() {
+ return null;
+ }
+ public HttpServletRequest getRealRequest(){
+ return this.dummyRequest;
+ }
+
+
/**
* jParams should not be null !
*
