User: schaefera
  Date: 01/12/03 19:24:36

  Modified:    src/main/org/jboss/management/j2ee EJB.java EjbModule.java
                        J2EEApplication.java J2EEResource.java JNDI.java
  Log:
  Remove any error logs. Implemented MEJBBean code therefore it works
  like the EJB-Adaptor. Later on it will migrate to the definit JSR-77
  implementation as soon as the spec. is more specific.
  
  Revision  Changes    Path
  1.5       +3 -3      jboss/src/main/org/jboss/management/j2ee/EJB.java
  
  Index: EJB.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/management/j2ee/EJB.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- EJB.java  2001/11/28 06:33:37     1.4
  +++ EJB.java  2001/12/04 03:24:36     1.5
  @@ -19,7 +19,7 @@
    * {@link javax.management.j2ee.EJB EJB}.
    *
    * @author  <a href="mailto:[EMAIL PROTECTED]";>Andreas Schaefer</a>.
  - * @version $Revision: 1.4 $
  + * @version $Revision: 1.5 $
    *   
    * <p><b>Revisions:</b>
    *
  @@ -67,7 +67,7 @@
            ).getObjectName();
         }
         catch( Exception e ) {
  -         lLog.error( "Could not create JSR-77 EJB: " + pBeanMeta.getJndiName(), e );
  +//AS         lLog.error( "Could not create JSR-77 EJB: " + pBeanMeta.getJndiName(), 
e );
            return null;
         }
      }
  @@ -79,7 +79,7 @@
            pServer.unregisterMBean( new ObjectName( pEJBName ) );
         }
         catch( Exception e ) {
  -         lLog.error( "Could not destory JSR-77 EJB: " + pEJBName, e );
  +//AS         lLog.error( "Could not destory JSR-77 EJB: " + pEJBName, e );
         }
      }
      
  
  
  
  1.8       +4 -4      jboss/src/main/org/jboss/management/j2ee/EjbModule.java
  
  Index: EjbModule.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/management/j2ee/EjbModule.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- EjbModule.java    2001/11/28 06:33:37     1.7
  +++ EjbModule.java    2001/12/04 03:24:36     1.8
  @@ -29,7 +29,7 @@
    * {@link javax.management.j2ee.EjbModule EjbModule}.
    *
    * @author  <a href="mailto:[EMAIL PROTECTED]";>Andreas Schaefer</a>.
  - * @version $Revision: 1.7 $
  + * @version $Revision: 1.8 $
    *   
    * <p><b>Revisions:</b>
    *
  @@ -74,7 +74,7 @@
            lDD = J2EEDeployedObject.getDeploymentDescriptor( pURL, 
J2EEDeployedObject.EJB );
         }
         catch( Exception e ) {
  -         lLog.error( "Could not create JSR-77 EjbModule: " + pApplicationName, e );
  +//AS         lLog.error( "Could not create JSR-77 EjbModule: " + pApplicationName, 
e );
            return null;
         }
         try {
  @@ -100,7 +100,7 @@
            ).getObjectName();
         }
         catch( Exception e ) {
  -         lLog.error( "Could not create JSR-77 EjbModule: " + pApplicationName, e );
  +//AS         lLog.error( "Could not create JSR-77 EjbModule: " + pApplicationName, 
e );
            return null;
         }
      }
  @@ -112,7 +112,7 @@
            pServer.unregisterMBean( new ObjectName( pModuleName ) );
         }
         catch( Exception e ) {
  -         lLog.error( "Could not destory JSR-77 EjbModule: " + pModuleName, e );
  +//AS         lLog.error( "Could not destory JSR-77 EjbModule: " + pModuleName, e );
         }
      }
      
  
  
  
  1.7       +4 -4      jboss/src/main/org/jboss/management/j2ee/J2EEApplication.java
  
  Index: J2EEApplication.java
  ===================================================================
  RCS file: 
/cvsroot/jboss/jboss/src/main/org/jboss/management/j2ee/J2EEApplication.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- J2EEApplication.java      2001/11/28 06:33:37     1.6
  +++ J2EEApplication.java      2001/12/04 03:24:36     1.7
  @@ -24,7 +24,7 @@
    * {@link javax.management.j2ee.J2EEApplication J2EEApplication}.
    *
    * @author  <a href="mailto:[EMAIL PROTECTED]";>Andreas Schaefer</a>.
  - * @version $Revision: 1.6 $
  + * @version $Revision: 1.7 $
    *   
    * <p><b>Revisions:</b>
    *
  @@ -57,7 +57,7 @@
            ).iterator().next();
         }
         catch( Exception e ) {
  -         lLog.error( "Could not create JSR-77 J2EEApplication: " + pName, e );
  +//AS         lLog.error( "Could not create JSR-77 J2EEApplication: " + pName, e );
            return null;
         }
         try {
  @@ -78,7 +78,7 @@
            ).getObjectName();
         }
         catch( Exception e ) {
  -         lLog.error( "Could not create JSR-77 J2EEApplication: " + pName, e );
  +//AS         lLog.error( "Could not create JSR-77 J2EEApplication: " + pName, e );
            return null;
         }
      }
  @@ -98,7 +98,7 @@
            pServer.unregisterMBean( lApplication );
         }
         catch( Exception e ) {
  -         lLog.error( "Could not destroy JSR-77 J2EEApplication: " + pName, e );
  +//AS         lLog.error( "Could not destroy JSR-77 J2EEApplication: " + pName, e );
         }
      }
      
  
  
  
  1.5       +17 -2     jboss/src/main/org/jboss/management/j2ee/J2EEResource.java
  
  Index: J2EEResource.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/management/j2ee/J2EEResource.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- J2EEResource.java 2001/11/28 06:33:37     1.4
  +++ J2EEResource.java 2001/12/04 03:24:36     1.5
  @@ -14,7 +14,7 @@
    * {@link javax.management.j2ee.J2EEResource J2EEResource}.
    *
    * @author  <a href="mailto:[EMAIL PROTECTED]";>Andreas Schaefer</a>.
  - * @version $Revision: 1.4 $
  + * @version $Revision: 1.5 $
    *   
    * <p><b>Revisions:</b>
    *
  @@ -50,7 +50,22 @@
   
      // Z implementation ----------------------------------------------
      
  -   // Y overrides ---------------------------------------------------
  +   // ServiceMBeanSupport overrides ---------------------------------
  +   
  +   /**
  +    * This method is only overwriten because to catch the exception
  +    * which is not specified in {@link javax.management.j2ee.StateManageable
  +    * StateManageable} interface.
  +    **/
  +   public void start()
  +   {
  +      try {
  +         super.start();
  +      }
  +      catch( Exception e ) {
  +         getLog().error( "start failed", e );
  +      }
  +   }
      
      // Package protected ---------------------------------------------
      
  
  
  
  1.6       +39 -10    jboss/src/main/org/jboss/management/j2ee/JNDI.java
  
  Index: JNDI.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/management/j2ee/JNDI.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- JNDI.java 2001/12/03 02:26:01     1.5
  +++ JNDI.java 2001/12/04 03:24:36     1.6
  @@ -22,7 +22,7 @@
    * {@link javax.management.j2ee.JNDI JNDI}.
    *
    * @author  <a href="mailto:[EMAIL PROTECTED]";>Andreas Schaefer</a>.
  - * @version $Revision: 1.5 $
  + * @version $Revision: 1.6 $
    *   
    * <p><b>Revisions:</b>
    *
  @@ -52,10 +52,10 @@
      private static final String[] sTypes = new String[] {
                                                "j2ee.object.created",
                                                "j2ee.object.deleted",
  +                                             "state.stopped",
  +                                             "state.stopping",
                                                "state.starting",
                                                "state.running",
  -                                             "state.stopping",
  -                                             "state.stopped",
                                                "state.failed"
                                             };
      
  @@ -69,7 +69,7 @@
            ).iterator().next();
         }
         catch( Exception e ) {
  -         lLog.error( "Could not create JSR-77 JNDI: " + pName, e );
  +//AS         lLog.error( "Could not create JSR-77 JNDI: " + pName, e );
            return null;
         }
         try {
  @@ -90,7 +90,7 @@
            ).getObjectName();
         }
         catch( Exception e ) {
  -         lLog.error( "Could not create JSR-77 JNDI: " + pName, e );
  +//AS         lLog.error( "Could not create JSR-77 JNDI: " + pName, e );
            return null;
         }
      }
  @@ -110,7 +110,7 @@
            pServer.unregisterMBean( lJNDI );
         }
         catch( Exception e ) {
  -         lLog.error( "Could not destroy JSR-77 JNDI: " + pName, e );
  +//AS         lLog.error( "Could not destroy JSR-77 JNDI: " + pName, e );
         }
      }
      
  @@ -155,7 +155,7 @@
         return mState;
      }
   
  -   public void start() {
  +   public void startService() {
         try {
            getServer().invoke(
               mService,
  @@ -175,7 +175,7 @@
         start();
      }
   
  -   public void stop() {
  +   public void stopService() {
         try {
            getServer().invoke(
               mService,
  @@ -203,8 +203,29 @@
            //AS ToDo: not found.
            jme.printStackTrace();
         }
  +      sendNotification(
  +         new J2EEManagementEvent(
  +            sTypes[ 0 ],
  +            getName(),
  +            1,
  +            System.currentTimeMillis(),
  +            "JNDI Resource created"
  +         ).getNotification()
  +      );
  +   }
  +   
  +   public void preDeregister() {
  +      sendNotification(
  +         new J2EEManagementEvent(
  +            sTypes[ 1 ],
  +            getName(),
  +            1,
  +            System.currentTimeMillis(),
  +            "JNDI Resource deleted"
  +         ).getNotification()
  +      );
      }
  -      
  +   
      // java.lang.Object overrides ------------------------------------
      
      public String toString() {
  @@ -235,7 +256,15 @@
                     mStartTime = -1;
                  }
                  // Now send the event to the JSR-77 listeners
  -               //AS ToDo
  +               sendNotification(
  +                  new J2EEManagementEvent(
  +                     sTypes[ getState() + 2 ],
  +                     getName(),
  +                     1,
  +                     System.currentTimeMillis(),
  +                     "State changed"
  +                  ).getNotification()
  +               );
               }
            }
         }
  
  
  

_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development

Reply via email to