completed Hessian 3.2 upgrade

This commit is contained in:
Juergen Hoeller 2009-07-21 13:08:59 +00:00
parent 8c7aec3c97
commit b2f9786ee8
2 changed files with 3 additions and 9 deletions

View File

@ -16,19 +16,12 @@
package org.springframework.remoting.caucho; package org.springframework.remoting.caucho;
import java.io.IOException;
import java.net.InetSocketAddress;
import com.caucho.burlap.client.BurlapProxyFactory; import com.caucho.burlap.client.BurlapProxyFactory;
import com.caucho.hessian.client.HessianProxyFactory; import com.caucho.hessian.client.HessianProxyFactory;
import com.sun.net.httpserver.HttpServer;
import junit.framework.TestCase; import junit.framework.TestCase;
import org.junit.Ignore;
import org.springframework.aop.framework.ProxyFactory;
import org.springframework.beans.ITestBean; import org.springframework.beans.ITestBean;
import org.springframework.beans.TestBean; import org.springframework.beans.TestBean;
import org.springframework.core.JdkVersion;
import org.springframework.remoting.RemoteAccessException; 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 { public void testSimpleHessianServiceExporter() throws IOException {
if (JdkVersion.getMajorJavaVersion() < JdkVersion.JAVA_16) { if (JdkVersion.getMajorJavaVersion() < JdkVersion.JAVA_16) {
return; return;
@ -217,6 +210,7 @@ public class CauchoRemotingTests extends TestCase {
server.stop(Integer.MAX_VALUE); server.stop(Integer.MAX_VALUE);
} }
} }
*/
private static class TestHessianProxyFactory extends HessianProxyFactory { private static class TestHessianProxyFactory extends HessianProxyFactory {

View File

@ -3,7 +3,7 @@ Bundle-Name: Spring Web
Bundle-Vendor: SpringSource Bundle-Vendor: SpringSource
Bundle-ManifestVersion: 2 Bundle-ManifestVersion: 2
Import-Template: 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, org.codehaus.jackson.*;version="[1.0.0, 1.1.0)";resolution:=optional,
com.sun.net.*;version="0";resolution:=optional, com.sun.net.*;version="0";resolution:=optional,
javax.el.*;version="[1.0.0, 2.0.0)";resolution:=optional, javax.el.*;version="[1.0.0, 2.0.0)";resolution:=optional,