[openejb-scm] [2472] trunk/openejb3/server/openejb-client/src/main/java/org/openejb/client: All itests pass over http+ejbd

[dblevins]

Title: [2472] trunk/openejb3/server/openejb-client/src/main/java/org/openejb/client: All itests pass over http+ejbd

Revision

2472

Author

dblevins

Date

2006-02-19 20:37:31 -0500 (Sun, 19 Feb 2006)

Log Message

All itests pass over http+ejbd

Modified Paths

• trunk/openejb3/server/openejb-client/src/main/java/org/openejb/client/HttpConnectionFactory.java
• trunk/openejb3/server/openejb-ejbd/src/main/java/org/openejb/server/ejbd/EjbServer.java
• trunk/openejb3/server/openejb-http/src/test/java/org/openejb/server/httpd/HttpEjbServerTest.java

Diff

Modified: trunk/openejb3/server/openejb-client/src/main/java/org/openejb/client/HttpConnectionFactory.java (2471 => 2472)

--- trunk/openejb3/server/openejb-client/src/main/java/org/openejb/client/HttpConnectionFactory.java	2006-02-20 01:31:53 UTC (rev 2471)
+++ trunk/openejb3/server/openejb-client/src/main/java/org/openejb/client/HttpConnectionFactory.java	2006-02-20 01:37:31 UTC (rev 2472)
@@ -45,7 +45,7 @@
             String host = "localhost";
 //            String host = server.getLocation().getHost();
             // TODO: Use the URI for making the URL
-            URL url = "" URL("http", host, server.getPort(), "rjp");
+            URL url = ""
             httpURLConnection = (HttpURLConnection)url.openConnection();
             httpURLConnection.setDoOutput(true);
             httpURLConnection.connect();

Modified: trunk/openejb3/server/openejb-ejbd/src/main/java/org/openejb/server/ejbd/EjbServer.java (2471 => 2472)

--- trunk/openejb3/server/openejb-ejbd/src/main/java/org/openejb/server/ejbd/EjbServer.java	2006-02-20 01:31:53 UTC (rev 2471)
+++ trunk/openejb3/server/openejb-ejbd/src/main/java/org/openejb/server/ejbd/EjbServer.java	2006-02-20 01:37:31 UTC (rev 2472)
@@ -50,6 +50,7 @@
     }
 
     public void service(InputStream inputStream, OutputStream outputStream) throws ServiceException, IOException {
+        ServerFederation.setApplicationServer(server);
         server.service(inputStream, outputStream);
     }
 

Modified: trunk/openejb3/server/openejb-http/src/test/java/org/openejb/server/httpd/HttpEjbServerTest.java (2471 => 2472)

--- trunk/openejb3/server/openejb-http/src/test/java/org/openejb/server/httpd/HttpEjbServerTest.java	2006-02-20 01:31:53 UTC (rev 2471)
+++ trunk/openejb3/server/openejb-http/src/test/java/org/openejb/server/httpd/HttpEjbServerTest.java	2006-02-20 01:37:31 UTC (rev 2472)
@@ -54,8 +54,8 @@
     public static Test suite() {
         TestSuite suite = new HttpEjbServerTest();
         suite.addTest(StatelessTestSuite.suite());
-//        suite.addTest(StatefulTestSuite.suite());
-//        suite.addTest(BmpTestSuite.suite());
+        suite.addTest(StatefulTestSuite.suite());
+        suite.addTest(BmpTestSuite.suite());
         // TODO: The CmpTestSuite deadlocks intellij for some reason.
 //        suite.addTest(CmpTestSuite.suite());
         return suite;