gdamour 2004/06/02 04:29:25
Modified: sandbox/webdav/src/java/org/apache/geronimo/datastore/impl/remote
GFileManagerProxy.java
sandbox/messaging/src/java/org/apache/geronimo/messaging
NodeImpl.java AbstractEndPoint.java
sandbox/messaging/src/test/org/apache/geronimo/messaging
MockEndPointImpl.java
sandbox/webdav/src/java/org/apache/geronimo/webdav/jetty
JettyDAVServer.java JettyConnectorImpl.java
sandbox/webdav/src/java/org/apache/geronimo/webdav
CatalinaDAVRepository.java AbstractConnector.java
sandbox/webdav/src/java/org/apache/geronimo/datastore/impl
AbstractGFileManager.java
sandbox/webdav/src/java/org/apache/geronimo/datastore/impl/local
LocalGFileManager.java
sandbox/messaging/src/java/org/apache/geronimo/messaging/replication
ReplicationMemberImpl.java
Log:
New GBeanInfo construction mechanism.
Revision Changes Path
1.2 +2 -4
incubator-geronimo/sandbox/webdav/src/java/org/apache/geronimo/datastore/impl/remote/GFileManagerProxy.java
Index: GFileManagerProxy.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/sandbox/webdav/src/java/org/apache/geronimo/datastore/impl/remote/GFileManagerProxy.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- GFileManagerProxy.java 11 May 2004 12:24:59 -0000 1.1
+++ GFileManagerProxy.java 2 Jun 2004 11:29:24 -0000 1.2
@@ -89,9 +89,7 @@
static {
GBeanInfoFactory factory = new
GBeanInfoFactory(GFileManagerProxy.class, AbstractEndPoint.GBEAN_INFO);
- factory.setConstructor(
- new String[] {"Node", "Delegate"},
- new Class[] {Node.class, GFileManager.class});
+ factory.setConstructor(new String[] {"Node", "Delegate"});
factory.addReference("Delegate", GFileManager.class);
GBEAN_INFO = factory.getBeanInfo();
}
1.4 +5 -7
incubator-geronimo/sandbox/messaging/src/java/org/apache/geronimo/messaging/NodeImpl.java
Index: NodeImpl.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/sandbox/messaging/src/java/org/apache/geronimo/messaging/NodeImpl.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- NodeImpl.java 27 May 2004 14:34:46 -0000 1.3
+++ NodeImpl.java 2 Jun 2004 11:29:24 -0000 1.4
@@ -350,12 +350,10 @@
static {
GBeanInfoFactory factory = new GBeanInfoFactory(NodeImpl.class);
- factory.setConstructor(
- new String[] {"NodeInfo", "MessagingTransportFactory"},
- new Class[] {NodeInfo.class, MessagingTransportFactory.class});
- factory.addAttribute("NodeInfo", true);
- factory.addAttribute("MessagingTransportFactory", true);
- factory.addAttribute("Topology", true);
+ factory.setConstructor(new String[] {"NodeInfo",
"MessagingTransportFactory"});
+ factory.addAttribute("NodeInfo", NodeInfo.class, true);
+ factory.addAttribute("MessagingTransportFactory",
MessagingTransportFactory.class, true);
+ factory.addAttribute("Topology", NodeTopology.class, true);
factory.addOperation("join", new Class[]{NodeInfo.class});
factory.addOperation("leave", new Class[]{NodeInfo.class});
factory.addOperation("addEndPoint", new Class[]{EndPoint.class});
1.3 +7 -11
incubator-geronimo/sandbox/messaging/src/java/org/apache/geronimo/messaging/AbstractEndPoint.java
Index: AbstractEndPoint.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/sandbox/messaging/src/java/org/apache/geronimo/messaging/AbstractEndPoint.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractEndPoint.java 20 May 2004 13:37:11 -0000 1.2
+++ AbstractEndPoint.java 2 Jun 2004 11:29:24 -0000 1.3
@@ -17,12 +17,10 @@
package org.apache.geronimo.messaging;
-import java.util.Arrays;
-
+import org.apache.geronimo.gbean.GBean;
import org.apache.geronimo.gbean.GBeanContext;
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoFactory;
-import org.apache.geronimo.gbean.GConstructorInfo;
import org.apache.geronimo.gbean.WaitingException;
import org.apache.geronimo.messaging.interceptors.HeaderOutInterceptor;
import org.apache.geronimo.messaging.interceptors.MsgOutInterceptor;
@@ -33,7 +31,7 @@
* @version $Revision$ $Date$
*/
public abstract class AbstractEndPoint
- implements EndPoint
+ implements EndPoint, GBean
{
/**
@@ -168,12 +166,10 @@
static {
GBeanInfoFactory infoFactory = new GBeanInfoFactory("Abstract
EndPoint", AbstractEndPoint.class.getName());
infoFactory.addReference("Node", Node.class);
- infoFactory.addAttribute("ID", true);
- infoFactory.addAttribute("MsgConsumerOut", false);
- infoFactory.addAttribute("MsgProducerOut", false);
- infoFactory.setConstructor(new GConstructorInfo(
- Arrays.asList(new Object[]{"Node", "ID"}),
- Arrays.asList(new Object[]{Node.class, Object.class})));
+ infoFactory.addAttribute("ID", Object.class, true);
+ infoFactory.addAttribute("MsgConsumerOut", MsgOutInterceptor.class,
false);
+ infoFactory.addAttribute("MsgProducerOut", MsgOutInterceptor.class,
false);
+ infoFactory.setConstructor(new String[]{"Node", "ID"});
GBEAN_INFO = infoFactory.getBeanInfo();
}
1.2 +4 -6
incubator-geronimo/sandbox/messaging/src/test/org/apache/geronimo/messaging/MockEndPointImpl.java
Index: MockEndPointImpl.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/sandbox/messaging/src/test/org/apache/geronimo/messaging/MockEndPointImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MockEndPointImpl.java 11 May 2004 12:06:41 -0000 1.1
+++ MockEndPointImpl.java 2 Jun 2004 11:29:24 -0000 1.2
@@ -20,7 +20,6 @@
import java.util.ArrayList;
import java.util.List;
-import org.apache.geronimo.gbean.GAttributeInfo;
import org.apache.geronimo.gbean.GBean;
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoFactory;
@@ -71,10 +70,9 @@
static {
GBeanInfoFactory factory = new
GBeanInfoFactory(MockEndPointImpl.class, AbstractEndPoint.GBEAN_INFO);
factory.setConstructor(
- new String[] {"Node", "ID", "TargetNodes"},
- new Class[] {Node.class, Object.class, NodeInfo[].class});
- factory.addAttribute(new GAttributeInfo("TargetNodes", true));
- factory.addAttribute(new GAttributeInfo("Received", false));
+ new String[] {"Node", "ID", "TargetNodes"});
+ factory.addAttribute("TargetNodes", NodeInfo[].class, true);
+ factory.addAttribute("Received", List.class, false);
factory.addOperation("sendRawObject", new Class[]{Object.class});
GBEAN_INFO = factory.getBeanInfo();
}
1.5 +3 -10
incubator-geronimo/sandbox/webdav/src/java/org/apache/geronimo/webdav/jetty/JettyDAVServer.java
Index: JettyDAVServer.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/sandbox/webdav/src/java/org/apache/geronimo/webdav/jetty/JettyDAVServer.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- JettyDAVServer.java 10 Mar 2004 10:00:41 -0000 1.4
+++ JettyDAVServer.java 2 Jun 2004 11:29:24 -0000 1.5
@@ -24,7 +24,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.geronimo.gbean.GAttributeInfo;
import org.apache.geronimo.gbean.GBean;
import org.apache.geronimo.gbean.GBeanContext;
import org.apache.geronimo.gbean.GBeanInfo;
@@ -51,11 +50,6 @@
private static final Log log = LogFactory.getLog(JettyDAVServer.class);
/**
- * Context callback.
- */
- private GBeanContext context;
-
- /**
* Jetty Server doing the actual work.
*/
private final Server server;
@@ -231,7 +225,6 @@
}
public void setGBeanContext(GBeanContext aContext) {
- context = aContext;
}
public void doStart() throws WaitingException, Exception {
@@ -270,8 +263,8 @@
GBeanInfoFactory infoFactory = new GBeanInfoFactory("DAV Server -
Jetty", JettyDAVServer.class.getName());
infoFactory.addReference(new GReferenceInfo("Connectors",
JettyConnector.class.getName()));
infoFactory.addReference(new GReferenceInfo("Repositories",
DAVRepository.class.getName()));
- infoFactory.addAttribute(new GAttributeInfo("Connectors", false,
Boolean.TRUE, Boolean.TRUE, null, null));
- infoFactory.addAttribute(new GAttributeInfo("Repositories", false,
Boolean.TRUE, Boolean.TRUE, null, null));
+ infoFactory.addAttribute("Connectors", Collection.class, false);
+ infoFactory.addAttribute("Repositories", Collection.class, false);
GBEAN_INFO = infoFactory.getBeanInfo();
}
1.5 +3 -4
incubator-geronimo/sandbox/webdav/src/java/org/apache/geronimo/webdav/jetty/JettyConnectorImpl.java
Index: JettyConnectorImpl.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/sandbox/webdav/src/java/org/apache/geronimo/webdav/jetty/JettyConnectorImpl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- JettyConnectorImpl.java 10 Mar 2004 10:00:41 -0000 1.4
+++ JettyConnectorImpl.java 2 Jun 2004 11:29:24 -0000 1.5
@@ -19,7 +19,6 @@
import java.lang.reflect.Constructor;
-import org.apache.geronimo.gbean.GAttributeInfo;
import org.apache.geronimo.gbean.GBean;
import org.apache.geronimo.gbean.GBeanContext;
import org.apache.geronimo.gbean.GBeanInfo;
@@ -105,9 +104,9 @@
static {
GBeanInfoFactory infoFactory =
new GBeanInfoFactory("Connector - Jetty",
- JettyConnectorImpl.class.getName(),
+ JettyConnectorImpl.class,
AbstractConnector.getGBeanInfo());
- infoFactory.addAttribute(new GAttributeInfo("Listener", false));
+ infoFactory.addAttribute("Listener", HttpListener.class, false);
GBEAN_INFO = infoFactory.getBeanInfo();
}
1.5 +9 -14
incubator-geronimo/sandbox/webdav/src/java/org/apache/geronimo/webdav/CatalinaDAVRepository.java
Index: CatalinaDAVRepository.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/sandbox/webdav/src/java/org/apache/geronimo/webdav/CatalinaDAVRepository.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- CatalinaDAVRepository.java 10 Mar 2004 10:00:41 -0000 1.4
+++ CatalinaDAVRepository.java 2 Jun 2004 11:29:24 -0000 1.5
@@ -18,7 +18,6 @@
package org.apache.geronimo.webdav;
import java.io.File;
-import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
@@ -28,12 +27,10 @@
import org.apache.catalina.servlets.WebdavServlet;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.geronimo.gbean.GAttributeInfo;
import org.apache.geronimo.gbean.GBean;
import org.apache.geronimo.gbean.GBeanContext;
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoFactory;
-import org.apache.geronimo.gbean.GConstructorInfo;
import org.apache.geronimo.gbean.WaitingException;
import org.apache.naming.resources.FileDirContext;
@@ -165,16 +162,14 @@
static {
GBeanInfoFactory infoFactory =
new GBeanInfoFactory("DAV Repository - Catalina WebDAV
Servlet",
- CatalinaDAVRepository.class.getName());
- infoFactory.addAttribute(new GAttributeInfo("Root", true));
- infoFactory.addAttribute(new GAttributeInfo("Context", true));
- infoFactory.addAttribute(new GAttributeInfo("Host", true));
- infoFactory.addAttribute(new GAttributeInfo("HandlingServlet",
false));
- infoFactory.addAttribute(new GAttributeInfo("ServletContextAttr",
false));
- infoFactory.addAttribute(new GAttributeInfo("ServletInitParam",
false));
- infoFactory.setConstructor(new GConstructorInfo(
- Arrays.asList(new Object[]{"Root", "Context", "Host"}),
- Arrays.asList(new Object[]{File.class, String.class,
String.class})));
+ CatalinaDAVRepository.class);
+ infoFactory.addAttribute("Root", File.class, true);
+ infoFactory.addAttribute("Context", String.class, true);
+ infoFactory.addAttribute("Host", String.class, true);
+ infoFactory.addAttribute("HandlingServlet", Class.class, false);
+ infoFactory.addAttribute("ServletContextAttr", Map.class, false);
+ infoFactory.addAttribute("ServletInitParam", Map.class, false);
+ infoFactory.setConstructor(new String[]{"Root", "Context", "Host"});
GBEAN_INFO = infoFactory.getBeanInfo();
}
1.4 +7 -11
incubator-geronimo/sandbox/webdav/src/java/org/apache/geronimo/webdav/AbstractConnector.java
Index: AbstractConnector.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/sandbox/webdav/src/java/org/apache/geronimo/webdav/AbstractConnector.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AbstractConnector.java 10 Mar 2004 10:00:41 -0000 1.3
+++ AbstractConnector.java 2 Jun 2004 11:29:24 -0000 1.4
@@ -22,11 +22,9 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.geronimo.gbean.GAttributeInfo;
import org.apache.geronimo.gbean.GBean;
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoFactory;
-import org.apache.geronimo.gbean.GConstructorInfo;
/**
* Base implementation for the Connector contracts.
@@ -140,14 +138,12 @@
static {
GBeanInfoFactory infoFactory = new GBeanInfoFactory("Abstract
Connector", AbstractConnector.class.getName());
- infoFactory.addAttribute(new GAttributeInfo("Port", true));
- infoFactory.addAttribute(new GAttributeInfo("Protocol", true));
- infoFactory.addAttribute(new GAttributeInfo("Interface", true));
- infoFactory.addAttribute(new GAttributeInfo("MaxConnections", true));
- infoFactory.addAttribute(new GAttributeInfo("MaxIdleTime", true));
- infoFactory.setConstructor(new GConstructorInfo(
- new String[]{"Protocol", "Interface", "Port",
"MaxConnections", "MaxIdleTime"},
- new Class[]{String.class, String.class, Integer.TYPE,
Integer.TYPE, Integer.TYPE}));
+ infoFactory.addAttribute("Port", int.class, true);
+ infoFactory.addAttribute("Protocol", String.class, true);
+ infoFactory.addAttribute("Interface", String.class, true);
+ infoFactory.addAttribute("MaxConnections", int.class, true);
+ infoFactory.addAttribute("MaxIdleTime", int.class, true);
+ infoFactory.setConstructor(new String[]{"Protocol", "Interface",
"Port", "MaxConnections", "MaxIdleTime"});
GBEAN_INFO = infoFactory.getBeanInfo();
}
1.5 +3 -3
incubator-geronimo/sandbox/webdav/src/java/org/apache/geronimo/datastore/impl/AbstractGFileManager.java
Index: AbstractGFileManager.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/sandbox/webdav/src/java/org/apache/geronimo/datastore/impl/AbstractGFileManager.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AbstractGFileManager.java 11 May 2004 12:24:59 -0000 1.4
+++ AbstractGFileManager.java 2 Jun 2004 11:29:25 -0000 1.5
@@ -235,8 +235,8 @@
static {
GBeanInfoFactory factory = new
GBeanInfoFactory(AbstractGFileManager.class);
- factory.addAttribute("Name", true);
- factory.addAttribute("LockManager", true);
+ factory.addAttribute("Name", String.class, true);
+ factory.addAttribute("LockManager", LockManager.class, true);
factory.addOperation("startInteraction");
factory.addOperation("factoryGFile", new Class[]{Object.class,
String.class});
factory.addOperation("persistNew", new Class[]{Object.class,
GFile.class});
1.4 +4 -6
incubator-geronimo/sandbox/webdav/src/java/org/apache/geronimo/datastore/impl/local/LocalGFileManager.java
Index: LocalGFileManager.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/sandbox/webdav/src/java/org/apache/geronimo/datastore/impl/local/LocalGFileManager.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- LocalGFileManager.java 11 May 2004 12:25:00 -0000 1.3
+++ LocalGFileManager.java 2 Jun 2004 11:29:25 -0000 1.4
@@ -156,11 +156,9 @@
static {
GBeanInfoFactory factory =
- new GBeanInfoFactory(LocalGFileManager.class.getName(),
AbstractGFileManager.GBEAN_INFO);
- factory.setConstructor(
- new String[] {"Name", "Root", "LockManager"},
- new Class[] {String.class, File.class, LockManager.class});
- factory.addAttribute("Root", true);
+ new GBeanInfoFactory(LocalGFileManager.class,
AbstractGFileManager.GBEAN_INFO);
+ factory.setConstructor(new String[] {"Name", "Root", "LockManager"});
+ factory.addAttribute("Root", File.class, true);
GBEAN_INFO = factory.getBeanInfo();
}
1.3 +3 -8
incubator-geronimo/sandbox/messaging/src/java/org/apache/geronimo/messaging/replication/ReplicationMemberImpl.java
Index: ReplicationMemberImpl.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/sandbox/messaging/src/java/org/apache/geronimo/messaging/replication/ReplicationMemberImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ReplicationMemberImpl.java 20 May 2004 13:37:11 -0000 1.2
+++ ReplicationMemberImpl.java 2 Jun 2004 11:29:25 -0000 1.3
@@ -21,7 +21,6 @@
import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
-import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
@@ -30,11 +29,9 @@
import net.sf.cglib.proxy.LazyLoader;
import net.sf.cglib.proxy.MethodInterceptor;
-import org.apache.geronimo.gbean.GAttributeInfo;
import org.apache.geronimo.gbean.GBean;
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoFactory;
-import org.apache.geronimo.gbean.GConstructorInfo;
import org.apache.geronimo.messaging.AbstractEndPoint;
import org.apache.geronimo.messaging.Node;
import org.apache.geronimo.messaging.NodeInfo;
@@ -231,12 +228,10 @@
static {
GBeanInfoFactory infoFactory = new GBeanInfoFactory("Replication
Member", ReplicationMemberImpl.class.getName(), AbstractEndPoint.GBEAN_INFO);
- infoFactory.addAttribute(new GAttributeInfo("TargetNodes", true));
+ infoFactory.addAttribute("TargetNodes", NodeInfo[].class, true);
infoFactory.addOperation("registerReplicantCapable", new Class[]
{ReplicationCapable.class});
infoFactory.addOperation("retrieveReplicantCapable", new Class[]
{Object.class});
- infoFactory.setConstructor(new GConstructorInfo(
- Arrays.asList(new Object[]{"Node", "ID", "TargetNodes"}),
- Arrays.asList(new Object[]{Node.class, String.class,
NodeInfo[].class})));
+ infoFactory.setConstructor(new String[]{"Node", "ID",
"TargetNodes"});
GBEAN_INFO = infoFactory.getBeanInfo();
}
