Merge pull request #22953 from smillidge/22927

Fixes #22927 removed Jakarta Management API from GlassFish 6.0.0

appserver/common/amx-javaee/pom.xml

@@ -47,10 +47,6 @@
     </properties>
 
     <dependencies>
-        <dependency>
-            <groupId>jakarta.management.j2ee</groupId>
-            <artifactId>jakarta.management.j2ee-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.glassfish.main.common</groupId>
             <artifactId>amx-core</artifactId>

appserver/common/amx-javaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/J2EEManagedObjectImplBase.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -16,15 +16,12 @@
 
 package org.glassfish.admin.amx.impl.j2ee;
 
-import java.lang.String;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
-import javax.management.j2ee.Management;
-import javax.management.j2ee.ManagementHome;
 import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.rmi.PortableRemoteObject;
@@ -256,20 +253,6 @@ protected String[] getChildrenAsStrings( final String... args )
         return getChildrenAsStrings(types);
     }
 
-    public final Management getMEJB() {
-        Management mejb = null;
-        try {
-            final Context ic = new InitialContext();
-            final String ejbName = System.getProperty("mejb.name", "ejb/mgmt/MEJB");
-            final Object objref = ic.lookup(ejbName);
-            final ManagementHome home = (ManagementHome) PortableRemoteObject.narrow(objref, ManagementHome.class);
-            mejb = home.create();
-        } catch (Exception ex) {
-            throw new RuntimeException("Can't find MEJB", ex);
-        }
-        return mejb;
-    }
-
 }
 
 

appserver/common/amx-javaee/src/main/java/org/glassfish/admin/amx/j2ee/EntityBean.java

@@ -17,8 +17,6 @@
 package org.glassfish.admin.amx.j2ee;
 
 
-import javax.management.j2ee.statistics.EntityBeanStats;
-import org.glassfish.admin.amx.annotation.ManagedAttribute;
 import org.glassfish.admin.amx.core.AMXMBeanMetadata;
 
 /**

appserver/common/amx-javaee/src/main/java/org/glassfish/admin/amx/j2ee/StatisticsProvider.java

@@ -15,20 +15,10 @@
  */
 
 package org.glassfish.admin.amx.j2ee;
-
-import javax.management.j2ee.statistics.Stats;
-import org.glassfish.admin.amx.annotation.ManagedAttribute;
-
 /**
 	Defines access to Stats.
  */
 public interface StatisticsProvider
 {
-	/**
-		Return a Stats object
-		
-		@return the Stats object or null if not available
-	 */
- 	@ManagedAttribute
-	public Stats		getStats();
+
 }