User: schaefera
Date: 02/03/23 18:25:05
Modified: src/main/org/jboss/management/j2ee J2EEDeployedObject.java
J2EEManagedObject.java StateManageable.java
StateManagement.java
Log:
Fixed a problem with the RMINotificationListener and wrong numbering of
the State in StateManageable found by Dirk Laessig (thanx).
Revision Changes Path
1.2 +4 -2
jboss-management/src/main/org/jboss/management/j2ee/J2EEDeployedObject.java
Index: J2EEDeployedObject.java
===================================================================
RCS file:
/cvsroot/jboss/jboss-management/src/main/org/jboss/management/j2ee/J2EEDeployedObject.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- J2EEDeployedObject.java 11 Mar 2002 04:31:32 -0000 1.1
+++ J2EEDeployedObject.java 24 Mar 2002 02:25:05 -0000 1.2
@@ -21,7 +21,7 @@
* {@link javax.management.j2ee.J2EEDeployedObject J2EEDeployedObject}.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Andreas Schaefer</a>.
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*
* <p><b>Revisions:</b>
*
@@ -43,12 +43,14 @@
public static final int WEB = 1;
public static final int EJB = 2;
public static final int RAR = 3;
+ public static final int SAR = 4;
private static final String[] sDescriptors = new String[] {
"META-INF/application.xml",
"WEB-INF/web.xml",
"META-INF/ejb-jar.xml",
- "META-INF/ra.xml"
+ "META-INF/ra.xml",
+ "META-INF/jboss-service.xml"
};
// Attributes ----------------------------------------------------
1.6 +7 -1
jboss-management/src/main/org/jboss/management/j2ee/J2EEManagedObject.java
Index: J2EEManagedObject.java
===================================================================
RCS file:
/cvsroot/jboss/jboss-management/src/main/org/jboss/management/j2ee/J2EEManagedObject.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- J2EEManagedObject.java 19 Mar 2002 02:50:18 -0000 1.5
+++ J2EEManagedObject.java 24 Mar 2002 02:25:05 -0000 1.6
@@ -25,7 +25,7 @@
* {@link javax.management.j2ee.J2EEManagedObject J2EEManagedObject}.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Andreas Schaefer</a>.
- * @version $Revision: 1.5 $
+ * @version $Revision: 1.6 $
*
* <p><b>Revisions:</b>
*
@@ -225,6 +225,7 @@
* override {@link #postCreation postCreation()} method.
**/
public final void postRegister( java.lang.Boolean pRegistrationDone ) {
+ try {
log.debug("postRegister(), parent: " + mParent );
if( pRegistrationDone.booleanValue() ) {
// Let the subclass handle post creation steps
@@ -246,6 +247,11 @@
super.postRegister( new Boolean( false ) );
}
}
+ }
+ }
+ catch( RuntimeException re ) {
+ log.error( "Caught Runtime Exception is postRegister()", re );
+ throw re;
}
}
1.2 +4 -4
jboss-management/src/main/org/jboss/management/j2ee/StateManageable.java
Index: StateManageable.java
===================================================================
RCS file:
/cvsroot/jboss/jboss-management/src/main/org/jboss/management/j2ee/StateManageable.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- StateManageable.java 11 Mar 2002 04:31:32 -0000 1.1
+++ StateManageable.java 24 Mar 2002 02:25:05 -0000 1.2
@@ -27,7 +27,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Marc Fleury</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Andreas Schaefer</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*
* <p><b>Revisions:</b>
*
@@ -42,10 +42,10 @@
{
// Constants -----------------------------------------------------
- public static final int STOPPED = 0;
- public static final int STOPPING = 1;
- public static final int STARTING = 2;
- public static final int RUNNING = 3;
+ public static final int STARTING = 0;
+ public static final int RUNNING = 1;
+ public static final int STOPPING = 2;
+ public static final int STOPPED = 3;
public static final int FAILED = 4;
// Public --------------------------------------------------------
1.3 +45 -4
jboss-management/src/main/org/jboss/management/j2ee/StateManagement.java
Index: StateManagement.java
===================================================================
RCS file:
/cvsroot/jboss/jboss-management/src/main/org/jboss/management/j2ee/StateManagement.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- StateManagement.java 13 Mar 2002 04:42:05 -0000 1.2
+++ StateManagement.java 24 Mar 2002 02:25:05 -0000 1.3
@@ -18,7 +18,7 @@
* {@link javax.management.j2ee.EJBModule EJBModule}.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Andreas Schaefer</a>.
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*
* <p><b>Revisions:</b>
*
@@ -37,10 +37,10 @@
public 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"
};
@@ -52,6 +52,47 @@
// Static --------------------------------------------------------
+ /**
+ * Converts a start from JBoss Service MBeans to the JSR-77 state
+ * and vice versa
+ *
+ * @param pFromService True if the conversion is from Service to JSR-77
+ * otherwise false
+ * @param pState State to be converted. Must be between 0 and 4.
+ *
+ * @return Converted state or -1 if unknown.
+ **/
+ public static int convertState( boolean pFromService, int pState ) {
+ if( pFromService ) {
+ switch( pState ) {
+ case ServiceMBean.STARTING:
+ return StateManageable.STARTING;
+ case ServiceMBean.STARTED:
+ return StateManageable.RUNNING;
+ case ServiceMBean.STOPPING:
+ return StateManageable.STOPPING;
+ case ServiceMBean.STOPPED:
+ return StateManageable.STOPPED;
+ case ServiceMBean.FAILED:
+ return StateManageable.FAILED;
+ }
+ } else {
+ switch( pState ) {
+ case StateManageable.STARTING:
+ return ServiceMBean.STARTING;
+ case StateManageable.RUNNING:
+ return ServiceMBean.STARTED;
+ case StateManageable.STOPPING:
+ return ServiceMBean.STOPPING;
+ case StateManageable.STOPPED:
+ return ServiceMBean.STOPPED;
+ case StateManageable.FAILED:
+ return ServiceMBean.FAILED;
+ }
+ }
+ return -1;
+ }
+
// Constructors --------------------------------------------------
/**
@@ -115,7 +156,7 @@
lStartTime = lChange.getTimeStamp();
}
setStartTime( lStartTime );
- setState( lState );
+ setState( convertState( true, lState ) );
}
}
}
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
