geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gr...@apache.org
Subject cvs commit: incubator-geronimo/modules/core/src/test/org/apache/geronimo/common StateTest.java
Date Mon, 18 Aug 2003 13:30:20 GMT
gregw       2003/08/18 06:30:20

  Modified:    modules/core/src/java/org/apache/geronimo/common
                        AbstractComponent.java AbstractInterceptor.java
                        AbstractRPCContainer.java
                        AbstractStateManageable.java Component.java
               modules/core/src/java/org/apache/geronimo/deployment/dependency
                        DependencyService.java
               modules/core/src/java/org/apache/geronimo/deployment/scanner
                        DeploymentScannerMBean.java
               modules/core/src/java/org/apache/geronimo/ejb/context
                        TransactionInterceptor.java
               modules/core/src/java/org/apache/geronimo/jmx
                        RelationshipMBean.java
  Removed:     modules/core/src/java/org/apache/geronimo/common
                        J2EENotification.java State.java
                        StateManageable.java
               modules/core/src/java/org/apache/geronimo/web
                        AbstractWebApplication.java
                        AbstractWebContainer.java WebApplication.java
                        WebConnector.java WebContainer.java
               modules/core/src/test/org/apache/geronimo/common
                        StateTest.java
  Log:
  moved jsr77 model to the spec package. Moved web stuff to web module
  
  Revision  Changes    Path
  1.7       +2 -1      incubator-geronimo/modules/core/src/java/org/apache/geronimo/common/AbstractComponent.java
  
  Index: AbstractComponent.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/common/AbstractComponent.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- AbstractComponent.java	16 Aug 2003 23:16:18 -0000	1.6
  +++ AbstractComponent.java	18 Aug 2003 13:30:19 -0000	1.7
  @@ -54,6 +54,7 @@
    * ====================================================================
    */
   package org.apache.geronimo.common;
  +import org.apache.management.j2ee.State;
   
   /**
    * A helper implementation of the Component interface that should
  
  
  
  1.5       +2 -1      incubator-geronimo/modules/core/src/java/org/apache/geronimo/common/AbstractInterceptor.java
  
  Index: AbstractInterceptor.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/common/AbstractInterceptor.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- AbstractInterceptor.java	14 Aug 2003 07:14:33 -0000	1.4
  +++ AbstractInterceptor.java	18 Aug 2003 13:30:19 -0000	1.5
  @@ -54,6 +54,7 @@
    * ====================================================================
    */
   package org.apache.geronimo.common;
  +import org.apache.management.j2ee.State;
   
   
   /**
  
  
  
  1.3       +2 -1      incubator-geronimo/modules/core/src/java/org/apache/geronimo/common/AbstractRPCContainer.java
  
  Index: AbstractRPCContainer.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/common/AbstractRPCContainer.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- AbstractRPCContainer.java	16 Aug 2003 23:16:18 -0000	1.2
  +++ AbstractRPCContainer.java	18 Aug 2003 13:30:19 -0000	1.3
  @@ -6,6 +6,7 @@
   import java.util.ListIterator;
   import java.util.Map;
   import javax.management.ObjectName;
  +import org.apache.management.j2ee.State;
   
   /**
    * Base class for a Container that can be accecpt invocation.
  
  
  
  1.4       +6 -3      incubator-geronimo/modules/core/src/java/org/apache/geronimo/common/AbstractStateManageable.java
  
  Index: AbstractStateManageable.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/common/AbstractStateManageable.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- AbstractStateManageable.java	16 Aug 2003 23:16:18 -0000	1.3
  +++ AbstractStateManageable.java	18 Aug 2003 13:30:19 -0000	1.4
  @@ -85,6 +85,9 @@
   import org.apache.geronimo.deployment.dependency.DependencyServiceMBean;
   import org.apache.geronimo.deployment.service.MBeanRelationship;
   import org.apache.geronimo.jmx.JMXUtil;
  +import org.apache.management.j2ee.State;
  +import org.apache.management.j2ee.StateManageable;
  +import org.apache.management.j2ee.NotificationType;
   
   /**
    * Abstract implementation of JSR77 StateManageable.
  @@ -121,7 +124,7 @@
   
       public MBeanNotificationInfo[] getNotificationInfo() {
           return new MBeanNotificationInfo[]{
  -            new MBeanNotificationInfo(J2EENotification.TYPES,
  +            new MBeanNotificationInfo(NotificationType.TYPES,
                       "javax.management.Notification",
                       "J2EE Notifications")
           };
  @@ -157,7 +160,7 @@
               MBeanServerNotification notification = (MBeanServerNotification) n;
               source = notification.getMBeanName();
               try {
  -                server.addNotificationListener(source, this, J2EENotification.NOTIFICATION_FILTER,
null);
  +                server.addNotificationListener(source, this, NotificationType.NOTIFICATION_FILTER,
null);
               } catch (InstanceNotFoundException e) {
                   // the instance died before we could get going... not a big deal
                   return;
  
  
  
  1.6       +2 -1      incubator-geronimo/modules/core/src/java/org/apache/geronimo/common/Component.java
  
  Index: Component.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/common/Component.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Component.java	15 Aug 2003 14:11:26 -0000	1.5
  +++ Component.java	18 Aug 2003 13:30:19 -0000	1.6
  @@ -54,6 +54,7 @@
    * ====================================================================
    */
   package org.apache.geronimo.common;
  +import org.apache.management.j2ee.StateManageable;
   
   
   /**
  
  
  
  1.2       +2 -2      incubator-geronimo/modules/core/src/java/org/apache/geronimo/deployment/dependency/DependencyService.java
  
  Index: DependencyService.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/deployment/dependency/DependencyService.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DependencyService.java	17 Aug 2003 05:40:18 -0000	1.1
  +++ DependencyService.java	18 Aug 2003 13:30:19 -0000	1.2
  @@ -69,7 +69,7 @@
   
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
  -import org.apache.geronimo.common.State;
  +import org.apache.management.j2ee.State;
   import org.apache.geronimo.jmx.JMXUtil;
   import org.apache.geronimo.deployment.service.MBeanRelationship;
   
  
  
  
  1.6       +2 -3      incubator-geronimo/modules/core/src/java/org/apache/geronimo/deployment/scanner/DeploymentScannerMBean.java
  
  Index: DeploymentScannerMBean.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/deployment/scanner/DeploymentScannerMBean.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- DeploymentScannerMBean.java	16 Aug 2003 23:16:30 -0000	1.5
  +++ DeploymentScannerMBean.java	18 Aug 2003 13:30:19 -0000	1.6
  @@ -58,8 +58,7 @@
   import java.net.MalformedURLException;
   import java.net.URL;
   import java.util.Set;
  -
  -import org.apache.geronimo.common.StateManageable;
  +import org.apache.management.j2ee.StateManageable;
   
   /**
    *
  
  
  
  1.8       +2 -2      incubator-geronimo/modules/core/src/java/org/apache/geronimo/ejb/context/TransactionInterceptor.java
  
  Index: TransactionInterceptor.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/ejb/context/TransactionInterceptor.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- TransactionInterceptor.java	16 Aug 2003 23:16:51 -0000	1.7
  +++ TransactionInterceptor.java	18 Aug 2003 13:30:19 -0000	1.8
  @@ -60,7 +60,7 @@
   import org.apache.geronimo.common.Invocation;
   import org.apache.geronimo.common.InvocationResult;
   import org.apache.geronimo.common.RPCContainer;
  -import org.apache.geronimo.common.State;
  +import org.apache.management.j2ee.State;
   import org.apache.geronimo.ejb.container.EJBPlugins;
   import org.apache.geronimo.ejb.metadata.EJBMetadata;
   
  
  
  
  1.3       +2 -2      incubator-geronimo/modules/core/src/java/org/apache/geronimo/jmx/RelationshipMBean.java
  
  Index: RelationshipMBean.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/jmx/RelationshipMBean.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- RelationshipMBean.java	16 Aug 2003 23:16:55 -0000	1.2
  +++ RelationshipMBean.java	18 Aug 2003 13:30:19 -0000	1.3
  @@ -55,7 +55,7 @@
    */
   package org.apache.geronimo.jmx;
   
  -import org.apache.geronimo.common.StateManageable;
  +import org.apache.management.j2ee.StateManageable;
   
   /**
    * 
  
  
  

Mime
View raw message