[picocontainer-scm] [5731] java/2.x/trunk/web/web-core: xstream should not be a mandatory dep

Revision 5731
Author paul
Date 2010-07-11 22:01:30 -0500 (Sun, 11 Jul 2010)

Log Message

xstream should not be a mandatory dep

Modified Paths

- java/2.x/trunk/web/web-core/pom.xml

- java/2.x/trunk/web/web-core/src/java/org/picocontainer/web/PicoServletContainerFilter.java

Added Paths

- java/2.x/trunk/web/web-core/src/java/org/picocontainer/web/debug/

- java/2.x/trunk/web/web-core/src/java/org/picocontainer/web/debug/PrintSessionSizeDetailsForDebugging.java

Diff

Modified: java/2.x/trunk/web/web-core/pom.xml (5730 => 5731)

--- java/2.x/trunk/web/web-core/pom.xml 2010-07-04 23:00:58 UTC (rev 5730)
+++ java/2.x/trunk/web/web-core/pom.xml 2010-07-12 03:01:30 UTC (rev 5731)
@@ -16,6 +16,7 @@
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.picocontainer.script</groupId>

Modified: java/2.x/trunk/web/web-core/src/java/org/picocontainer/web/PicoServletContainerFilter.java (5730 => 5731)

--- java/2.x/trunk/web/web-core/src/java/org/picocontainer/web/PicoServletContainerFilter.java 2010-07-04 23:00:58 UTC (rev 5730)
+++ java/2.x/trunk/web/web-core/src/java/org/picocontainer/web/PicoServletContainerFilter.java 2010-07-12 03:01:30 UTC (rev 5731)
@@ -7,11 +7,14 @@
******************************************************************************/
package org.picocontainer.web;

-import java.io.IOException;
-import java.io.Serializable;
-import java.io.ByteArrayOutputStream;
-import java.io.ObjectOutputStream;
-import java.lang.reflect.Type;
+import org.picocontainer.Characteristics;
+import org.picocontainer.DefaultPicoContainer;
+import org.picocontainer.MutablePicoContainer;
+import org.picocontainer.PicoCompositionException;
+import org.picocontainer.PicoContainer;
+import org.picocontainer.adapters.AbstractAdapter;
+import org.picocontainer.lifecycle.DefaultLifecycleState;
+import org.picocontainer.web.debug.PrintSessionSizeDetailsForDebugging;

import javax.servlet.Filter;
import javax.servlet.FilterChain;
@@ -21,19 +24,12 @@
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import java.io.IOException;
+import java.io.Serializable;
+import java.lang.reflect.Type;

-import org.picocontainer.DefaultPicoContainer;
-import org.picocontainer.MutablePicoContainer;
-import org.picocontainer.Characteristics;
-import org.picocontainer.PicoContainer;
-import org.picocontainer.PicoCompositionException;
-import org.picocontainer.lifecycle.DefaultLifecycleState;
-import org.picocontainer.adapters.AbstractAdapter;
-import com.thoughtworks.xstream.XStream;
-import com.thoughtworks.xstream.converters.reflection.PureJavaReflectionProvider;
-
@SuppressWarnings("serial")
public abstract class PicoServletContainerFilter implements Filter, Serializable {

@@ -134,7 +130,7 @@

if (!isStateless) {
if (printSessionSize) {
- printSessionSizeDetailsForDebugging(ssh);
+ PrintSessionSizeDetailsForDebugging.printItIfDebug(debug, ssh);
}
sess.setAttribute(SessionStoreHolder.class.getName(), ssh);
}
@@ -154,19 +150,6 @@

}

- private void printSessionSizeDetailsForDebugging(SessionStoreHolder ssh) throws IOException {
- if ( debug ){
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- ObjectOutputStream oos = new ObjectOutputStream(baos);
- oos.writeObject(ssh);
- oos.close();
- baos.close();
- String xml = new XStream(new PureJavaReflectionProvider()).toXML(ssh);
- int bytes = baos.toByteArray().length;
- System.out.println("** Session written (" + bytes + " bytes), xml representation= " + xml);
- }
- }
-
protected void containersSetupForRequest(MutablePicoContainer appcontainer, MutablePicoContainer sessionContainer,
MutablePicoContainer requestContainer, ServletRequest req, ServletResponse resp) {
}

Added: java/2.x/trunk/web/web-core/src/java/org/picocontainer/web/debug/PrintSessionSizeDetailsForDebugging.java (0 => 5731)

--- java/2.x/trunk/web/web-core/src/java/org/picocontainer/web/debug/PrintSessionSizeDetailsForDebugging.java (rev 0)
+++ java/2.x/trunk/web/web-core/src/java/org/picocontainer/web/debug/PrintSessionSizeDetailsForDebugging.java 2010-07-12 03:01:30 UTC (rev 5731)
@@ -0,0 +1,27 @@
+package org.picocontainer.web.debug;
+
+import com.thoughtworks.xstream.XStream;
+import com.thoughtworks.xstream.converters.reflection.PureJavaReflectionProvider;
+import org.picocontainer.web.SessionStoreHolder;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.ObjectOutputStream;
+
+public class PrintSessionSizeDetailsForDebugging {
+
+ public static void printItIfDebug(boolean debug, SessionStoreHolder ssh) throws IOException {
+ if ( debug ){
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ ObjectOutputStream oos = new ObjectOutputStream(baos);
+ oos.writeObject(ssh);
+ oos.close();
+ baos.close();
+ String xml = new XStream(new PureJavaReflectionProvider()).toXML(ssh);
+ int bytes = baos.toByteArray().length;
+ System.out.println("** Session written (" + bytes + " bytes), xml representation= " + xml);
+ }
+ }
+
+
+}

----------

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email