User: schaefera
Date: 02/02/12 22:00:37
Modified: src/main/org/jboss/management/j2ee EJB.java EjbModule.java
EjbModuleMBean.java EntityBean.java
J2EEApplication.java
Log:
Adjustments to bring JSR-77 for J2EE Applications back.
Revision Changes Path
1.7 +5 -5 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- EJB.java 13 Feb 2002 04:42:24 -0000 1.6
+++ EJB.java 13 Feb 2002 06:00:37 -0000 1.7
@@ -19,7 +19,7 @@
* {@link javax.management.j2ee.EJB EJB}.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Andreas Schaefer</a>.
- * @version $Revision: 1.6 $
+ * @version $Revision: 1.7 $
*
* <p><b>Revisions:</b>
*
@@ -45,7 +45,7 @@
"MessageDrivenBean"
};
- public static ObjectName create( MBeanServer pServer, String pEJBModule,
BeanMetaData pBeanMeta ) {
+ public static ObjectName create( MBeanServer pServer, String pEjbModule,
BeanMetaData pBeanMeta ) {
Logger lLog = Logger.getLogger( EJB.class );
try {
int lType =
@@ -58,7 +58,7 @@
null,
new Object[] {
pBeanMeta.getJndiName(),
- new ObjectName( pEJBModule )
+ new ObjectName( pEjbModule )
},
new String[] {
String.class.getName(),
@@ -90,12 +90,12 @@
*
* @throws InvalidParameterException If list of nodes or ports was null or empty
**/
- public EJB( String pType, String pName, ObjectName pEJBModule )
+ public EJB( String pType, String pName, ObjectName pEjbModule )
throws
MalformedObjectNameException,
InvalidParentException
{
- super( pType, pName, pEJBModule );
+ super( pType, pName, pEjbModule );
}
// java.lang.Object overrides --------------------------------------
1.11 +15 -15 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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- EjbModule.java 13 Feb 2002 05:31:09 -0000 1.10
+++ EjbModule.java 13 Feb 2002 06:00:37 -0000 1.11
@@ -29,7 +29,7 @@
* {@link javax.management.j2ee.EJBModule EJBModule}.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Andreas Schaefer</a>.
- * @version $Revision: 1.10 $
+ * @version $Revision: 1.11 $
*
* <p><b>Revisions:</b>
*
@@ -39,9 +39,9 @@
* the create() and destroy() helper method
* </ul>
**/
-public class EJBModule
+public class EjbModule
extends J2EEModule
- implements EJBModuleMBean
+ implements EjbModuleMBean
{
// Constants -----------------------------------------------------
@@ -53,7 +53,7 @@
// Static --------------------------------------------------------
public static ObjectName create( MBeanServer pServer, String pApplicationName,
String pName, URL pURL ) {
- Logger lLog = Logger.getLogger( EJBModule.class );
+ Logger lLog = Logger.getLogger( EjbModule.class );
String lDD = null;
ObjectName lApplication = null;
try {
@@ -63,7 +63,7 @@
).iterator().next();
String lServerName = lServer.getKeyPropertyList().get( "type" ) + "=" +
lServer.getKeyPropertyList().get( "name" );
- lLog.debug( "EJBModule.create(), server name: " + lServerName );
+ lLog.debug( "EjbModule.create(), server name: " + lServerName );
lApplication = (ObjectName) pServer.queryNames(
new ObjectName( J2EEManagedObject.getDomainName() +
":type=J2EEApplication" +
",name=" + pApplicationName + "," + lServerName + ",*"
@@ -74,7 +74,7 @@
lDD = J2EEDeployedObject.getDeploymentDescriptor( pURL,
J2EEDeployedObject.EJB );
}
catch( Exception e ) {
-//AS lLog.error( "Could not create JSR-77 EJBModule: " + pApplicationName,
e );
+//AS lLog.error( "Could not create JSR-77 EjbModule: " + pApplicationName,
e );
return null;
}
try {
@@ -85,7 +85,7 @@
", dd: " + lDD
);
return pServer.createMBean(
- "org.jboss.management.j2ee.EJBModule",
+ "org.jboss.management.j2ee.EjbModule",
null,
new Object[] {
pName,
@@ -100,19 +100,19 @@
).getObjectName();
}
catch( Exception e ) {
-//AS lLog.error( "Could not create JSR-77 EJBModule: " + pApplicationName,
e );
+//AS lLog.error( "Could not create JSR-77 EjbModule: " + pApplicationName,
e );
return null;
}
}
public static void destroy( MBeanServer pServer, String pModuleName ) {
- Logger lLog = Logger.getLogger( EJBModule.class );
+ Logger lLog = Logger.getLogger( EjbModule.class );
try {
- // Now remove the EJBModule
+ // Now remove the EjbModule
pServer.unregisterMBean( new ObjectName( pModuleName ) );
}
catch( Exception e ) {
-//AS lLog.error( "Could not destory JSR-77 EJBModule: " + pModuleName, e );
+//AS lLog.error( "Could not destory JSR-77 EjbModule: " + pModuleName, e );
}
}
@@ -126,17 +126,17 @@
*
* @throws InvalidParameterException If the given Name is null
**/
- public EJBModule( String pName, ObjectName pApplication, String
pDeploymentDescriptor )
+ public EjbModule( String pName, ObjectName pApplication, String
pDeploymentDescriptor )
throws
MalformedObjectNameException,
InvalidParentException
{
- super( "EJBModule", pName, pApplication, pDeploymentDescriptor );
+ super( "EjbModule", pName, pApplication, pDeploymentDescriptor );
}
// Public --------------------------------------------------------
- // EJBModule implementation --------------------------------------
+ // EjbModule implementation --------------------------------------
public ObjectName[] getEjbs() {
return (ObjectName[]) mEJBs.toArray( new ObjectName[ 0 ] );
@@ -180,7 +180,7 @@
// Object overrides ---------------------------------------------------
public String toString() {
- return "EJBModule[ " + super.toString() +
+ return "EjbModule[ " + super.toString() +
"EJBs: " + mEJBs +
" ]";
}
1.5 +2 -2 jboss/src/main/org/jboss/management/j2ee/EjbModuleMBean.java
Index: EjbModuleMBean.java
===================================================================
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/management/j2ee/EjbModuleMBean.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- EjbModuleMBean.java 13 Feb 2002 05:32:48 -0000 1.4
+++ EjbModuleMBean.java 13 Feb 2002 06:00:37 -0000 1.5
@@ -13,7 +13,7 @@
* EJBModule}.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Andreas Schaefer</a>.
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
*
* <p><b>Revisions:</b>
*
@@ -22,7 +22,7 @@
* <li> Adjustments to the JBoss Guidelines
* </ul>
**/
-public interface EJBModuleMBean
+public interface EjbModuleMBean
extends EJBModule, J2EEManagedObjectMBean
{
}
1.4 +2 -2 jboss/src/main/org/jboss/management/j2ee/EntityBean.java
Index: EntityBean.java
===================================================================
RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/management/j2ee/EntityBean.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- EntityBean.java 27 Nov 2001 06:15:26 -0000 1.3
+++ EntityBean.java 13 Feb 2002 06:00:37 -0000 1.4
@@ -14,7 +14,7 @@
* {@link javax.management.j2ee.EntityBean EntityBean}.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Andreas Schaefer</a>.
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*
* <p><b>Revisions:</b>
*
@@ -40,12 +40,12 @@
*
* @throws InvalidParameterException If list of nodes or ports was null or empty
**/
- public EntityBean( String pName, ObjectName pEJBModule )
+ public EntityBean( String pName, ObjectName pEjbModule )
throws
MalformedObjectNameException,
InvalidParentException
{
- super( "EntityBean", pName, pEJBModule );
+ super( "EntityBean", pName, pEjbModule );
}
// -------------------------------------------------------------------------
1.8 +10 -5 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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- J2EEApplication.java 4 Dec 2001 03:24:36 -0000 1.7
+++ J2EEApplication.java 13 Feb 2002 06:00:37 -0000 1.8
@@ -24,7 +24,7 @@
* {@link javax.management.j2ee.J2EEApplication J2EEApplication}.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Andreas Schaefer</a>.
- * @version $Revision: 1.7 $
+ * @version $Revision: 1.8 $
*
* <p><b>Revisions:</b>
*
@@ -46,7 +46,7 @@
// Static --------------------------------------------------------
- public static ObjectName create( MBeanServer pServer, String pName, String
pDescriptor ) {
+ public static ObjectName create( MBeanServer pServer, String pName, URL pURL ) {
Logger lLog = Logger.getLogger( J2EEApplication.class );
String lDD = null;
ObjectName lServer = null;
@@ -55,12 +55,17 @@
new ObjectName( J2EEManagedObject.getDomainName() +
":type=J2EEServer,*" ),
null
).iterator().next();
+ // First get the deployement descriptor
+ lDD = J2EEDeployedObject.getDeploymentDescriptor( pURL,
J2EEDeployedObject.APPLICATION );
}
catch( Exception e ) {
//AS lLog.error( "Could not create JSR-77 J2EEApplication: " + pName, e );
return null;
}
try {
+ lLog.debug( "Create J2EE Application, name: " + pName +
+ ", server: " + lServer
+ );
// Now create the J2EEApplication
return pServer.createMBean(
"org.jboss.management.j2ee.J2EEApplication",
@@ -68,7 +73,7 @@
new Object[] {
pName,
lServer,
- pDescriptor
+ lDD
},
new String[] {
String.class.getName(),
@@ -140,7 +145,7 @@
public void addChild( ObjectName pChild ) {
String lType = J2EEManagedObject.getType( pChild );
- if( "EJBModule".equals( lType ) ) {
+ if( "EjbModule".equals( lType ) ) {
mModules.add( pChild );
} else if( "WebModule".equals( lType ) ) {
mModules.add( pChild );
@@ -151,7 +156,7 @@
public void removeChild( ObjectName pChild ) {
String lType = J2EEManagedObject.getType( pChild );
- if( "EJBModule".equals( lType ) ) {
+ if( "EjbModule".equals( lType ) ) {
mModules.remove( pChild );
} else if( "WebModule".equals( lType ) ) {
mModules.remove( pChild );
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
