User: schaefera Date: 01/08/09 08:44:21 Modified: src/main/org/jboss/ejb/plugins AbstractInstancePool.java BMPPersistenceManager.java CMPPersistenceManager.java SingletonStatelessSessionInstancePool.java Log: Added updated JSR-77 classes and adjust the RMI-Connector to work with Log4J. Revision Changes Path 1.15 +5 -5 jboss/src/main/org/jboss/ejb/plugins/AbstractInstancePool.java Index: AbstractInstancePool.java =================================================================== RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/AbstractInstancePool.java,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- AbstractInstancePool.java 2001/08/03 17:15:44 1.14 +++ AbstractInstancePool.java 2001/08/09 15:44:21 1.15 @@ -24,7 +24,7 @@ import org.jboss.metadata.XmlLoadable; import org.jboss.logging.Logger; -import org.jboss.management.JBossCountStatistic; +import org.jboss.management.j2ee.CountStatistic; /** @@ -38,7 +38,7 @@ * @author <a href="mailto:[EMAIL PROTECTED]">Marc Fleury</a> * @author <a href="mailto:[EMAIL PROTECTED]">Andreas Schaefer</a> * -* @version $Revision: 1.14 $ +* @version $Revision: 1.15 $ * * <p><b>Revisions:</b> * <p><b>20010704 marcf:</b> @@ -62,11 +62,11 @@ int maxSize = 30; /** Counter of all the Bean instantiated within the Pool **/ - protected JBossCountStatistic mInstantiate = new JBossCountStatistic( "Instantiation", "", "Beans instantiated in Pool" ); + protected CountStatistic mInstantiate = new CountStatistic( "Instantiation", "", "Beans instantiated in Pool" ); /** Counter of all the Bean destroyed within the Pool **/ - protected JBossCountStatistic mDestroy = new JBossCountStatistic( "Destroy", "", "Beans destroyed in Pool" ); + protected CountStatistic mDestroy = new CountStatistic( "Destroy", "", "Beans destroyed in Pool" ); /** Counter of all the ready Beans within the Pool (which are not used now) **/ - protected JBossCountStatistic mReadyBean = new JBossCountStatistic( "ReadyBean", "", "Numbers of ready Bean Pool" ); + protected CountStatistic mReadyBean = new CountStatistic( "ReadyBean", "", "Numbers of ready Bean Pool" ); // Static -------------------------------------------------------- 1.29 +10 -10 jboss/src/main/org/jboss/ejb/plugins/BMPPersistenceManager.java Index: BMPPersistenceManager.java =================================================================== RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/BMPPersistenceManager.java,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- BMPPersistenceManager.java 2001/08/03 17:15:44 1.28 +++ BMPPersistenceManager.java 2001/08/09 15:44:21 1.29 @@ -30,8 +30,8 @@ import org.jboss.ejb.EntityEnterpriseContext; import org.jboss.logging.Logger; -import org.jboss.management.JBossCountStatistic; -import org.jboss.management.JBossTimeStatistic; +import org.jboss.management.j2ee.CountStatistic; +import org.jboss.management.j2ee.TimeStatistic; /** * <description> @@ -40,7 +40,7 @@ * @author <a href="mailto:[EMAIL PROTECTED]">Rickard Öberg</a> * @author <a href="mailto:[EMAIL PROTECTED]">Marc Fleury</a> * @author <a href="mailto:[EMAIL PROTECTED]">Andreas Schaefer</a> -* @version $Revision: 1.28 $ +* @version $Revision: 1.29 $ * * <p><b>Revisions:</b> * <p><b>20010709 andreas schaefer:</b> @@ -70,13 +70,13 @@ HashMap postCreateMethods = new HashMap(); HashMap finderMethods = new HashMap(); - private JBossCountStatistic mCreate = new JBossCountStatistic( "Create", "", "EJBs created" ); - private JBossCountStatistic mRemove = new JBossCountStatistic( "Remove", "", "EJBs removed" ); - private JBossCountStatistic mActiveBean = new JBossCountStatistic( "ActiveBean", "", "Numbers of active EJBs" ); - private JBossTimeStatistic mActivate = new JBossTimeStatistic( "Activation", "ms", "Activation Time" ); - private JBossTimeStatistic mPassivate = new JBossTimeStatistic( "Passivation", "ms", "Passivation Time" ); - private JBossTimeStatistic mLoad = new JBossTimeStatistic( "Load", "ms", "Load Time" ); - private JBossTimeStatistic mStore = new JBossTimeStatistic( "Store", "ms", "Load Time" ); + private CountStatistic mCreate = new CountStatistic( "Create", "", "EJBs created" ); + private CountStatistic mRemove = new CountStatistic( "Remove", "", "EJBs removed" ); + private CountStatistic mActiveBean = new CountStatistic( "ActiveBean", "", "Numbers of active EJBs" ); + private TimeStatistic mActivate = new TimeStatistic( "Activation", "ms", "Activation Time" ); + private TimeStatistic mPassivate = new TimeStatistic( "Passivation", "ms", "Passivation Time" ); + private TimeStatistic mLoad = new TimeStatistic( "Load", "ms", "Load Time" ); + private TimeStatistic mStore = new TimeStatistic( "Store", "ms", "Load Time" ); // Static -------------------------------------------------------- 1.31 +10 -10 jboss/src/main/org/jboss/ejb/plugins/CMPPersistenceManager.java Index: CMPPersistenceManager.java =================================================================== RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/CMPPersistenceManager.java,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- CMPPersistenceManager.java 2001/08/08 16:23:46 1.30 +++ CMPPersistenceManager.java 2001/08/09 15:44:21 1.31 @@ -38,8 +38,8 @@ import org.jboss.util.FinderResults; import org.jboss.util.Sync; -import org.jboss.management.JBossCountStatistic; -import org.jboss.management.JBossTimeStatistic; +import org.jboss.management.j2ee.CountStatistic; +import org.jboss.management.j2ee.TimeStatistic; /** * The CMP Persistence Manager implements the semantics of the CMP @@ -53,7 +53,7 @@ * @author <a href="mailto:[EMAIL PROTECTED]">Dan Christopherson</a> * @author <a href="mailto:[EMAIL PROTECTED]">Bill Burke</a> * @author <a href="mailto:[EMAIL PROTECTED]">Andreas Schaefer</a> -* @version $Revision: 1.30 $ +* @version $Revision: 1.31 $ * * Revisions: * 20010621 Bill Burke: removed loadEntities call because CMP read-ahead is now @@ -80,13 +80,13 @@ HashMap createMethods = new HashMap(); HashMap postCreateMethods = new HashMap(); - private JBossCountStatistic mCreate = new JBossCountStatistic( "Create", "", "EJBs created" ); - private JBossCountStatistic mRemove = new JBossCountStatistic( "Remove", "", "EJBs removed" ); - private JBossCountStatistic mActiveBean = new JBossCountStatistic( "ActiveBean", "", "Numbers of active EJBs" ); - private JBossTimeStatistic mActivation = new JBossTimeStatistic( "Activation", "ms", "Activation Time" ); - private JBossTimeStatistic mPassivation = new JBossTimeStatistic( "Passivation", "ms", "Passivation Time" ); - private JBossTimeStatistic mLoad = new JBossTimeStatistic( "Load", "ms", "Load Time" ); - private JBossTimeStatistic mStore = new JBossTimeStatistic( "Store", "ms", "Load Time" ); + private CountStatistic mCreate = new CountStatistic( "Create", "", "EJBs created" ); + private CountStatistic mRemove = new CountStatistic( "Remove", "", "EJBs removed" ); + private CountStatistic mActiveBean = new CountStatistic( "ActiveBean", "", "Numbers of active EJBs" ); + private TimeStatistic mActivation = new TimeStatistic( "Activation", "ms", "Activation Time" ); + private TimeStatistic mPassivation = new TimeStatistic( "Passivation", "ms", "Passivation Time" ); + private TimeStatistic mLoad = new TimeStatistic( "Load", "ms", "Load Time" ); + private TimeStatistic mStore = new TimeStatistic( "Store", "ms", "Load Time" ); // Static -------------------------------------------------------- 1.11 +5 -5 jboss/src/main/org/jboss/ejb/plugins/SingletonStatelessSessionInstancePool.java Index: SingletonStatelessSessionInstancePool.java =================================================================== RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/SingletonStatelessSessionInstancePool.java,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- SingletonStatelessSessionInstancePool.java 2001/08/03 17:15:44 1.10 +++ SingletonStatelessSessionInstancePool.java 2001/08/09 15:44:21 1.11 @@ -22,7 +22,7 @@ import org.jboss.metadata.MetaData; import org.w3c.dom.Element; import org.jboss.logging.Logger; -import org.jboss.management.JBossCountStatistic; +import org.jboss.management.j2ee.CountStatistic; /** @@ -31,7 +31,7 @@ * * @see <related> * @author <a href="mailto:[EMAIL PROTECTED]">Rickard Öberg</a> - * @version $Revision: 1.10 $ + * @version $Revision: 1.11 $ * * <p><b>Revisions:</b> * <p><b>20010718 andreas schaefer:</b> @@ -52,11 +52,11 @@ boolean isSynchronized = true; /** Counter of all the Bean instantiated within the Pool **/ - protected JBossCountStatistic mInstantiate = new JBossCountStatistic( "Instantiation", "", "Beans instantiated in Pool" ); + protected CountStatistic mInstantiate = new CountStatistic( "Instantiation", "", "Beans instantiated in Pool" ); /** Counter of all the Bean destroyed within the Pool **/ - protected JBossCountStatistic mDestroy = new JBossCountStatistic( "Destroy", "", "Beans destroyed in Pool" ); + protected CountStatistic mDestroy = new CountStatistic( "Destroy", "", "Beans destroyed in Pool" ); /** Counter of all the ready Beans within the Pool (which are not used now) **/ - protected JBossCountStatistic mReadyBean = new JBossCountStatistic( "ReadyBean", "", "Numbers of ready Bean Pool" ); + protected CountStatistic mReadyBean = new CountStatistic( "ReadyBean", "", "Numbers of ready Bean Pool" ); // Static -------------------------------------------------------- _______________________________________________ Jboss-development mailing list [EMAIL PROTECTED] http://lists.sourceforge.net/lists/listinfo/jboss-development