djencks 2005/03/05 21:49:39
Modified: modules/core/src/java/org/openejb/server ServiceDaemon.java
SimpleSocketService.java
StandardServiceStackGBean.java
Log:
GERONIMO-450. Change name to gbeanName, namePart to name, and break up
reference patterns into pieces
Revision Changes Path
1.17 +3 -2
openejb/modules/core/src/java/org/openejb/server/ServiceDaemon.java
Index: ServiceDaemon.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/server/ServiceDaemon.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ServiceDaemon.java 3 Feb 2005 00:07:58 -0000 1.16
+++ ServiceDaemon.java 6 Mar 2005 02:49:39 -0000 1.17
@@ -52,6 +52,7 @@
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
import org.apache.geronimo.gbean.GBeanLifecycle;
+import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
public class ServiceDaemon implements GBeanLifecycle {
private static final Log log = LogFactory.getLog(ServiceDaemon.class);
@@ -206,7 +207,7 @@
static {
GBeanInfoBuilder infoFactory = new
GBeanInfoBuilder(ServiceDaemon.class);
- infoFactory.addReference("SocketService", SocketService.class);
+ infoFactory.addReference("SocketService", SocketService.class,
NameFactory.GERONIMO_SERVICE);
infoFactory.addAttribute("inetAddress", InetAddress.class, true);
infoFactory.addAttribute("port", int.class, true);
1.13 +3 -2
openejb/modules/core/src/java/org/openejb/server/SimpleSocketService.java
Index: SimpleSocketService.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/server/SimpleSocketService.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- SimpleSocketService.java 18 Dec 2004 01:55:43 -0000 1.12
+++ SimpleSocketService.java 6 Mar 2005 02:49:39 -0000 1.13
@@ -58,6 +58,7 @@
import org.apache.geronimo.gbean.GBeanInfoBuilder;
import org.apache.geronimo.gbean.GBeanLifecycle;
import org.apache.geronimo.kernel.ClassLoading;
+import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
import org.openejb.ContainerIndex;
import org.openejb.OpenEJB;
@@ -133,7 +134,7 @@
infoFactory.addAttribute("classLoader", ClassLoader.class, false);
infoFactory.addAttribute("name", String.class, false);
- infoFactory.addReference("ContainerIndex", ContainerIndex.class);
+ infoFactory.addReference("ContainerIndex", ContainerIndex.class,
NameFactory.GERONIMO_SERVICE);
infoFactory.addInterface(SocketService.class);
1.2 +3 -2
openejb/modules/core/src/java/org/openejb/server/StandardServiceStackGBean.java
Index: StandardServiceStackGBean.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/server/StandardServiceStackGBean.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- StandardServiceStackGBean.java 19 Dec 2004 06:17:15 -0000 1.1
+++ StandardServiceStackGBean.java 6 Mar 2005 02:49:39 -0000 1.2
@@ -55,6 +55,7 @@
import org.apache.geronimo.kernel.GBeanNotFoundException;
import org.apache.geronimo.kernel.Kernel;
import org.apache.geronimo.kernel.jmx.JMXUtil;
+import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
public class StandardServiceStackGBean {
@@ -72,7 +73,7 @@
infoFactory.addAttribute("priority", int.class, true);
infoFactory.addAttribute("logOnSuccess", String[].class, true);
infoFactory.addAttribute("logOnFailure", String[].class, true);
- infoFactory.addReference("Server", ServerService.class);
+ infoFactory.addReference("Server", ServerService.class,
NameFactory.GERONIMO_SERVICE);
infoFactory.setConstructor(new String[]{
"name",
