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

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

Hide file tree

Showing 4 changed files with 9 additions and 12 deletions.
diff --git a/appserver/common/amx-javaee/pom.xml b/appserver/common/amx-javaee/pom.xml
@@ -93,5 +93,10 @@
             <groupId>org.glassfish.corba</groupId>
             <artifactId>glassfish-corba-omgapi</artifactId>
         </dependency>
+        <dependency>
+            <groupId>fish.payara.server.internal.common</groupId>
+            <artifactId>stats77</artifactId>
+            <version>${project.version}</version>
+        </dependency>
     </dependencies>
 </project>
diff --git a/appserver/common/amx-javaee/src/main/java/org/glassfish/admin/amx/j2ee/EntityBean.java b/appserver/common/amx-javaee/src/main/java/org/glassfish/admin/amx/j2ee/EntityBean.java
@@ -37,17 +37,10 @@
  * only if the new code is made subject to such option by the copyright
  * holder.
  */
-
 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;
 
-/**
- */
-@AMXMBeanMetadata(type=J2EETypes.ENTITY_BEAN, leaf=true)
-public interface EntityBean extends EJB
-{	
+@AMXMBeanMetadata(type = J2EETypes.ENTITY_BEAN, leaf = true)
+public interface EntityBean extends EJB {
 }
diff --git a/...rver/common/amx-javaee/src/main/java/org/glassfish/admin/amx/j2ee/StatisticsProvider.java b/...rver/common/amx-javaee/src/main/java/org/glassfish/admin/amx/j2ee/StatisticsProvider.java
@@ -40,7 +40,7 @@
 
 package org.glassfish.admin.amx.j2ee;
 
-import javax.management.j2ee.statistics.Stats;
+import org.glassfish.j2ee.statistics.Stats;
 import org.glassfish.admin.amx.annotation.ManagedAttribute;
 
 /**

diff --git a/.../web/web-glue/src/main/java/com/sun/enterprise/web/connector/extension/GrizzlyConfig.java b/.../web/web-glue/src/main/java/com/sun/enterprise/web/connector/extension/GrizzlyConfig.java
@@ -50,11 +50,10 @@
 import com.sun.enterprise.web.WebContainer;
 import org.glassfish.api.admin.ServerEnvironment;
 import org.glassfish.hk2.api.ServiceLocator;
-import javax.management.j2ee.statistics.Stats;
+import org.glassfish.j2ee.statistics.Stats;
 import org.glassfish.web.LogFacade;
 
 import javax.management.ObjectName;
-import java.lang.String;
 import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.ResourceBundle;