Issue #23507 Finished work from #22953 - jakarta.management.j2ee-api removal
- reverted some changes from the previous commit
- removed tests depending on the j2ee-api jar
diff --git a/appserver/core/api-exporter-fragment/pom.xml b/appserver/core/api-exporter-fragment/pom.xml
index 539927b..f98736c 100755
--- a/appserver/core/api-exporter-fragment/pom.xml
+++ b/appserver/core/api-exporter-fragment/pom.xml
@@ -223,8 +223,6 @@
javax.lang.model.type;
javax.lang.model.util;
javax.management;
- javax.management.j2ee;
- javax.management.j2ee.statistics;
javax.management.loading;
javax.management.modelmbean;
javax.management.monitor;
diff --git a/appserver/extras/javaee/manifest-jar/pom.xml b/appserver/extras/javaee/manifest-jar/pom.xml
index b44b3cf..43946d6 100644
--- a/appserver/extras/javaee/manifest-jar/pom.xml
+++ b/appserver/extras/javaee/manifest-jar/pom.xml
@@ -37,7 +37,7 @@
<configuration>
<archive>
<manifestEntries>
- <Class-Path>../modules/jakarta.servlet-api.jar ../modules/jakarta.annotation-api.jar ../modules/jakarta.ejb-api.jar ../modules/jakarta.transaction-api.jar ../modules/jakarta.management.j2ee-api.jar ../modules/jakarta.resource-api.jar ../modules/jakarta.authentication-api.jar ../modules/jakarta.authorization-api.jar ../modules/jakarta.xml.bind-api.jar ../modules/webservices-api-osgi.jar ../modules/jakarta.mail.jar ../modules/jakarta.activation.jar ../modules/jakarta.faces.jar ../modules/jakarta.servlet.jsp-api.jar ../modules/jakarta.el.jar ../modules/jakarta.el-api.jar ../modules/jakarta.servlet.jsp.jstl-api.jar ../modules/jakarta.persistence-api.jar ../modules/jakarta.jms-api.jar ../modules/hibernate-validator.jar ../modules/jakarta.validation-api.jar ../modules/cdi-api.jar ../../mq/lib/jaxm-api.jar ../modules/jakarta.ws.rs-api.jar ../modules/jakarta.json.jar ../modules/jakarta.json.bind-api.jar ../modules/jakarta.websocket-api.jar ../modules/jakarta.enterprise.concurrent-api.jar ../modules/jakarta.batch-api.jar ../modules/jakarta.inject-api.jar</Class-Path>
+ <Class-Path>../modules/jakarta.servlet-api.jar ../modules/jakarta.annotation-api.jar ../modules/jakarta.ejb-api.jar ../modules/jakarta.transaction-api.jar ../modules/jakarta.resource-api.jar ../modules/jakarta.authentication-api.jar ../modules/jakarta.authorization-api.jar ../modules/jakarta.xml.bind-api.jar ../modules/webservices-api-osgi.jar ../modules/jakarta.mail.jar ../modules/jakarta.activation.jar ../modules/jakarta.faces.jar ../modules/jakarta.servlet.jsp-api.jar ../modules/jakarta.el.jar ../modules/jakarta.el-api.jar ../modules/jakarta.servlet.jsp.jstl-api.jar ../modules/jakarta.persistence-api.jar ../modules/jakarta.jms-api.jar ../modules/hibernate-validator.jar ../modules/jakarta.validation-api.jar ../modules/cdi-api.jar ../../mq/lib/jaxm-api.jar ../modules/jakarta.ws.rs-api.jar ../modules/jakarta.json.jar ../modules/jakarta.json.bind-api.jar ../modules/jakarta.websocket-api.jar ../modules/jakarta.enterprise.concurrent-api.jar ../modules/jakarta.batch-api.jar ../modules/jakarta.inject-api.jar</Class-Path>
<GlassFish-ServerExcluded>true</GlassFish-ServerExcluded>
</manifestEntries>
</archive>
diff --git a/appserver/featuresets/glassfish/pom.xml b/appserver/featuresets/glassfish/pom.xml
index 132b0ab..f79f36e 100644
--- a/appserver/featuresets/glassfish/pom.xml
+++ b/appserver/featuresets/glassfish/pom.xml
@@ -804,15 +804,5 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>jakarta.management.j2ee</groupId>
- <artifactId>jakarta.management.j2ee-api</artifactId>
- <exclusions>
- <exclusion>
- <groupId>*</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
</dependencies>
</project>
diff --git a/appserver/pom.xml b/appserver/pom.xml
index bc72d09..01ddd27 100644
--- a/appserver/pom.xml
+++ b/appserver/pom.xml
@@ -133,7 +133,6 @@
<!-- Jakarta Enterprise beans -->
<jakarta.ejb-api.version>4.0.0</jakarta.ejb-api.version>
- <jakarta.ejb-management-api.version>1.1.4</jakarta.ejb-management-api.version>
<!-- Jakarta JSON -->
<jsonp-api.version>2.0.1</jsonp-api.version>
@@ -385,11 +384,6 @@
<artifactId>jakarta.ejb-api</artifactId>
<version>${jakarta.ejb-api.version}</version>
</dependency>
- <dependency>
- <groupId>jakarta.management.j2ee</groupId>
- <artifactId>jakarta.management.j2ee-api</artifactId>
- <version>${jakarta.ejb-management-api.version}</version>
- </dependency>
<!-- Jakarta JSON -->
<dependency>
diff --git a/appserver/tests/amx/pom.xml b/appserver/tests/amx/pom.xml
index 70e731f..7d48528 100755
--- a/appserver/tests/amx/pom.xml
+++ b/appserver/tests/amx/pom.xml
@@ -72,14 +72,6 @@
<dependencies>
-
- <dependency>
- <groupId>javax.management.j2ee</groupId>
- <artifactId>management-api</artifactId>
- <version>${management-api.version}</version>
- <scope>compile</scope>
- </dependency>
-
<dependency>
<groupId>org.glassfish.common</groupId>
<artifactId>amx-core</artifactId>
diff --git a/appserver/tests/amx/src/org/glassfish/admin/amxtest/AMXTestBase.java b/appserver/tests/amx/src/org/glassfish/admin/amxtest/AMXTestBase.java
index 4f9e72f..62cb034 100644
--- a/appserver/tests/amx/src/org/glassfish/admin/amxtest/AMXTestBase.java
+++ b/appserver/tests/amx/src/org/glassfish/admin/amxtest/AMXTestBase.java
@@ -16,17 +16,12 @@
package org.glassfish.admin.amxtest;
-import com.sun.appserv.management.DomainRoot;
-import com.sun.appserv.management.base.AMX;
-import com.sun.appserv.management.base.BulkAccess;
+import com.sun.appserv.management.base.AMXDebugSupportMBean;
import com.sun.appserv.management.base.NotificationServiceMgr;
import com.sun.appserv.management.base.QueryMgr;
-import com.sun.appserv.management.base.SystemInfo;
-import com.sun.appserv.management.base.Util;
import com.sun.appserv.management.base.XTypes;
import com.sun.appserv.management.client.AppserverConnectionSource;
import com.sun.appserv.management.client.ConnectionSource;
-import com.sun.appserv.management.client.ProxyFactory;
import com.sun.appserv.management.config.AMXConfig;
import com.sun.appserv.management.config.ConfigConfig;
import com.sun.appserv.management.config.DomainConfig;
@@ -35,26 +30,36 @@
import com.sun.appserv.management.config.NodeAgentConfig;
import com.sun.appserv.management.config.ServerConfig;
import com.sun.appserv.management.config.ServersConfig;
-import com.sun.appserv.management.j2ee.J2EEDomain;
-import com.sun.appserv.management.util.jmx.JMXUtil;
import com.sun.appserv.management.util.jmx.MBeanServerConnectionConnectionSource;
-import com.sun.appserv.management.util.misc.ClassUtil;
-import com.sun.appserv.management.util.misc.ExceptionUtil;
import com.sun.appserv.management.util.misc.GSetUtil;
-import com.sun.appserv.management.util.misc.TypeCast;
-import com.sun.appserv.management.base.AMXDebugSupportMBean;
-import javax.management.MBeanServerConnection;
-import javax.management.ObjectName;
-import javax.management.Attribute;
-import javax.management.AttributeList;
import java.io.IOException;
import java.lang.reflect.Method;
import java.util.Collection;
+import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-import java.util.HashMap;
+
+import javax.management.Attribute;
+import javax.management.AttributeList;
+import javax.management.MBeanServerConnection;
+import javax.management.ObjectName;
+
+import org.glassfish.admin.amx.base.BulkAccess;
+import org.glassfish.admin.amx.base.DomainRoot;
+import org.glassfish.admin.amx.base.SystemInfo;
+import org.glassfish.admin.amx.core.proxy.ProxyFactory;
+import org.glassfish.admin.amx.j2ee.J2EEDomain;
+import org.glassfish.admin.amx.util.ClassUtil;
+import org.glassfish.admin.amx.util.ExceptionUtil;
+import org.glassfish.admin.amx.util.TypeCast;
+import org.glassfish.admin.amx.util.jmx.JMXUtil;
+import org.glassfish.external.amx.AMX;
+
+import javassist.bytecode.analysis.Util;
+
+import static org.junit.jupiter.api.Assertions.fail;
/**
Base class for testing the AMX API
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/singleton-startup/hello/client/Client.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/singleton-startup/hello/client/Client.java
index 0f24296..72b8161 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/singleton-startup/hello/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/singleton-startup/hello/client/Client.java
@@ -22,8 +22,6 @@
import javax.naming.InitialContext;
-import javax.management.j2ee.ManagementHome;
-import javax.management.j2ee.Management;
import javax.rmi.PortableRemoteObject;
import com.acme.Hello;
@@ -50,16 +48,6 @@
public void doTest() {
try {
-
- // Ensure that MEJB is registered under all three of its JNDI names
- System.out.println("Looking up MEJB Homes");
- ManagementHome mh1Obj = (ManagementHome) new InitialContext().lookup("ejb/mgmt/MEJB");
- ManagementHome mh2Obj = (ManagementHome) new InitialContext().lookup("java:global/mejb/MEJBBean");
- ManagementHome mh3Obj = (ManagementHome) new InitialContext().lookup("java:global/mejb/MEJBBean!javax.management.j2ee.ManagementHome");
- addStatus("mejb relative lookup", (mh1Obj != null));
- addStatus("mejb global lookup", (mh2Obj != null));
- addStatus("mejb global lookup with explicit ManagedHome interface", (mh3Obj != null));
-
Hello hello = (Hello) new InitialContext().lookup("java:global/" + appName + "/SingletonBean");
String response = hello.hello();
addStatus("Singleton bean response", response.equals("hello, world!\n"));
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/hello/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/hello/client/Client.java
index f64c869..d420ef5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/hello/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/hello/client/Client.java
@@ -21,8 +21,6 @@
import javax.naming.InitialContext;
-import javax.management.j2ee.ManagementHome;
-import javax.management.j2ee.Management;
import javax.rmi.PortableRemoteObject;
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
@@ -48,20 +46,8 @@
public void doTest() {
try {
-
- // Ensure that MEJB is registered under all three of its JNDI names
- System.out.println("Looking up MEJB Homes");
- ManagementHome mh1Obj = (ManagementHome) new InitialContext().lookup("ejb/mgmt/MEJB");
- ManagementHome mh2Obj = (ManagementHome) new InitialContext().lookup("java:global/mejb/MEJBBean");
- ManagementHome mh3Obj = (ManagementHome) new InitialContext().lookup("java:global/mejb/MEJBBean!javax.management.j2ee.ManagementHome");
-
- System.out.println("mejb home obj 1 = " + mh1Obj);
- System.out.println("mejb home obj 2 = " + mh2Obj);
- System.out.println("mejb home obj 3 = " + mh3Obj);
-
Hello hello = (Hello) new InitialContext().lookup("java:global/" + appName + "/SingletonBean");
-
System.out.println("Singleton says : " + hello.hello());
hello.async();
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/hello/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/hello/ejb/SingletonBean.java
index c52f2db..a3923bd 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/hello/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/hello/ejb/SingletonBean.java
@@ -23,11 +23,9 @@
import javax.naming.InitialContext;
-import javax.management.j2ee.ManagementHome;
-
@Singleton
@Remote(Hello.class)
- @EJB(name="mejb", beanInterface=javax.management.j2ee.ManagementHome.class, mappedName="ejb/mgmt/MEJB")
+@EJB(name="mejb", mappedName="ejb/mgmt/MEJB")
@Startup
public class SingletonBean {
@@ -37,28 +35,6 @@
@PersistenceContext
private EntityManager em;
- /*Object returned from IIOP_OBJECT_FACTORY is still ior
- @EJB(mappedName="ejb/mgmt/MEJB")
- ManagementHome mHome1;
- */
-
- /* Object returned from IIOP_OBJECT_FACTORY is still ior
- @EJB(lookup="java:global/mejb/MEJBBean")
- ManagementHome mHome2;
- */
-
- /* Doesn't work b/c actual MEJB app Home interface is new glassfish
- * type, so actual type derived from field declaration is tacked
- * onto mappedName and results in NameNotFound
- @EJB(mappedName="java:global/mejb/MEJBBean")
- ManagementHome mHome2;
- */
-
-
-
-
- //MEJBHome mHome2;
-
@PostConstruct
public void init() {
System.out.println("In SingletonBean::init()");
@@ -66,18 +42,6 @@
if( orb == null ) {
throw new EJBException("null ORB");
}
- try {
- // same problem ManagementHome mHomeL = (ManagementHome) new InitialContext().lookup("java:comp/env/mejb");
- // same problem ManagementHome mHomeL2 = (ManagementHome) new InitialContext().lookup("java:global/mejb/MEJBBean");
- // System.out.println("mHomeL = " + mHomeL);
- // System.out.println("mHomeL2 = " + mHomeL2);
- } catch(Exception e) {
- throw new EJBException(e);
- }
-
- // System.out.println("mHome1 = " + mHome1);
- // System.out.println("mHome2 = " + mHome2);
-
}
public String hello() {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/client/Client.java
index 800f0b3..4f16875 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/client/Client.java
@@ -21,8 +21,6 @@
import javax.naming.InitialContext;
-import javax.management.j2ee.ManagementHome;
-import javax.management.j2ee.Management;
import javax.rmi.PortableRemoteObject;
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/ejb/SFSB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/ejb/SFSB.java
index 46fc80f..6bca0ac 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/ejb/SFSB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/ejb/SFSB.java
@@ -22,7 +22,6 @@
import javax.naming.InitialContext;
-import javax.management.j2ee.ManagementHome;
@Stateful
@LocalBean
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/descriptor/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/descriptor/client/Client.java
index 6e75724..fbc607d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/descriptor/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/descriptor/client/Client.java
@@ -21,8 +21,6 @@
import javax.naming.InitialContext;
-import javax.management.j2ee.ManagementHome;
-import javax.management.j2ee.Management;
import javax.rmi.PortableRemoteObject;
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/descriptor/ejb/SFSB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/descriptor/ejb/SFSB.java
index 12e1717..a797b05 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/descriptor/ejb/SFSB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/descriptor/ejb/SFSB.java
@@ -22,8 +22,6 @@
import javax.naming.InitialContext;
-import javax.management.j2ee.ManagementHome;
-
public class SFSB implements Hello {
private EntityManager em;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/client/Client.java
index 18b14ab..0a33261 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/client/Client.java
@@ -21,8 +21,6 @@
import javax.naming.InitialContext;
-import javax.management.j2ee.ManagementHome;
-import javax.management.j2ee.Management;
import javax.rmi.PortableRemoteObject;
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/ejb/SFSB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/ejb/SFSB.java
index dd6d00a..d15a8c5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/ejb/SFSB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/ejb/SFSB.java
@@ -22,8 +22,6 @@
import javax.naming.InitialContext;
-import javax.management.j2ee.ManagementHome;
-
@Stateful
@LocalBean
public class SFSB implements Hello {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/ejb/SFSB1.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/ejb/SFSB1.java
index 2f0dc24..d689f39 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/ejb/SFSB1.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/ejb/SFSB1.java
@@ -22,8 +22,6 @@
import javax.naming.InitialContext;
-import javax.management.j2ee.ManagementHome;
-
@Stateful
@LocalBean
public class SFSB1 implements Hello1 {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/ejb/SFSB2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/ejb/SFSB2.java
index 759bd84..a39af15 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/ejb/SFSB2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/ejb/SFSB2.java
@@ -22,8 +22,6 @@
import javax.naming.InitialContext;
-import javax.management.j2ee.ManagementHome;
-
@Stateful
@LocalBean
public class SFSB2 implements Hello2 {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/descriptor/ejb-jar.xml
index 4b2a197..35ebd04 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/descriptor/ejb-jar.xml
@@ -33,20 +33,6 @@
<use-caller-identity/>
</security-identity>
</session>
-<!-- no javax.management.jar in workspace yet
- <session>
- <display-name>DummyMEJBBean</display-name>
- <ejb-name>DummyMEJBBean</ejb-name>
- <home>javax.management.j2ee.ManagementHome</home>
- <remote>javax.management.j2ee.Management</remote>
- <ejb-class>com.sun.s1asdev.ejb.stubs.ejbapp.DummyMEJBBean</ejb-class>
- <session-type>Stateless</session-type>
- <transaction-type>Bean</transaction-type>
- <security-identity>
- <use-caller-identity/>
- </security-identity>
- </session>
--->
</enterprise-beans>
<assembly-descriptor>
</assembly-descriptor>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/ejb/DummyMEJBBean.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/ejb/DummyMEJBBean.java
index 0030181..bb8ff4c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/ejb/DummyMEJBBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/ejb/DummyMEJBBean.java
@@ -16,118 +16,6 @@
package com.sun.s1asdev.ejb.stubs.ejbapp;
-import java.io.Serializable;
-import java.rmi.RemoteException;
-import jakarta.ejb.SessionBean;
-import jakarta.ejb.SessionContext;
-import jakarta.ejb.EJBException;
-
-import java.util.*;
-//import javax.management.*;
-//import javax.management.j2ee.*;
-
-public class DummyMEJBBean {} /**
-implements SessionBean {
-
- private SessionContext sc;
-
- public DummyMEJBBean() {}
-
- public void ejbCreate() throws RemoteException {
- System.out.println("In DummyMEJBBean::ejbCreate !!");
- }
-
- public void setSessionContext(SessionContext sc) {
- this.sc = sc;
- }
-
- public Set queryNames(ObjectName name, QueryExp query) {
- return new HashSet();
- }
-
- public boolean isRegistered(ObjectName name) {
- return false;
- }
-
- public Integer getMBeanCount() {
-
- // Invoking this method from another app will verify that
- // the context class loader for this app is set appropriately during
- // the invocation. The javax.management.j2ee apis are packaged
- // as part of the server's classpath. That matches the behavior of
- // Bug 6342495, which showed that the context class loader was still
- // set to the calling application when the Home/Remote interfaces were
- // loaded from above the application classloader level.
- //
- // Calling getClassLoader tests that the context classloader is set
- // appropriately because of the security requirements that J2SE
- // imposes on requesting a class loader. By default application code
- // in the appserver does not have the RuntimePermission
- // "getClassLoader". In that case, requesting a class loader is only
- // allowed if the returned class loader matches the requesting
- // class' class loader(or is a child of it). So, if the context
- // class loader is still incorrectly set to the calling app's
- // class loader, the call to getContextClassLoader() should throw
- // a security exception.
-
- // The advantage to writing the test using
- // javax.management APIs and this behavior is it will work on an
- // out-of-the-box installation of the appserver. No additions to the
- // server's classpath or the default server.policy file are needed.
-
-
- System.out.println("In DummyEJBBean::getMBeanCount()");
-
- System.out.println("My classloader = " +
- DummyMEJBBean.class.getClassLoader());
-
- // This should fail with a security exception if the caller is in
- // a separate app within the same server and the context class
- // loader is still incorrectly set to the caller app's classloader.
- System.out.println("context class loader = " +
- Thread.currentThread().getContextClassLoader());
-
-
- return new Integer(0);
- }
-
-
- public MBeanInfo getMBeanInfo(ObjectName name) throws IntrospectionException, InstanceNotFoundException, ReflectionException {
- return null;
- }
-
- public Object getAttribute(ObjectName name, String attribute) throws MBeanException, AttributeNotFoundException, InstanceNotFoundException, ReflectionException {
- return null;
- }
-
- public AttributeList getAttributes(ObjectName name, String[] attributes) throws InstanceNotFoundException, ReflectionException {
- return null;
- }
-
- public void setAttribute(ObjectName name, Attribute attribute) throws InstanceNotFoundException, AttributeNotFoundException, InvalidAttributeValueException, MBeanException, ReflectionException {
- return;
- }
-
- public AttributeList setAttributes(ObjectName name, AttributeList attributes) throws InstanceNotFoundException, ReflectionException {
- return null;
- }
-
- public Object invoke(ObjectName name, String operationName, Object[] params, String[] signature) throws InstanceNotFoundException, MBeanException, ReflectionException {
- return null;
- }
-
- public String getDefaultDomain() {
- return null;
- }
-
- public ListenerRegistration getListenerRegistry() {
- return null;
- }
-
- public void ejbRemove() throws RemoteException {}
-
- public void ejbActivate() {}
-
- public void ejbPassivate() {}
+public class DummyMEJBBean {
+
}
- */
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/webclient/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/ejb/stubs/webclient/descriptor/web.xml
index b28878f..479e9d8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/webclient/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/webclient/descriptor/web.xml
@@ -36,13 +36,5 @@
<home>com.sun.s1asdev.ejb.stubs.ejbapp.HelloHome</home>
<remote>com.sun.s1asdev.ejb.stubs.ejbapp.Hello</remote>
</ejb-ref>
-<!--
- <ejb-ref>
- <ejb-ref-name>ejb/dummymejb</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>javax.management.j2ee.ManagementHome</home>
- <remote>javax.management.j2ee.Management</remote>
- </ejb-ref>
--->
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/webclient/servlet/Servlet.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/webclient/servlet/Servlet.java
index cf43e50..ce6e779 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/webclient/servlet/Servlet.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/webclient/servlet/Servlet.java
@@ -25,9 +25,6 @@
import com.sun.s1asdev.ejb.stubs.ejbapp.Hello;
import com.sun.s1asdev.ejb.stubs.ejbapp.HelloHome;
-//import javax.management.j2ee.ManagementHome;
-//import javax.management.j2ee.Management;
-
public class Servlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/webservice/google/mejbclient/MANIFEST.MF b/appserver/tests/appserv-tests/devtests/webservice/google/mejbclient/MANIFEST.MF
deleted file mode 100644
index 73cd735..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/google/mejbclient/MANIFEST.MF
+++ /dev/null
@@ -1,2 +0,0 @@
-Manifest-Version: 1.0
-Main-Class: google.MEJBClient
diff --git a/appserver/tests/appserv-tests/devtests/webservice/google/mejbclient/MEJBClient.java b/appserver/tests/appserv-tests/devtests/webservice/google/mejbclient/MEJBClient.java
deleted file mode 100644
index 4be7e3e..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/google/mejbclient/MEJBClient.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Copyright (c) 2001, 2018 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
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package google;
-
-//import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
-import java.io.*;
-import java.util.*;
-import java.net.*;
-import javax.management.j2ee.ManagementHome;
-import javax.management.j2ee.Management;
-import javax.management.*;
-import javax.naming.*;
-import javax.rmi.PortableRemoteObject;
-
-public class MEJBClient {
-
-// private SimpleReporterAdapter stat =
-// new SimpleReporterAdapter("appserv-tests");
-
- public static void main(String[] args) {
- MEJBClient client = new MEJBClient();
-
- // run the tests
- client.runTestClient();
- }
-
- public void runTestClient() {
- try{
-// stat.addDescription("Testing webservices mejb client app.");
- test01();
-// stat.printSummary("webservicesMejbAppID");
- } catch (Exception ex) {
- System.out.println("Exception in runTestClient: " + ex.toString());
- ex.printStackTrace();
- }
- }
-
- public void test01() {
-
- // instanciate the mejb
- try {
-
- Context ic = new InitialContext();
- System.out.println("***Created initial context");
-
- java.lang.Object objref = ic.lookup("ejb/mgmt/MEJB");
- System.out.println("***Looked up ManagementHome!!");
-
- ManagementHome home = (ManagementHome)PortableRemoteObject.narrow(
- objref, ManagementHome.class);
- System.out.println("***Narrowed ManagementHome!!");
-
- Management mejb = home.create();
- System.out.println("***Got the MEJB!!");
-
- String domain = mejb.getDefaultDomain();
- System.out.println("***MEJB default domain = "+domain);
- int mbeanCount = mejb.getMBeanCount().intValue();
- System.out.println("***MBeanCount = "+mbeanCount);
-
- // Print attributes of all MBeans
- ObjectName query = new ObjectName("*:j2eeType=J2EEApplication,name=googleApp,*");
- Set mbeanNames = mejb.queryNames(query, null);
- if ( mbeanNames.size() != 1 ) {
- System.out.println("***ERROR: mbeans returned by query is "
- +mbeanNames.size() + " it should be 1");
- }
-
- Iterator it = mbeanNames.iterator();
- ObjectName name = (ObjectName)it.next();
- System.out.println("Obtained jsr77 mbean for googleApp = "+name);
-
- // Get attr values from MEJB and print them
- try{
- Object attr = mejb.getAttribute(name, "hasWebServices");
- boolean hasWebServices=false;
- if (attr instanceof Boolean) {
- hasWebServices = ((Boolean) attr).booleanValue();
- }
-
- System.out.println("For HasWebServices "+hasWebServices);
-
- attr = mejb.getAttribute(name, "endpointAddresses");
- if (attr instanceof String[]) {
- String[] addresses = (String[]) attr;
- for (int i=0;i<addresses.length;i++) {
- System.out.println("Registered addresses " + addresses[i]);
-
- // retrieve the wsdl file
- URL url = new URL("http://localhost:8080/"+addresses[i]+"?wsdl");
- HttpURLConnection connection = (HttpURLConnection) url.openConnection();
- connection.setRequestMethod("GET");
- connection.connect();
- int responseCode = connection.getResponseCode();
- if (responseCode!=HttpURLConnection.HTTP_OK) {
- System.out.println("Cannot retrieve wsdl for " + addresses[i] + " error is " + connection.getResponseMessage());
- } else {
- InputStream is = new BufferedInputStream(connection.getInputStream());
- byte[] buffer = new byte[100];
- int read;
- do {
- read = is.read(buffer,0, 100);
- System.out.println(new String(buffer,0, read));
- } while(read==100 && read!=-1);
- }
- }
- }
-
- }
- catch(Exception exp){
- //exp.printStackTrace();
- System.out.println("***Exception occured while "+
- "accessing mbean details: Keep continuing\n");
- }
-
- mejb.remove();
-
- } catch(NamingException ne){
- System.out.println("***Exception while initializing context.\n");
- ne.printStackTrace();
- } catch(Exception re) {
- re.printStackTrace();
- }
- }
-
-}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/google/mejbclient/application-client.xml b/appserver/tests/appserv-tests/devtests/webservice/google/mejbclient/application-client.xml
deleted file mode 100644
index 75db3a9..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/google/mejbclient/application-client.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 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
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<application-client version="1.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd">
- <description>This is my mejb client</description>
- <display-name>MEJBClient</display-name>
- <ejb-ref>
- <ejb-ref-name>ejbs/mejb</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>javax.management.j2ee.ManagementHome</home>
- <remote>javax.management.j2ee.Management</remote>
- <ejb-link>MEjbBean</ejb-link>
- </ejb-ref>
-</application-client>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/google/mejbclient/sun-application-client.xml b/appserver/tests/appserv-tests/devtests/webservice/google/mejbclient/sun-application-client.xml
deleted file mode 100644
index 5357b1b..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/google/mejbclient/sun-application-client.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-application-client PUBLIC "-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 Application Client 1.4//EN" "http://www.sun.com/software/sunone/appserver/dtds/sun-application-client_1_4-0.dtd">
-<!--
-
- Copyright (c) 2017, 2018 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
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<sun-application-client>
- <ejb-ref>
- <ejb-ref-name>ejbs/mejb</ejb-ref-name>
- <jndi-name>ejb/mgmt/MEJB</jndi-name>
- </ejb-ref>
-</sun-application-client>
diff --git a/appserver/tests/quicklook/amx/src/test/amx/AMXConfigProxyTests.java b/appserver/tests/quicklook/amx/src/test/amx/AMXConfigProxyTests.java
index 3090a5a..36167d2 100644
--- a/appserver/tests/quicklook/amx/src/test/amx/AMXConfigProxyTests.java
+++ b/appserver/tests/quicklook/amx/src/test/amx/AMXConfigProxyTests.java
@@ -34,7 +34,6 @@
import org.glassfish.admin.amx.core.*;
import org.glassfish.admin.amx.base.*;
import org.glassfish.admin.amx.config.*;
-//import org.glassfish.admin.amx.j2ee.*;
import org.glassfish.admin.amx.monitoring.*;
import org.glassfish.admin.amx.util.CollectionUtil;
import org.glassfish.admin.amx.util.ExceptionUtil;
diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/mbeanapi/common/com/sun/enterprise/admin/mbeanapi/common/AMXMonitoringTestBase.java b/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/mbeanapi/common/com/sun/enterprise/admin/mbeanapi/common/AMXMonitoringTestBase.java
deleted file mode 100644
index e6ab0a2..0000000
--- a/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/mbeanapi/common/com/sun/enterprise/admin/mbeanapi/common/AMXMonitoringTestBase.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 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
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.enterprise.admin.mbeanapi.common;
-
-import com.sun.appserv.management.DomainRoot;
-import com.sun.appserv.management.monitor.ApplicationMonitor;
-import com.sun.appserv.management.monitor.MonitoringRoot;
-import com.sun.appserv.management.monitor.MonitoringStats;
-import com.sun.appserv.management.monitor.ServerRootMonitor;
-import java.io.IOException;
-import javax.management.j2ee.statistics.Statistic;
-import javax.management.j2ee.statistics.Stats;
-
-/**
- */
-public class AMXMonitoringTestBase {
-
- DomainRoot mDomainRoot;
- public static final String SERVER_NAME = "server";
- public static final String APP_NAME = "stateless-simple";
- public static final String STATELESS_EJB_NAME = "stateless-simple.war";
-
-
- public AMXMonitoringTestBase(final String host, final int port,
- final String adminUser, final String adminPassword,
- final boolean useTLS) throws IOException {
-
- final AMXConnector ct =
- new AMXConnector( host, port, adminUser, adminPassword, useTLS );
- mDomainRoot = ct.getDomainRoot();
-
- }
-
- /**
- *
- */
- private MonitoringRoot getMonitoringRoot() {
- return mDomainRoot.getMonitoringRoot();
- }
-
- /**
- *
- */
- public ServerRootMonitor getServerRootMonitor(final String serverName) {
-
- ServerRootMonitor svrRoot =
- (serverName != null || "".equals(serverName))
- ? ( (ServerRootMonitor) getMonitoringRoot().
- getServerRootMonitorMap().get(serverName) )
- : ( (ServerRootMonitor) getMonitoringRoot().
- getServerRootMonitorMap().get(SERVER_NAME) );
- assert(svrRoot != null) : "Cannot find server with name " +
- serverName + "!";
- return svrRoot;
- }
-
-
- /**
- *
- */
- public ApplicationMonitor getApplicationMonitor(
- final String serverName, final String appName) {
- ApplicationMonitor app =
- (appName != null || "".equals(appName))
- ? ( (ApplicationMonitor) getServerRootMonitor(serverName).
- getApplicationMonitorMap().get(appName) )
- : ( (ApplicationMonitor) getServerRootMonitor(serverName).
- getApplicationMonitorMap().get(APP_NAME) );
- assert(app != null) : "Cannot find application monitor with name " +
- appName + "!";
- return app;
- }
-
-
- /**
- *
- */
- public void listStats (MonitoringStats ms) {
- if (ms != null) {
- Stats stats = ms.getStats();
- Statistic[] sts = stats.getStatistics();
- printStats(sts);
- } else {
- System.out.println("VERIFY! Stats for " + ms.getName()
- + " doesn't exist!");
- }
- }
-
-
- /**
- *
- */
- public void printStats(Statistic[] stats) {
- if (stats == null) {
- return;
- }
-
- for ( int i=0; i < stats.length; i++) {
- printStat(stats[i]);
- }
- }
-
-
- /**
- *
- *
- */
- public void printStat(Statistic stat) {
- if (stat == null) {
- return;
- } else {
- System.out.println(" | ");
- System.out.println(" | ");
- System.out.println(" --- Stat [" + stat.getName() + "]");
- System.out.println(" |");
- System.out.println(" |");
- System.out.println(" ---- Description: "
- + stat.getDescription());
- System.out.println(" ---- Start Time: "
- + stat.getStartTime());
- System.out.println(" ---- Last Sample Time: "
- + stat.getLastSampleTime());
- System.out.println(" ---- Unit: "
- + stat.getUnit());
- System.out.println("\n");
- }
- }
-
- /**
- *
- */
- public static void printArgs(final String [] args) {
- System.out.println("Printing arguments......");
- for(int i = 0; i < args.length; i++) {
- System.out.println("Args[" + i + "]: " + args[i]);
- }
- }
-
- /**
- *
- */
- public void printBlock(final String title) {
- System.out.println("\n*******************************************");
- System.out.println("* *");
- System.out.println("* " + title + " *");
- System.out.println("* *");
- System.out.println("*******************************************\n");
- }
-}
diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/mbeanapi/monitoring/README b/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/mbeanapi/monitoring/README
deleted file mode 100644
index f09c6b9..0000000
--- a/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/mbeanapi/monitoring/README
+++ /dev/null
@@ -1,8 +0,0 @@
-To run tests:
-
-cd mbeanapi/common
-ant all // compiles common files required
-
-cd mbeanapi/monitoring
-ant all
-
diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/mbeanapi/monitoring/build.properties b/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/mbeanapi/monitoring/build.properties
deleted file mode 100644
index 9f2f6c3..0000000
--- a/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/mbeanapi/monitoring/build.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
-
- Copyright (c) 2018 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
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-
-<property name="ee" value="enterprise edition"/>
-<property name="appserver.instance.name" value="server"/>
-
diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/mbeanapi/monitoring/build.xml b/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/mbeanapi/monitoring/build.xml
deleted file mode 100644
index 63552c9..0000000
--- a/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/mbeanapi/monitoring/build.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE project [
-<!--
-
- Copyright (c) 2018 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
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<!ENTITY commonSetup SYSTEM "file:./../../../../../config/properties.xml">
-<!ENTITY commonBuild SYSTEM "file:./../../../../../config/common.xml">
-<!ENTITY commonBuild SYSTEM "file:./../../../../../config/run.xml">
-<!ENTITY eeCommonBuild SYSTEM "file:./../../../../../config/ee-common.xml">
-<!ENTITY testproperties SYSTEM "file:./build.properties">
-]>
-
-<project name="ee-synchronization" default="usage" basedir=".">
-
- &commonSetup;
- &commonBuild;
- &eeCommonBuild;
- &testproperties;
-
- <target name="all" depends="setup, run-tests, cleanup"/>
-
- <target name="setup">
- <antcall target="deploy-apps"/>
- <antcall target="create-connection-pools"/>
- </target>
-
- <target name="deploy-apps">
- <echo message="Deploying ${env.S1AS_HOME}/samples/ejb/stateless/apps/simple/stateless-simple.ear "/>
- <antcall target="deploy-common">
- <param name="deployed.app" value="${env.S1AS_HOME}/samples/ejb/stateless/apps/simple/stateless-simple.ear"/>
- </antcall>
- </target>
-
- <target name="undeploy-apps">
- <echo message="Un deploying stateless-simple"/>
- <antcall target="undeploy-common">
- <param name="deployedapp.name" value="stateless-simple"/>
- </antcall>
- </target>
-
- <target name="create-connection-pools">
- <echo message="creating a connection pool mbeanapi-test-conn-pool"/>
- <antcall target="create-connector-connpool">
- <param name="ra.name" value="stateless-simple#jdbcra"/>
- <param name="connection.defname" value="javax.sql.DataSource"/>
- <param name="connector.conpool.name" value="mbeanapi-test-conn-pool"/>
- </antcall>
- </target>
-
- <target name="remove-connection-pools">
- <echo message="deleting connection pool mbeanapi-test-conn-pool"/>
- <antcall target="delete-connector-connpool-common">
- <param name="connector.conpool.name" value="mbeanapi-test-conn-pool"/>
- </antcall>
- </target>
-
- <target name="run-tests" depends="setup">
- <antcall target="ejb">
- <param name="ejb.target" value="all"/>
- </antcall>
- <antcall target="web">
- <param name="web.target" value="all"/>
- </antcall>
- <antcall target="jdbc">
- <param name="jdbc.target" value="all"/>
- </antcall>
- <antcall target="misc">
- <param name="misc.target" value="all"/>
- </antcall>
- </target>
-
- <target name="ejb">
- <record name="ejb.output" action="start"/>
- <ant dir="ejb" target="${ejb.target}"/>
- <record name="ejb.output" action="stop"/>
- </target>
-
- <target name="web">
- <record name="web.output" action="start"/>
- <ant dir="web" target="${web.target}"/>
- <record name="web.output" action="stop"/>
- </target>
-
- <target name="jdbc">
- <record name="jdbc.output" action="start"/>
- <ant dir="jdbc" target="${jdbc.target}"/>
- <record name="jdbc.output" action="stop"/>
- </target>
-
- <target name="misc">
- <record name="misc.output" action="start"/>
- <ant dir="misc" target="${misc.target}"/>
- <record name="misc.output" action="stop"/>
- </target>
-
- <target name="cleanup">
- <antcall target="undeploy-apps"/>
- <antcall target="remove-connection-pools"/>
- </target>
-
- <target name="usage">
- <antcall target="usage-common"/>
- </target>
-
-</project>
diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/mbeanapi/monitoring/connector/ConnectorMonitoring.java b/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/mbeanapi/monitoring/connector/ConnectorMonitoring.java
deleted file mode 100644
index 6d2dcf2..0000000
--- a/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/mbeanapi/monitoring/connector/ConnectorMonitoring.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 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
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.s1asdev.admin.mbeanapi.monitoring.connector;
-
-import com.sun.appserv.management.monitor.ConnectorConnectionPoolMonitor;
-import java.io.IOException;
-
-import java.util.Map;
-import java.util.Set;
-import java.util.Iterator;
-import java.util.Collection;
-
-import com.sun.appserv.management.monitor.ApplicationMonitor;
-import com.sun.appserv.management.monitor.WebModuleMonitor;
-import com.sun.appserv.management.monitor.ServletMonitor;
-import com.sun.appserv.management.monitor.WebModuleVirtualServerMonitor;
-import com.sun.appserv.management.monitor.NativeWebCoreVirtualServerRequestMonitor;
-import com.sun.appserv.management.monitor.statistics.NativeWebCoreVirtualServerRequestStats;
-
-import com.sun.appserv.management.util.misc.ExceptionUtil;
-
-import com.sun.appserv.management.util.stringifier.SmartStringifier;
-import com.sun.appserv.management.util.stringifier.StringifierRegistryIniterImpl;
-import com.sun.appserv.management.util.stringifier.StringifierRegistryImpl;
-
-import com.sun.enterprise.admin.mbeanapi.common.AMXConnector;
-import com.sun.enterprise.admin.mbeanapi.common.AMXMonitoringTestBase;
-
-
-
-/**
- * This test prints the statistics for ejb module and stateless bean
- *
- * ConnectorMonitoring</B>
- *
- * @author <a href=mailto:satish.viswanatham@sun.com>Satish Viswanatham</a>
- * Date: Aug 24, 2004
- * @version $Revision: 1.1 $
- */
-public class ConnectorMonitoring extends AMXMonitoringTestBase {
-
- private String serverName;
- private static String SERVLETS = " - SERVLETS -";
- private static String VS = "VIRTUAL SERVER";
-
- public ConnectorMonitoring(final String host, final int port, final String serverName,
- final String adminUser, final String adminPassword,
- final boolean useTLS) throws IOException {
- super(host, port, adminUser,adminPassword,useTLS);
- this.serverName = serverName;
- }
-
-
- public void test() {
- Map connMap =
- getServerRootMonitor(serverName).
- getConnectorConnectionPoolMonitorMap();
- assert(connMap.size() > 0) :
- "The connection pool monitor map is " + connMap.size();
- for(Iterator itr = connMap.values().iterator(); itr.hasNext();) {
- ConnectorConnectionPoolMonitor connMonitor =
- (ConnectorConnectionPoolMonitor) itr.next();
- System.out.println("\nConnectorConnectionPoolMonitor [" +
- connMonitor.getName() + "]");
- printStats(connMonitor.getStats().getStatistics());
- }
- /*
- HTTPServiceMonitor httpService =
- getServerRootMonitor(serverName).getHTTPServiceMonitor();
- assert (httpService != null) : "The http service monitor is null!";
- Map vsMap = httpService.getHTTPServiceVirtualServerMonitorMap();
- assert (vsMap.size() > 0) : "The http service monitor map is empty!";
- for(Iterator itr = vsMap.values().iterator(); itr.hasNext();) {
- HTTPServiceVirtualServerMonitor vsMtr =
- (HTTPServiceVirtualServerMonitor) vsMap.get(itr.next());
- assert (vsMtr != null) : "The http virtual server monitor is null!";
- NativeWebCoreVirtualServerRequestMonitor rMtr =
- vsMtr.getNativeWebCoreVirtualServerRequestMonitor();
- NativeWebCoreVirtualServerRequestStats wcStats =
- rMtr.getNativeWebCoreVirtualServerRequestStats();
- printStats(wcStats.getStatistics());
- }
- **/
- }
-
-
- /**
- *
- */
- public static void main( final String[] args ) {
- new StringifierRegistryIniterImpl( StringifierRegistryImpl.DEFAULT );
-
- try {
- ConnectorMonitoring connMtr = new ConnectorMonitoring(
- System.getProperty("HOST", "hoyas.red.iplanet.com"),
- Integer.parseInt(System.getProperty("PORT","8686")), args[0],
- System.getProperty("ADMIN_USER", "admin"),
- System.getProperty("ADMIN_PASSWORD", "adminadmin"),
- Boolean.getBoolean(System.getProperty("USE_TLS", "false")));
-
- ConnectorMonitoring.printArgs(args);
-
- connMtr.test();
-
- } catch( Throwable t ) {
- ExceptionUtil.getRootCause( t ).printStackTrace();
- }
- }
-
-}
diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/mbeanapi/monitoring/connector/build.properties b/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/mbeanapi/monitoring/connector/build.properties
deleted file mode 100644
index 895c078..0000000
--- a/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/mbeanapi/monitoring/connector/build.properties
+++ /dev/null
@@ -1,55 +0,0 @@
-#
-# Copyright (c) 2018 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
-# http://www.eclipse.org/legal/epl-2.0.
-#
-# This Source Code may also be made available under the following Secondary
-# Licenses when the conditions for such availability set forth in the
-# Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
-# version 2 with the GNU Classpath Exception, which is available at
-# https://www.gnu.org/software/classpath/license.html.
-#
-# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-#
-
-#
-# The environment variables for compiling and running the tests.
-#
-src.dir=
-
-#
-# Set location for jmx.jar either from install or build.
-#
-jmx.jar=
-
-#
-# Classpath dependent variables
-#
-module.publish.home=${src.dir}/publish/JDK1.4_DBG.OBJ
-mbeanapi.jar=${module.publish.home}/admin-core/mbeanapi/lib/mbeanapi.jar
-mbeanapi-impl.jar=${module.publish.home}/admin/mbeanapi-impl/lib/mbeanapi-impl.jar
-jmx-ri.jar=${module.publish.home}/jmx/lib/jmxri.jar
-jmx-remote.jar=${module.publish.home}/rjmx-ri/jmxremote.jar
-jmx-remote_optional.jar=${module.publish.home}/rjmx-ri/jmxremote_optional.jar
-appserv-commons.jar=${module.publish.home}/appserv-commons/lib/appserv-commons.jar
-mgmt-api.jar=${module.publish.home}/management-api/lib/management-api.jar
-
-#
-# The instance that the web module or application is deployed on. If this is
-# null or "" then the default server instance "server" is assumed.
-#
-instance.name=server
-
-#
-# The application that the web module lives in. This is only relevant if the
-# web module to be tested is embedded within an application.
-#
-application.name=stateless-simple
-
-#
-# The embedded or standalone web module.
-#
-web.module.name=stateless-simple.war
-
diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/mbeanapi/monitoring/connector/build.xml b/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/mbeanapi/monitoring/connector/build.xml
deleted file mode 100644
index 663db17..0000000
--- a/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/mbeanapi/monitoring/connector/build.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-
- Copyright (c) 2018 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
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<project name="MBeanApi Monitoring tests" default="all" basedir=".">
-
-<property name="testsRoot" value="."/>
-<property name="build" value="${testsRoot}/build"/>
-<property file="./bootstrap.subcomponent.properties"/>
-<property file="./../../../../../../../bootstrap/bootstrap.properties"/>
-<property file="./../../../../../../../appserv/build.properties"/>
-<property file="./build.properties"/>
-
-
- <path id="compile.classpath">
- <pathelement location="${jmxri.jar}"/>
- <pathelement location="${mbeanapi.jar}"/>
- <pathelement location="${mbeanapi-impl.jar}"/>
- <pathelement location="${jmx.jar}"/>
- </path>
-
- <path id="run.classpath">
- <pathelement location="${jmx-ri.jar}"/>
- <pathelement location="${mbeanapi.jar}"/>
- <pathelement location="${mbeanapi-impl.jar}"/>
- <pathelement location="../../common/build"/>
- <pathelement location="${jmx-remote.jar}"/>
- <pathelement location="${jmx-remote_optional.jar}"/>
- <pathelement location="${appserv-commons.jar}"/>
- <pathelement location="${mgmt-api.jar}"/>
- <pathelement location="${jmx.jar}"/>
- <pathelement location="build"/>
- </path>
-
- <target name="init" description="MBeanapi Tests initialization">
- <mkdir dir="${build}"/>
- </target>
-
- <!-- all -->
- <target name="all" depends="build"
- description="Build entire component">
- <antcall target="connector-mtr-test"/>
- </target>
-
- <!-- build -->
- <target name="build" depends="compile"
- description="Build entire component" />
-
- <!-- compile-common -->
- <target name="compile-common" depends="init">
- <javac srcdir="${src.dir}/appserv-tests/devtests/ee/admin/mbeanapi/common"
- destdir="${build}"
- debug="${javac.debug}"
- optimize="${javac.optimize}"
- source="${javac.source}"
- deprecation="${javac.deprecation}"
- failonerror="true">
- <classpath refid="compile.classpath"/>
- <include name="**/AMXMonitoringTestBase.java"/>
- </javac>
- </target>
-
- <!-- compile -->
- <target name="compile" depends="init, compile-common">
- <javac srcdir="${src.dir}/appserv-tests/devtests/ee/admin/mbeanapi/monitoring/connector"
- destdir="${build}"
- debug="${javac.debug}"
- optimize="${javac.optimize}"
- source="${javac.source}"
- deprecation="${javac.deprecation}"
- failonerror="true">
- <classpath refid="compile.classpath"/>
- <include name="**/*.java"/>
- </javac>
- </target>
-
- <!-- clean -->
- <target name="clean" description="clean">
- <delete dir="${build}"/>
- </target>
-
- <!-- EJB pool monitoring Test Case -->
- <target name="connector-mtr-test">
- <antcall target="test-common">
- <param name="test.class"
- value="com.sun.s1asdev.admin.mbeanapi.monitoring.connector.ConnectorMonitoring"/>
- </antcall>
- </target>
-
- <target name="test-common">
- <java classname="${test.class}" failonerror="true" fork="true">
- <classpath>
- <path refid="run.classpath"/>
- </classpath>
- <jvmarg value="-enableassertions"/>
- <arg value="${instance.name}" />
- <arg value="${application.name}" />
- <arg value="${web.module.name}" />
- </java>
- </target>
-
-
-</project>
diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/mbeanapi/monitoring/ejb/EJBMonitoring.java b/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/mbeanapi/monitoring/ejb/EJBMonitoring.java
deleted file mode 100755
index 1a6df95..0000000
--- a/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/mbeanapi/monitoring/ejb/EJBMonitoring.java
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 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
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.s1asdev.admin.mbeanapi.monitoring.ejb;
-
-import java.io.IOException;
-
-import java.util.Map;
-import java.util.Set;
-import java.util.Iterator;
-
-import javax.management.j2ee.statistics.Statistic;
-import javax.management.j2ee.statistics.Stats;
-
-import com.sun.appserv.management.DomainRoot;
-import com.sun.appserv.management.monitor.MonitoringRoot;
-import com.sun.appserv.management.monitor.ServerRootMonitor;
-import com.sun.appserv.management.monitor.ApplicationMonitor;
-import com.sun.appserv.management.monitor.EJBModuleMonitor;
-import com.sun.appserv.management.monitor.EJBMonitor;
-import com.sun.appserv.management.monitor.BeanPoolMonitor;
-import com.sun.appserv.management.monitor.BeanCacheMonitor;
-import com.sun.appserv.management.monitor.BeanMethodMonitor;
-import com.sun.appserv.management.monitor.MonitoringStats;
-
-import com.sun.appserv.management.util.misc.ExceptionUtil;
-
-import com.sun.appserv.management.util.stringifier.SmartStringifier;
-import com.sun.appserv.management.util.stringifier.StringifierRegistryIniterImpl;
-import com.sun.appserv.management.util.stringifier.StringifierRegistryImpl;
-import com.sun.enterprise.admin.mbeanapi.common.AMXConnector;
-
-
-/**
- * This test print the statistics for ejb module and stateless bean
- *
- * EJBMonitoring</B>
- *
- * @author <a href=mailto:satish.viswanatham@sun.com>Satish Viswanatham</a>
- * Date: Aug 24, 2004
- * @version $Revision: 1.5 $
- */
-public class EJBMonitoring {
-
- private final DomainRoot mDomainRoot;
-
- private String SERVER_NAME = "server";
-
- //private String APP_NAME = "cmpcustomer1";
- //private String APP_NAME = "bmp-simple";
- private String APP_NAME = "stateless-simple";
-
- private String STATELESS_EJB_NAME = "stateless-simpleEjb_jar";
-
- public void testEJBPoolStats()
- {
- MonitoringRoot monitorRoot = mDomainRoot.getMonitoringRoot() ;
- assert(monitorRoot !=null);
- ServerRootMonitor svrRootMtr = (ServerRootMonitor) monitorRoot.
- getServerRootMonitorMap(). get(SERVER_NAME);
- Map appsMtrMgr = svrRootMtr.getApplicationMonitorMap();
-
- ApplicationMonitor appMtr =
- (ApplicationMonitor) appsMtrMgr.get(APP_NAME);
-
- Map ejbMgr = appMtr.getEJBModuleMonitorMap();
-
- Stats stats = null;
- Statistic[] sts = null;
-
- System.out.println(" size is " + ejbMgr.size());
- Iterator itr = ejbMgr.values().iterator();
-
- while (itr.hasNext()) {
- Object tmp = itr.next();
- System.out.println("Ejb is " + tmp);
- EJBModuleMonitor beanMgr = (EJBModuleMonitor) tmp;
-
- Map beans = beanMgr.getEJBMonitorMap();
-
- Iterator it = beans.values().iterator();
-
- while (it.hasNext()) {
- EJBMonitor em = (EJBMonitor) it.next();
- listStats(em);
-
- Map methodMap = em.getBeanMethodMonitorMap();
- itr = methodMap.values().iterator();
-
- while (itr.hasNext()) {
- Object o = itr.next();
- System.out.println(
- " Looking at stats for this method " + o);
- BeanMethodMonitor bmm = (BeanMethodMonitor) o;
- listStats(bmm);
-
- }
- }
-
- BeanPoolMonitor bPool = beanMgr.getBeanPoolMonitor(
- STATELESS_EJB_NAME);
- if (bPool == null) {
- System.out.println("Error: BeanPool monitor is null");
- } else {
- listStats(bPool);
- }
-
- BeanCacheMonitor bCache = beanMgr.getBeanCacheMonitor(
- STATELESS_EJB_NAME);
- if (bCache == null) {
- System.out.println("Error: BeanCache monitor is null");
- } else {
- listStats(bCache);
- }
-
- }
-
-
- }
-
- public void listStats (MonitoringStats ms)
- {
- Stats stats = ms.getStats();
- Statistic[] sts = stats.getStatistics();
- printStats(sts);
- }
-
- public void printStats(Statistic[] stats)
- {
- if (stats == null)
- return;
-
- for ( int i=0; i < stats.length; i++)
- {
- printStat(stats[i]);
- }
-
- }
-
- public void printStat(Statistic stat)
- {
- if (stat == null)
- return;
- else
- System.out.println(" Stat name is " + stat.getName() +
- " description: " + stat.getDescription() + " start time "
- + stat.getStartTime() + " last sample time "
- + stat.getLastSampleTime() + " unit " + stat.getUnit());
- }
-
- public EJBMonitoring(final String host,
- final int port,
- final String adminUser,
- final String adminPassword,
- final boolean useTLS)
- throws IOException
- {
- final AMXConnector ct =
- new AMXConnector( host, port, adminUser, adminPassword, useTLS );
-
- mDomainRoot = ct.getDomainRoot();
-
- }
-
-
- public static void main( final String[] args )
- {
- new StringifierRegistryIniterImpl( StringifierRegistryImpl.DEFAULT );
-
- try
- {
- EJBMonitoring ejbMtr = new EJBMonitoring(
- System.getProperty("HOST", "localhost"),
- Integer.parseInt(System.getProperty("PORT","8686")),
- System.getProperty("ADMIN_USER", "admin"),
- System.getProperty("ADMIN_PASSWORD", "adminadmin"),
- Boolean.getBoolean(System.getProperty("USE_TLS", "false")));
-
- ejbMtr.testEJBPoolStats();
- }
- catch( Throwable t )
- {
- ExceptionUtil.getRootCause( t ).printStackTrace();
- }
- }
-}
diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/mbeanapi/monitoring/ejb/build.properties b/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/mbeanapi/monitoring/ejb/build.properties
deleted file mode 100755
index b1a1948..0000000
--- a/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/mbeanapi/monitoring/ejb/build.properties
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# Copyright (c) 2018 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
-# http://www.eclipse.org/legal/epl-2.0.
-#
-# This Source Code may also be made available under the following Secondary
-# Licenses when the conditions for such availability set forth in the
-# Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
-# version 2 with the GNU Classpath Exception, which is available at
-# https://www.gnu.org/software/classpath/license.html.
-#
-# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-#
-
-
-
-src.dir=.
-module.publish.home=../../../../../../${publish.home}
-mbeanapi.jar=${module.publish.home}/admin-core/mbeanapi/lib/mbeanapi.jar
-mbeanapi-impl.jar=${module.publish.home}/admin/mbeanapi-impl/lib/mbeanapi-impl.jar
-jmx-ri.jar=${module.publish.home}/jmx/lib/jmxri.jar
-jmx-remote.jar=${module.publish.home}/rjmx-ri/jmxremote.jar
-jmx-remote_optional.jar=${module.publish.home}/rjmx-ri/jmxremote_optional.jar
-appserv-commons.jar=${module.publish.home}/appserv-commons/lib/appserv-commons.jar
-mgmt-api.jar=${module.publish.home}/management-api/lib/management-api.jar
-
diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/mbeanapi/monitoring/ejb/build.xml b/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/mbeanapi/monitoring/ejb/build.xml
deleted file mode 100755
index 322e1f7..0000000
--- a/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/mbeanapi/monitoring/ejb/build.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-
- Copyright (c) 2018 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
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<project name="MBeanApi Monitoring tests" default="all" basedir=".">
-
-<property name="testsRoot" value="."/>
-<property name="build" value="${testsRoot}/build"/>
-<property file="./bootstrap.subcomponent.properties"/>
-<property file="./../../../../../../../bootstrap/bootstrap.properties"/>
-<property file="./../../../../../../../appserv/build.properties"/>
-<property file="./build.properties"/>
-
-
- <path id="compile.classpath">
- <pathelement location="${jmxri.jar}"/>
- <pathelement location="${mbeanapi.jar}"/>
- <pathelement location="${mbeanapi-impl.jar}"/>
- <pathelement location="../../common/build"/>
- </path>
-
- <path id="run.classpath">
- <pathelement location="${jmx-ri.jar}"/>
- <pathelement location="${mbeanapi.jar}"/>
- <pathelement location="${mbeanapi-impl.jar}"/>
- <pathelement location="../../common/build"/>
- <pathelement location="${jmx-remote.jar}"/>
- <pathelement location="${jmx-remote_optional.jar}"/>
- <pathelement location="${appserv-commons.jar}"/>
- <pathelement location="${mgmt-api.jar}"/>
- <pathelement location="build"/>
- </path>
-
- <target name="init" description="MBeanapi Tests initialization">
- <mkdir dir="${build}"/>
- </target>
-
- <!-- all -->
- <target name="all" depends="build"
- description="Build entire component">
- <antcall target="ejb-pool-mtr-test"/>
- </target>
-
- <!-- build -->
- <target name="build" depends="compile"
- description="Build entire component" />
-
- <!-- compile -->
- <target name="compile" depends="init">
- <javac srcdir="${src.dir}"
- destdir="${build}"
- debug="${javac.debug}"
- optimize="${javac.optimize}"
- source="${javac.source}"
- deprecation="${javac.deprecation}"
- failonerror="true">
- <classpath refid="compile.classpath"/>
- <include name="**/*.java"/>
- </javac>
- </target>
-
- <!-- clean -->
- <target name="clean" description="clean">
- <delete dir="${build}"/>
- </target>
-
- <!-- EJB pool monitoring Test Case -->
- <target name="ejb-pool-mtr-test">
- <antcall target="test-common">
- <param name="test.class"
- value="com.sun.s1asdev.admin.mbeanapi.monitoring.ejb.EJBMonitoring"/>
- </antcall>
- </target>
-
- <target name="test-common">
- <java classname="${test.class}" failonerror="true" fork="true">
- <classpath>
- <path refid="run.classpath"/>
- </classpath>
- <!--jvmarg value="-Dcom.sun.aas.instanceRoot=/tmp"/-->
- </java>
- </target>
-
-
-</project>
diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/mbeanapi/monitoring/http/HTTPMonitoring.java b/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/mbeanapi/monitoring/http/HTTPMonitoring.java
deleted file mode 100644
index 8bea846..0000000
--- a/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/mbeanapi/monitoring/http/HTTPMonitoring.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 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
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.s1asdev.admin.mbeanapi.monitoring.http;
-
-import com.sun.appserv.management.monitor.HTTPServiceMonitor;
-import com.sun.appserv.management.monitor.HTTPServiceVirtualServerMonitor;
-import java.io.IOException;
-
-import java.util.Map;
-import java.util.Set;
-import java.util.Iterator;
-import java.util.Collection;
-
-import com.sun.appserv.management.monitor.ApplicationMonitor;
-import com.sun.appserv.management.monitor.WebModuleMonitor;
-import com.sun.appserv.management.monitor.ServletMonitor;
-import com.sun.appserv.management.monitor.WebModuleVirtualServerMonitor;
-import com.sun.appserv.management.monitor.NativeWebCoreVirtualServerRequestMonitor;
-import com.sun.appserv.management.monitor.statistics.NativeWebCoreVirtualServerRequestStats;
-
-import com.sun.appserv.management.util.misc.ExceptionUtil;
-
-import com.sun.appserv.management.util.stringifier.SmartStringifier;
-import com.sun.appserv.management.util.stringifier.StringifierRegistryIniterImpl;
-import com.sun.appserv.management.util.stringifier.StringifierRegistryImpl;
-
-import com.sun.enterprise.admin.mbeanapi.common.AMXConnector;
-import com.sun.enterprise.admin.mbeanapi.common.AMXMonitoringTestBase;
-
-
-
-/**
- * This test prints the statistics for ejb module and stateless bean
- *
- * HTTPMonitoring</B>
- *
- * @author <a href=mailto:satish.viswanatham@sun.com>Satish Viswanatham</a>
- * Date: Aug 24, 2004
- * @version $Revision: 1.1 $
- */
-public class HTTPMonitoring extends AMXMonitoringTestBase {
-
- private String serverName;
- private static String SERVLETS = " - SERVLETS -";
- private static String VS = "VIRTUAL SERVER";
-
- public HTTPMonitoring(final String host, final int port, final String serverName,
- final String adminUser, final String adminPassword,
- final boolean useTLS) throws IOException {
- super(host, port, adminUser,adminPassword,useTLS);
- this.serverName = serverName;
- }
-
-
- public void test() {
- HTTPServiceMonitor httpService =
- getServerRootMonitor(serverName).getHTTPServiceMonitor();
- assert (httpService != null) : "The http service monitor is null!";
- Map vsMap = httpService.getHTTPServiceVirtualServerMonitorMap();
- assert (vsMap.size() > 0) : "The http service monitor map is empty!";
- for(Iterator itr = vsMap.values().iterator(); itr.hasNext();) {
- HTTPServiceVirtualServerMonitor vsMtr =
- (HTTPServiceVirtualServerMonitor) vsMap.get(itr.next());
- assert (vsMtr != null) : "The http virtual server monitor is null!";
- NativeWebCoreVirtualServerRequestMonitor rMtr =
- vsMtr.getNativeWebCoreVirtualServerRequestMonitor();
- NativeWebCoreVirtualServerRequestStats wcStats =
- rMtr.getNativeWebCoreVirtualServerRequestStats();
- printStats(wcStats.getStatistics());
- }
- }
-
-
- /**
- *
- */
- public static void main( final String[] args ) {
- new StringifierRegistryIniterImpl( StringifierRegistryImpl.DEFAULT );
-
- try {
- HTTPMonitoring httpMtr = new HTTPMonitoring(
- System.getProperty("HOST", "localhost"),
- Integer.parseInt(System.getProperty("PORT","8686")), args[0],
- System.getProperty("ADMIN_USER", "admin"),
- System.getProperty("ADMIN_PASSWORD", "adminadmin"),
- Boolean.getBoolean(System.getProperty("USE_TLS", "false")));
-
- HTTPMonitoring.printArgs(args);
-
- httpMtr.test();
-
- } catch( Throwable t ) {
- ExceptionUtil.getRootCause( t ).printStackTrace();
- }
- }
-
-}
diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/mbeanapi/monitoring/http/build.properties b/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/mbeanapi/monitoring/http/build.properties
deleted file mode 100644
index 895c078..0000000
--- a/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/mbeanapi/monitoring/http/build.properties
+++ /dev/null
@@ -1,55 +0,0 @@
-#
-# Copyright (c) 2018 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
-# http://www.eclipse.org/legal/epl-2.0.
-#
-# This Source Code may also be made available under the following Secondary
-# Licenses when the conditions for such availability set forth in the
-# Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
-# version 2 with the GNU Classpath Exception, which is available at
-# https://www.gnu.org/software/classpath/license.html.
-#
-# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-#
-
-#
-# The environment variables for compiling and running the tests.
-#
-src.dir=
-
-#
-# Set location for jmx.jar either from install or build.
-#
-jmx.jar=
-
-#
-# Classpath dependent variables
-#
-module.publish.home=${src.dir}/publish/JDK1.4_DBG.OBJ
-mbeanapi.jar=${module.publish.home}/admin-core/mbeanapi/lib/mbeanapi.jar
-mbeanapi-impl.jar=${module.publish.home}/admin/mbeanapi-impl/lib/mbeanapi-impl.jar
-jmx-ri.jar=${module.publish.home}/jmx/lib/jmxri.jar
-jmx-remote.jar=${module.publish.home}/rjmx-ri/jmxremote.jar
-jmx-remote_optional.jar=${module.publish.home}/rjmx-ri/jmxremote_optional.jar
-appserv-commons.jar=${module.publish.home}/appserv-commons/lib/appserv-commons.jar
-mgmt-api.jar=${module.publish.home}/management-api/lib/management-api.jar
-
-#
-# The instance that the web module or application is deployed on. If this is
-# null or "" then the default server instance "server" is assumed.
-#
-instance.name=server
-
-#
-# The application that the web module lives in. This is only relevant if the
-# web module to be tested is embedded within an application.
-#
-application.name=stateless-simple
-
-#
-# The embedded or standalone web module.
-#
-web.module.name=stateless-simple.war
-
diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/mbeanapi/monitoring/http/build.xml b/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/mbeanapi/monitoring/http/build.xml
deleted file mode 100644
index a8ba55b..0000000
--- a/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/mbeanapi/monitoring/http/build.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-
- Copyright (c) 2018 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
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<project name="MBeanApi Monitoring tests" default="all" basedir=".">
-
-<property name="testsRoot" value="."/>
-<property name="build" value="${testsRoot}/build"/>
-<property file="./bootstrap.subcomponent.properties"/>
-<property file="./../../../../../../../bootstrap/bootstrap.properties"/>
-<property file="./../../../../../../../appserv/build.properties"/>
-<property file="./build.properties"/>
-
-
- <path id="compile.classpath">
- <pathelement location="${jmxri.jar}"/>
- <pathelement location="${mbeanapi.jar}"/>
- <pathelement location="${mbeanapi-impl.jar}"/>
- <pathelement location="${jmx.jar}"/>
- </path>
-
- <path id="run.classpath">
- <pathelement location="${jmx-ri.jar}"/>
- <pathelement location="${mbeanapi.jar}"/>
- <pathelement location="${mbeanapi-impl.jar}"/>
- <pathelement location="../../common/build"/>
- <pathelement location="${jmx-remote.jar}"/>
- <pathelement location="${jmx-remote_optional.jar}"/>
- <pathelement location="${appserv-commons.jar}"/>
- <pathelement location="${mgmt-api.jar}"/>
- <pathelement location="${jmx.jar}"/>
- <pathelement location="build"/>
- </path>
-
- <target name="init" description="MBeanapi Tests initialization">
- <mkdir dir="${build}"/>
- </target>
-
- <!-- all -->
- <target name="all" depends="build"
- description="Build entire component">
- <antcall target="http-mtr-test"/>
- </target>
-
- <!-- build -->
- <target name="build" depends="compile"
- description="Build entire component" />
-
- <!-- compile-common -->
- <target name="compile-common" depends="init">
- <javac srcdir="${src.dir}/appserv-tests/devtests/ee/admin/mbeanapi/common"
- destdir="${build}"
- debug="${javac.debug}"
- optimize="${javac.optimize}"
- source="${javac.source}"
- deprecation="${javac.deprecation}"
- failonerror="true">
- <classpath refid="compile.classpath"/>
- <include name="**/AMXMonitoringTestBase.java"/>
- </javac>
- </target>
-
- <!-- compile -->
- <target name="compile" depends="init, compile-common">
- <javac srcdir="${src.dir}/appserv-tests/devtests/ee/admin/mbeanapi/monitoring/http"
- destdir="${build}"
- debug="${javac.debug}"
- optimize="${javac.optimize}"
- source="${javac.source}"
- deprecation="${javac.deprecation}"
- failonerror="true">
- <classpath refid="compile.classpath"/>
- <include name="**/*.java"/>
- </javac>
- </target>
-
- <!-- clean -->
- <target name="clean" description="clean">
- <delete dir="${build}"/>
- </target>
-
- <!-- EJB pool monitoring Test Case -->
- <target name="http-mtr-test">
- <antcall target="test-common">
- <param name="test.class"
- value="com.sun.s1asdev.admin.mbeanapi.monitoring.http.HTTPMonitoring"/>
- </antcall>
- </target>
-
- <target name="test-common">
- <java classname="${test.class}" failonerror="true" fork="true">
- <classpath>
- <path refid="run.classpath"/>
- </classpath>
- <jvmarg value="-enableassertions"/>
- <arg value="${instance.name}" />
- <arg value="${application.name}" />
- <arg value="${web.module.name}" />
- </java>
- </target>
-
-
-</project>
diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/mbeanapi/monitoring/jdbc/JDBCMonitoring.java b/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/mbeanapi/monitoring/jdbc/JDBCMonitoring.java
deleted file mode 100644
index 7d8647c..0000000
--- a/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/mbeanapi/monitoring/jdbc/JDBCMonitoring.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 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
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.s1asdev.admin.mbeanapi.monitoring.jdbc;
-
-import java.io.IOException;
-
-import java.util.Map;
-import java.util.Set;
-import java.util.Iterator;
-
-import javax.management.j2ee.statistics.Statistic;
-import javax.management.j2ee.statistics.Stats;
-
-import com.sun.appserv.management.DomainRoot;
-import com.sun.appserv.management.monitor.MonitoringRoot;
-import com.sun.appserv.management.monitor.ServerRootMonitor;
-import com.sun.appserv.management.monitor.JDBCConnectionPoolMonitor;
-import com.sun.appserv.management.monitor.ConnectorConnectionPoolMonitor;
-import com.sun.appserv.management.monitor.MonitoringStats;
-
-import com.sun.appserv.management.util.misc.ExceptionUtil;
-
-import com.sun.appserv.management.util.stringifier.SmartStringifier;
-import com.sun.appserv.management.util.stringifier.StringifierRegistryIniterImpl;
-import com.sun.appserv.management.util.stringifier.StringifierRegistryImpl;
-import com.sun.enterprise.admin.mbeanapi.common.AMXConnector;
-
-
-/**
- * This test print the statistics for jdbc and connector connection pools
- *
- * JDBCMonitoring</B>
- *
- * @author <a href=mailto:satish.viswanatham@sun.com>Satish Viswanatham</a>
- * Date: Aug 24, 2004
- * @version $Revision: 1.3 $
- */
-public class JDBCMonitoring {
-
- private static DomainRoot mDomainRoot;
-
- private static String SERVER_NAME = "server";
-
- public void testCCPoolStats( ServerRootMonitor svrRootMtr)
- {
-
- Map cpMtrMgr = svrRootMtr.getConnectorConnectionPoolMonitorMap();
- System.out.println("connector connection pool size is " +
- cpMtrMgr.size());
- Iterator itr = cpMtrMgr.values().iterator();
- while (itr.hasNext()) {
- Object o = itr.next();
- System.out.println(" Connector Connection pool is " + o);
- ConnectorConnectionPoolMonitor cPool =
- (ConnectorConnectionPoolMonitor)o;
- listStat(cPool);
- }
-
- }
-
- public void testJDBCPoolStats( ServerRootMonitor svrRootMtr)
- {
-
- Map cpMtrMgr = svrRootMtr.getJDBCConnectionPoolMonitorMap();
- System.out.println("jdbc connection pool size is " + cpMtrMgr.size());
- Iterator itr = cpMtrMgr.values().iterator();
- while (itr.hasNext()) {
- Object o = itr.next();
- System.out.println(" Connection pool is " + o);
- JDBCConnectionPoolMonitor cPool = (JDBCConnectionPoolMonitor)o;
- listStat(cPool);
- }
-
- }
-
- public void listStat(MonitoringStats mtr)
- {
- if (mtr == null) {
- System.out.println("Monitoring stats is null");
- } else {
- listStats(mtr);
- }
- }
-
- public void listStats(MonitoringStats ms)
- {
- Stats stats = ms.getStats();
- Statistic[] sts = stats.getStatistics();
- printStats(sts);
- }
-
- public void printStats(Statistic[] stats)
- {
- if (stats == null)
- return;
-
- for ( int i=0; i < stats.length; i++)
- {
- printStat(stats[i]);
- }
-
- }
-
- public void printStat(Statistic stat)
- {
- if (stat == null)
- return;
- else
- System.out.println(" Stat name is " + stat.getName() +
- " description: " + stat.getDescription() + " start time "
- + stat.getStartTime() + " last sample time "
- + stat.getLastSampleTime() + " unit " + stat.getUnit());
- }
-
- public JDBCMonitoring(final String host,
- final int port,
- final String adminUser,
- final String adminPassword,
- final boolean useTLS)
- throws IOException
- {
- final AMXConnector ct =
- new AMXConnector( host, port, adminUser, adminPassword, useTLS );
-
- mDomainRoot = ct.getDomainRoot();
-
- }
-
-
- public static void main( final String[] args )
- {
- new StringifierRegistryIniterImpl( StringifierRegistryImpl.DEFAULT );
-
- try
- {
- JDBCMonitoring jdbcMtr = new JDBCMonitoring(
- System.getProperty("HOST", "localhost"),
- Integer.parseInt(System.getProperty("PORT","8686")),
- System.getProperty("ADMIN_USER", "admin"),
- System.getProperty("ADMIN_PASSWORD", "adminadmin"),
- Boolean.getBoolean(System.getProperty("USE_TLS", "false")));
-
- MonitoringRoot monitorRoot = mDomainRoot.getMonitoringRoot() ;
- assert(monitorRoot !=null);
- ServerRootMonitor svrRootMtr = (ServerRootMonitor) monitorRoot.
- getServerRootMonitorMap(). get(SERVER_NAME);
-
- jdbcMtr.testJDBCPoolStats(svrRootMtr);
- jdbcMtr.testCCPoolStats(svrRootMtr);
- }
- catch( Throwable t )
- {
- ExceptionUtil.getRootCause( t ).printStackTrace();
- }
- }
-}
diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/mbeanapi/monitoring/jdbc/build.properties b/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/mbeanapi/monitoring/jdbc/build.properties
deleted file mode 100644
index b1a1948..0000000
--- a/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/mbeanapi/monitoring/jdbc/build.properties
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# Copyright (c) 2018 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
-# http://www.eclipse.org/legal/epl-2.0.
-#
-# This Source Code may also be made available under the following Secondary
-# Licenses when the conditions for such availability set forth in the
-# Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
-# version 2 with the GNU Classpath Exception, which is available at
-# https://www.gnu.org/software/classpath/license.html.
-#
-# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-#
-
-
-
-src.dir=.
-module.publish.home=../../../../../../${publish.home}
-mbeanapi.jar=${module.publish.home}/admin-core/mbeanapi/lib/mbeanapi.jar
-mbeanapi-impl.jar=${module.publish.home}/admin/mbeanapi-impl/lib/mbeanapi-impl.jar
-jmx-ri.jar=${module.publish.home}/jmx/lib/jmxri.jar
-jmx-remote.jar=${module.publish.home}/rjmx-ri/jmxremote.jar
-jmx-remote_optional.jar=${module.publish.home}/rjmx-ri/jmxremote_optional.jar
-appserv-commons.jar=${module.publish.home}/appserv-commons/lib/appserv-commons.jar
-mgmt-api.jar=${module.publish.home}/management-api/lib/management-api.jar
-
diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/mbeanapi/monitoring/jdbc/build.xml b/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/mbeanapi/monitoring/jdbc/build.xml
deleted file mode 100644
index 6afd09b..0000000
--- a/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/mbeanapi/monitoring/jdbc/build.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-
- Copyright (c) 2018 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
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<project name="MBeanApi Monitoring tests" default="all" basedir=".">
-
-<property name="testsRoot" value="."/>
-<property name="build" value="${testsRoot}/build"/>
-<property file="./bootstrap.subcomponent.properties"/>
-<property file="./../../../../../../../bootstrap/bootstrap.properties"/>
-<property file="./../../../../../../../appserv/build.properties"/>
-<property file="./build.properties"/>
-
-
- <path id="compile.classpath">
- <pathelement location="${jmxri.jar}"/>
- <pathelement location="${mbeanapi.jar}"/>
- <pathelement location="${mbeanapi-impl.jar}"/>
- <pathelement location="../../common/build"/>
- </path>
-
- <path id="run.classpath">
- <pathelement location="${jmx-ri.jar}"/>
- <pathelement location="${mbeanapi.jar}"/>
- <pathelement location="${mbeanapi-impl.jar}"/>
- <pathelement location="../../common/build"/>
- <pathelement location="${jmx-remote.jar}"/>
- <pathelement location="${jmx-remote_optional.jar}"/>
- <pathelement location="${appserv-commons.jar}"/>
- <pathelement location="build"/>
- <pathelement location="${mgmt-api.jar}"/>
- </path>
-
- <target name="init" description="MBeanapi Tests initialization">
- <mkdir dir="${build}"/>
- </target>
-
- <!-- all -->
- <target name="all" depends="build"
- description="Build entire component">
- <antcall target="jdbc-mtr-test"/>
- </target>
-
- <!-- build -->
- <target name="build" depends="compile"
- description="Build entire component" />
-
- <!-- compile -->
- <target name="compile" depends="init">
- <javac srcdir="${src.dir}"
- destdir="${build}"
- debug="${javac.debug}"
- optimize="${javac.optimize}"
- source="${javac.source}"
- deprecation="${javac.deprecation}"
- failonerror="true">
- <classpath refid="compile.classpath"/>
- <include name="**/*.java"/>
- </javac>
- </target>
-
- <!-- clean -->
- <target name="clean" description="clean">
- <delete dir="${build}"/>
- </target>
-
- <!-- EJB pool monitoring Test Case -->
- <target name="jdbc-mtr-test">
- <antcall target="test-common">
- <param name="test.class"
- value="com.sun.s1asdev.admin.mbeanapi.monitoring.jdbc.JDBCMonitoring"/>
- </antcall>
- </target>
-
- <target name="test-common">
- <java classname="${test.class}" failonerror="true" fork="true">
- <classpath>
- <path refid="run.classpath"/>
- </classpath>
- <!--jvmarg value="-Dcom.sun.aas.instanceRoot=/tmp"/-->
- </java>
- </target>
-
-
-</project>
diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/mbeanapi/monitoring/misc/MiscMonitoring.java b/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/mbeanapi/monitoring/misc/MiscMonitoring.java
deleted file mode 100644
index a058c65..0000000
--- a/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/mbeanapi/monitoring/misc/MiscMonitoring.java
+++ /dev/null
@@ -1,210 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 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
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.s1asdev.admin.mbeanapi.monitoring.misc;
-
-import java.io.IOException;
-
-import java.util.Map;
-import java.util.Set;
-import java.util.Iterator;
-
-import javax.management.j2ee.statistics.Statistic;
-import javax.management.j2ee.statistics.Stats;
-
-import com.sun.appserv.management.DomainRoot;
-import com.sun.appserv.management.monitor.MonitoringRoot;
-import com.sun.appserv.management.monitor.ServerRootMonitor;
-import com.sun.appserv.management.monitor.JVMMonitor;
-import com.sun.appserv.management.monitor.TransactionServiceMonitor;
-import com.sun.appserv.management.monitor.HTTPServiceMonitor;
-import com.sun.appserv.management.monitor.ConnectionManagerMonitor;
-import com.sun.appserv.management.monitor.ThreadPoolMonitor;
-import com.sun.appserv.management.monitor.MonitoringStats;
-
-import com.sun.appserv.management.util.misc.ExceptionUtil;
-
-import com.sun.appserv.management.util.stringifier.SmartStringifier;
-import com.sun.appserv.management.util.stringifier.StringifierRegistryIniterImpl;
-import com.sun.appserv.management.util.stringifier.StringifierRegistryImpl;
-import com.sun.enterprise.admin.mbeanapi.common.AMXConnector;
-
-
-/**
- * This test print the statistics for ejb module and stateless bean
- *
- * JDBCMonitoring</B>
- *
- * @author <a href=mailto:satish.viswanatham@sun.com>Satish Viswanatham</a>
- * Date: Aug 24, 2004
- * @version $Revision: 1.3 $
- */
-public class MiscMonitoring {
-
- private static DomainRoot mDomainRoot;
-
- private static final String SERVER_NAME = "server";
-
- public void testThreadPoolStats(ServerRootMonitor svrRootMtr)
- {
- Map tpMap= svrRootMtr.getThreadPoolMonitorMap();
- System.out.println("\n" + "Thread Pool Monitor Stats: "
- + "\n");
-
- System.out.println("Thread PoolORB monitor map " + tpMap.size());
-
- Iterator itr = tpMap.values().iterator();
-
- while ( itr.hasNext()) {
- Object o = itr.next();
- System.out.println(" Looking at monitor " + o);
-
- ThreadPoolMonitor tpm = (ThreadPoolMonitor) o;
- listStats(tpm);
- }
- }
-
- public void testORBStats(ServerRootMonitor svrRootMtr)
- {
- Map orbMap= svrRootMtr.getORBConnectionManagerMonitorMap();
- System.out.println("\n" + "ORB Connection Manager Monitor Stats: "
- + "\n");
-
- System.out.println("ORB monitor map " + orbMap.size());
-
- Iterator itr = orbMap.values().iterator();
-
- while ( itr.hasNext()) {
- Object o = itr.next();
- System.out.println(" Looking at monitor " + o);
-
- ConnectionManagerMonitor cm = (ConnectionManagerMonitor) o;
- listStats(cm);
- }
- }
-
- public void testJVMStats(ServerRootMonitor svrRootMtr)
- {
- JVMMonitor jvmMtr = svrRootMtr.getJVMMonitor();
-
- System.out.println("\n" + "JVM Monitor Stats: " + "\n");
- listStats(jvmMtr);
- }
-
- public void testTransactionServiceStats(ServerRootMonitor svrRootMtr)
- {
- TransactionServiceMonitor tsMtr =
- svrRootMtr.getTransactionServiceMonitor();
-
- System.out.println("\n" + "Transaction Service Monitor Stats: " + "\n");
- listStats(tsMtr);
- }
-
- public void testHTTPServiceStats(ServerRootMonitor svrRootMtr)
- {
- HTTPServiceMonitor tsMtr = svrRootMtr.getHTTPServiceMonitor();
-
- System.out.println("\n" + "File Cache Monitor Stats: " + "\n");
- listStats(tsMtr.getFileCacheMonitor());
- System.out.println("\n" + "DNS Monitor Stats: " + "\n");
- listStats(tsMtr.getDNSMonitor());
- System.out.println("\n" + "PWC Thread pool Monitor Stats: " + "\n");
- listStats(tsMtr.getPWCThreadPoolMonitor());
- System.out.println("\n" + "Connection queue Monitor Stats: " + "\n");
- listStats(tsMtr.getConnectionQueueMonitor());
- System.out.println("\n" + "Keep Alive Monitor Stats: " + "\n");
- listStats(tsMtr.getKeepAliveMonitor());
- }
-
- public void listStats(MonitoringStats mtr)
- {
- if (mtr == null) {
- System.out.println("Monitoring stats is null");
- } else {
- Stats stats = mtr.getStats();
- Statistic[] sts = stats.getStatistics();
- printStats(sts);
- }
- }
-
- public void printStats(Statistic[] stats)
- {
- if (stats == null)
- return;
-
- for ( int i=0; i < stats.length; i++)
- {
- printStat(stats[i]);
- }
-
- }
-
- public void printStat(Statistic stat)
- {
- if (stat == null)
- return;
- else
- System.out.println(" Stat name is " + stat.getName() +
- " description: " + stat.getDescription() + " start time "
- + stat.getStartTime() + " last sample time "
- + stat.getLastSampleTime() + " unit " + stat.getUnit());
- }
-
- public MiscMonitoring(final String host,
- final int port,
- final String adminUser,
- final String adminPassword,
- final boolean useTLS)
- throws IOException
- {
- final AMXConnector ct =
- new AMXConnector( host, port, adminUser, adminPassword, useTLS );
-
- mDomainRoot = ct.getDomainRoot();
-
- }
-
-
- public static void main( final String[] args )
- {
- new StringifierRegistryIniterImpl( StringifierRegistryImpl.DEFAULT );
-
- try
- {
- MiscMonitoring miscMtr = new MiscMonitoring(
- System.getProperty("HOST", "localhost"),
- Integer.parseInt(System.getProperty("PORT","8686")),
- System.getProperty("ADMIN_USER", "admin"),
- System.getProperty("ADMIN_PASSWORD", "adminadmin"),
- Boolean.getBoolean(System.getProperty("USE_TLS", "false")));
-
- MonitoringRoot monitorRoot = mDomainRoot.getMonitoringRoot() ;
- assert(monitorRoot !=null);
- ServerRootMonitor svrRootMtr = (ServerRootMonitor) monitorRoot.
- getServerRootMonitorMap(). get(SERVER_NAME);
-
- miscMtr.testJVMStats(svrRootMtr);
- miscMtr.testTransactionServiceStats(svrRootMtr);
- miscMtr.testHTTPServiceStats(svrRootMtr);
- miscMtr.testThreadPoolStats(svrRootMtr);
- miscMtr.testORBStats(svrRootMtr);
- }
- catch( Throwable t )
- {
- ExceptionUtil.getRootCause( t ).printStackTrace();
- }
- }
-}
diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/mbeanapi/monitoring/misc/build.properties b/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/mbeanapi/monitoring/misc/build.properties
deleted file mode 100644
index b1a1948..0000000
--- a/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/mbeanapi/monitoring/misc/build.properties
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# Copyright (c) 2018 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
-# http://www.eclipse.org/legal/epl-2.0.
-#
-# This Source Code may also be made available under the following Secondary
-# Licenses when the conditions for such availability set forth in the
-# Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
-# version 2 with the GNU Classpath Exception, which is available at
-# https://www.gnu.org/software/classpath/license.html.
-#
-# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-#
-
-
-
-src.dir=.
-module.publish.home=../../../../../../${publish.home}
-mbeanapi.jar=${module.publish.home}/admin-core/mbeanapi/lib/mbeanapi.jar
-mbeanapi-impl.jar=${module.publish.home}/admin/mbeanapi-impl/lib/mbeanapi-impl.jar
-jmx-ri.jar=${module.publish.home}/jmx/lib/jmxri.jar
-jmx-remote.jar=${module.publish.home}/rjmx-ri/jmxremote.jar
-jmx-remote_optional.jar=${module.publish.home}/rjmx-ri/jmxremote_optional.jar
-appserv-commons.jar=${module.publish.home}/appserv-commons/lib/appserv-commons.jar
-mgmt-api.jar=${module.publish.home}/management-api/lib/management-api.jar
-
diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/mbeanapi/monitoring/misc/build.xml b/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/mbeanapi/monitoring/misc/build.xml
deleted file mode 100644
index 1127060..0000000
--- a/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/mbeanapi/monitoring/misc/build.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-
- Copyright (c) 2018 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
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<project name="MBeanApi Monitoring tests" default="all" basedir=".">
-
-<property name="testsRoot" value="."/>
-<property name="build" value="${testsRoot}/build"/>
-<property file="./bootstrap.subcomponent.properties"/>
-<property file="./../../../../../../../bootstrap/bootstrap.properties"/>
-<property file="./../../../../../../../appserv/build.properties"/>
-<property file="./build.properties"/>
-
-
- <path id="compile.classpath">
- <pathelement location="${jmxri.jar}"/>
- <pathelement location="${mbeanapi.jar}"/>
- <pathelement location="${mbeanapi-impl.jar}"/>
- <pathelement location="../../common/build"/>
- </path>
-
- <path id="run.classpath">
- <pathelement location="${jmx-ri.jar}"/>
- <pathelement location="${mbeanapi.jar}"/>
- <pathelement location="${mbeanapi-impl.jar}"/>
- <pathelement location="../../common/build"/>
- <pathelement location="${jmx-remote.jar}"/>
- <pathelement location="${jmx-remote_optional.jar}"/>
- <pathelement location="${appserv-commons.jar}"/>
- <pathelement location="${mgmt-api.jar}"/>
- <pathelement location="build"/>
- </path>
-
- <target name="init" description="MBeanapi Tests initialization">
- <mkdir dir="${build}"/>
- </target>
-
- <!-- all -->
- <target name="all" depends="build"
- description="Build entire component">
- <antcall target="misc-mtr-test"/>
- </target>
-
- <!-- build -->
- <target name="build" depends="compile"
- description="Build entire component" />
-
- <!-- compile -->
- <target name="compile" depends="init">
- <javac srcdir="${src.dir}"
- destdir="${build}"
- debug="${javac.debug}"
- optimize="${javac.optimize}"
- source="${javac.source}"
- deprecation="${javac.deprecation}"
- failonerror="true">
- <classpath refid="compile.classpath"/>
- <include name="**/*.java"/>
- </javac>
- </target>
-
- <!-- clean -->
- <target name="clean" description="clean">
- <delete dir="${build}"/>
- </target>
-
- <!-- EJB pool monitoring Test Case -->
- <target name="misc-mtr-test">
- <antcall target="test-common">
- <param name="test.class"
- value="com.sun.s1asdev.admin.mbeanapi.monitoring.misc.MiscMonitoring"/>
- </antcall>
- </target>
-
- <target name="test-common">
- <java classname="${test.class}" failonerror="true" fork="true">
- <classpath>
- <path refid="run.classpath"/>
- </classpath>
- <!--jvmarg value="-Dcom.sun.aas.instanceRoot=/tmp"/-->
- </java>
- </target>
-
-
-</project>
diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/mbeanapi/monitoring/web/WebMonitoring.java b/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/mbeanapi/monitoring/web/WebMonitoring.java
deleted file mode 100644
index ea22ff0..0000000
--- a/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/mbeanapi/monitoring/web/WebMonitoring.java
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 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
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.s1asdev.admin.mbeanapi.monitoring.web;
-
-import java.io.IOException;
-
-import java.util.Map;
-import java.util.Set;
-import java.util.Iterator;
-import java.util.Collection;
-
-import com.sun.appserv.management.monitor.ApplicationMonitor;
-import com.sun.appserv.management.monitor.ServletMonitor;
-import com.sun.appserv.management.monitor.WebModuleVirtualServerMonitor;
-
-import com.sun.appserv.management.util.misc.ExceptionUtil;
-
-import com.sun.appserv.management.util.stringifier.SmartStringifier;
-import com.sun.appserv.management.util.stringifier.StringifierRegistryIniterImpl;
-import com.sun.appserv.management.util.stringifier.StringifierRegistryImpl;
-
-import com.sun.enterprise.admin.mbeanapi.common.AMXConnector;
-import com.sun.enterprise.admin.mbeanapi.common.AMXMonitoringTestBase;
-
-
-
-/**
- * This test prints the statistics for ejb module and stateless bean
- *
- * WebMonitoring</B>
- *
- * @author <a href=mailto:satish.viswanatham@sun.com>Satish Viswanatham</a>
- * Date: Aug 24, 2004
- * @version $Revision: 1.7 $
- */
-public class WebMonitoring extends AMXMonitoringTestBase {
-
- private String serverName;
- private static String SERVLETS = " - SERVLETS -";
- private static String VS = "VIRTUAL SERVER";
-
- public WebMonitoring(final String host, final int port, final String serverName,
- final String adminUser, final String adminPassword,
- final boolean useTLS) throws IOException {
- super(host, port, adminUser,adminPassword,useTLS);
- this.serverName = serverName;
- }
-
-
- public void test(final String applicationName, final String webModule) {
- if(isEmbeddedWebModule(applicationName, webModule)) {
- testEmbeddedWebModules(getWebModules(applicationName));
- } else {
- testStandAloneWebModule(webModule);
- }
- }
-
-
- /**
- *
- */
- public void testStandAloneWebModule(final String webModuleName) {
- Map webMap = getServerRootMonitor(serverName).
- getWebModuleVirtualServerMonitorMap();
- assert(webMap != null && webMap.size() > 0) : "FAILURE!";
- testEmbeddedWebModules(webMap);
- }
-
-
- /**
- *
- */
- public void testEmbeddedWebModules(final Map webModules) {
- assert(webModules != null && webModules.size() > 0) :
- "No web module monitors found! Make sure that the monitoring level " +
- "is set to HIGH or LOW!!";
- Iterator itr = webModules.values().iterator();
- while(itr.hasNext()) {
- WebModuleVirtualServerMonitor webMonitor = (WebModuleVirtualServerMonitor)itr.next();
- if (!webMonitor.getName().equals("//__asadmin/adminapp")
- && !webMonitor.getName().equals("//__asadmin/admingui")
- && !webMonitor.getName().equals("//__asadmin/com_sun_web_ui")) {
- System.out.println("\nStats for WebModule [" +
- webMonitor.getName() + "]");
- testWebModuleServlets(webMonitor.getServletMonitorMap());
- }
- }
- }
-
-
- /**
- *
- */
- public void testWebModuleServlets(final Map servlets) {
- printBlock(SERVLETS);
- assert(servlets != null && servlets.size() > 0) :
- "No servlet monitors found! Make sure that the monitoring level " +
- "is set to HIGH or LOW!!";
- Iterator itr = servlets.values().iterator();
- while(itr.hasNext()) {
- ServletMonitor sltMonitor = (ServletMonitor)itr.next();
- System.out.println(" |");
- System.out.println(" |");
- System.out.println(" ---- SERVLET [" + sltMonitor.getName() + "]");
- listStats(sltMonitor);
- }
- }
-
-
- /**
- *
- */
- private Map getWebModules(final String applicationName) {
- return getApplicationMonitor(serverName, applicationName).
- getWebModuleVirtualServerMonitorMap();
- }
-
-
- /**
- *
- */
- private boolean isEmbeddedWebModule(final String applicationName,
- final String webModuleName) {
- final ApplicationMonitor appMtr =
- getApplicationMonitor(serverName, applicationName);
- final Map webMgr = appMtr.getWebModuleVirtualServerMonitorMap();
- return (webMgr.get(webModuleName) != null
- || "".equals(webMgr.get(webModuleName)));
- }
-
-
-
- /**
- *
- */
- public static void main( final String[] args ) {
- new StringifierRegistryIniterImpl( StringifierRegistryImpl.DEFAULT );
-
- try {
- WebMonitoring webMtr = new WebMonitoring(
- System.getProperty("HOST", "localhost"),
- Integer.parseInt(System.getProperty("PORT","8686")), args[0],
- System.getProperty("ADMIN_USER", "admin"),
- System.getProperty("ADMIN_PASSWORD", "adminadmin"),
- Boolean.getBoolean(System.getProperty("USE_TLS", "false")));
-
- WebMonitoring.printArgs(args);
-
- if(args.length < 3) {
- webMtr.test(null,null);
- } else {
- webMtr.test(args[1], args[2]);
- }
-
- } catch( Throwable t ) {
- ExceptionUtil.getRootCause( t ).printStackTrace();
- }
- }
-
-}
diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/mbeanapi/monitoring/web/build.properties b/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/mbeanapi/monitoring/web/build.properties
deleted file mode 100644
index 895c078..0000000
--- a/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/mbeanapi/monitoring/web/build.properties
+++ /dev/null
@@ -1,55 +0,0 @@
-#
-# Copyright (c) 2018 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
-# http://www.eclipse.org/legal/epl-2.0.
-#
-# This Source Code may also be made available under the following Secondary
-# Licenses when the conditions for such availability set forth in the
-# Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
-# version 2 with the GNU Classpath Exception, which is available at
-# https://www.gnu.org/software/classpath/license.html.
-#
-# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-#
-
-#
-# The environment variables for compiling and running the tests.
-#
-src.dir=
-
-#
-# Set location for jmx.jar either from install or build.
-#
-jmx.jar=
-
-#
-# Classpath dependent variables
-#
-module.publish.home=${src.dir}/publish/JDK1.4_DBG.OBJ
-mbeanapi.jar=${module.publish.home}/admin-core/mbeanapi/lib/mbeanapi.jar
-mbeanapi-impl.jar=${module.publish.home}/admin/mbeanapi-impl/lib/mbeanapi-impl.jar
-jmx-ri.jar=${module.publish.home}/jmx/lib/jmxri.jar
-jmx-remote.jar=${module.publish.home}/rjmx-ri/jmxremote.jar
-jmx-remote_optional.jar=${module.publish.home}/rjmx-ri/jmxremote_optional.jar
-appserv-commons.jar=${module.publish.home}/appserv-commons/lib/appserv-commons.jar
-mgmt-api.jar=${module.publish.home}/management-api/lib/management-api.jar
-
-#
-# The instance that the web module or application is deployed on. If this is
-# null or "" then the default server instance "server" is assumed.
-#
-instance.name=server
-
-#
-# The application that the web module lives in. This is only relevant if the
-# web module to be tested is embedded within an application.
-#
-application.name=stateless-simple
-
-#
-# The embedded or standalone web module.
-#
-web.module.name=stateless-simple.war
-
diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/mbeanapi/monitoring/web/build.xml b/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/mbeanapi/monitoring/web/build.xml
deleted file mode 100644
index b764fe3..0000000
--- a/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/mbeanapi/monitoring/web/build.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-
- Copyright (c) 2018 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
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<project name="MBeanApi Monitoring tests" default="all" basedir=".">
-
-<property name="testsRoot" value="."/>
-<property name="build" value="${testsRoot}/build"/>
-<property file="./bootstrap.subcomponent.properties"/>
-<property file="./../../../../../../../bootstrap/bootstrap.properties"/>
-<property file="./../../../../../../../appserv/build.properties"/>
-<property file="./build.properties"/>
-
-
- <path id="compile.classpath">
- <pathelement location="${jmxri.jar}"/>
- <pathelement location="${mbeanapi.jar}"/>
- <pathelement location="${mbeanapi-impl.jar}"/>
- <pathelement location="${jmx.jar}"/>
- </path>
-
- <path id="run.classpath">
- <pathelement location="${jmx-ri.jar}"/>
- <pathelement location="${mbeanapi.jar}"/>
- <pathelement location="${mbeanapi-impl.jar}"/>
- <pathelement location="../../common/build"/>
- <pathelement location="${jmx-remote.jar}"/>
- <pathelement location="${jmx-remote_optional.jar}"/>
- <pathelement location="${appserv-commons.jar}"/>
- <pathelement location="${mgmt-api.jar}"/>
- <pathelement location="${jmx.jar}"/>
- <pathelement location="build"/>
- </path>
-
- <target name="init" description="MBeanapi Tests initialization">
- <mkdir dir="${build}"/>
- </target>
-
- <!-- all -->
- <target name="all" depends="build"
- description="Build entire component">
- <antcall target="web-mtr-test"/>
- </target>
-
- <!-- build -->
- <target name="build" depends="compile"
- description="Build entire component" />
-
- <!-- compile-common -->
- <target name="compile-common" depends="init">
- <javac srcdir="${src.dir}/appserv-tests/devtests/ee/admin/mbeanapi/common"
- destdir="${build}"
- debug="${javac.debug}"
- optimize="${javac.optimize}"
- source="${javac.source}"
- deprecation="${javac.deprecation}"
- failonerror="true">
- <classpath refid="compile.classpath"/>
- <include name="**/*.java"/>
- </javac>
- </target>
-
- <!-- compile -->
- <target name="compile" depends="init, compile-common">
- <javac srcdir="${src.dir}/appserv-tests/devtests/ee/admin/mbeanapi/monitoring/web"
- destdir="${build}"
- debug="${javac.debug}"
- optimize="${javac.optimize}"
- source="${javac.source}"
- deprecation="${javac.deprecation}"
- failonerror="true">
- <classpath refid="compile.classpath"/>
- <include name="**/*.java"/>
- </javac>
- </target>
-
- <!-- clean -->
- <target name="clean" description="clean">
- <delete dir="${build}"/>
- </target>
-
- <!-- EJB pool monitoring Test Case -->
- <target name="web-mtr-test">
- <antcall target="test-common">
- <param name="test.class"
- value="com.sun.s1asdev.admin.mbeanapi.monitoring.web.WebMonitoring"/>
- </antcall>
- </target>
-
- <target name="test-common">
- <java classname="${test.class}" failonerror="true" fork="true">
- <classpath>
- <path refid="run.classpath"/>
- </classpath>
- <jvmarg value="-enableassertions"/>
- <arg value="${instance.name}" />
- <arg value="${application.name}" />
- <arg value="${web.module.name}" />
- </java>
- </target>
-
-
-</project>
diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/mbeans1/build.properties b/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/mbeans1/build.properties
deleted file mode 100644
index 41f2762..0000000
--- a/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/mbeans1/build.properties
+++ /dev/null
@@ -1,30 +0,0 @@
-<!--
-
- Copyright (c) 2018 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
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-
-<property name="module" value="management-mejb"/>
-<property name="appname" value="${module}"/>
-<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client" value="management-mejbClient"/>
-<property name="application.xml" value="descriptor/application.xml"/>
-<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="application-client.xml" value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml" value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
-<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
-<property name="app.type" value="application"/>
diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/mbeans1/build.xml b/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/mbeans1/build.xml
deleted file mode 100644
index 4988fda..0000000
--- a/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/mbeans1/build.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE project [
-<!--
-
- Copyright (c) 2018 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
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<!ENTITY commonSetup SYSTEM "file:./../../../config/properties.xml">
-<!ENTITY commonBuild SYSTEM "file:./../../../config/common.xml">
-<!ENTITY commonLazyInit SYSTEM "file:./../common.xml">
-<!ENTITY testproperties SYSTEM "file:./build.properties">
-]>
-
-<project name="management-mejb" default="usage" basedir=".">
-
- &commonSetup;
- &commonBuild;
- &commonLazyInit;
- &testproperties;
-
- <target name="all" depends="run-test"/>
- <target name="run-test" depends="pre-start,clean,build,deploy,run,undeploy"/>
-
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- </target>
-
- <target name="compile" depends="clean">
- <antcall target="compile-common">
- <param name="src" value="client"/>
- </antcall>
- </target>
-
- <target name="build" depends="compile">
- <antcall target="appclient-jar-common">
- <param name="appclientjar.classes"
- value="**/*Client*.class" />
- </antcall>
- <antcall target="ear-common"/>
- </target>
-
- <target name="deploy"
- depends="init-common">
- <antcall target="deploy-common"/>
- </target>
-
-
- <target name="run" depends="init-common">
- <antcall target="restart-server"/>
- <antcall target="runclient-common"/>
- </target>
-
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-common"/>
- </target>
-
- <target name="usage">
- <antcall target="usage-common"/>
- </target>
-
-
-
-</project>
diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/mbeans1/client/Client.java b/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/mbeans1/client/Client.java
deleted file mode 100644
index fd8935f..0000000
--- a/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/mbeans1/client/Client.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Copyright (c) 2002, 2018 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
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.s1asdev.management.mejb.client;
-
-
-import java.util.*;
-import javax.management.*;
-import javax.management.remote.*;
-
-import com.sun.appserv.management.*;
-import com.sun.appserv.management.client.*;
-import com.sun.appserv.management.config.*;
-
-import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
-
-public class Client {
-
- // consts
- public static String kTestNotRun = "TEST NOT RUN";
- public static String kTestPassed = "TEST PASSED";
- public static String kTestFailed = "TEST FAILED";
-
- private static SimpleReporterAdapter stat =
- new SimpleReporterAdapter("appserv-tests");
-
- public static void main (String[] args) {
- stat.addDescription("management-mejb");
- Client client = new Client(args);
- client.doTest();
- stat.printSummary("management-mejb");
- }
-
- public Client (String[] args) {}
-
- public String doTest() {
-
- boolean pass = false;
- String res = kTestNotRun;
-
- try {
-
- String host = "localhost";
- int port = 8686;
- String user = "admin";
- String password = "adminadmin";
-
- // Get Config info using AMX
- AppserverConnectionSource conn = new AppserverConnectionSource(
- host, port, user, password, null);
-
- DomainRoot domainRoot = conn.getDomainRoot();
-
- DomainConfig config = domainRoot.getDomainConfig();
-
- Map map = config.getJDBCResourceConfigMap();
- Collection<JDBCResourceConfig> jdbcConfigs =
- (Collection<JDBCResourceConfig>)map.values();
- for ( JDBCResourceConfig jdbcConfig : jdbcConfigs ) {
- System.err.println("JDBC Resource: name = " + jdbcConfig.getName()
- + ", JNDI Name = " + jdbcConfig.getJNDIName()
- + ", Pool Name = " + jdbcConfig.getPoolName());
- System.err.println("\t\tJ2EEType = " + jdbcConfig.getJ2EEType());
- pass = true;
- }
-
- if (pass == false) {
- throw new Exception("No JDBC resources found");
- }
- pass = false;
-
- // Get Config info using JMX
- //MBeanServerConnection mbConn = conn.getMBeanServerConnection( false );
- String urls = "service:jmx:rmi:///jndi/rmi://" +
- host + ":" + port + "/management/rmi-jmx-connector";
- JMXServiceURL url = new JMXServiceURL(urls);
- HashMap env = new HashMap();
- env.put(JMXConnector.CREDENTIALS, new String[] { user, password });
- JMXConnector jmxConnector = JMXConnectorFactory.connect(url, env);
- MBeanServerConnection mbConn = jmxConnector.getMBeanServerConnection();
-
- //ObjectName objectName =
- // new ObjectName("amx:j2eeType=X-JDBCResourceConfig,*");
- ObjectName objectName = null; // to query all MBeans
- Set mbeans = (Set) mbConn.queryNames(objectName, null);
- Iterator it = mbeans.iterator();
- while ( it.hasNext() ) {
- ObjectName mbean = (ObjectName) it.next();
- System.err.println("Object Name : " + mbean.getCanonicalName());
- pass = true;
- }
-
- if (pass == false) {
- throw new Exception("No Mbeans found");
- }
-
- } catch(Exception re) {
- re.printStackTrace();
- res = kTestFailed;
- return res;
- }
-
- if ( pass ) {
- res = kTestPassed;
- System.out.println("Mbean Test passed");
- stat.addStatus("Mbean Test", stat.PASS);
-
- } else {
- res = kTestFailed;
- System.out.println("Mbean Test failed");
- stat.addStatus("Mbean Test", stat.FAIL);
-
- }
-
- return res;
- }
-
-}
-
diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/mbeans1/client/MANIFEST.MF b/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/mbeans1/client/MANIFEST.MF
deleted file mode 100644
index b4bb107..0000000
--- a/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/mbeans1/client/MANIFEST.MF
+++ /dev/null
@@ -1,4 +0,0 @@
-Manifest-Version: 1.0
-Created-By: Apache Ant 1.5.1
-Main-Class: com.sun.s1asdev.management.mejb.client.Client
-
diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/mbeans1/descriptor/application-client.xml b/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/mbeans1/descriptor/application-client.xml
deleted file mode 100644
index e9aa427..0000000
--- a/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/mbeans1/descriptor/application-client.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2018 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
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<application-client version="1.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd">
- <display-name>management-mejbClient</display-name>
- <ejb-ref>
- <ejb-ref-name>ejbs/mejb</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>javax.management.j2ee.ManagementHome</home>
- <remote>javax.management.j2ee.Management</remote>
- <ejb-link>MEjbBean</ejb-link>
- </ejb-ref>
-</application-client>
diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/mbeans1/descriptor/application.xml b/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/mbeans1/descriptor/application.xml
deleted file mode 100644
index 67b56f4..0000000
--- a/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/mbeans1/descriptor/application.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2018 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
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<application version="1.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application_1_4.xsd">
- <description>MEJB Client Application</description>
- <display-name>mejbClientApp</display-name>
- <module>
- <java>management-mejb-client.jar</java>
- </module>
-</application>
diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/mbeans1/descriptor/sun-application-client.xml b/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/mbeans1/descriptor/sun-application-client.xml
deleted file mode 100644
index e0cc83a..0000000
--- a/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/mbeans1/descriptor/sun-application-client.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-application-client PUBLIC "-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 7.0 Application Client 1.3//EN" "http://www.sun.com/software/sunone/appserver/dtds/sun-application-client_1_3-0.dtd">
-<!--
-
- Copyright (c) 2018 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
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<sun-application-client>
- <ejb-ref>
- <ejb-ref-name>ejbs/mejb</ejb-ref-name>
- <jndi-name>ejb/mgmt/MEJB</jndi-name>
- </ejb-ref>
-</sun-application-client>
diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/mbeans1/descriptor/sun-application.xml b/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/mbeans1/descriptor/sun-application.xml
deleted file mode 100644
index a956f32..0000000
--- a/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/mbeans1/descriptor/sun-application.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-application PUBLIC "-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 7.0 J2EE Application 1.3//EN" "http://www.sun.com/software/sunone/appserver/dtds/sun-application_1_3-0.dtd">
-<!--
-
- Copyright (c) 2018 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
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<sun-application/>
diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/management/README b/appserver/tests/v2-tests/appserv-tests/sqetests/management/README
deleted file mode 100644
index d1099fd..0000000
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/management/README
+++ /dev/null
@@ -1,18 +0,0 @@
-unit tests for management
-This test is not turned on as part of quick test yet.
-Until MEjbApp.ear is deployed in the appserver as part of auto deploy, please deploy the mejb manually and run this test to check the
-availability of the mejb.
-MEjbAppl.ear is available as part of the source build in publish/<JDK...>/admin-core/jsr77/lib directory.
-Here is the deploy command to deploy the MEjbApp.ear, assuming its copied to c:\temp
-
-asadmin>deploy --user admin --password password --name MEjbApp c:/temp/MEjbApp.ear --type application
-
-To execute the test, cd to appserv-tests\sqetests\management directory and run the following commond.
-> ant mejb
-
-
-
-
-
-
-
diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/management/build.xml b/appserver/tests/v2-tests/appserv-tests/sqetests/management/build.xml
deleted file mode 100644
index c39d17a..0000000
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/management/build.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-
- Copyright (c) 2018 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
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<project name="management" default="usage" basedir=".">
-
- <property name="mejb-target" value="all"/>
-
-<!-- ======== Targets by execution granularity ========== -->
- <target name="all">
- <antcall target="mejbtests">
- <param name="mejb-target" value="all"/>
- </antcall>
- </target>
-
- <target name="run-test">
- <antcall target="mejbtests">
- <param name="mejb-target" value="run-test"/>
- </antcall>
- </target>
-
- <target name="clean">
- <antcall target="mejbtests">
- <param name="mejb-target" value="clean"/>
- </antcall>
- </target>
-
- <target name="build">
- <antcall target="mejbtests">
- <param name="mejb-target" value="build"/>
- </antcall>
- </target>
-
- <target name="deploy">
- <antcall target="mejbtests">
- <param name="mejb-target" value="deploy"/>
- </antcall>
- </target>
-
- <target name="undeploy">
- <antcall target="mejbtests">
- <param name="mejb-target" value="undeploy"/>
- </antcall>
- </target>
-
- <target name="run">
- <antcall target="mejbtests">
- <param name="mejb-target" value="run"/>
- </antcall>
- </target>
-
- <target name="setup">
- <antcall target="mejbtests">
- <param name="mejb-target" value="setup"/>
- </antcall>
- </target>
-
- <target name="unsetup">
- <antcall target="mejbtests">
- <param name="mejb-target" value="unsetup"/>
- </antcall>
- </target>
-
-
- <target name="mejbtests">
- <antcall target="mejb"/>
- </target>
-
-<!-- ======== Targets by technology ========== -->
-
- <target name="mejb">
- <record name="mejb.output" action="start" />
- <ant dir="mejb" target="${mejb-target}"/>
- <record name="mejb.output" action="stop" />
- </target>
-
- <target name="usage">
- <echo> Usage:
- ======== Targets by execution granularity =========
-
- ant clean (Cleans all management tests)
- ant build (builds all mejb tests)
- ant setup (setup all required resources)
- ant deploy (deploy all test apps)
- ant run (Executes all tests)
- ant undeploy (undeploy all test apps)
- ant unsetup (remove all set resources)
-
- ======== Targets by technology =========
-
- ant mejb (Executes the mejb test)
- ant all (Executes all the mejb tests)
-
- ===== Targets by technoloy and execution granularity ======
- Note: Run the command of the following type:
-
- % ant mejb -Dmejb-target=clean
-
- to run the 'clean' target for 'stateless' tests
- </echo>
- </target>
-</project>
diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/management/mejb/build.properties b/appserver/tests/v2-tests/appserv-tests/sqetests/management/mejb/build.properties
deleted file mode 100644
index 0158802..0000000
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/management/mejb/build.properties
+++ /dev/null
@@ -1,31 +0,0 @@
-<!--
-
- Copyright (c) 2018 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
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-
-<property name="module" value="management-mejb"/>
-<property name="appname" value="${module}"/>
-<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client" value="management-mejbClient"/>
-<property name="application.xml" value="descriptor/application.xml"/>
-<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="application-client.xml" value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml" value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
-<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
-<property name="app.type" value="application"/>
-<property name="verbose.mode" value="false"/>
diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/management/mejb/build.xml b/appserver/tests/v2-tests/appserv-tests/sqetests/management/mejb/build.xml
deleted file mode 100644
index a5f9f55..0000000
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/management/mejb/build.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE project [
-<!--
-
- Copyright (c) 2018 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
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<!ENTITY commonSetup SYSTEM "file:./../../../config/properties.xml">
-<!ENTITY commonBuild SYSTEM "file:./../../../config/common.xml">
-<!ENTITY testproperties SYSTEM "file:./build.properties">
-]>
-
-<project name="management-mejb" default="usage" basedir=".">
-
- &commonSetup;
- &commonBuild;
- &testproperties;
-
- <target name="all" depends="clean,build,deploy,setup, run,undeploy,unsetup"/>
- <target name="run-test" depends="clean,build,deploy,run,undeploy"/>
-
- <target name="setup">
- <antcall target="create-file-users"/>
- </target>
- <target name="unsetup">
- <antcall target="delete-file-users"/>
- </target>
-
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- </target>
-
- <target name="compile" depends="clean">
- <antcall target="compile-common">
- <param name="src" value="client"/>
- </antcall>
- </target>
-
- <target name="build" depends="compile">
- <antcall target="appclient-jar-common">
- <param name="appclientjar.classes"
- value="**/*Client*.class" />
- </antcall>
- <antcall target="ear-common"/>
- </target>
-
- <target name="deploy"
- depends="init-common">
- <antcall target="deploy-common"/>
- </target>
-
- <target name="run" depends="init-common">
- <antcall target="runclient-common">
- <param name="appclient.application.args" value="${verbose.mode}"/>
- </antcall>
-
- </target>
-
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-common"/>
- </target>
-
- <target name="usage">
- <antcall target="usage-common"/>
- </target>
-
-<!-- ================================================================ -->
-<!-- Target to create users in file realm -->
-<!-- ================================================================ -->
-
-<target name="create-file-users" depends="init-common">
- <antcall target ="create-user-common">
- <param name="user" value="j2ee"/>
- <param name="password" value="j2ee"/>
- <param name="groups" value="asadmin"/>
- </antcall>
-</target>
-
-<!-- ================================================================ -->
-<!-- Target to delete users in file realm -->
-<!-- ================================================================ -->
-
-<target name="delete-file-users" depends="init-common">
- <antcall target ="delete-user-common">
- <param name="user" value="j2ee"/>
- <param name="password" value="j2ee"/>
- <param name="groups" value="asadmin"/>
- </antcall>
-</target>
-
-</project>
diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/management/mejb/client/Client.java b/appserver/tests/v2-tests/appserv-tests/sqetests/management/mejb/client/Client.java
deleted file mode 100644
index e5c974b..0000000
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/management/mejb/client/Client.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- * Copyright (c) 2002, 2018 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
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.s1asdev.management.mejb.client;
-
-import java.io.*;
-import java.util.*;
-import javax.management.j2ee.ManagementHome;
-import javax.management.j2ee.Management;
-import javax.management.*;
-import javax.naming.*;
-import javax.rmi.PortableRemoteObject;
-
-import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
-
-public class Client {
-
- // consts
- public static String kTestNotRun = "TEST NOT RUN";
- public static String kTestPassed = "TEST PASSED";
- public static String kTestFailed = "TEST FAILED";
- public boolean DEBUG = false;
-
- String jndiName = "ejb/mgmt/MEJB";
- private static SimpleReporterAdapter stat =
- new SimpleReporterAdapter("appserv-tests");
-
- public static void main (String[] args) {
- stat.addDescription("management-mejb");
- Client client = new Client(args);
- client.doTest();
- stat.printSummary("management-mejb");
- }
-
- public Client(String[] args) {
- String debug=args[0];
- if(debug.equalsIgnoreCase("false"))
- DEBUG=false;
- if(debug.equalsIgnoreCase("true"))
- DEBUG=true;
- }
-
-
-
- public String doTest() {
-
- boolean pass = true;
- String res = kTestNotRun;
-
- try {
-
- Context ic = new InitialContext();
- System.out.println("***Created initial context");
-
- java.lang.Object objref = ic.lookup("ejb/mgmt/MEJB");
- System.out.println("***Looked up ManagementHome!!");
-
- ManagementHome home = (ManagementHome)PortableRemoteObject.narrow(
- objref, ManagementHome.class);
- System.out.println("***Narrowed ManagementHome!!");
-
- Management mejb = home.create();
- System.out.println("***Got the MEJB!!");
-
- String domain = mejb.getDefaultDomain();
- System.out.println("***MEJB default domain = "+domain);
- int mbeanCount = mejb.getMBeanCount().intValue();
- System.out.println("***MBeanCount = "+mbeanCount);
-
- // Print attributes of all MBeans
- ObjectName query = new ObjectName("*:*");
- Set mbeanNames = mejb.queryNames(query, null);
- if ( mbeanNames.size() != mbeanCount ) {
- System.out.println("***ERROR: mbeans returned by query is "
- +mbeanNames.size());
- pass = false;
- }
- if(DEBUG){
- System.out.println("Test running in verbose mode");
- printConsoleOutput(mbeanNames,mejb);
- }
- mejb.remove();
- if ( pass ) {
- res = kTestPassed;
- System.out.println("MEJB Test passed");
- stat.addStatus("MEJB Test", stat.PASS);
-
- } else {
- res = kTestFailed;
- System.out.println("MEJB Test failed");
- stat.addStatus("MEJB Test", stat.FAIL);
-
- }
-
- return res;
-
- } catch(NamingException ne){
- System.out.println("***Exception while initializing context.\n");
- ne.printStackTrace();
- res = kTestFailed;
- return res;
- } catch(Exception re) {
- re.printStackTrace();
- res = kTestFailed;
- return res;
- }
- }
-
- public void printConsoleOutput(Set mbeanNames, Management managementbean){
- Set mbeanNamesSet=mbeanNames;
- Management mejb=managementbean;
-
- try{
- Iterator it = mbeanNamesSet.iterator();
- while ( it.hasNext() ) {
-
- ObjectName name = (ObjectName)it.next();
- System.out.println("ObjectName = "+name);
-
- // Construct list of attr names
- MBeanInfo info = mejb.getMBeanInfo(name);
- MBeanAttributeInfo[] attrInfo = info.getAttributes();
- String[] attrNames = new String[attrInfo.length];
- for ( int i=0; i<attrInfo.length; i++ ) {
- attrNames[i] = attrInfo[i].getName();
- }
- // Get attr values from MEJB and print them
-
- AttributeList attrs = mejb.getAttributes(name, attrNames);
- for ( int i=0; i<attrs.size(); i++ ) {
-
- if (attrs.get(i) != null) {
- System.out.println("TYPE = " +
- attrs.get(i).getClass().getName());
- }
-
- if (attrs.get(i) instanceof Attribute) {
- Attribute attr = (Attribute)attrs.get(i);
- System.out.println("Attribute name = "+attr.getName()
- +"value = "+attr.getValue());
- } else {
- Object attr = attrs.get(i);
- System.out.println("Attribute = " + attr);
- }
- }
- }
- } catch(Exception exp){
- //exp.printStackTrace();
- System.out.println("***Exception occured while "+
- "accessing mbean details: Keep continuing\n");
- }
- //System.out.println("=======================");
- }
-
-
-}
diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/management/mejb/client/MANIFEST.MF b/appserver/tests/v2-tests/appserv-tests/sqetests/management/mejb/client/MANIFEST.MF
deleted file mode 100644
index b4bb107..0000000
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/management/mejb/client/MANIFEST.MF
+++ /dev/null
@@ -1,4 +0,0 @@
-Manifest-Version: 1.0
-Created-By: Apache Ant 1.5.1
-Main-Class: com.sun.s1asdev.management.mejb.client.Client
-
diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/management/mejb/descriptor/application-client.xml b/appserver/tests/v2-tests/appserv-tests/sqetests/management/mejb/descriptor/application-client.xml
deleted file mode 100644
index e9aa427..0000000
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/management/mejb/descriptor/application-client.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2018 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
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<application-client version="1.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd">
- <display-name>management-mejbClient</display-name>
- <ejb-ref>
- <ejb-ref-name>ejbs/mejb</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>javax.management.j2ee.ManagementHome</home>
- <remote>javax.management.j2ee.Management</remote>
- <ejb-link>MEjbBean</ejb-link>
- </ejb-ref>
-</application-client>
diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/management/mejb/descriptor/application.xml b/appserver/tests/v2-tests/appserv-tests/sqetests/management/mejb/descriptor/application.xml
deleted file mode 100644
index 67b56f4..0000000
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/management/mejb/descriptor/application.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2018 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
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<application version="1.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application_1_4.xsd">
- <description>MEJB Client Application</description>
- <display-name>mejbClientApp</display-name>
- <module>
- <java>management-mejb-client.jar</java>
- </module>
-</application>
diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/management/mejb/descriptor/sun-application-client.xml b/appserver/tests/v2-tests/appserv-tests/sqetests/management/mejb/descriptor/sun-application-client.xml
deleted file mode 100644
index e0cc83a..0000000
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/management/mejb/descriptor/sun-application-client.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-application-client PUBLIC "-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 7.0 Application Client 1.3//EN" "http://www.sun.com/software/sunone/appserver/dtds/sun-application-client_1_3-0.dtd">
-<!--
-
- Copyright (c) 2018 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
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<sun-application-client>
- <ejb-ref>
- <ejb-ref-name>ejbs/mejb</ejb-ref-name>
- <jndi-name>ejb/mgmt/MEJB</jndi-name>
- </ejb-ref>
-</sun-application-client>
diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/management/mejb/descriptor/sun-application.xml b/appserver/tests/v2-tests/appserv-tests/sqetests/management/mejb/descriptor/sun-application.xml
deleted file mode 100644
index a956f32..0000000
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/management/mejb/descriptor/sun-application.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-application PUBLIC "-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 7.0 J2EE Application 1.3//EN" "http://www.sun.com/software/sunone/appserver/dtds/sun-application_1_3-0.dtd">
-<!--
-
- Copyright (c) 2018 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
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<sun-application/>
