User: user57  
  Date: 01/07/31 22:30:21

  Modified:    src/main/org/jboss/management Tag: jboss_buildmagic
                        DataCollector.java EJBDataCollector.java
                        JDBCDataCollector.java JNDIDataCollector.java
                        MailDataCollector.java NodeDataCollector.java
                        ServerDataCollector.java
                        ServerDataCollectorMBean.java
  Added:       src/main/org/jboss/management Tag: jboss_buildmagic
                        JBossConnectorModule.java JBossCountStatistic.java
                        JBossEjbModule.java JBossEntityBean.java
                        JBossIpAddress.java JBossJ2EEApplication.java
                        JBossJ2EEManagedObject.java
                        JBossJ2EEManagement.java JBossJ2EEModule.java
                        JBossJ2EEResource.java JBossJ2EEServer.java
                        JBossJDBC.java JBossJDBCConnectionPool.java
                        JBossJDBCDriver.java JBossJNDI.java JBossJVM.java
                        JBossJavaMail.java JBossManagement.java
                        JBossManagementMBean.java
                        JBossMessageDrivenBean.java JBossNode.java
                        JBossPort.java JBossStatefulSessionBean.java
                        JBossStatelessSessionBean.java
                        JBossTimeStatistic.java JBossWebModule.java
  Log:
   o updated from HEAD
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.3.2.1   +4 -4      jboss/src/main/org/jboss/management/DataCollector.java
  
  Index: DataCollector.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/management/DataCollector.java,v
  retrieving revision 1.3
  retrieving revision 1.3.2.1
  diff -u -r1.3 -r1.3.2.1
  --- DataCollector.java        2001/07/20 20:07:16     1.3
  +++ DataCollector.java        2001/08/01 05:30:21     1.3.2.1
  @@ -10,9 +10,9 @@
   
   import javax.management.MBeanServer;
   
  -import management.J2EEManagedObject;
  -import management.StatisticsProvider;
  -import management.Stats;
  +import javax.management.j2ee.J2EEManagedObject;
  +import javax.management.j2ee.StatisticsProvider;
  +import javax.management.j2ee.Stats;
   
   /**
    * Collector Interface which must be implemented by
  
  
  
  1.4.2.1   +14 -13    jboss/src/main/org/jboss/management/EJBDataCollector.java
  
  Index: EJBDataCollector.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/management/EJBDataCollector.java,v
  retrieving revision 1.4
  retrieving revision 1.4.2.1
  diff -u -r1.4 -r1.4.2.1
  --- EJBDataCollector.java     2001/07/20 23:14:57     1.4
  +++ EJBDataCollector.java     2001/08/01 05:30:21     1.4.2.1
  @@ -27,16 +27,16 @@
   import org.jboss.management.JBossStatefulSessionBean;
   import org.jboss.management.JBossStatelessSessionBean;
   
  -import management.CountStatistic;
  -import management.EjbModule;
  -import management.EJB;
  -import management.EntityBean;
  -import management.EntityBeanStats;
  -import management.J2EEApplication;
  -import management.J2EEModule;
  -import management.Statistic;
  -import management.Stats;
  -import management.TimeStatistic;
  +import javax.management.j2ee.CountStatistic;
  +import javax.management.j2ee.EjbModule;
  +import javax.management.j2ee.EJB;
  +import javax.management.j2ee.EntityBean;
  +import javax.management.j2ee.EntityBeanStats;
  +import javax.management.j2ee.J2EEApplication;
  +import javax.management.j2ee.J2EEModule;
  +import javax.management.j2ee.Statistic;
  +import javax.management.j2ee.Stats;
  +import javax.management.j2ee.TimeStatistic;
   
   /**
   * EJB Data Collector collects the management data about EJBs.
  @@ -118,6 +118,7 @@
               // Only to test the Statistics Gathering
               if( lContainer instanceof EntityContainer ) {
                  Map lStatistics = ( (EntityContainer) lContainer 
).retrieveStatistic();
  +               System.out.println( "Statistics: " + lStatistics );
               }
            }
            i = lApplications.keySet().iterator();
  @@ -143,7 +144,7 @@
         return lReturn;
      }
   
  -  public Stats getStatistics( management.StatisticsProvider pProvider, MBeanServer 
pServer )
  +  public Stats getStatistics( javax.management.j2ee.StatisticsProvider pProvider, 
MBeanServer pServer )
     {
       try {
         if( pProvider instanceof EJB )
  @@ -184,7 +185,7 @@
       return null;
     }
     
  -  public void resetStatistics( management.StatisticsProvider pProvider, MBeanServer 
pServer )
  +  public void resetStatistics( javax.management.j2ee.StatisticsProvider pProvider, 
MBeanServer pServer )
     {
     }
   }
  
  
  
  1.3.2.1   +6 -6      jboss/src/main/org/jboss/management/JDBCDataCollector.java
  
  Index: JDBCDataCollector.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/management/JDBCDataCollector.java,v
  retrieving revision 1.3
  retrieving revision 1.3.2.1
  diff -u -r1.3 -r1.3.2.1
  --- JDBCDataCollector.java    2001/07/20 20:07:16     1.3
  +++ JDBCDataCollector.java    2001/08/01 05:30:21     1.3.2.1
  @@ -18,11 +18,11 @@
   import org.jboss.management.JBossJDBCConnectionPool;
   import org.jboss.management.JBossJDBCDriver;
   
  -import management.JDBC;
  -import management.JDBCConnectionPool;
  -import management.JDBCDriver;
  -import management.StatisticsProvider;
  -import management.Stats;
  +import javax.management.j2ee.JDBC;
  +import javax.management.j2ee.JDBCConnectionPool;
  +import javax.management.j2ee.JDBCDriver;
  +import javax.management.j2ee.StatisticsProvider;
  +import javax.management.j2ee.Stats;
   
   /**
    * JDBC Data Collector
  
  
  
  1.3.2.1   +4 -4      jboss/src/main/org/jboss/management/JNDIDataCollector.java
  
  Index: JNDIDataCollector.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/management/JNDIDataCollector.java,v
  retrieving revision 1.3
  retrieving revision 1.3.2.1
  diff -u -r1.3 -r1.3.2.1
  --- JNDIDataCollector.java    2001/07/20 20:07:16     1.3
  +++ JNDIDataCollector.java    2001/08/01 05:30:21     1.3.2.1
  @@ -17,9 +17,9 @@
   
   import org.jboss.management.JBossJNDI;
   
  -import management.JNDI;
  -import management.StatisticsProvider;
  -import management.Stats;
  +import javax.management.j2ee.JNDI;
  +import javax.management.j2ee.StatisticsProvider;
  +import javax.management.j2ee.Stats;
   
   /**
    * JNDI Data Collector
  
  
  
  1.3.2.1   +4 -4      jboss/src/main/org/jboss/management/MailDataCollector.java
  
  Index: MailDataCollector.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/management/MailDataCollector.java,v
  retrieving revision 1.3
  retrieving revision 1.3.2.1
  diff -u -r1.3 -r1.3.2.1
  --- MailDataCollector.java    2001/07/20 20:07:16     1.3
  +++ MailDataCollector.java    2001/08/01 05:30:21     1.3.2.1
  @@ -17,9 +17,9 @@
   
   import org.jboss.management.JBossJavaMail;
   
  -import management.JavaMail;
  -import management.StatisticsProvider;
  -import management.Stats;
  +import javax.management.j2ee.JavaMail;
  +import javax.management.j2ee.StatisticsProvider;
  +import javax.management.j2ee.Stats;
   
   /**
    * Mail Data Collector
  
  
  
  1.3.2.1   +7 -7      jboss/src/main/org/jboss/management/NodeDataCollector.java
  
  Index: NodeDataCollector.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/management/NodeDataCollector.java,v
  retrieving revision 1.3
  retrieving revision 1.3.2.1
  diff -u -r1.3 -r1.3.2.1
  --- NodeDataCollector.java    2001/07/20 20:07:16     1.3
  +++ NodeDataCollector.java    2001/08/01 05:30:21     1.3.2.1
  @@ -20,12 +20,12 @@
   import org.jboss.management.JBossNode;
   import org.jboss.management.JBossPort;
   
  -import management.IpAddress;
  -import management.JVM;
  -import management.Node;
  -import management.Port;
  -import management.StatisticsProvider;
  -import management.Stats;
  +import javax.management.j2ee.IpAddress;
  +import javax.management.j2ee.JVM;
  +import javax.management.j2ee.Node;
  +import javax.management.j2ee.Port;
  +import javax.management.j2ee.StatisticsProvider;
  +import javax.management.j2ee.Stats;
   
   /**
    * Node Data Collector
  
  
  
  1.3.2.1   +5 -5      jboss/src/main/org/jboss/management/ServerDataCollector.java
  
  Index: ServerDataCollector.java
  ===================================================================
  RCS file: 
/cvsroot/jboss/jboss/src/main/org/jboss/management/ServerDataCollector.java,v
  retrieving revision 1.3
  retrieving revision 1.3.2.1
  diff -u -r1.3 -r1.3.2.1
  --- ServerDataCollector.java  2001/07/20 20:07:16     1.3
  +++ ServerDataCollector.java  2001/08/01 05:30:21     1.3.2.1
  @@ -32,10 +32,10 @@
   import org.jboss.naming.NonSerializableFactory;
   import org.jboss.util.ServiceMBeanSupport;
   
  -import management.EJB;
  -import management.J2EEApplication;
  -import management.StatisticsProvider;
  -import management.Stats;
  +import javax.management.j2ee.EJB;
  +import javax.management.j2ee.J2EEApplication;
  +import javax.management.j2ee.StatisticsProvider;
  +import javax.management.j2ee.Stats;
   
   /**
    * JBoss Management MBean Wrapper
  
  
  
  1.3.2.1   +6 -6      
jboss/src/main/org/jboss/management/ServerDataCollectorMBean.java
  
  Index: ServerDataCollectorMBean.java
  ===================================================================
  RCS file: 
/cvsroot/jboss/jboss/src/main/org/jboss/management/ServerDataCollectorMBean.java,v
  retrieving revision 1.3
  retrieving revision 1.3.2.1
  diff -u -r1.3 -r1.3.2.1
  --- ServerDataCollectorMBean.java     2001/07/20 20:07:16     1.3
  +++ ServerDataCollectorMBean.java     2001/08/01 05:30:21     1.3.2.1
  @@ -10,9 +10,9 @@
   
   import org.jboss.util.ServiceMBean;
   
  -import management.J2EEApplication;
  -import management.StatisticsProvider;
  -import management.Stats;
  +import javax.management.j2ee.J2EEApplication;
  +import javax.management.j2ee.StatisticsProvider;
  +import javax.management.j2ee.Stats;
   
   /**
    * This interface defines the manageable interface for the JBoss Server
  @@ -83,14 +83,14 @@
   
     /**
      * @return All the registered resources of this server. All are of type
  -   * {@link management.J2EEResource J2EEResource}.
  +   * {@link javax.management.j2ee.J2EEResource J2EEResource}.
      */
     public Collection getResources();
   
   
     /**
      * @return All the nodes of this server running. All are of type
  -   * {@link management.Node Node}.
  +   * {@link javax.management.j2ee.Node Node}.
      */
     public Collection getNodes();
   
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.1   +1 -1      jboss/src/main/org/jboss/management/JBossConnectorModule.java
  
  Index: JBossConnectorModule.java
  ===================================================================
  RCS file: 
/cvsroot/jboss/jboss/src/main/org/jboss/management/JBossConnectorModule.java,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  
  
  
  1.1.2.1   +1 -1      jboss/src/main/org/jboss/management/JBossCountStatistic.java
  
  Index: JBossCountStatistic.java
  ===================================================================
  RCS file: 
/cvsroot/jboss/jboss/src/main/org/jboss/management/JBossCountStatistic.java,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  
  
  
  1.1.2.1   +1 -1      jboss/src/main/org/jboss/management/JBossEjbModule.java
  
  Index: JBossEjbModule.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/management/JBossEjbModule.java,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  
  
  
  1.1.2.1   +0 -0      jboss/src/main/org/jboss/management/JBossEntityBean.java
  
  Index: JBossEntityBean.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/management/JBossEntityBean.java,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  
  
  
  1.1.2.1   +0 -0      jboss/src/main/org/jboss/management/JBossIpAddress.java
  
  Index: JBossIpAddress.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/management/JBossIpAddress.java,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  
  
  
  1.1.2.1   +1 -1      jboss/src/main/org/jboss/management/JBossJ2EEApplication.java
  
  Index: JBossJ2EEApplication.java
  ===================================================================
  RCS file: 
/cvsroot/jboss/jboss/src/main/org/jboss/management/JBossJ2EEApplication.java,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  
  
  
  1.1.2.1   +0 -0      jboss/src/main/org/jboss/management/JBossJ2EEManagedObject.java
  
  Index: JBossJ2EEManagedObject.java
  ===================================================================
  RCS file: 
/cvsroot/jboss/jboss/src/main/org/jboss/management/JBossJ2EEManagedObject.java,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  
  
  
  1.1.2.1   +1 -1      jboss/src/main/org/jboss/management/JBossJ2EEManagement.java
  
  Index: JBossJ2EEManagement.java
  ===================================================================
  RCS file: 
/cvsroot/jboss/jboss/src/main/org/jboss/management/JBossJ2EEManagement.java,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  
  
  
  1.1.2.1   +1 -1      jboss/src/main/org/jboss/management/JBossJ2EEModule.java
  
  Index: JBossJ2EEModule.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/management/JBossJ2EEModule.java,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  
  
  
  1.1.2.1   +0 -0      jboss/src/main/org/jboss/management/JBossJ2EEResource.java
  
  Index: JBossJ2EEResource.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/management/JBossJ2EEResource.java,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  
  
  
  1.1.2.1   +1 -1      jboss/src/main/org/jboss/management/JBossJ2EEServer.java
  
  Index: JBossJ2EEServer.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/management/JBossJ2EEServer.java,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  
  
  
  1.1.2.1   +0 -0      jboss/src/main/org/jboss/management/JBossJDBC.java
  
  Index: JBossJDBC.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/management/JBossJDBC.java,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  
  
  
  1.1.2.1   +0 -0      jboss/src/main/org/jboss/management/JBossJDBCConnectionPool.java
  
  Index: JBossJDBCConnectionPool.java
  ===================================================================
  RCS file: 
/cvsroot/jboss/jboss/src/main/org/jboss/management/JBossJDBCConnectionPool.java,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  
  
  
  1.1.2.1   +0 -0      jboss/src/main/org/jboss/management/JBossJDBCDriver.java
  
  Index: JBossJDBCDriver.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/management/JBossJDBCDriver.java,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  
  
  
  1.1.2.1   +0 -0      jboss/src/main/org/jboss/management/JBossJNDI.java
  
  Index: JBossJNDI.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/management/JBossJNDI.java,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  
  
  
  1.1.2.1   +0 -0      jboss/src/main/org/jboss/management/JBossJVM.java
  
  Index: JBossJVM.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/management/JBossJVM.java,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  
  
  
  1.1.2.1   +0 -0      jboss/src/main/org/jboss/management/JBossJavaMail.java
  
  Index: JBossJavaMail.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/management/JBossJavaMail.java,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  
  
  
  1.1.2.1   +0 -0      jboss/src/main/org/jboss/management/JBossManagement.java
  
  Index: JBossManagement.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/management/JBossManagement.java,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  
  
  
  1.1.2.1   +0 -0      jboss/src/main/org/jboss/management/JBossManagementMBean.java
  
  Index: JBossManagementMBean.java
  ===================================================================
  RCS file: 
/cvsroot/jboss/jboss/src/main/org/jboss/management/JBossManagementMBean.java,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  
  
  
  1.1.2.1   +0 -0      jboss/src/main/org/jboss/management/JBossMessageDrivenBean.java
  
  Index: JBossMessageDrivenBean.java
  ===================================================================
  RCS file: 
/cvsroot/jboss/jboss/src/main/org/jboss/management/JBossMessageDrivenBean.java,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  
  
  
  1.1.2.1   +0 -0      jboss/src/main/org/jboss/management/JBossNode.java
  
  Index: JBossNode.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/management/JBossNode.java,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  
  
  
  1.1.2.1   +0 -0      jboss/src/main/org/jboss/management/JBossPort.java
  
  Index: JBossPort.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/management/JBossPort.java,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  
  
  
  1.1.2.1   +0 -0      
jboss/src/main/org/jboss/management/JBossStatefulSessionBean.java
  
  Index: JBossStatefulSessionBean.java
  ===================================================================
  RCS file: 
/cvsroot/jboss/jboss/src/main/org/jboss/management/JBossStatefulSessionBean.java,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  
  
  
  1.1.2.1   +0 -0      
jboss/src/main/org/jboss/management/JBossStatelessSessionBean.java
  
  Index: JBossStatelessSessionBean.java
  ===================================================================
  RCS file: 
/cvsroot/jboss/jboss/src/main/org/jboss/management/JBossStatelessSessionBean.java,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  
  
  
  1.1.2.1   +1 -1      jboss/src/main/org/jboss/management/JBossTimeStatistic.java
  
  Index: JBossTimeStatistic.java
  ===================================================================
  RCS file: 
/cvsroot/jboss/jboss/src/main/org/jboss/management/JBossTimeStatistic.java,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  
  
  
  1.1.2.1   +1 -1      jboss/src/main/org/jboss/management/JBossWebModule.java
  
  Index: JBossWebModule.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/management/JBossWebModule.java,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  
  
  

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

Reply via email to