FISH-1280 Jakarta EE9: jakarta.management.j2ee-api removed

payara · Apr 8, 2021 · ca05371 · ca05371
1 parent f20153b
commit ca05371
Show file tree

Hide file tree

Showing 95 changed files with 1,149 additions and 155 deletions.
diff --git a/api/payara-bom/pom.xml b/api/payara-bom/pom.xml
@@ -449,11 +449,6 @@
                 <artifactId>jakarta.json-api</artifactId>
                 <version>${jsonp.version}</version>
             </dependency>
-            <dependency>
-                <groupId>jakarta.management.j2ee</groupId>
-                <artifactId>jakarta.management.j2ee-api</artifactId>
-                <version>${jakarta.management.j2ee-api.version}</version>
-            </dependency>
             <dependency>
                 <groupId>jakarta.xml.ws</groupId>
                 <artifactId>jakarta.xml.ws-api</artifactId>

diff --git a/appserver/admin/gf_template/src/main/resources/config/default-web.xml b/appserver/admin/gf_template/src/main/resources/config/default-web.xml
@@ -331,7 +331,6 @@
         jakarta.ejb-api.jar
         jakarta.enterprise.deploy-api.jar
         jakarta.mail.jar
-        jakarta.management.j2ee-api.jar
         jakarta.persistence.jar
         jakarta.resource-api.jar
         jakarta.security.auth.message-api.jar

diff --git a/appserver/admin/gf_template_web/src/main/resources/config/default-web.xml b/appserver/admin/gf_template_web/src/main/resources/config/default-web.xml
@@ -328,7 +328,6 @@
         jakarta.ejb-api.jar
         jakarta.enterprise.deploy-api.jar
         jakarta.mail.jar
-        jakarta.management.j2ee-api.jar
         jakarta.persistence.jar
         jakarta.resource-api.jar
         jakarta.security.auth.message-api.jar

diff --git a/appserver/admin/production_domain_template/src/main/resources/config/default-web.xml b/appserver/admin/production_domain_template/src/main/resources/config/default-web.xml
@@ -313,7 +313,6 @@
         jakarta.ejb-api.jar
         jakarta.enterprise.deploy-api.jar
         jakarta.mail.jar
-        jakarta.management.j2ee-api.jar
         jakarta.persistence.jar
         jakarta.resource-api.jar
         jakarta.security.auth.message-api.jar

diff --git a/appserver/admin/production_domain_template_web/src/main/resources/config/default-web.xml b/appserver/admin/production_domain_template_web/src/main/resources/config/default-web.xml
@@ -337,7 +337,6 @@
         jakarta.ejb-api.jar
         jakarta.enterprise.deploy-api.jar
         jakarta.mail.jar
-        jakarta.management.j2ee-api.jar
         jakarta.persistence.jar
         jakarta.resource-api.jar
         jakarta.security.auth.message-api.jar

diff --git a/appserver/admin/runtime/jsr77/pom.xml b/appserver/admin/runtime/jsr77/pom.xml
@@ -54,10 +54,6 @@
     <description>JSR77 Model Classes</description>
 
     <dependencies>
-        <dependency>
-            <groupId>jakarta.management.j2ee</groupId>
-            <artifactId>jakarta.management.j2ee-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.glassfish.deployment</groupId>
             <artifactId>dol</artifactId>

diff --git a/appserver/common/amx-javaee/pom.xml b/appserver/common/amx-javaee/pom.xml
@@ -73,10 +73,6 @@
     </properties>
 
     <dependencies>
-        <dependency>
-            <groupId>jakarta.management.j2ee</groupId>
-            <artifactId>jakarta.management.j2ee-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>fish.payara.server.internal.common</groupId>
             <artifactId>amx-core</artifactId>

diff --git a/appserver/common/stats77/pom.xml b/appserver/common/stats77/pom.xml
@@ -73,9 +73,5 @@
             <artifactId>internal-api</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>jakarta.management.j2ee</groupId>
-            <artifactId>jakarta.management.j2ee-api</artifactId>
-        </dependency>
     </dependencies>
 </project>
diff --git a/...ts77/src/main/java/com/sun/enterprise/admin/monitor/registry/MonitoringLevelListener.java b/...ts77/src/main/java/com/sun/enterprise/admin/monitor/registry/MonitoringLevelListener.java
@@ -71,7 +71,7 @@ public interface MonitoringLevelListener {
 	 * is guaranteed that it will be unchanged by monitoring framework.
 	 */
 	public void changeLevel(MonitoringLevel from, MonitoringLevel to, 
-		javax.management.j2ee.statistics.Stats handback);
+		org.glassfish.j2ee.statistics.Stats handback);
 
 	/**
 	 * Method to convey the change in monitoring level. The configuration

diff --git a/...n/stats77/src/main/java/com/sun/enterprise/admin/monitor/registry/MonitoringRegistry.java b/...n/stats77/src/main/java/com/sun/enterprise/admin/monitor/registry/MonitoringRegistry.java
@@ -41,7 +41,7 @@
 
 package com.sun.enterprise.admin.monitor.registry;
 
-import javax.management.j2ee.statistics.*;
+import org.glassfish.j2ee.statistics.*;
 import com.sun.enterprise.admin.monitor.stats.*;
 
 /**
@@ -71,7 +71,7 @@ public interface MonitoringRegistry {
 
     /**
      * Registers the Stats implementation for EntityBeanStats
-     * @param entityBeanStats implementation of javax.management.j2ee.statistics.EntityBeanStats
+     * @param entityBeanStats implementation of org.glassfish.j2ee.statistics.EntityBeanStats
      * @param entityBeanName
      * @param moduleName
      * @param applicationName passing a null here would 
@@ -102,7 +102,7 @@ public void unregisterEntityBeanStats(String entityBeanName, String moduleName,
     /**
      * Registers the Stats implementation for StatelessSessionBeanStats
      * @param statelessSessionBeanStats implementation of 
-     * javax.management.j2ee.statistics.StatelessSessionBeanStats
+     * org.glassfish.j2ee.statistics.StatelessSessionBeanStats
      * @param statelessSessionBeanName
      * @param moduleName
      * @param applicationName  passing a null here would 
@@ -135,7 +135,7 @@ public void unregisterStatelessSessionBeanStats(String statelessSessionBeanName,
     /**
      * Registers the Stats implementation for StatefulSessionBeanStats
      * @param statefulSessionBeanStats  implementation of from 
-     * javax.management.j2ee.statistics.StatefulSessionBeanStats
+     * org.glassfish.j2ee.statistics.StatefulSessionBeanStats
      * @param statefulSessionBeanName
      * @param moduleName
      * @param applicationName  passing a null here would 
@@ -167,7 +167,7 @@ public void unregisterStatefulSessionBeanStats(String statefulSessionBeanName,
     /**
      * Registers the Stats implementation for MessageDrivenBeanStats
      * @param messageDrivenBeanStats  implementation of 
-     * javax.management.j2ee.statistics.MessageDrivenBeanStats
+     * org.glassfish.j2ee.statistics.MessageDrivenBeanStats
      * @param messageDrivenBeanName
      * @param moduleName
      * @param applicationName  passing a null here would 

diff --git a/...r/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/registry/StatsHolder.java b/...r/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/registry/StatsHolder.java
@@ -41,7 +41,7 @@
 
 package com.sun.enterprise.admin.monitor.registry;
 
-import javax.management.j2ee.statistics.Stats;
+import org.glassfish.j2ee.statistics.Stats;
 import javax.management.ObjectName;
 import java.util.Collection;
 

diff --git a/...n/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/AverageRangeStatistic.java b/...n/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/AverageRangeStatistic.java
@@ -41,7 +41,7 @@
 
 package com.sun.enterprise.admin.monitor.stats;
 
-import javax.management.j2ee.statistics.RangeStatistic;
+import org.glassfish.j2ee.statistics.RangeStatistic;
 
 /** An interface that Specifies standard measurements of the lowest and highest values an attribute has held 
  * as well as its current value.  Extending RangeStatistic, it also provides the average value.

diff --git a/...n/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/BoundaryStatisticImpl.java b/...n/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/BoundaryStatisticImpl.java
@@ -41,7 +41,7 @@
 
 package com.sun.enterprise.admin.monitor.stats;
 
-import javax.management.j2ee.statistics.BoundaryStatistic;
+import org.glassfish.j2ee.statistics.BoundaryStatistic;
 
 /** An implementation of a BoundaryStatistic. All instances of this class are
  * immutable. Provides all the necessary accessors for properties.

diff --git a/...ats77/src/main/java/com/sun/enterprise/admin/monitor/stats/BoundedRangeStatisticImpl.java b/...ats77/src/main/java/com/sun/enterprise/admin/monitor/stats/BoundedRangeStatisticImpl.java
@@ -41,7 +41,7 @@
 
 package com.sun.enterprise.admin.monitor.stats;
 
-import javax.management.j2ee.statistics.BoundedRangeStatistic;
+import org.glassfish.j2ee.statistics.BoundedRangeStatistic;
 import com.sun.enterprise.util.i18n.StringManager;
 
 /** An implementation of a BoundedRangeStatistic. All instances of this class are

diff --git a/...mon/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/ConnectionPoolStats.java b/...mon/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/ConnectionPoolStats.java
@@ -41,9 +41,9 @@
 
 package com.sun.enterprise.admin.monitor.stats;
 
-import javax.management.j2ee.statistics.Stats;
-import javax.management.j2ee.statistics.RangeStatistic;
-import javax.management.j2ee.statistics.CountStatistic;
+import org.glassfish.j2ee.statistics.Stats;
+import org.glassfish.j2ee.statistics.RangeStatistic;
+import org.glassfish.j2ee.statistics.CountStatistic;
 
 /** 
  * A Stats interface to represent the statistical data exposed by a Connection 

diff --git a/...7/src/main/java/com/sun/enterprise/admin/monitor/stats/ConnectorEndPointFactoryStats.java b/...7/src/main/java/com/sun/enterprise/admin/monitor/stats/ConnectorEndPointFactoryStats.java
@@ -41,7 +41,7 @@
 
 package com.sun.enterprise.admin.monitor.stats;
 
-import javax.management.j2ee.statistics.CountStatistic;
+import org.glassfish.j2ee.statistics.CountStatistic;
 
 /**
  * A Stats interface to represent the statistical data about 

diff --git a/.../stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/ConnectorWorkMgmtStats.java b/.../stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/ConnectorWorkMgmtStats.java
@@ -41,9 +41,9 @@
 
 package com.sun.enterprise.admin.monitor.stats;
 
-import javax.management.j2ee.statistics.RangeStatistic;
-import javax.management.j2ee.statistics.CountStatistic;
-import javax.management.j2ee.statistics.Stats;
+import org.glassfish.j2ee.statistics.RangeStatistic;
+import org.glassfish.j2ee.statistics.CountStatistic;
+import org.glassfish.j2ee.statistics.Stats;
 
 /**
  * A Stats interface to represent the statistical data about 

diff --git a/...mmon/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/CountStatisticImpl.java b/...mmon/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/CountStatisticImpl.java
@@ -41,7 +41,7 @@
 
 package com.sun.enterprise.admin.monitor.stats;
 
-import javax.management.j2ee.statistics.CountStatistic;
+import org.glassfish.j2ee.statistics.CountStatistic;
 import com.sun.enterprise.util.i18n.StringManager;
 
 /** An implementation of a CountStatistic. All instances of this class are

diff --git a/...er/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/EJBCacheStats.java b/...er/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/EJBCacheStats.java
@@ -40,9 +40,9 @@
 // Portions Copyright [2019] Payara Foundation and/or affiliates
 
 package com.sun.enterprise.admin.monitor.stats;
-import javax.management.j2ee.statistics.Stats;
-import javax.management.j2ee.statistics.CountStatistic;
-import javax.management.j2ee.statistics.BoundedRangeStatistic;
+import org.glassfish.j2ee.statistics.Stats;
+import org.glassfish.j2ee.statistics.CountStatistic;
+import org.glassfish.j2ee.statistics.BoundedRangeStatistic;
 
 /**
  * A Stats interface to represent the statistics exposed by the Enterprise Bean Cache.

diff --git a/...r/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/EJBMethodStats.java b/...r/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/EJBMethodStats.java
@@ -40,9 +40,9 @@
 // Portions Copyright [2019] Payara Foundation and/or affiliates
 
 package com.sun.enterprise.admin.monitor.stats;
-import javax.management.j2ee.statistics.Stats;
-import javax.management.j2ee.statistics.CountStatistic;
-import javax.management.j2ee.statistics.TimeStatistic;
+import org.glassfish.j2ee.statistics.Stats;
+import org.glassfish.j2ee.statistics.CountStatistic;
+import org.glassfish.j2ee.statistics.TimeStatistic;
 
 /** A Stats interface to represent the statistical data exposed by an EJB Business Method.
  * These are based on the statistics exposed in S1AS7.0. 

diff --git a/...ver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/EJBPoolStats.java b/...ver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/EJBPoolStats.java
@@ -41,9 +41,9 @@
 
 package com.sun.enterprise.admin.monitor.stats;
 
-import javax.management.j2ee.statistics.Stats;
-import javax.management.j2ee.statistics.CountStatistic;
-import javax.management.j2ee.statistics.BoundedRangeStatistic;
+import org.glassfish.j2ee.statistics.Stats;
+import org.glassfish.j2ee.statistics.CountStatistic;
+import org.glassfish.j2ee.statistics.BoundedRangeStatistic;
 
 /** A Stats interface to represent the statistical data exposed by an EJB Bean Pool.
  * These are based on the statistics exposed in S1AS7.0. 

diff --git a/...erver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/GFJTAStats.java b/...erver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/GFJTAStats.java
@@ -43,7 +43,7 @@
 
 import java.util.List;
 import java.util.Map;
-import javax.management.j2ee.statistics.JTAStats;
+import org.glassfish.j2ee.statistics.JTAStats;
 
 /** Defines additional Sun ONE Application Server specific statistic to transaction service.
  * @author  <a href="mailto:[email protected]">Kedar Mhaswade</a>
@@ -55,7 +55,7 @@ public interface GFJTAStats extends JTAStats {
 	/** Returns the IDs of the transactions that are currently active, as a StrignStatistic. 
 	 * An active transaction is same as an in-flight transaction. Every such transaction can be rolled back after
 	 * freezing the transaction service.
-	 * @see javax.management.j2ee.statistics.JTAStats#getActiveCount
+	 * @see org.glassfish.j2ee.statistics.JTAStats#getActiveCount
 	 * @return		a comma separated String of IDs
 	 */
 	public StringStatistic getActiveIds();

diff --git a/...common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/GenericStatsImpl.java b/...common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/GenericStatsImpl.java
@@ -46,13 +46,13 @@
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.HashMap;
-import javax.management.j2ee.statistics.Stats;
-import javax.management.j2ee.statistics.Statistic;
+import org.glassfish.j2ee.statistics.Stats;
+import org.glassfish.j2ee.statistics.Statistic;
 
 /** Provides for generic implementation of any Stats interface. This class facilitates
  * composition over inheritance for all the classes that implement their
  * specific Stats interfaces. None of them has to implement the methods defined
- * by the {@link javax.management.j2ee.statistics.Stats} interface. This class
+ * by the {@link org.glassfish.j2ee.statistics.Stats} interface. This class
  * implements the same interface and does that job. All that implementing classes
  * have to do is implement the specific accessing methods in their Stats interfaces
  * and delegate the rest to this class. <b> This class invokes all these methods in
@@ -158,7 +158,7 @@ private boolean implementsInterface(Class c, Object o) {
     }
 
     private boolean extendsStatsInterface(Class i) {
-        final Class statsInterface = javax.management.j2ee.statistics.Stats.class;
+        final Class statsInterface = org.glassfish.j2ee.statistics.Stats.class;
         return ( statsInterface.isAssignableFrom(i) );
     }
 
@@ -209,7 +209,7 @@ private String[] methods2Statistics(Method[] methods) {
     }
 
     private boolean isStatsInterfaceMethod(String name) {
-        final Method[] methods = javax.management.j2ee.statistics.Stats.class.getMethods();
+        final Method[] methods = org.glassfish.j2ee.statistics.Stats.class.getMethods();
         boolean isInterfaceMethod = false;
         for (int i = 0 ; i < methods.length ; i++) {
             if (methods[i].getName().equals(name)) {

diff --git a/...s77/src/main/java/com/sun/enterprise/admin/monitor/stats/HAStatefulSessionStoreStats.java b/...s77/src/main/java/com/sun/enterprise/admin/monitor/stats/HAStatefulSessionStoreStats.java
@@ -37,11 +37,12 @@
  * only if the new code is made subject to such option by the copyright
  * holder.
  */
-// Portions Copyright [2019] Payara Foundation and/or affiliates
+// Portions Copyright [2019-2021] Payara Foundation and/or affiliates
 
 package com.sun.enterprise.admin.monitor.stats;
-
-import javax.management.j2ee.statistics.CountStatistic;
+import org.glassfish.j2ee.statistics.CountStatistic;
+import org.glassfish.j2ee.statistics.TimeStatistic;
+import com.sun.enterprise.admin.monitor.stats.AverageRangeStatistic;
 
 /**
  *

diff --git a/...ommon/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/HTTPListenerStats.java b/...ommon/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/HTTPListenerStats.java
@@ -41,8 +41,8 @@
 
 package com.sun.enterprise.admin.monitor.stats;
 
-import javax.management.j2ee.statistics.Stats;
-import javax.management.j2ee.statistics.CountStatistic;
+import org.glassfish.j2ee.statistics.Stats;
+import org.glassfish.j2ee.statistics.CountStatistic;
 
 /** 
  * A Stats interface to represent the statistical data exposed by an

diff --git a/...on/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/JVMClassLoadingStats.java b/...on/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/JVMClassLoadingStats.java
@@ -41,8 +41,8 @@
 
 package com.sun.enterprise.admin.monitor.stats;
 
-import javax.management.j2ee.statistics.Stats;
-import javax.management.j2ee.statistics.CountStatistic;
+import org.glassfish.j2ee.statistics.Stats;
+import org.glassfish.j2ee.statistics.CountStatistic;
 
 /**
  * A Stats interface, to expose the monitoring information 

diff --git a/...mon/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/JVMCompilationStats.java b/...mon/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/JVMCompilationStats.java
@@ -41,8 +41,8 @@
 
 package com.sun.enterprise.admin.monitor.stats;
 
-import javax.management.j2ee.statistics.Stats;
-import javax.management.j2ee.statistics.CountStatistic;
+import org.glassfish.j2ee.statistics.Stats;
+import org.glassfish.j2ee.statistics.CountStatistic;
 
 /**
  * A Stats interface, to expose the monitoring information 

diff --git a/...tats77/src/main/java/com/sun/enterprise/admin/monitor/stats/JVMGarbageCollectorStats.java b/...tats77/src/main/java/com/sun/enterprise/admin/monitor/stats/JVMGarbageCollectorStats.java
@@ -41,8 +41,8 @@
 
 package com.sun.enterprise.admin.monitor.stats;
 
-import javax.management.j2ee.statistics.Stats;
-import javax.management.j2ee.statistics.CountStatistic;
+import org.glassfish.j2ee.statistics.Stats;
+import org.glassfish.j2ee.statistics.CountStatistic;
 
 /**
  * A Stats interface, to expose the monitoring information 

diff --git a/...r/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/JVMMemoryStats.java b/...r/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/JVMMemoryStats.java
@@ -41,8 +41,8 @@
 
 package com.sun.enterprise.admin.monitor.stats;
 
-import javax.management.j2ee.statistics.Stats;
-import javax.management.j2ee.statistics.CountStatistic;
+import org.glassfish.j2ee.statistics.Stats;
+import org.glassfish.j2ee.statistics.CountStatistic;
 
 /**
  * A Stats interface, to expose the monitoring information 

diff --git a/...stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/JVMOperatingSystemStats.java b/...stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/JVMOperatingSystemStats.java
@@ -41,8 +41,8 @@
 
 package com.sun.enterprise.admin.monitor.stats;
 
-import javax.management.j2ee.statistics.Stats;
-import javax.management.j2ee.statistics.CountStatistic;
+import org.glassfish.j2ee.statistics.Stats;
+import org.glassfish.j2ee.statistics.CountStatistic;
 
 /**
  * A Stats interface, to expose information 

diff --git a/.../common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/JVMRuntimeStats.java b/.../common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/JVMRuntimeStats.java
@@ -40,8 +40,8 @@
 // Portions Copyright [2019] Payara Foundation and/or affiliates
 
 package com.sun.enterprise.admin.monitor.stats;
-import javax.management.j2ee.statistics.Stats;
-import javax.management.j2ee.statistics.CountStatistic;
+import org.glassfish.j2ee.statistics.Stats;
+import org.glassfish.j2ee.statistics.CountStatistic;
 
 /**
  * A Stats interface to expose information about the JVM Runtime