djencks 2004/01/22 01:14:15
Modified: modules/core/src/java/org/apache/geronimo/connector/outbound
ConnectionManagerDeployment.java
modules/core/src/java/org/apache/geronimo/security
AbstractSecurityRealm.java
modules/core/src/test/org/apache/geronimo/connector/work
PooledWorkManagerTest.java
Log:
remove some leftover bits of GeronimoMBeanTarget
Revision Changes Path
1.16 +3 -26
incubator-geronimo/modules/core/src/java/org/apache/geronimo/connector/outbound/ConnectionManagerDeployment.java
Index: ConnectionManagerDeployment.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/connector/outbound/ConnectionManagerDeployment.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ConnectionManagerDeployment.java 22 Jan 2004 06:39:24 -0000 1.15
+++ ConnectionManagerDeployment.java 22 Jan 2004 09:14:14 -0000 1.16
@@ -72,8 +72,6 @@
import org.apache.geronimo.gbean.GEndpointInfo;
import org.apache.geronimo.gbean.GOperationInfo;
import org.apache.geronimo.kernel.KernelMBean;
-import org.apache.geronimo.kernel.service.GeronimoMBeanContext;
-import org.apache.geronimo.kernel.service.GeronimoMBeanTarget;
import org.apache.geronimo.security.bridge.RealmBridge;
/**
@@ -83,7 +81,7 @@
*
* @version $Revision$ $Date$
* */
-public class ConnectionManagerDeployment implements GeronimoMBeanTarget,
ConnectionManagerFactory, GBean {
+public class ConnectionManagerDeployment implements
ConnectionManagerFactory, GBean {
private static final GBeanInfo GBEAN_INFO;
@@ -113,10 +111,7 @@
private ConnectionTracker connectionTracker;
private KernelMBean kernel;
- //GeronimoMBeanTarget support.
- private GeronimoMBeanContext context;
-
- //default constructor for normal use as mbean
+ //default constructor for use as endpoint
public ConnectionManagerDeployment() {
}
@@ -147,20 +142,10 @@
public void setGBeanContext(GBeanContext context) {
}
- public void setMBeanContext(GeronimoMBeanContext context) {
- this.context = context;
- }
-
- public boolean canStart() {
- return true;
- }
-
public void doStart() {
MBeanServer mbeanServer = null;
if (kernel != null) {
mbeanServer = kernel.getMBeanServer();
- } else if (context != null) {
- mbeanServer = context.getServer();
} else {
throw new IllegalStateException("Neither kernel nor context is
set, but you're trying to start");
}
@@ -246,18 +231,10 @@
cm = new ProxyConnectionManager(agentID, connectionManagerName,
stack);
}
- public boolean canStop() {
- return true;
- }
-
- /* (non-Javadoc)
- * @see
org.apache.geronimo.core.service.AbstractStateManageable#doStop()
- */
public void doStop() {
cm = null;
realmBridge = null;
connectionTracker = null;
-
}
public void doFail() {
1.8 +5 -6
incubator-geronimo/modules/core/src/java/org/apache/geronimo/security/AbstractSecurityRealm.java
Index: AbstractSecurityRealm.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/security/AbstractSecurityRealm.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- AbstractSecurityRealm.java 22 Jan 2004 07:29:56 -0000 1.7
+++ AbstractSecurityRealm.java 22 Jan 2004 09:14:15 -0000 1.8
@@ -55,15 +55,14 @@
*/
package org.apache.geronimo.security;
-import org.apache.geronimo.kernel.service.GeronimoMBeanContext;
-import org.apache.geronimo.kernel.service.GeronimoMBeanTarget;
+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.GAttributeInfo;
-import org.apache.geronimo.gbean.GOperationInfo;
import org.apache.geronimo.gbean.GConstructorInfo;
-import org.apache.geronimo.gbean.GBeanContext;
+import org.apache.geronimo.gbean.GOperationInfo;
+import org.apache.geronimo.kernel.service.GeronimoMBeanContext;
import org.apache.regexp.RE;
1.4 +1 -7
incubator-geronimo/modules/core/src/test/org/apache/geronimo/connector/work/PooledWorkManagerTest.java
Index: PooledWorkManagerTest.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/modules/core/src/test/org/apache/geronimo/connector/work/PooledWorkManagerTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PooledWorkManagerTest.java 26 Nov 2003 02:15:32 -0000 1.3
+++ PooledWorkManagerTest.java 22 Jan 2004 09:14:15 -0000 1.4
@@ -66,13 +66,7 @@
import javax.resource.spi.work.WorkManager;
import junit.framework.TestCase;
-
import org.apache.geronimo.kernel.jmx.JMXKernel;
-import org.apache.geronimo.kernel.management.State;
-import org.apache.geronimo.kernel.service.GeronimoMBeanContext;
-import org.apache.geronimo.connector.work.pool.ScheduleWorkExecutorPool;
-import org.apache.geronimo.connector.work.pool.StartWorkExecutorPool;
-import org.apache.geronimo.connector.work.pool.SyncWorkExecutorPool;
/**
* Timing is crucial for this test case, which focuses on the synchronization
