From b2f9786ee880180a181930510fdeaf4bc5e621b2 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Tue, 21 Jul 2009 13:08:59 +0000 Subject: [PATCH] completed Hessian 3.2 upgrade --- .../remoting/caucho/CauchoRemotingTests.java | 10 ++-------- org.springframework.web/template.mf | 2 +- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/org.springframework.web/src/test/java/org/springframework/remoting/caucho/CauchoRemotingTests.java b/org.springframework.web/src/test/java/org/springframework/remoting/caucho/CauchoRemotingTests.java index 41de7614f7a..b2ca68eb7f6 100644 --- a/org.springframework.web/src/test/java/org/springframework/remoting/caucho/CauchoRemotingTests.java +++ b/org.springframework.web/src/test/java/org/springframework/remoting/caucho/CauchoRemotingTests.java @@ -16,19 +16,12 @@ package org.springframework.remoting.caucho; -import java.io.IOException; -import java.net.InetSocketAddress; - import com.caucho.burlap.client.BurlapProxyFactory; import com.caucho.hessian.client.HessianProxyFactory; -import com.sun.net.httpserver.HttpServer; import junit.framework.TestCase; -import org.junit.Ignore; -import org.springframework.aop.framework.ProxyFactory; import org.springframework.beans.ITestBean; import org.springframework.beans.TestBean; -import org.springframework.core.JdkVersion; import org.springframework.remoting.RemoteAccessException; /** @@ -188,7 +181,7 @@ public class CauchoRemotingTests extends TestCase { } } - @Ignore("Using the JDK 1.6 HttpServer breaks when running multiple test methods") + /** Using the JDK 1.6 HttpServer breaks when running multiple test methods public void testSimpleHessianServiceExporter() throws IOException { if (JdkVersion.getMajorJavaVersion() < JdkVersion.JAVA_16) { return; @@ -217,6 +210,7 @@ public class CauchoRemotingTests extends TestCase { server.stop(Integer.MAX_VALUE); } } + */ private static class TestHessianProxyFactory extends HessianProxyFactory { diff --git a/org.springframework.web/template.mf b/org.springframework.web/template.mf index 1c137a70ca0..b638e0798ca 100644 --- a/org.springframework.web/template.mf +++ b/org.springframework.web/template.mf @@ -3,7 +3,7 @@ Bundle-Name: Spring Web Bundle-Vendor: SpringSource Bundle-ManifestVersion: 2 Import-Template: - com.caucho.*;version="[3.1.5, 4.0.0)";resolution:=optional, + com.caucho.*;version="[3.2.0, 4.0.0)";resolution:=optional, org.codehaus.jackson.*;version="[1.0.0, 1.1.0)";resolution:=optional, com.sun.net.*;version="0";resolution:=optional, javax.el.*;version="[1.0.0, 2.0.0)";resolution:=optional,