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/java/org/apache/geronimo/ejb/context TransactionInterceptor.java
Date Wed, 20 Aug 2003 07:13:26 GMT
gregw       2003/08/20 00:13:26

  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
                        DeploymentInfoMBean.java
               modules/core/src/java/org/apache/geronimo/deployment/dependency
                        DependencyService.java DependencyServiceMBean.java
               modules/core/src/java/org/apache/geronimo/deployment/plan
                        DestroyMBeanInstance.java
               modules/core/src/java/org/apache/geronimo/deployment/scanner
                        DeploymentScannerMBean.java
               modules/core/src/java/org/apache/geronimo/ejb/context
                        TransactionInterceptor.java
  Log:
  Moved jsr77 model classes back to core module
  
  Revision  Changes    Path
  1.8       +2 -2      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.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- AbstractComponent.java	18 Aug 2003 13:30:19 -0000	1.7
  +++ AbstractComponent.java	20 Aug 2003 07:13:25 -0000	1.8
  @@ -54,7 +54,7 @@
    * ====================================================================
    */
   package org.apache.geronimo.common;
  -import org.apache.management.j2ee.State;
  +import org.apache.geronimo.management.State;
   
   /**
    * A helper implementation of the Component interface that should
  
  
  
  1.6       +2 -2      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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- AbstractInterceptor.java	18 Aug 2003 13:30:19 -0000	1.5
  +++ AbstractInterceptor.java	20 Aug 2003 07:13:25 -0000	1.6
  @@ -54,7 +54,7 @@
    * ====================================================================
    */
   package org.apache.geronimo.common;
  -import org.apache.management.j2ee.State;
  +import org.apache.geronimo.management.State;
   
   
   /**
  
  
  
  1.4       +2 -2      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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- AbstractRPCContainer.java	18 Aug 2003 13:30:19 -0000	1.3
  +++ AbstractRPCContainer.java	20 Aug 2003 07:13:25 -0000	1.4
  @@ -6,7 +6,7 @@
   import java.util.ListIterator;
   import java.util.Map;
   import javax.management.ObjectName;
  -import org.apache.management.j2ee.State;
  +import org.apache.geronimo.management.State;
   
   /**
    * Base class for a Container that can be accecpt invocation.
  
  
  
  1.6       +20 -20    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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- AbstractStateManageable.java	18 Aug 2003 21:56:27 -0000	1.5
  +++ AbstractStateManageable.java	20 Aug 2003 07:13:25 -0000	1.6
  @@ -87,9 +87,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.NotificationType;
  -import org.apache.management.j2ee.State;
  -import org.apache.management.j2ee.StateManageable;
  +import org.apache.geronimo.management.NotificationType;
  +import org.apache.geronimo.management.State;
  +import org.apache.geronimo.management.StateManageable;
   
   /**
    * Abstract implementation of JSR77 StateManageable.
  @@ -270,7 +270,7 @@
               if (state == State.STARTING || state == State.RUNNING) {
                   return;
               }
  -            setState(State.STARTING);
  +            setStateInstance(State.STARTING);
           }
           doNotification(State.STARTING.getEventTypeValue());
   
  @@ -283,15 +283,15 @@
                               dependencyService.canStart(objectName) && canStart())
{
                           enrollInRelationships();
                           doStart();
  -                        setState(State.RUNNING);
  +                        setStateInstance(State.RUNNING);
                           newState = State.RUNNING;
                       }
                   } catch (Exception e) {
  -                    setState(State.FAILED);
  +                    setStateInstance(State.FAILED);
                       newState = State.FAILED;
                       throw e;
                   } catch (Error e) {
  -                    setState(State.FAILED);
  +                    setStateInstance(State.FAILED);
                       newState = State.FAILED;
                       throw e;
                   }
  @@ -322,7 +322,7 @@
               if (state == State.STOPPED || state == State.STOPPING) {
                   return;
               }
  -            setState(State.STOPPING);
  +            setStateInstance(State.STOPPING);
           }
           doNotification(State.STOPPING.getEventTypeValue());
   
  @@ -354,15 +354,15 @@
                           if (dependencyService.canStop(objectName) && canStop())
{
                               unenrollInRelationships();
                               doStop();
  -                            setState(State.STOPPED);
  +                            setStateInstance(State.STOPPED);
                               newState = State.STOPPED;
                           }
                       } catch (Exception e) {
  -                        setState(State.FAILED);
  +                        setStateInstance(State.FAILED);
                           newState = State.FAILED;
                           throw e;
                       } catch (Error e) {
  -                        setState(State.FAILED);
  +                        setStateInstance(State.FAILED);
                           newState = State.FAILED;
                           throw e;
                       }
  @@ -557,13 +557,13 @@
                       if (dependencyService.canStart(objectName) && canStart()) {
                           try {
                               doStart();
  -                            setState(State.RUNNING);
  +                            setStateInstance(State.RUNNING);
                               newState = State.RUNNING;
                           } catch (Exception e) {
  -                            setState(State.FAILED);
  +                            setStateInstance(State.FAILED);
                               newState = State.FAILED;
                           } catch (Error e) {
  -                            setState(State.FAILED);
  +                            setStateInstance(State.FAILED);
                               newState = State.FAILED;
                           }
                       }
  @@ -571,7 +571,7 @@
                       // Someone stopping, stopped, failed or unregistered we need to change
state
                       State recommendState = dependencyService.shouldChangeState(objectName);
                       if (recommendState != null) {
  -                        setState(recommendState);
  +                        setStateInstance(recommendState);
                           newState = recommendState;
                       }
                   } else if (state == State.STOPPING) {
  @@ -579,13 +579,13 @@
                           try {
                               unenrollInRelationships();
                               doStop();
  -                            setState(State.STOPPED);
  +                            setStateInstance(State.STOPPED);
                               newState = State.STOPPED;
                           } catch (Exception e) {
  -                            setState(State.FAILED);
  +                            setStateInstance(State.FAILED);
                               newState = State.FAILED;
                           } catch (Error e) {
  -                            setState(State.FAILED);
  +                            setStateInstance(State.FAILED);
                               newState = State.FAILED;
                           }
                       }
  @@ -603,7 +603,7 @@
        * @param newState the target state to transition
        * @throws IllegalStateException Thrown if the transition is not supported by the J2EE
Management lifecycle.
        */
  -    private synchronized void setState(State newState) throws IllegalStateException {
  +    private synchronized void setStateInstance(State newState) throws IllegalStateException
{
           switch (state.toInt()) {
           case State.STOPPED_INDEX:
               switch (newState.toInt()) {
  
  
  
  1.7       +2 -2      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.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Component.java	18 Aug 2003 13:30:19 -0000	1.6
  +++ Component.java	20 Aug 2003 07:13:25 -0000	1.7
  @@ -54,7 +54,7 @@
    * ====================================================================
    */
   package org.apache.geronimo.common;
  -import org.apache.management.j2ee.StateManageable;
  +import org.apache.geronimo.management.StateManageable;
   
   
   /**
  
  
  
  1.4       +2 -2      incubator-geronimo/modules/core/src/java/org/apache/geronimo/deployment/DeploymentInfoMBean.java
  
  Index: DeploymentInfoMBean.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/deployment/DeploymentInfoMBean.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- DeploymentInfoMBean.java	18 Aug 2003 22:29:03 -0000	1.3
  +++ DeploymentInfoMBean.java	20 Aug 2003 07:13:25 -0000	1.4
  @@ -59,7 +59,7 @@
   import java.util.Collection;
   import javax.management.ObjectName;
   
  -import org.apache.management.j2ee.StateManageable;
  +import org.apache.geronimo.management.StateManageable;
   
   /**
    *
  
  
  
  1.4       +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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- DependencyService.java	18 Aug 2003 22:02:05 -0000	1.3
  +++ DependencyService.java	20 Aug 2003 07:13:26 -0000	1.4
  @@ -72,7 +72,7 @@
   import org.apache.commons.logging.LogFactory;
   import org.apache.geronimo.deployment.service.MBeanRelationship;
   import org.apache.geronimo.jmx.JMXUtil;
  -import org.apache.management.j2ee.State;
  +import org.apache.geronimo.management.State;
   
   /**
    *
  
  
  
  1.3       +2 -2      incubator-geronimo/modules/core/src/java/org/apache/geronimo/deployment/dependency/DependencyServiceMBean.java
  
  Index: DependencyServiceMBean.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/deployment/dependency/DependencyServiceMBean.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- DependencyServiceMBean.java	18 Aug 2003 22:02:05 -0000	1.2
  +++ DependencyServiceMBean.java	20 Aug 2003 07:13:26 -0000	1.3
  @@ -58,7 +58,7 @@
   import java.util.Set;
   import javax.management.ObjectName;
   
  -import org.apache.management.j2ee.State;
  +import org.apache.geronimo.management.State;
   
   /**
    *
  
  
  
  1.5       +2 -2      incubator-geronimo/modules/core/src/java/org/apache/geronimo/deployment/plan/DestroyMBeanInstance.java
  
  Index: DestroyMBeanInstance.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/deployment/plan/DestroyMBeanInstance.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- DestroyMBeanInstance.java	18 Aug 2003 22:31:23 -0000	1.4
  +++ DestroyMBeanInstance.java	20 Aug 2003 07:13:26 -0000	1.5
  @@ -64,7 +64,7 @@
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
   import org.apache.geronimo.deployment.DeploymentException;
  -import org.apache.management.j2ee.State;
  +import org.apache.geronimo.management.State;
   
   /**
    *
  
  
  
  1.7       +2 -2      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.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- DeploymentScannerMBean.java	18 Aug 2003 13:30:19 -0000	1.6
  +++ DeploymentScannerMBean.java	20 Aug 2003 07:13:26 -0000	1.7
  @@ -58,7 +58,7 @@
   import java.net.MalformedURLException;
   import java.net.URL;
   import java.util.Set;
  -import org.apache.management.j2ee.StateManageable;
  +import org.apache.geronimo.management.StateManageable;
   
   /**
    *
  
  
  
  1.9       +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.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- TransactionInterceptor.java	18 Aug 2003 13:30:19 -0000	1.8
  +++ TransactionInterceptor.java	20 Aug 2003 07:13:26 -0000	1.9
  @@ -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.management.j2ee.State;
  +import org.apache.geronimo.management.State;
   import org.apache.geronimo.ejb.container.EJBPlugins;
   import org.apache.geronimo.ejb.metadata.EJBMetadata;
   
  
  
  

Mime
View raw message