Author: andygumbrecht
Date: Wed Dec 12 15:27:22 2012
New Revision: 1420760
URL: http://svn.apache.org/viewvc?rev=1420760&view=rev
Log:
Use configured port.
Correct typo (getOuputStream to getOutputStream).
Modified:
openejb/trunk/openejb/server/openejb-client/src/main/java/org/apache/openejb/client/Client.java
openejb/trunk/openejb/server/openejb-client/src/main/java/org/apache/openejb/client/Connection.java
openejb/trunk/openejb/server/openejb-client/src/main/java/org/apache/openejb/client/HttpConnectionFactory.java
openejb/trunk/openejb/server/openejb-client/src/main/java/org/apache/openejb/client/SocketConnectionFactory.java
openejb/trunk/openejb/server/openejb-client/src/main/java/org/apache/openejb/client/java/javaURLContextFactory.java
openejb/trunk/openejb/server/openejb-client/src/test/java/org/apache/openejb/client/ConnectionManagerTest.java
openejb/trunk/openejb/server/openejb-client/src/test/java/org/apache/openejb/client/OverlyStickyConnectionTest.java
openejb/trunk/openejb/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/ClientObjectFactory.java
openejb/trunk/openejb/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/BasicClusterableRequestHandlerTest.java
openejb/trunk/openejb/server/openejb-server/src/main/java/org/apache/openejb/server/Start.java
openejb/trunk/openejb/server/openejb-server/src/main/java/org/apache/openejb/server/Status.java
Modified:
openejb/trunk/openejb/server/openejb-client/src/main/java/org/apache/openejb/client/Client.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-client/src/main/java/org/apache/openejb/client/Client.java?rev=1420760&r1=1420759&r2=1420760&view=diff
==============================================================================
---
openejb/trunk/openejb/server/openejb-client/src/main/java/org/apache/openejb/client/Client.java
(original)
+++
openejb/trunk/openejb/server/openejb-client/src/main/java/org/apache/openejb/client/Client.java
Wed Dec 12 15:27:22 2012
@@ -150,7 +150,7 @@ public class Client {
/*----------------------------------*/
try {
- out = conn.getOuputStream();
+ out = conn.getOutputStream();
} catch (IOException e) {
throw newIOException("Cannot open output stream to server: ",
e);
Modified:
openejb/trunk/openejb/server/openejb-client/src/main/java/org/apache/openejb/client/Connection.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-client/src/main/java/org/apache/openejb/client/Connection.java?rev=1420760&r1=1420759&r2=1420760&view=diff
==============================================================================
---
openejb/trunk/openejb/server/openejb-client/src/main/java/org/apache/openejb/client/Connection.java
(original)
+++
openejb/trunk/openejb/server/openejb-client/src/main/java/org/apache/openejb/client/Connection.java
Wed Dec 12 15:27:22 2012
@@ -16,14 +16,9 @@
*/
package org.apache.openejb.client;
-import javax.naming.NamingException;
-import javax.naming.AuthenticationException;
-import javax.transaction.RollbackException;
-import javax.ejb.EJBException;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import java.io.NotSerializableException;
import java.net.URI;
public interface Connection {
@@ -36,6 +31,6 @@ public interface Connection {
public InputStream getInputStream() throws IOException;
- public OutputStream getOuputStream() throws IOException;
+ public OutputStream getOutputStream() throws IOException;
}
Modified:
openejb/trunk/openejb/server/openejb-client/src/main/java/org/apache/openejb/client/HttpConnectionFactory.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-client/src/main/java/org/apache/openejb/client/HttpConnectionFactory.java?rev=1420760&r1=1420759&r2=1420760&view=diff
==============================================================================
---
openejb/trunk/openejb/server/openejb-client/src/main/java/org/apache/openejb/client/HttpConnectionFactory.java
(original)
+++
openejb/trunk/openejb/server/openejb-client/src/main/java/org/apache/openejb/client/HttpConnectionFactory.java
Wed Dec 12 15:27:22 2012
@@ -106,7 +106,7 @@ public class HttpConnectionFactory imple
}
}
- public OutputStream getOuputStream() throws IOException {
+ public OutputStream getOutputStream() throws IOException {
if (outputStream == null) {
outputStream = httpURLConnection.getOutputStream();
}
Modified:
openejb/trunk/openejb/server/openejb-client/src/main/java/org/apache/openejb/client/SocketConnectionFactory.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-client/src/main/java/org/apache/openejb/client/SocketConnectionFactory.java?rev=1420760&r1=1420759&r2=1420760&view=diff
==============================================================================
---
openejb/trunk/openejb/server/openejb-client/src/main/java/org/apache/openejb/client/SocketConnectionFactory.java
(original)
+++
openejb/trunk/openejb/server/openejb-client/src/main/java/org/apache/openejb/client/SocketConnectionFactory.java
Wed Dec 12 15:27:22 2012
@@ -164,7 +164,7 @@ public class SocketConnectionFactory imp
throw new IOException("Connection busy");
}
- final OutputStream ouputStream = conn.getOuputStream();
+ final OutputStream ouputStream = conn.getOutputStream();
if (conn.socket.isClosed()) {
pool.put(null);
return this.getConnection(uri);
@@ -364,7 +364,7 @@ public class SocketConnectionFactory imp
}
@Override
- public OutputStream getOuputStream() throws IOException {
+ public OutputStream getOutputStream() throws IOException {
try {
Modified:
openejb/trunk/openejb/server/openejb-client/src/main/java/org/apache/openejb/client/java/javaURLContextFactory.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-client/src/main/java/org/apache/openejb/client/java/javaURLContextFactory.java?rev=1420760&r1=1420759&r2=1420760&view=diff
==============================================================================
---
openejb/trunk/openejb/server/openejb-client/src/main/java/org/apache/openejb/client/java/javaURLContextFactory.java
(original)
+++
openejb/trunk/openejb/server/openejb-client/src/main/java/org/apache/openejb/client/java/javaURLContextFactory.java
Wed Dec 12 15:27:22 2012
@@ -28,6 +28,8 @@ import java.util.Properties;
* @version $Rev$ $Date$
*/
public class javaURLContextFactory implements ObjectFactory {
+
+ @Override
public Object getObjectInstance(Object obj, Name name, Context nameCtx,
Hashtable<?, ?> environment) throws Exception {
RemoteInitialContextFactory context = new
RemoteInitialContextFactory();
Modified:
openejb/trunk/openejb/server/openejb-client/src/test/java/org/apache/openejb/client/ConnectionManagerTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-client/src/test/java/org/apache/openejb/client/ConnectionManagerTest.java?rev=1420760&r1=1420759&r2=1420760&view=diff
==============================================================================
---
openejb/trunk/openejb/server/openejb-client/src/test/java/org/apache/openejb/client/ConnectionManagerTest.java
(original)
+++
openejb/trunk/openejb/server/openejb-client/src/test/java/org/apache/openejb/client/ConnectionManagerTest.java
Wed Dec 12 15:27:22 2012
@@ -53,7 +53,7 @@ public class ConnectionManagerTest exten
throw new UnsupportedOperationException();
}
- public OutputStream getOuputStream() throws IOException {
+ public OutputStream getOutputStream() throws IOException {
throw new UnsupportedOperationException();
}
Modified:
openejb/trunk/openejb/server/openejb-client/src/test/java/org/apache/openejb/client/OverlyStickyConnectionTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-client/src/test/java/org/apache/openejb/client/OverlyStickyConnectionTest.java?rev=1420760&r1=1420759&r2=1420760&view=diff
==============================================================================
---
openejb/trunk/openejb/server/openejb-client/src/test/java/org/apache/openejb/client/OverlyStickyConnectionTest.java
(original)
+++
openejb/trunk/openejb/server/openejb-client/src/test/java/org/apache/openejb/client/OverlyStickyConnectionTest.java
Wed Dec 12 15:27:22 2012
@@ -55,14 +55,14 @@ public class OverlyStickyConnectionTest
p.put("java.naming.factory.initial",
"org.apache.openejb.client.RemoteInitialContextFactory");
p.put("java.naming.provider.url", uri);
- InitialContext context = new InitialContext(p);
- return context;
+ return new InitialContext(p);
}
private final ThreadLocal<Connection> connection = new
ThreadLocal<Connection>();
public class MockConnectionFactory implements ConnectionFactory {
+ @Override
public Connection getConnection(final URI uri) throws IOException {
return new Connection() {
private ByteArrayInputStream in;
@@ -80,21 +80,26 @@ public class OverlyStickyConnectionTest
out.reset();
}
+ @Override
public URI getURI() {
return uri;
}
+ @Override
public void discard() {
}
+ @Override
public void close() throws IOException {
}
+ @Override
public InputStream getInputStream() throws IOException {
return in;
}
- public OutputStream getOuputStream() throws IOException {
+ @Override
+ public OutputStream getOutputStream() throws IOException {
return out;
}
};
Modified:
openejb/trunk/openejb/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/ClientObjectFactory.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/ClientObjectFactory.java?rev=1420760&r1=1420759&r2=1420760&view=diff
==============================================================================
---
openejb/trunk/openejb/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/ClientObjectFactory.java
(original)
+++
openejb/trunk/openejb/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/ClientObjectFactory.java
Wed Dec 12 15:27:22 2012
@@ -46,6 +46,7 @@ class ClientObjectFactory implements org
}
}
+ @Override
public javax.ejb.EJBMetaData getEJBMetaData(ProxyInfo info) {
CallContext call = CallContext.getCallContext();
@@ -56,6 +57,7 @@ class ClientObjectFactory implements org
return metaData;
}
+ @Override
public javax.ejb.Handle getHandle(ProxyInfo info) {
CallContext call = CallContext.getCallContext();
BeanContext beanContext = info.getBeanContext();
@@ -72,9 +74,9 @@ class ClientObjectFactory implements org
EJBMetaDataImpl eMetaData = buildEjbMetaData(info, beanContext,
idCode);
Object primKey = info.getPrimaryKey();
- EJBObjectHandler hanlder =
EJBObjectHandler.createEJBObjectHandler(eMetaData, getServerMetaData(),
cMetaData, primKey);
+ EJBObjectHandler handler =
EJBObjectHandler.createEJBObjectHandler(eMetaData, getServerMetaData(),
cMetaData, primKey);
- return new EJBObjectHandle(hanlder.createEJBObjectProxy());
+ return new EJBObjectHandle(handler.createEJBObjectProxy());
}
private ServerMetaData getServerMetaData() {
@@ -85,6 +87,7 @@ class ClientObjectFactory implements org
return serverMetaData;
}
+ @Override
public javax.ejb.HomeHandle getHomeHandle(ProxyInfo info) {
CallContext call = CallContext.getCallContext();
BeanContext beanContext = info.getBeanContext();
@@ -105,6 +108,7 @@ class ClientObjectFactory implements org
return new EJBHomeHandle(hanlder.createEJBHomeProxy());
}
+ @Override
public javax.ejb.EJBObject getEJBObject(ProxyInfo info) {
CallContext call = CallContext.getCallContext();
BeanContext beanContext = info.getBeanContext();
@@ -126,6 +130,7 @@ class ClientObjectFactory implements org
return (javax.ejb.EJBObject) hanlder.createEJBObjectProxy();
}
+ @Override
public Object getBusinessObject(ProxyInfo info) {
CallContext call = CallContext.getCallContext();
BeanContext beanContext = info.getBeanContext();
@@ -170,6 +175,7 @@ class ClientObjectFactory implements org
return null;
}
+ @Override
public javax.ejb.EJBHome getEJBHome(ProxyInfo info) {
CallContext call = CallContext.getCallContext();
BeanContext beanContext = info.getBeanContext();
Modified:
openejb/trunk/openejb/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/BasicClusterableRequestHandlerTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/BasicClusterableRequestHandlerTest.java?rev=1420760&r1=1420759&r2=1420760&view=diff
==============================================================================
---
openejb/trunk/openejb/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/BasicClusterableRequestHandlerTest.java
(original)
+++
openejb/trunk/openejb/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/BasicClusterableRequestHandlerTest.java
Wed Dec 12 15:27:22 2012
@@ -31,7 +31,6 @@ import org.apache.openejb.loader.SystemI
import java.io.IOException;
import java.net.URI;
-
public class BasicClusterableRequestHandlerTest extends RMockTestCase {
private BasicClusterableRequestHandler requestHandler;
@@ -48,17 +47,18 @@ public class BasicClusterableRequestHand
clusteredContainer = (ClusteredRPCContainer)
mock(ClusteredRPCContainer.class);
beanContext = new BeanContext("aDeploymentId", null, new
ModuleContext("", null, "", new AppContext("", SystemInstance.get(), null,
null, null, false), null), BasicClusterableRequestHandlerTest.class, null,
null, null, null, null, null, null, null, null, null, false);
}
-
+
public void testNoOpWhenNotAClusteredContainer() throws Exception {
beanContext.getContainer();
-
+
startVerification();
-
+
requestHandler.updateServer(beanContext, request, response);
}
public void testUpdateServerWhenRequestHashDiffersFromServerSideHash()
throws Exception {
- final URI[] locations = new URI[] {new URI("ejbd://localhost:4201")};
+ final int port = SystemInstance.get().getOptions().get("ejbd.port",
4201);
+ final URI[] locations = new URI[]{new URI("ejbd://localhost:" + port)};
ServerMetaData server = new ServerMetaData(locations);
beanContext.setContainer(clusteredContainer);
@@ -68,26 +68,29 @@ public class BasicClusterableRequestHand
response.setServer(null);
modify().args(new AbstractExpression() {
+ @Override
public void describeWith(ExpressionDescriber arg0) throws
IOException {
}
+ @Override
public boolean passes(Object arg0) {
ServerMetaData actualServer = (ServerMetaData) arg0;
assertSame(locations, actualServer.getLocations());
return true;
}
});
-
+
clusteredContainer.getLocations(beanContext);
modify().returnValue(locations);
-
+
startVerification();
-
+
requestHandler.updateServer(beanContext, request, response);
}
public void testServerIsNotUpdatedWhenRequestHashEqualsServerSideHash()
throws Exception {
- URI[] locations = new URI[] {new URI("ejbd://localhost:4201")};
+ final int port = SystemInstance.get().getOptions().get("ejbd.port",
4201);
+ URI[] locations = new URI[]{new URI("ejbd://localhost:" + port)};
ServerMetaData server = new ServerMetaData(locations);
beanContext.setContainer(clusteredContainer);
@@ -99,7 +102,7 @@ public class BasicClusterableRequestHand
modify().returnValue(locations);
startVerification();
-
+
requestHandler.updateServer(beanContext, request, response);
}
Modified:
openejb/trunk/openejb/server/openejb-server/src/main/java/org/apache/openejb/server/Start.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-server/src/main/java/org/apache/openejb/server/Start.java?rev=1420760&r1=1420759&r2=1420760&view=diff
==============================================================================
---
openejb/trunk/openejb/server/openejb-server/src/main/java/org/apache/openejb/server/Start.java
(original)
+++
openejb/trunk/openejb/server/openejb-server/src/main/java/org/apache/openejb/server/Start.java
Wed Dec 12 15:27:22 2012
@@ -16,6 +16,7 @@
*/
package org.apache.openejb.server;
+import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.util.Connect;
import java.io.File;
@@ -30,19 +31,25 @@ public class Start {
public static void main(String[] args) {
-// System.exit(new Start().start()?0:1);
+ // System.exit(new Start().start()?0:1);
new Start().start();
}
+ public static boolean connect() {
+ final int port = SystemInstance.get().getOptions().get("ejbd.port",
4201);
+ return Connect.connect(1, "localhost", port);
+
+ }
+
public boolean start() {
if (!connect()) {
forkServerProcess();
-
- return Connect.connect(10, "localhost", 4201);
+ final int port =
SystemInstance.get().getOptions().get("ejbd.port", 4201);
+ return Connect.connect(10, "localhost", port);
} else {
@@ -133,6 +140,7 @@ public class Start {
}
+ @SuppressWarnings("unchecked")
private String getClasspath() {
String classpath = System.getProperty("java.class.path");
@@ -163,16 +171,9 @@ public class Start {
}
- public static boolean connect() {
-
- return Connect.connect(1, "localhost", 4201);
-
- }
-
private static final class Pipe implements Runnable {
private final InputStream is;
-
private final OutputStream out;
private Pipe(InputStream is, OutputStream out) {
Modified:
openejb/trunk/openejb/server/openejb-server/src/main/java/org/apache/openejb/server/Status.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-server/src/main/java/org/apache/openejb/server/Status.java?rev=1420760&r1=1420759&r2=1420760&view=diff
==============================================================================
---
openejb/trunk/openejb/server/openejb-server/src/main/java/org/apache/openejb/server/Status.java
(original)
+++
openejb/trunk/openejb/server/openejb-server/src/main/java/org/apache/openejb/server/Status.java
Wed Dec 12 15:27:22 2012
@@ -16,6 +16,8 @@
*/
package org.apache.openejb.server;
+import org.apache.openejb.loader.SystemInstance;
+
import java.io.OutputStream;
import java.net.Socket;
@@ -42,7 +44,8 @@ public class Status {
private boolean connect(int tries) {
try {
- Socket socket = new Socket("localhost", 4201);
+ final int port =
SystemInstance.get().getOptions().get("ejbd.port", 4201);
+ Socket socket = new Socket("localhost", port);
OutputStream out = socket.getOutputStream();
} catch (Exception e) {
if (tries < 2) {
