hammant 01/12/31 04:07:31
Modified: armi/src/java/org/apache/commons/armi/client
ArmiFactory.java
armi/src/java/org/apache/commons/armi/test DirectTest.java
PipeTest.java RmiClientTest.java
SocketClientTest.java
Removed: armi/src/java/org/apache/commons/armi/client/impl
DefaultBlockingArmiFactory.java
Log:
Remove SAX style factory as frankly it is an anti-pattern to IoC.
Revision Changes Path
1.3 +4 -28
jakarta-commons-sandbox/armi/src/java/org/apache/commons/armi/client/ArmiFactory.java
Index: ArmiFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/armi/src/java/org/apache/commons/armi/client/ArmiFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ArmiFactory.java 30 Dec 2001 00:42:10 -0000 1.2
+++ ArmiFactory.java 31 Dec 2001 12:07:31 -0000 1.3
@@ -1,8 +1,8 @@
/*
- * $Header:
/home/cvs/jakarta-commons-sandbox/armi/src/java/org/apache/commons/armi/client/ArmiFactory.java,v
1.2 2001/12/30 00:42:10 hammant Exp $
- * $Revision: 1.2 $
- * $Date: 2001/12/30 00:42:10 $
+ * $Header:
/home/cvs/jakarta-commons-sandbox/armi/src/java/org/apache/commons/armi/client/ArmiFactory.java,v
1.3 2001/12/31 12:07:31 hammant Exp $
+ * $Revision: 1.3 $
+ * $Date: 2001/12/31 12:07:31 $
*
* ====================================================================
*
@@ -72,34 +72,10 @@
*
*
* @author Paul Hammant <a
href="mailto:[EMAIL PROTECTED]";>[EMAIL PROTECTED]</a>
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
public abstract class ArmiFactory {
- private static transient ArmiFactory mDefaultArmiFactory;
-
- public static synchronized void setDefaultArmiFactory(ArmiFactory armiFactory) {
- // set once.
- if (mDefaultArmiFactory == null) {
- mDefaultArmiFactory = armiFactory;
- }
- }
-
- /**
- * Method getDefaultArmiFactory
- *
- *
- * @return
- *
- */
- public static synchronized ArmiFactory getDefaultArmiFactory() {
-
- if (mDefaultArmiFactory == null) {
- mDefaultArmiFactory = new ClientClassArmiFactory();
- }
-
- return mDefaultArmiFactory;
- }
/**
* Method lookup
1.4 +15 -10
jakarta-commons-sandbox/armi/src/java/org/apache/commons/armi/test/DirectTest.java
Index: DirectTest.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/armi/src/java/org/apache/commons/armi/test/DirectTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DirectTest.java 30 Dec 2001 01:12:04 -0000 1.3
+++ DirectTest.java 31 Dec 2001 12:07:31 -0000 1.4
@@ -1,8 +1,8 @@
/*
- * $Header:
/home/cvs/jakarta-commons-sandbox/armi/src/java/org/apache/commons/armi/test/DirectTest.java,v
1.3 2001/12/30 01:12:04 hammant Exp $
- * $Revision: 1.3 $
- * $Date: 2001/12/30 01:12:04 $
+ * $Header:
/home/cvs/jakarta-commons-sandbox/armi/src/java/org/apache/commons/armi/test/DirectTest.java,v
1.4 2001/12/31 12:07:31 hammant Exp $
+ * $Revision: 1.4 $
+ * $Date: 2001/12/31 12:07:31 $
*
* ====================================================================
*
@@ -71,6 +71,7 @@
import org.apache.commons.armi.client.ArmiFactory;
import org.apache.commons.armi.client.impl.direct.DirectArmiHostContext;
import org.apache.commons.armi.client.impl.ServerClassArmiFactory;
+import org.apache.commons.armi.client.impl.ClientClassArmiFactory;
/**
@@ -78,10 +79,12 @@
*
*
* @author Paul Hammant <a
href="mailto:[EMAIL PROTECTED]";>[EMAIL PROTECTED]</a>
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
public class DirectTest {
+ private static String mServerOrClientFactory;
+
/**
* Method main
*
@@ -95,9 +98,7 @@
System.out.println("Direct Test");
- if (args[0].equals("S")) {
- ArmiFactory.setDefaultArmiFactory(new ServerClassArmiFactory());
- }
+ mServerOrClientFactory = args[0];
DirectServer ds = new DirectServer();
TestInterfaceImpl ti = new TestInterfaceImpl();
@@ -115,7 +116,7 @@
*
*
* @author Paul Hammant <a
href="mailto:[EMAIL PROTECTED]";>[EMAIL PROTECTED]</a>
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
static class DirectTestClient implements Runnable {
@@ -141,8 +142,12 @@
try {
ArmiHostContext arhc = new
DirectArmiHostContext(mInvocationHandler);
- TestInterface ti =
- (TestInterface)
ArmiFactory.getDefaultArmiFactory().lookup(arhc, "Hello");
+ TestInterface ti = null;
+ if (mServerOrClientFactory.equals("S")) {
+ ti = (TestInterface) new ServerClassArmiFactory().lookup(arhc,
"Hello");
+ } else {
+ ti = (TestInterface) new ClientClassArmiFactory().lookup(arhc,
"Hello");
+ }
TestClient tc = new TestClient(ti);
} catch (ArmiConnectionException ace) {
System.err.println("Some problem during connection to server : "
1.4 +15 -10
jakarta-commons-sandbox/armi/src/java/org/apache/commons/armi/test/PipeTest.java
Index: PipeTest.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/armi/src/java/org/apache/commons/armi/test/PipeTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PipeTest.java 30 Dec 2001 01:12:04 -0000 1.3
+++ PipeTest.java 31 Dec 2001 12:07:31 -0000 1.4
@@ -1,8 +1,8 @@
/*
- * $Header:
/home/cvs/jakarta-commons-sandbox/armi/src/java/org/apache/commons/armi/test/PipeTest.java,v
1.3 2001/12/30 01:12:04 hammant Exp $
- * $Revision: 1.3 $
- * $Date: 2001/12/30 01:12:04 $
+ * $Header:
/home/cvs/jakarta-commons-sandbox/armi/src/java/org/apache/commons/armi/test/PipeTest.java,v
1.4 2001/12/31 12:07:31 hammant Exp $
+ * $Revision: 1.4 $
+ * $Date: 2001/12/31 12:07:31 $
*
* ====================================================================
*
@@ -70,6 +70,7 @@
import org.apache.commons.armi.common.ArmiConnectionException;
import org.apache.commons.armi.client.impl.piped.PipedArmiHostContext;
import org.apache.commons.armi.client.impl.ServerClassArmiFactory;
+import org.apache.commons.armi.client.impl.ClientClassArmiFactory;
import java.io.IOException;
@@ -79,10 +80,12 @@
*
*
* @author Paul Hammant <a
href="mailto:[EMAIL PROTECTED]";>[EMAIL PROTECTED]</a>
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
public class PipeTest {
+ private static String mServerOrClientFactory;
+
/**
* Method main
*
@@ -96,9 +99,7 @@
System.out.println("Piped Test");
- if (args[0].equals("S")) {
- ArmiFactory.setDefaultArmiFactory(new ServerClassArmiFactory());
- }
+ mServerOrClientFactory = args[0];
PipedServer ps = new PipedServer();
TestInterfaceImpl ti = new TestInterfaceImpl();
@@ -116,7 +117,7 @@
*
*
* @author Paul Hammant <a
href="mailto:[EMAIL PROTECTED]";>[EMAIL PROTECTED]</a>
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
static class PipedTestClient implements Runnable {
@@ -142,8 +143,12 @@
try {
ArmiHostContext arhc = new PipedArmiHostContext(mPipedServer);
- TestInterface ti =
- (TestInterface)
ArmiFactory.getDefaultArmiFactory().lookup(arhc, "Hello");
+ TestInterface ti = null;
+ if (mServerOrClientFactory.equals("S")) {
+ ti = (TestInterface) new ServerClassArmiFactory().lookup(arhc,
"Hello");
+ } else {
+ ti = (TestInterface) new ClientClassArmiFactory().lookup(arhc,
"Hello");
+ }
TestClient tc = new TestClient(ti);
} catch (ArmiConnectionException ace) {
System.err.println("Some problem during connection to server : "
1.4 +12 -8
jakarta-commons-sandbox/armi/src/java/org/apache/commons/armi/test/RmiClientTest.java
Index: RmiClientTest.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/armi/src/java/org/apache/commons/armi/test/RmiClientTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- RmiClientTest.java 30 Dec 2001 01:12:04 -0000 1.3
+++ RmiClientTest.java 31 Dec 2001 12:07:31 -0000 1.4
@@ -1,8 +1,8 @@
/*
- * $Header:
/home/cvs/jakarta-commons-sandbox/armi/src/java/org/apache/commons/armi/test/RmiClientTest.java,v
1.3 2001/12/30 01:12:04 hammant Exp $
- * $Revision: 1.3 $
- * $Date: 2001/12/30 01:12:04 $
+ * $Header:
/home/cvs/jakarta-commons-sandbox/armi/src/java/org/apache/commons/armi/test/RmiClientTest.java,v
1.4 2001/12/31 12:07:31 hammant Exp $
+ * $Revision: 1.4 $
+ * $Date: 2001/12/31 12:07:31 $
*
* ====================================================================
*
@@ -67,6 +67,7 @@
import org.apache.commons.armi.client.ArmiFactory;
import org.apache.commons.armi.client.impl.rmi.RmiArmiHostContext;
import org.apache.commons.armi.client.impl.ServerClassArmiFactory;
+import org.apache.commons.armi.client.impl.ClientClassArmiFactory;
/**
@@ -74,7 +75,7 @@
*
*
* @author Paul Hammant <a
href="mailto:[EMAIL PROTECTED]";>[EMAIL PROTECTED]</a>
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
public class RmiClientTest {
@@ -91,13 +92,16 @@
System.out.println("ARMI over RMI Client");
+
+
+ ArmiHostContext arhc = new RmiArmiHostContext("127.0.0.1", 4321);
+ TestInterface ti = null;
if (args[0].equals("S")) {
- ArmiFactory.setDefaultArmiFactory(new ServerClassArmiFactory());
+ ti = (TestInterface) new ServerClassArmiFactory().lookup(arhc, "Hello");
+ } else {
+ ti = (TestInterface) new ClientClassArmiFactory().lookup(arhc, "Hello");
}
- ArmiHostContext arhc = new RmiArmiHostContext("127.0.0.1", 4321);
- TestInterface ti = (TestInterface)
ArmiFactory.getDefaultArmiFactory().lookup(arhc,
- "Hello");
new TestClient(ti);
}
1.4 +13 -9
jakarta-commons-sandbox/armi/src/java/org/apache/commons/armi/test/SocketClientTest.java
Index: SocketClientTest.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/armi/src/java/org/apache/commons/armi/test/SocketClientTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SocketClientTest.java 30 Dec 2001 01:12:04 -0000 1.3
+++ SocketClientTest.java 31 Dec 2001 12:07:31 -0000 1.4
@@ -1,8 +1,8 @@
/*
- * $Header:
/home/cvs/jakarta-commons-sandbox/armi/src/java/org/apache/commons/armi/test/SocketClientTest.java,v
1.3 2001/12/30 01:12:04 hammant Exp $
- * $Revision: 1.3 $
- * $Date: 2001/12/30 01:12:04 $
+ * $Header:
/home/cvs/jakarta-commons-sandbox/armi/src/java/org/apache/commons/armi/test/SocketClientTest.java,v
1.4 2001/12/31 12:07:31 hammant Exp $
+ * $Revision: 1.4 $
+ * $Date: 2001/12/31 12:07:31 $
*
* ====================================================================
*
@@ -68,6 +68,7 @@
import org.apache.commons.armi.common.ArmiConnectionException;
import org.apache.commons.armi.client.impl.socket.PlainSocketArmiHostContext;
import org.apache.commons.armi.client.impl.ServerClassArmiFactory;
+import org.apache.commons.armi.client.impl.ClientClassArmiFactory;
import java.io.IOException;
@@ -77,7 +78,7 @@
*
*
* @author Paul Hammant <a
href="mailto:[EMAIL PROTECTED]";>[EMAIL PROTECTED]</a>
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
public class SocketClientTest {
@@ -94,13 +95,16 @@
System.out.println("Stream over Socket Client");
- if (args[0].equals("S")) {
- ArmiFactory.setDefaultArmiFactory(new ServerClassArmiFactory());
- }
+
ArmiHostContext arhc = new PlainSocketArmiHostContext("127.0.0.1", 1234);
- TestInterface ti = (TestInterface)
ArmiFactory.getDefaultArmiFactory().lookup(arhc,
- "Hello");
+
+ TestInterface ti = null;
+ if (args[0].equals("S")) {
+ ti = (TestInterface) new ServerClassArmiFactory().lookup(arhc, "Hello");
+ } else {
+ ti = (TestInterface) new ClientClassArmiFactory().lookup(arhc, "Hello");
+ }
new TestClient(ti);
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
