SF.net SVN: mx4j: [2262] trunk/mx4j
[email protected] Tue, 20 Mar 2007 17:09:33 -0700
| Newsgroups | gmane.comp.java.mx4j.cvs |
|---|---|
| Message-ID | <[email protected]> |
Revision: 2262
http://svn.sourceforge.net/mx4j/?rev=2262&view=rev
Author: simonebordet
Date: 2007-03-20 17:09:32 -0700 (Tue, 20 Mar 2007)
Log Message:
-----------
Tests package reorganization.
Modified Paths:
--------------
trunk/mx4j/jsr003/pom.xml
trunk/mx4j/jsr003/src/test/java/test/javax/management/BinaryOpValueExpTest.java
trunk/mx4j/jsr003/src/test/java/test/javax/management/BinaryRelQueryExpTest.java
trunk/mx4j/jsr003/src/test/java/test/javax/management/DynamicMBeanFunctionalityTest.java
trunk/mx4j/jsr003/src/test/java/test/javax/management/MBeanComplianceTest.java
trunk/mx4j/jsr003/src/test/java/test/javax/management/MBeanIntrospectionTest.java
trunk/mx4j/jsr003/src/test/java/test/javax/management/MBeanRegistrationTest.java
trunk/mx4j/jsr003/src/test/java/test/javax/management/MBeanServerBuilderTest.java
trunk/mx4j/jsr003/src/test/java/test/javax/management/MBeanServerInvocationHandlerTest.java
trunk/mx4j/jsr003/src/test/java/test/javax/management/MBeanServerTest.java
trunk/mx4j/jsr003/src/test/java/test/javax/management/MBeanStarInfoTest.java
trunk/mx4j/jsr003/src/test/java/test/javax/management/MultiThreadMBeanServerTest.java
trunk/mx4j/jsr003/src/test/java/test/javax/management/NotificationListenerTest.java
trunk/mx4j/jsr003/src/test/java/test/javax/management/ObjectNameTest.java
trunk/mx4j/jsr003/src/test/java/test/javax/management/PermissionTestCase.java
trunk/mx4j/jsr003/src/test/java/test/javax/management/QueryTest.java
trunk/mx4j/jsr003/src/test/java/test/javax/management/SecurityManagerTestCase.java
trunk/mx4j/jsr003/src/test/java/test/javax/management/StandardMBeanTest.java
trunk/mx4j/jsr003/src/test/java/test/javax/management/compliance/JMXComplianceTestCase.java
trunk/mx4j/jsr003/src/test/java/test/javax/management/compliance/serialization/JMXSerializationTest.java
trunk/mx4j/jsr003/src/test/java/test/javax/management/compliance/signature/JMXSignatureTest.java
trunk/mx4j/jsr003/src/test/java/test/javax/management/loading/ClassLoaderRepositoryTest.java
trunk/mx4j/jsr003/src/test/java/test/javax/management/loading/MLetTest.java
trunk/mx4j/jsr003/src/test/java/test/javax/management/modelmbean/DescriptorSupportTest.java
trunk/mx4j/jsr003/src/test/java/test/javax/management/modelmbean/ModelMBeanAttributeInfoTest.java
trunk/mx4j/jsr003/src/test/java/test/javax/management/modelmbean/ModelMBeanConstructorInfoTest.java
trunk/mx4j/jsr003/src/test/java/test/javax/management/modelmbean/ModelMBeanInfoSupportTest.java
trunk/mx4j/jsr003/src/test/java/test/javax/management/modelmbean/ModelMBeanNotificationInfoTest.java
trunk/mx4j/jsr003/src/test/java/test/javax/management/modelmbean/ModelMBeanOperationInfoTest.java
trunk/mx4j/jsr003/src/test/java/test/javax/management/modelmbean/RequiredModelMBeanTest.java
trunk/mx4j/jsr003/src/test/java/test/javax/management/modelmbean/support/ModelMBeanTarget.java
trunk/mx4j/jsr003/src/test/java/test/javax/management/monitor/CounterMonitorTest.java
trunk/mx4j/jsr003/src/test/java/test/javax/management/monitor/GaugeMonitorTest.java
trunk/mx4j/jsr003/src/test/java/test/javax/management/monitor/MonitorTestCase.java
trunk/mx4j/jsr003/src/test/java/test/javax/management/monitor/StringMonitorTest.java
trunk/mx4j/jsr003/src/test/java/test/javax/management/openmbean/ArrayTypeTest.java
trunk/mx4j/jsr003/src/test/java/test/javax/management/openmbean/CompositeDataSupportTest.java
trunk/mx4j/jsr003/src/test/java/test/javax/management/openmbean/CompositeTypeTest.java
trunk/mx4j/jsr003/src/test/java/test/javax/management/openmbean/OpenMBeanAttributeInfoSupportTest.java
trunk/mx4j/jsr003/src/test/java/test/javax/management/openmbean/OpenMBeanInfoSupportTest.java
trunk/mx4j/jsr003/src/test/java/test/javax/management/openmbean/OpenMBeanOperationInfoSupportTest.java
trunk/mx4j/jsr003/src/test/java/test/javax/management/openmbean/OpenMBeanParameterInfoSupportTest.java
trunk/mx4j/jsr003/src/test/java/test/javax/management/openmbean/TabularDataSupportTest.java
trunk/mx4j/jsr003/src/test/java/test/javax/management/openmbean/TabularTypeTest.java
trunk/mx4j/jsr003/src/test/java/test/javax/management/relation/RelationServiceTest.java
trunk/mx4j/jsr003/src/test/java/test/javax/management/relation/RoleTest.java
trunk/mx4j/jsr003/src/test/java/test/javax/management/support/ExceptionGeneratingDMB.java
trunk/mx4j/jsr003/src/test/java/test/javax/management/support/NullMBeanInfoDMB.java
trunk/mx4j/jsr003/src/test/java/test/javax/management/support/RegistrationSupport.java
trunk/mx4j/jsr003/src/test/java/test/javax/management/support/StandardMBeanSupport.java
trunk/mx4j/jsr003/src/test/java/test/javax/management/timer/TimerTest.java
trunk/mx4j/jsr003/src/test/java/test/mx4j/AbstractDynamicMBeanTest.java
trunk/mx4j/jsr003/src/test/java/test/mx4j/MiscellaneousTest.java
trunk/mx4j/jsr003/src/test/java/test/mx4j/log/LogRedirectionTest.java
trunk/mx4j/jsr003/src/test/java/test/mx4j/server/BCELMBeanInvokerTest.java
trunk/mx4j/jsr003/src/test/java/test/mx4j/server/MX4JMBeanServerTest.java
trunk/mx4j/jsr003/src/test/java/test/mx4j/server/NotificationListenerMBeanServerInterceptorTest.java
trunk/mx4j/jsr003/src/test/java/test/mx4j/timer/TimeQueueTest.java
trunk/mx4j/jsr160/pom.xml
trunk/mx4j/jsr160/src/test/java/mx4j/remote/RemoteNotificationClientHandlerTest.java
trunk/mx4j/jsr160/src/test/java/mx4j/remote/RemoteNotificationServerHandlerTest.java
trunk/mx4j/jsr160/src/test/java/test/javax/management/remote/compliance/OptionalRemoteJMXComplianceTestCase.java
trunk/mx4j/jsr160/src/test/java/test/javax/management/remote/compliance/RemoteJMXComplianceTestCase.java
trunk/mx4j/jsr160/src/test/java/test/javax/management/remote/compliance/serialization/RemoteJMXSerializationTest.java
trunk/mx4j/jsr160/src/test/java/test/javax/management/remote/compliance/serialization/support/RemoteComparator.java
trunk/mx4j/jsr160/src/test/java/test/javax/management/remote/compliance/serialization/support/RemoteInstantiator.java
trunk/mx4j/jsr160/src/test/java/test/javax/management/remote/compliance/signature/OptionalRemoteJMXSignatureTest.java
trunk/mx4j/jsr160/src/test/java/test/javax/management/remote/compliance/signature/RemoteJMXSignatureTest.java
trunk/mx4j/jsr160/src/test/java/test/javax/management/remote/rmi/RMIConnectorServerTestCase.java
trunk/mx4j/jsr160/src/test/java/test/javax/management/remote/rmi/RMIConnectorTestCase.java
trunk/mx4j/jsr160/src/test/java/test/javax/management/remote/rmi/RMIIIOPConnectorInvocationTest.java
trunk/mx4j/jsr160/src/test/java/test/javax/management/remote/rmi/RMIIIOPConnectorServerTest.java
trunk/mx4j/jsr160/src/test/java/test/javax/management/remote/rmi/RMIIIOPConnectorTest.java
trunk/mx4j/jsr160/src/test/java/test/javax/management/remote/rmi/RMIIIOPNotificationsTest.java
trunk/mx4j/jsr160/src/test/java/test/javax/management/remote/rmi/RMIInteroperabilityTest.java
trunk/mx4j/jsr160/src/test/java/test/javax/management/remote/rmi/RMIJRMPConnectorInvocationTest.java
trunk/mx4j/jsr160/src/test/java/test/javax/management/remote/rmi/RMIJRMPConnectorServerTest.java
trunk/mx4j/jsr160/src/test/java/test/javax/management/remote/rmi/RMIJRMPConnectorTest.java
trunk/mx4j/jsr160/src/test/java/test/javax/management/remote/rmi/RMIJRMPMultiThreadMBeanServerConnectionTest.java
trunk/mx4j/jsr160/src/test/java/test/javax/management/remote/rmi/RMIJRMPNotificationsTest.java
trunk/mx4j/jsr160/src/test/java/test/javax/management/remote/rmi/RMIJRMPRemoteSecurityManagerTest.java
trunk/mx4j/jsr160/src/test/java/test/javax/management/remote/rmi/RMIMarshallingTest.java
trunk/mx4j/jsr160/src/test/java/test/javax/management/remote/rmi/RMITestCase.java
trunk/mx4j/jsr160/src/test/java/test/javax/management/remote/support/Marshalling.java
trunk/mx4j/jsr160/src/test/java/test/javax/management/remote/support/MarshallingMBean.java
trunk/mx4j/jsr160/src/test/java/test/javax/management/remote/support/Unknown.java
trunk/mx4j/pom.xml
Added Paths:
-----------
trunk/mx4j/jsr160/src/test/java/test/
trunk/mx4j/jsr160/src/test/java/test/javax/
trunk/mx4j/jsr160/src/test/java/test/javax/management/
trunk/mx4j/jsr160/src/test/java/test/javax/management/remote/
trunk/mx4j/jsr160/src/test/java/test/javax/management/remote/JMXConnectorFactoryTest.java
trunk/mx4j/jsr160/src/test/java/test/javax/management/remote/JMXConnectorInvocationTestCase.java
trunk/mx4j/jsr160/src/test/java/test/javax/management/remote/JMXConnectorServerFactoryTest.java
trunk/mx4j/jsr160/src/test/java/test/javax/management/remote/JMXConnectorServerTestCase.java
trunk/mx4j/jsr160/src/test/java/test/javax/management/remote/JMXConnectorTestCase.java
trunk/mx4j/jsr160/src/test/java/test/javax/management/remote/JMXNotificationsTestCase.java
trunk/mx4j/jsr160/src/test/java/test/javax/management/remote/JMXServiceURLTest.java
trunk/mx4j/jsr160/src/test/java/test/javax/management/remote/RemoteSecurityManagerTestCase.java
trunk/mx4j/jsr160/src/test/java/test/javax/management/remote/compliance/
trunk/mx4j/jsr160/src/test/java/test/javax/management/remote/rmi/
trunk/mx4j/jsr160/src/test/java/test/javax/management/remote/support/
trunk/mx4j/tests-support/src/main/java/test/
trunk/mx4j/tests-support/src/main/java/test/mx4j/
trunk/mx4j/tests-support/src/main/java/test/mx4j/MX4JClassLoadingTestCase.java
trunk/mx4j/tests-support/src/main/java/test/mx4j/MX4JTestCase.java
trunk/mx4j/tests-support/src/main/java/test/mx4j/MultiThreadTestRunner.java
trunk/mx4j/tests-support/src/main/java/test/mx4j/MutableBoolean.java
trunk/mx4j/tests-support/src/main/java/test/mx4j/MutableInteger.java
trunk/mx4j/tests-support/src/main/java/test/mx4j/MutableLong.java
trunk/mx4j/tests-support/src/main/java/test/mx4j/MutableObject.java
trunk/mx4j/tests-support/src/main/java/test/mx4j/compliance/
trunk/mx4j/tests-support/src/main/java/test/mx4j/compliance/ComplianceTestCase.java
trunk/mx4j/tests-support/src/main/java/test/mx4j/compliance/serialization/
trunk/mx4j/tests-support/src/main/java/test/mx4j/compliance/serialization/SerializationVerifier.java
trunk/mx4j/tests-support/src/main/java/test/mx4j/compliance/serialization/Serializer.java
trunk/mx4j/tests-support/src/main/java/test/mx4j/compliance/signature/
trunk/mx4j/tests-support/src/main/java/test/mx4j/compliance/signature/FieldWrapper.java
trunk/mx4j/tests-support/src/main/java/test/mx4j/compliance/signature/MemberWrapper.java
trunk/mx4j/tests-support/src/main/java/test/mx4j/compliance/signature/MethodWrapper.java
trunk/mx4j/tests-support/src/main/java/test/mx4j/compliance/signature/NotCompliantException.java
trunk/mx4j/tests-support/src/main/java/test/mx4j/compliance/signature/NotCompliantWarningException.java
trunk/mx4j/tests-support/src/main/java/test/mx4j/compliance/signature/ObjectClass.java
trunk/mx4j/tests-support/src/main/java/test/mx4j/compliance/signature/ObjectMethod.java
trunk/mx4j/tests-support/src/main/java/test/mx4j/compliance/signature/SignatureVerifier.java
Removed Paths:
-------------
trunk/mx4j/jsr003/src/test/java/test/javax/management/compliance/ComplianceTestCase.java
trunk/mx4j/jsr003/src/test/java/test/javax/management/compliance/serialization/support/SerializationVerifier.java
trunk/mx4j/jsr003/src/test/java/test/javax/management/compliance/serialization/support/Serializer.java
trunk/mx4j/jsr003/src/test/java/test/javax/management/compliance/signature/support/
trunk/mx4j/jsr160/src/test/java/javax/management/remote/JMXConnectorFactoryTest.java
trunk/mx4j/jsr160/src/test/java/javax/management/remote/JMXConnectorInvocationTestCase.java
trunk/mx4j/jsr160/src/test/java/javax/management/remote/JMXConnectorServerFactoryTest.java
trunk/mx4j/jsr160/src/test/java/javax/management/remote/JMXConnectorServerTestCase.java
trunk/mx4j/jsr160/src/test/java/javax/management/remote/JMXConnectorTestCase.java
trunk/mx4j/jsr160/src/test/java/javax/management/remote/JMXNotificationsTestCase.java
trunk/mx4j/jsr160/src/test/java/javax/management/remote/JMXServiceURLTest.java
trunk/mx4j/jsr160/src/test/java/javax/management/remote/RemoteSecurityManagerTestCase.java
trunk/mx4j/jsr160/src/test/java/javax/management/remote/compliance/
trunk/mx4j/jsr160/src/test/java/javax/management/remote/rmi/
trunk/mx4j/jsr160/src/test/java/javax/management/remote/support/
trunk/mx4j/jsr160/src/test/java/test/javax/management/remote/compliance/serialization/OptionalRemoteJMXSerializationTest.java
trunk/mx4j/jsr160/src/test/java/test/javax/management/remote/compliance/serialization/support/OptionalRemoteComparator.java
trunk/mx4j/jsr160/src/test/java/test/javax/management/remote/compliance/serialization/support/OptionalRemoteInstantiator.java
trunk/mx4j/tests-support/src/main/java/mx4j/
Modified: trunk/mx4j/jsr003/pom.xml
===================================================================
--- trunk/mx4j/jsr003/pom.xml 2007-03-20 22:29:42 UTC (rev 2261)
+++ trunk/mx4j/jsr003/pom.xml 2007-03-21 00:09:32 UTC (rev 2262)
@@ -16,44 +16,18 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-surefire-plugin</artifactId>
+ <artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <!--<childDelegation>true</childDelegation>-->
- <forkMode>always</forkMode>
- <excludes>
- <exclude>**/*SecurityManager*</exclude>
- </excludes>
-<!--
- <includes>
- <include>**/management/*Test.java</include>
- </includes>
--->
+ <testExcludes>
+ <exclude>**/MultiThreadMBeanServerTest.java</exclude>
+ <exclude>**/SecurityManagerTestCase.java</exclude>
+ <exclude>**/LocalSecurityManagerTest.java</exclude>
+ </testExcludes>
</configuration>
</plugin>
</plugins>
</build>
-<!--
- <profiles>
- <profile>
- <id>jdk15</id>
- <activation>
- <jdk>1.5</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <includes>
- <include>**</include>
- </includes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
--->
+
<dependencies>
<dependency>
<groupId>commons-logging</groupId>
@@ -72,7 +46,7 @@
</dependency>
<dependency>
<groupId>mx4j</groupId>
- <artifactId>mx4j-tests</artifactId>
+ <artifactId>mx4j-tests-support</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
Modified: trunk/mx4j/jsr003/src/test/java/test/javax/management/BinaryOpValueExpTest.java
===================================================================
--- trunk/mx4j/jsr003/src/test/java/test/javax/management/BinaryOpValueExpTest.java 2007-03-20 22:29:42 UTC (rev 2261)
+++ trunk/mx4j/jsr003/src/test/java/test/javax/management/BinaryOpValueExpTest.java 2007-03-21 00:09:32 UTC (rev 2262)
@@ -12,7 +12,7 @@
import javax.management.QueryExp;
import javax.management.ValueExp;
-import mx4j.MX4JTestCase;
+import test.mx4j.MX4JTestCase;
/**
* @version $Revision$
Modified: trunk/mx4j/jsr003/src/test/java/test/javax/management/BinaryRelQueryExpTest.java
===================================================================
--- trunk/mx4j/jsr003/src/test/java/test/javax/management/BinaryRelQueryExpTest.java 2007-03-20 22:29:42 UTC (rev 2261)
+++ trunk/mx4j/jsr003/src/test/java/test/javax/management/BinaryRelQueryExpTest.java 2007-03-21 00:09:32 UTC (rev 2262)
@@ -14,7 +14,7 @@
import javax.management.StringValueExp;
import javax.management.ValueExp;
-import mx4j.MX4JTestCase;
+import test.mx4j.MX4JTestCase;
/**
* @version $Revision$
Modified: trunk/mx4j/jsr003/src/test/java/test/javax/management/DynamicMBeanFunctionalityTest.java
===================================================================
--- trunk/mx4j/jsr003/src/test/java/test/javax/management/DynamicMBeanFunctionalityTest.java 2007-03-20 22:29:42 UTC (rev 2261)
+++ trunk/mx4j/jsr003/src/test/java/test/javax/management/DynamicMBeanFunctionalityTest.java 2007-03-21 00:09:32 UTC (rev 2262)
@@ -17,8 +17,8 @@
import javax.management.ObjectName;
import javax.management.RuntimeMBeanException;
-import mx4j.MX4JTestCase;
import test.javax.management.support.MBeanDynamic;
+import test.mx4j.MX4JTestCase;
/**
* @version $Revision$
@@ -135,7 +135,7 @@
{
try
{
- m_server.createMBean("test.test.javax.management.support.ExceptionGeneratingDMB",
+ m_server.createMBean("test.javax.management.support.ExceptionGeneratingDMB",
new ObjectName(":register=no"),
new Object[]{Boolean.FALSE},
new String[]{"boolean"});
@@ -151,7 +151,7 @@
try
{
ObjectName objname = new ObjectName(":register=yes");
- m_server.createMBean("test.test.javax.management.support.ExceptionGeneratingDMB",
+ m_server.createMBean("test.javax.management.support.ExceptionGeneratingDMB",
objname,
new Object[]{Boolean.TRUE},
new String[]{"boolean"});
@@ -168,7 +168,7 @@
try
{
ObjectName objname = new ObjectName(":id=testNullMBeanInfo");
- m_server.createMBean("test.test.javax.management.support.NullMBeanInfoDMB", objname);
+ m_server.createMBean("test.javax.management.support.NullMBeanInfoDMB", objname);
m_server.getMBeanInfo(objname);
fail("Expecting JMRuntimeException");
}
Modified: trunk/mx4j/jsr003/src/test/java/test/javax/management/MBeanComplianceTest.java
===================================================================
--- trunk/mx4j/jsr003/src/test/java/test/javax/management/MBeanComplianceTest.java 2007-03-20 22:29:42 UTC (rev 2261)
+++ trunk/mx4j/jsr003/src/test/java/test/javax/management/MBeanComplianceTest.java 2007-03-21 00:09:32 UTC (rev 2262)
@@ -17,10 +17,10 @@
import javax.management.MBeanConstructorInfo;
import mx4j.MX4JSystemKeys;
-import mx4j.MX4JTestCase;
import mx4j.server.MBeanIntrospector;
import mx4j.server.MBeanMetaData;
import test.javax.management.support.ComplianceSupport;
+import test.mx4j.MX4JTestCase;
/**
* @version $Revision$
@@ -190,7 +190,7 @@
public void testCompliantPackagePrivate() throws Exception
{
- String clsName = "test.test.javax.management.support.ComplianceSupport$PackagePrivate";
+ String clsName = "test.javax.management.support.ComplianceSupport$PackagePrivate";
Class cls = getClass().getClassLoader().loadClass(clsName);
Constructor ctor = cls.getDeclaredConstructor(new Class[0]);
ctor.setAccessible(true);
Modified: trunk/mx4j/jsr003/src/test/java/test/javax/management/MBeanIntrospectionTest.java
===================================================================
--- trunk/mx4j/jsr003/src/test/java/test/javax/management/MBeanIntrospectionTest.java 2007-03-20 22:29:42 UTC (rev 2261)
+++ trunk/mx4j/jsr003/src/test/java/test/javax/management/MBeanIntrospectionTest.java 2007-03-21 00:09:32 UTC (rev 2262)
@@ -9,9 +9,9 @@
import javax.management.MBeanInfo;
import javax.management.MBeanOperationInfo;
-import mx4j.MX4JTestCase;
import mx4j.server.MBeanIntrospector;
import mx4j.server.MBeanMetaData;
+import test.mx4j.MX4JTestCase;
/**
* @version $Revision$ $Date$
Modified: trunk/mx4j/jsr003/src/test/java/test/javax/management/MBeanRegistrationTest.java
===================================================================
--- trunk/mx4j/jsr003/src/test/java/test/javax/management/MBeanRegistrationTest.java 2007-03-20 22:29:42 UTC (rev 2261)
+++ trunk/mx4j/jsr003/src/test/java/test/javax/management/MBeanRegistrationTest.java 2007-03-21 00:09:32 UTC (rev 2262)
@@ -26,10 +26,10 @@
import javax.management.RuntimeOperationsException;
import javax.management.loading.MLet;
-import mx4j.MX4JTestCase;
-import mx4j.MutableBoolean;
-import mx4j.MutableObject;
import test.javax.management.support.RegistrationSupport;
+import test.mx4j.MX4JTestCase;
+import test.mx4j.MutableBoolean;
+import test.mx4j.MutableObject;
/**
* @version $Revision$
Modified: trunk/mx4j/jsr003/src/test/java/test/javax/management/MBeanServerBuilderTest.java
===================================================================
--- trunk/mx4j/jsr003/src/test/java/test/javax/management/MBeanServerBuilderTest.java 2007-03-20 22:29:42 UTC (rev 2261)
+++ trunk/mx4j/jsr003/src/test/java/test/javax/management/MBeanServerBuilderTest.java 2007-03-21 00:09:32 UTC (rev 2262)
@@ -21,12 +21,12 @@
import javax.management.ObjectName;
import javax.management.ReflectionException;
-import mx4j.MX4JTestCase;
import mx4j.server.ChainedMBeanServer;
import mx4j.server.ChainedMBeanServerBuilder;
import mx4j.server.MX4JMBeanServer;
import mx4j.server.MX4JMBeanServerBuilder;
import mx4j.server.MX4JMBeanServerDelegate;
+import test.mx4j.MX4JTestCase;
/**
* @version $Revision$
Modified: trunk/mx4j/jsr003/src/test/java/test/javax/management/MBeanServerInvocationHandlerTest.java
===================================================================
--- trunk/mx4j/jsr003/src/test/java/test/javax/management/MBeanServerInvocationHandlerTest.java 2007-03-20 22:29:42 UTC (rev 2261)
+++ trunk/mx4j/jsr003/src/test/java/test/javax/management/MBeanServerInvocationHandlerTest.java 2007-03-21 00:09:32 UTC (rev 2262)
@@ -27,7 +27,7 @@
import javax.management.ObjectName;
import javax.naming.NamingException;
-import mx4j.MX4JTestCase;
+import test.mx4j.MX4JTestCase;
/**
* @version $Revision$
Modified: trunk/mx4j/jsr003/src/test/java/test/javax/management/MBeanServerTest.java
===================================================================
--- trunk/mx4j/jsr003/src/test/java/test/javax/management/MBeanServerTest.java 2007-03-20 22:29:42 UTC (rev 2261)
+++ trunk/mx4j/jsr003/src/test/java/test/javax/management/MBeanServerTest.java 2007-03-21 00:09:32 UTC (rev 2262)
@@ -25,13 +25,13 @@
import javax.management.ObjectName;
import javax.management.RuntimeOperationsException;
-import mx4j.MX4JTestCase;
-import mx4j.MutableInteger;
import test.javax.management.support.ClassLoaderSupport;
import test.javax.management.support.ComplianceSupport;
import test.javax.management.support.MBeanThrowingExceptions;
import test.javax.management.support.NotificationSupport;
import test.javax.management.support.PostRegistrationSupport;
+import test.mx4j.MX4JTestCase;
+import test.mx4j.MutableInteger;
/**
* @version $Revision$
Modified: trunk/mx4j/jsr003/src/test/java/test/javax/management/MBeanStarInfoTest.java
===================================================================
--- trunk/mx4j/jsr003/src/test/java/test/javax/management/MBeanStarInfoTest.java 2007-03-20 22:29:42 UTC (rev 2261)
+++ trunk/mx4j/jsr003/src/test/java/test/javax/management/MBeanStarInfoTest.java 2007-03-21 00:09:32 UTC (rev 2262)
@@ -16,7 +16,7 @@
import javax.management.MBeanOperationInfo;
import javax.management.MBeanParameterInfo;
-import mx4j.MX4JTestCase;
+import test.mx4j.MX4JTestCase;
/**
* @version $Revision$
Modified: trunk/mx4j/jsr003/src/test/java/test/javax/management/MultiThreadMBeanServerTest.java
===================================================================
--- trunk/mx4j/jsr003/src/test/java/test/javax/management/MultiThreadMBeanServerTest.java 2007-03-20 22:29:42 UTC (rev 2261)
+++ trunk/mx4j/jsr003/src/test/java/test/javax/management/MultiThreadMBeanServerTest.java 2007-03-21 00:09:32 UTC (rev 2262)
@@ -24,8 +24,8 @@
import javax.management.loading.MLet;
import javax.management.timer.Timer;
-import mx4j.MX4JTestCase;
-import mx4j.MultiThreadTestRunner;
+import test.mx4j.MX4JTestCase;
+import test.mx4j.MultiThreadTestRunner;
/**
* @version $Revision$
Modified: trunk/mx4j/jsr003/src/test/java/test/javax/management/NotificationListenerTest.java
===================================================================
--- trunk/mx4j/jsr003/src/test/java/test/javax/management/NotificationListenerTest.java 2007-03-20 22:29:42 UTC (rev 2261)
+++ trunk/mx4j/jsr003/src/test/java/test/javax/management/NotificationListenerTest.java 2007-03-21 00:09:32 UTC (rev 2262)
@@ -20,9 +20,9 @@
import javax.management.NotificationListener;
import javax.management.ObjectName;
-import mx4j.MX4JTestCase;
-import mx4j.MutableInteger;
-import mx4j.MutableObject;
+import test.mx4j.MX4JTestCase;
+import test.mx4j.MutableInteger;
+import test.mx4j.MutableObject;
/**
* @version $Revision$
Modified: trunk/mx4j/jsr003/src/test/java/test/javax/management/ObjectNameTest.java
===================================================================
--- trunk/mx4j/jsr003/src/test/java/test/javax/management/ObjectNameTest.java 2007-03-20 22:29:42 UTC (rev 2261)
+++ trunk/mx4j/jsr003/src/test/java/test/javax/management/ObjectNameTest.java 2007-03-21 00:09:32 UTC (rev 2262)
@@ -13,7 +13,7 @@
import javax.management.MalformedObjectNameException;
import javax.management.ObjectName;
-import mx4j.MX4JTestCase;
+import test.mx4j.MX4JTestCase;
/**
* @version $Revision$
Modified: trunk/mx4j/jsr003/src/test/java/test/javax/management/PermissionTestCase.java
===================================================================
--- trunk/mx4j/jsr003/src/test/java/test/javax/management/PermissionTestCase.java 2007-03-20 22:29:42 UTC (rev 2261)
+++ trunk/mx4j/jsr003/src/test/java/test/javax/management/PermissionTestCase.java 2007-03-21 00:09:32 UTC (rev 2262)
@@ -11,7 +11,7 @@
import java.security.Permission;
import java.security.PermissionCollection;
-import mx4j.MX4JTestCase;
+import test.mx4j.MX4JTestCase;
/**
* @version $Revision$
Modified: trunk/mx4j/jsr003/src/test/java/test/javax/management/QueryTest.java
===================================================================
--- trunk/mx4j/jsr003/src/test/java/test/javax/management/QueryTest.java 2007-03-20 22:29:42 UTC (rev 2261)
+++ trunk/mx4j/jsr003/src/test/java/test/javax/management/QueryTest.java 2007-03-21 00:09:32 UTC (rev 2262)
@@ -18,8 +18,8 @@
import javax.management.Query;
import javax.management.ValueExp;
-import mx4j.MX4JTestCase;
import test.javax.management.support.QuerySupport;
+import test.mx4j.MX4JTestCase;
/**
* Class QueryTest, tests the query service
@@ -226,7 +226,7 @@
result =
server.queryMBeans(null,
Query.eq(Query.classattr(),
- Query.value("test.test.javax.management.support.QuerySupport$Test")));
+ Query.value("test.javax.management.support.QuerySupport$Test")));
assertEquals(3, result.size());
}
@@ -447,13 +447,13 @@
server.registerMBean(c, name3);
Set result =
server.queryMBeans(null,
- Query.eq(Query.attr("test.test.javax.management.support.QuerySupport$Test",
+ Query.eq(Query.attr("test.javax.management.support.QuerySupport$Test",
"Number"),
Query.value(2)));
assertEquals(1, result.size());
result =
server.queryMBeans(null,
- Query.eq(Query.attr("test.test.javax.management.support.QuerySupport.Test2",
+ Query.eq(Query.attr("test.javax.management.support.QuerySupport.Test2",
"Number"),
Query.value(2)));
assertEquals(0, result.size());
Modified: trunk/mx4j/jsr003/src/test/java/test/javax/management/SecurityManagerTestCase.java
===================================================================
--- trunk/mx4j/jsr003/src/test/java/test/javax/management/SecurityManagerTestCase.java 2007-03-20 22:29:42 UTC (rev 2261)
+++ trunk/mx4j/jsr003/src/test/java/test/javax/management/SecurityManagerTestCase.java 2007-03-21 00:09:32 UTC (rev 2262)
@@ -25,7 +25,7 @@
import javax.management.Query;
import javax.management.QueryExp;
-import mx4j.MX4JTestCase;
+import test.mx4j.MX4JTestCase;
/**
* Test case class that defines all tests to be performed by a security manager test
Modified: trunk/mx4j/jsr003/src/test/java/test/javax/management/StandardMBeanTest.java
===================================================================
--- trunk/mx4j/jsr003/src/test/java/test/javax/management/StandardMBeanTest.java 2007-03-20 22:29:42 UTC (rev 2261)
+++ trunk/mx4j/jsr003/src/test/java/test/javax/management/StandardMBeanTest.java 2007-03-21 00:09:32 UTC (rev 2262)
@@ -16,8 +16,8 @@
import javax.management.ReflectionException;
import javax.management.StandardMBean;
-import mx4j.MX4JTestCase;
import test.javax.management.support.StandardMBeanSupport;
+import test.mx4j.MX4JTestCase;
/**
* @version $Revision$
@@ -185,7 +185,7 @@
try
{
name = ObjectName.getInstance(":type=privateimplementation2");
- server.createMBean("test.test.javax.management.support.StandardMBeanSupport$PublicInterface", name);
+ server.createMBean("test.javax.management.support.StandardMBeanSupport$PublicInterface", name);
fail("Must not be able to create an MBean whose class is private");
}
catch (ReflectionException x)
@@ -207,7 +207,7 @@
ObjectName smbtwoname = new ObjectName(":type=cbcounter");
mbs.registerMBean(smbtwo, smbtwoname);
- assertTrue(mbs.isInstanceOf(smbonename, "test.test.javax.management.support.StandardMBeanSupport$Management"));
- assertTrue(mbs.isInstanceOf(smbtwoname, "test.test.javax.management.support.StandardMBeanSupport$FullManagement"));
+ assertTrue(mbs.isInstanceOf(smbonename, "test.javax.management.support.StandardMBeanSupport$Management"));
+ assertTrue(mbs.isInstanceOf(smbtwoname, "test.javax.management.support.StandardMBeanSupport$FullManagement"));
}
}
Deleted: trunk/mx4j/jsr003/src/test/java/test/javax/management/compliance/ComplianceTestCase.java
===================================================================
--- trunk/mx4j/jsr003/src/test/java/test/javax/management/compliance/ComplianceTestCase.java 2007-03-20 22:29:42 UTC (rev 2261)
+++ trunk/mx4j/jsr003/src/test/java/test/javax/management/compliance/ComplianceTestCase.java 2007-03-21 00:09:32 UTC (rev 2262)
@@ -1,90 +0,0 @@
-/*
- * Copyright (C) The MX4J Contributors.
- * All rights reserved.
- *
- * This software is distributed under the terms of the MX4J License version 1.0.
- * See the terms of the MX4J License in the documentation provided with this software.
- */
-
-package test.javax.management.compliance;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.jar.JarEntry;
-import java.util.jar.JarFile;
-
-import mx4j.MX4JClassLoadingTestCase;
-
-/**
- * @version $Revision$
- */
-public abstract class ComplianceTestCase extends MX4JClassLoadingTestCase
-{
- public void testCompliance() throws Exception
- {
- ClassLoader loader = createClassLoader();
-
- JarFile jar = loadJar();
-
- Enumeration entries = jar.entries();
- ArrayList nonExistingMethods = new ArrayList();
- while (entries.hasMoreElements())
- {
- JarEntry entry = (JarEntry)entries.nextElement();
-
- // Skip directories
- if (entry.isDirectory()) continue;
-
- // Skip Sun's implementation classes
- String entryName = entry.getName();
- if (entryName.startsWith("javax"))
- {
- // Take the class
- String fullClassName = entryName.replace('/', '.');
- fullClassName = fullClassName.substring(0, fullClassName.length() - ".class".length());
-
- if (skipClassName(fullClassName)) continue;
-
- Class cls = loader.loadClass(fullClassName);
-
- if (skipClass(cls)) continue;
-
- String name = fullClassName.substring("javax.management".length());
- name = name.replace('.', '_');
- try
- {
- // Verify that a method with this name exists
- getClass().getMethod("test" + name, new Class[0]);
- }
- catch (NoSuchMethodException x)
- {
- nonExistingMethods.add(fullClassName);
- }
- }
- }
- Collections.sort(nonExistingMethods);
- if (nonExistingMethods.size() > 0) fail("Compliance test incomplete, missing classes are:\n" + nonExistingMethods);
- }
-
- protected abstract boolean skipClassName(String className);
-
- protected abstract boolean skipClass(Class cls);
-
- protected abstract void checkCompliance(String className) throws Exception;
-
- protected abstract ClassLoader createClassLoader() throws MalformedURLException;
-
- protected abstract JarFile loadJar() throws IOException;
-
- protected void check(String partialClassName) throws Exception
- {
- ClassLoader loader = createClassLoader();
- String fullName = "javax.management." + partialClassName;
- if (skipClassName(fullName)) return;
- if (skipClass(loader.loadClass(fullName))) return;
- checkCompliance(fullName);
- }
-}
Modified: trunk/mx4j/jsr003/src/test/java/test/javax/management/compliance/JMXComplianceTestCase.java
===================================================================
--- trunk/mx4j/jsr003/src/test/java/test/javax/management/compliance/JMXComplianceTestCase.java 2007-03-20 22:29:42 UTC (rev 2261)
+++ trunk/mx4j/jsr003/src/test/java/test/javax/management/compliance/JMXComplianceTestCase.java 2007-03-21 00:09:32 UTC (rev 2262)
@@ -13,8 +13,10 @@
import java.net.MalformedURLException;
import java.util.jar.JarFile;
+import test.mx4j.compliance.ComplianceTestCase;
+
/**
- * @version $Revision$
+ * @version $Revision:2260 $
*/
public abstract class JMXComplianceTestCase extends ComplianceTestCase
{
Modified: trunk/mx4j/jsr003/src/test/java/test/javax/management/compliance/serialization/JMXSerializationTest.java
===================================================================
--- trunk/mx4j/jsr003/src/test/java/test/javax/management/compliance/serialization/JMXSerializationTest.java 2007-03-20 22:29:42 UTC (rev 2261)
+++ trunk/mx4j/jsr003/src/test/java/test/javax/management/compliance/serialization/JMXSerializationTest.java 2007-03-21 00:09:32 UTC (rev 2262)
@@ -12,10 +12,10 @@
import java.lang.reflect.Modifier;
import test.javax.management.compliance.JMXComplianceTestCase;
-import test.javax.management.compliance.serialization.support.SerializationVerifier;
+import test.mx4j.compliance.serialization.SerializationVerifier;
/**
- * @version $Revision$
+ * @version $Revision:2260 $
*/
public class JMXSerializationTest extends JMXComplianceTestCase
{
@@ -41,7 +41,7 @@
ClassLoader jmxriLoader = createJMXRIWithTestsClassLoader();
ClassLoader mx4jLoader = createMX4JWithTestsClassLoader();
- SerializationVerifier verifier = new SerializationVerifier("test.test.javax.management.compliance.serialization.support.Instantiator", "test.test.javax.management.compliance.serialization.support.Comparator");
+ SerializationVerifier verifier = new SerializationVerifier("test.javax.management.compliance.serialization.support.Instantiator", "test.javax.management.compliance.serialization.support.Comparator");
verifier.verifySerialization(name, jmxriLoader, mx4jLoader);
}
}
Deleted: trunk/mx4j/jsr003/src/test/java/test/javax/management/compliance/serialization/support/SerializationVerifier.java
===================================================================
--- trunk/mx4j/jsr003/src/test/java/test/javax/management/compliance/serialization/support/SerializationVerifier.java 2007-03-20 22:29:42 UTC (rev 2261)
+++ trunk/mx4j/jsr003/src/test/java/test/javax/management/compliance/serialization/support/SerializationVerifier.java 2007-03-21 00:09:32 UTC (rev 2262)
@@ -1,146 +0,0 @@
-/*
- * Copyright (C) The MX4J Contributors.
- * All rights reserved.
- *
- * This software is distributed under the terms of the MX4J License version 1.0.
- * See the terms of the MX4J License in the documentation provided with this software.
- */
-
-package test.javax.management.compliance.serialization.support;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-/**
- * @version $Revision$
- */
-public class SerializationVerifier
-{
- private String instantiator;
- private String comparator;
-
- public SerializationVerifier(String instantiator, String comparator)
- {
- this.instantiator = instantiator;
- this.comparator = comparator;
- }
-
- public void verifySerialization(String name, ClassLoader jmxriLoader, ClassLoader mx4jLoader) throws Exception
- {
- name = name.substring(name.lastIndexOf('.') + 1);
-
- // Create the object, one with MX4J, one with JMXRI
- Thread.currentThread().setContextClassLoader(mx4jLoader);
- Object mx4j = create(name);
- Thread.currentThread().setContextClassLoader(jmxriLoader);
- Object jmxri = create(name);
-
- // Be sure they're not the same class
- if (mx4j.getClass().isInstance(jmxri)) throw new Exception("Classes must be different");
- if (jmxri.getClass().isInstance(mx4j)) throw new Exception("Classes must be different");
-
- // Serialize MX4J object
- Thread.currentThread().setContextClassLoader(mx4jLoader);
- byte[] mx4jBytes = serialize(mx4j);
-
- // Deserialize with JMXRI
- Thread.currentThread().setContextClassLoader(jmxriLoader);
- Object jmxriObject = deserialize(mx4jBytes);
-
- // Be sure they're not the same class
- if (mx4j.getClass().isInstance(jmxriObject)) throw new Exception("Classes must be different");
- if (jmxriObject.getClass().isInstance(mx4j)) throw new Exception("Classes must be different");
- // Be also sure the deserialized is of the same type as JMXRI
- if (jmxri.getClass() != jmxriObject.getClass()) throw new Exception("Classes must be equal");
-
- // Now compare the original and the deserialized
- compare(name, jmxri, jmxriObject);
-
- // Now, do the opposite
-
- // Serialize JMXRI object
- Thread.currentThread().setContextClassLoader(jmxriLoader);
- byte[] jmxriBytes = serialize(jmxri);
-
- // Deserialize with MX4J
- Thread.currentThread().setContextClassLoader(mx4jLoader);
- Object mx4jObject = deserialize(jmxriBytes);
-
- // Be sure they're not the same class
- if (jmxri.getClass().isInstance(mx4jObject)) throw new Exception("Classes must be different");
- if (mx4jObject.getClass().isInstance(jmxri)) throw new Exception("Classes must be different");
- // Be also sure the deserialized is of the same type as MX4J
- if (mx4j.getClass() != mx4jObject.getClass()) throw new Exception("Classes must be equal");
-
- // Now compare the original and the deserialized
- compare(name, mx4j, mx4jObject);
-
- }
-
- private Object create(String name) throws Exception
- {
- // Create an instance of the Instantiator
- ClassLoader loader = Thread.currentThread().getContextClassLoader();
- Object creator = loader.loadClass(instantiator).newInstance();
-
- // Lookup the creation method and call it
- Method method = creator.getClass().getMethod("create" + name, new Class[0]);
- Object object = method.invoke(creator, new Object[0]);
- return object;
- }
-
- private byte[] serialize(Object object) throws Exception
- {
- // Must delegate again to another object loaded with the correct classloader,
- // otherwise the deserialization will use the system classloader instead of
- // the context classloader
- ClassLoader loader = Thread.currentThread().getContextClassLoader();
- Object serializer = loader.loadClass("test.test.javax.management.compliance.serialization.support.Serializer").newInstance();
- Method method = serializer.getClass().getMethod("serialize", new Class[]{Object.class});
- return (byte[])method.invoke(serializer, new Object[]{object});
- }
-
- private Object deserialize(byte[] bytes) throws Exception
- {
- // Must delegate again to another object loaded with the correct classloader,
- // otherwise the deserialization will use the system classloader instead of
- // the context classloader
- ClassLoader loader = Thread.currentThread().getContextClassLoader();
- Object serializer = loader.loadClass("test.test.javax.management.compliance.serialization.support.Serializer").newInstance();
- Method method = serializer.getClass().getMethod("deserialize", new Class[]{byte[].class});
- return method.invoke(serializer, new Object[]{bytes});
- }
-
- private void compare(String name, Object obj1, Object obj2) throws Exception
- {
- // First check if the class has the equals method
- try
- {
- obj1.getClass().getDeclaredMethod("equals", new Class[]{Object.class});
- // It's present
- if (!obj1.equals(obj2)) throw new RuntimeException();
-
- }
- catch (NoSuchMethodException x)
- {
- // No equals(), create an instance of the Comparator
- ClassLoader loader = Thread.currentThread().getContextClassLoader();
- Object creator = loader.loadClass(comparator).newInstance();
-
- // Lookup the compare method
- Method method = creator.getClass().getMethod("compare" + name, new Class[]{Object.class, Object.class});
- try
- {
- method.invoke(creator, new Object[]{obj1, obj2});
- }
- catch (InvocationTargetException xx)
- {
- Throwable t = xx.getTargetException();
- if (t instanceof Exception)
- throw (Exception)t;
- else
- throw (Error)t;
- }
- }
- }
-}
Deleted: trunk/mx4j/jsr003/src/test/java/test/javax/management/compliance/serialization/support/Serializer.java
===================================================================
--- trunk/mx4j/jsr003/src/test/java/test/javax/management/compliance/serialization/support/Serializer.java 2007-03-20 22:29:42 UTC (rev 2261)
+++ trunk/mx4j/jsr003/src/test/java/test/javax/management/compliance/serialization/support/Serializer.java 2007-03-21 00:09:32 UTC (rev 2262)
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) The MX4J Contributors.
- * All rights reserved.
- *
- * This software is distributed under the terms of the MX4J License version 1.0.
- * See the terms of the MX4J License in the documentation provided with this software.
- */
-
-package test.javax.management.compliance.serialization.support;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-
-/**
- * @version $Revision$
- */
-public class Serializer
-{
- public byte[] serialize(Object object) throws IOException
- {
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- ObjectOutputStream oos = new ObjectOutputStream(baos);
- oos.writeObject(object);
- oos.close();
- byte[] bytes = baos.toByteArray();
- return bytes;
- }
-
- public Object deserialize(byte[] bytes) throws IOException, ClassNotFoundException
- {
- ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
- ObjectInputStream ois = new ObjectInputStream(bais);
- Object object = ois.readObject();
- ois.close();
- return object;
- }
-}
Modified: trunk/mx4j/jsr003/src/test/java/test/javax/management/compliance/signature/JMXSignatureTest.java
===================================================================
--- trunk/mx4j/jsr003/src/test/java/test/javax/management/compliance/signature/JMXSignatureTest.java 2007-03-20 22:29:42 UTC (rev 2261)
+++ trunk/mx4j/jsr003/src/test/java/test/javax/management/compliance/signature/JMXSignatureTest.java 2007-03-21 00:09:32 UTC (rev 2262)
@@ -12,15 +12,15 @@
import java.lang.reflect.Modifier;
import test.javax.management.compliance.JMXComplianceTestCase;
-import test.javax.management.compliance.signature.support.NotCompliantException;
-import test.javax.management.compliance.signature.support.NotCompliantWarningException;
-import test.javax.management.compliance.signature.support.SignatureVerifier;
+import test.mx4j.compliance.signature.NotCompliantException;
+import test.mx4j.compliance.signature.NotCompliantWarningException;
+import test.mx4j.compliance.signature.SignatureVerifier;
/**
* Test that verifies that the signature of the classes in JMXRI are equal to MX4J classes.
* It resembles a small TCK, for signatures of the JMX classes only.
*
- * @version $Revision$
+ * @version $Revision:2260 $
*/
public class JMXSignatureTest extends JMXComplianceTestCase
{
Modified: trunk/mx4j/jsr003/src/test/java/test/javax/management/loading/ClassLoaderRepositoryTest.java
===================================================================
--- trunk/mx4j/jsr003/src/test/java/test/javax/management/loading/ClassLoaderRepositoryTest.java 2007-03-20 22:29:42 UTC (rev 2261)
+++ trunk/mx4j/jsr003/src/test/java/test/javax/management/loading/ClassLoaderRepositoryTest.java 2007-03-21 00:09:32 UTC (rev 2262)
@@ -16,10 +16,10 @@
import javax.management.loading.ClassLoaderRepository;
import javax.management.loading.MLet;
-import mx4j.MX4JTestCase;
+import test.mx4j.MX4JTestCase;
/**
- * @version $Revision$
+ * @version $Revision:2260 $
*/
public class ClassLoaderRepositoryTest extends MX4JTestCase
{
Modified: trunk/mx4j/jsr003/src/test/java/test/javax/management/loading/MLetTest.java
===================================================================
--- trunk/mx4j/jsr003/src/test/java/test/javax/management/loading/MLetTest.java 2007-03-20 22:29:42 UTC (rev 2261)
+++ trunk/mx4j/jsr003/src/test/java/test/javax/management/loading/MLetTest.java 2007-03-21 00:09:32 UTC (rev 2262)
@@ -26,14 +26,14 @@
import javax.management.loading.PrivateMLet;
import mx4j.MX4JSystemKeys;
-import mx4j.MX4JTestCase;
import mx4j.loading.MLetParseException;
import mx4j.loading.MLetParser;
import mx4j.loading.MLetTag;
import mx4j.server.DefaultClassLoaderRepository;
+import test.mx4j.MX4JTestCase;
/**
- * @version $Revision$
+ * @version $Revision:2260 $
*/
public class MLetTest extends MX4JTestCase
{
Modified: trunk/mx4j/jsr003/src/test/java/test/javax/management/modelmbean/DescriptorSupportTest.java
===================================================================
--- trunk/mx4j/jsr003/src/test/java/test/javax/management/modelmbean/DescriptorSupportTest.java 2007-03-20 22:29:42 UTC (rev 2261)
+++ trunk/mx4j/jsr003/src/test/java/test/javax/management/modelmbean/DescriptorSupportTest.java 2007-03-21 00:09:32 UTC (rev 2262)
@@ -24,10 +24,10 @@
import javax.management.modelmbean.DescriptorSupport;
import javax.management.modelmbean.XMLParseException;
-import mx4j.MX4JTestCase;
+import test.mx4j.MX4JTestCase;
/**
- * @version $Revision$
+ * @version $Revision:2260 $
*/
public class DescriptorSupportTest extends MX4JTestCase
Modified: trunk/mx4j/jsr003/src/test/java/test/javax/management/modelmbean/ModelMBeanAttributeInfoTest.java
===================================================================
--- trunk/mx4j/jsr003/src/test/java/test/javax/management/modelmbean/ModelMBeanAttributeInfoTest.java 2007-03-20 22:29:42 UTC (rev 2261)
+++ trunk/mx4j/jsr003/src/test/java/test/javax/management/modelmbean/ModelMBeanAttributeInfoTest.java 2007-03-21 00:09:32 UTC (rev 2262)
@@ -17,13 +17,13 @@
import javax.management.modelmbean.DescriptorSupport;
import javax.management.modelmbean.ModelMBeanAttributeInfo;
-import mx4j.MX4JTestCase;
+import test.mx4j.MX4JTestCase;
/**
* Test case of ModelMBeanAttributeInfo. It will try to verify an appropriate
* behaviour in particular with respect to the descriptor values
*
- * @version $Revision$
+ * @version $Revision:2260 $
* @see
*/
Modified: trunk/mx4j/jsr003/src/test/java/test/javax/management/modelmbean/ModelMBeanConstructorInfoTest.java
===================================================================
--- trunk/mx4j/jsr003/src/test/java/test/javax/management/modelmbean/ModelMBeanConstructorInfoTest.java 2007-03-20 22:29:42 UTC (rev 2261)
+++ trunk/mx4j/jsr003/src/test/java/test/javax/management/modelmbean/ModelMBeanConstructorInfoTest.java 2007-03-21 00:09:32 UTC (rev 2262)
@@ -17,10 +17,10 @@
import javax.management.modelmbean.ModelMBeanConstructorInfo;
import junit.textui.TestRunner;
-import mx4j.MX4JTestCase;
+import test.mx4j.MX4JTestCase;
/**
- * @version $Revision$
+ * @version $Revision:2260 $
*/
public class ModelMBeanConstructorInfoTest extends MX4JTestCase
{
Modified: trunk/mx4j/jsr003/src/test/java/test/javax/management/modelmbean/ModelMBeanInfoSupportTest.java
===================================================================
--- trunk/mx4j/jsr003/src/test/java/test/javax/management/modelmbean/ModelMBeanInfoSupportTest.java 2007-03-20 22:29:42 UTC (rev 2261)
+++ trunk/mx4j/jsr003/src/test/java/test/javax/management/modelmbean/ModelMBeanInfoSupportTest.java 2007-03-21 00:09:32 UTC (rev 2262)
@@ -18,10 +18,10 @@
import javax.management.modelmbean.ModelMBeanNotificationInfo;
import javax.management.modelmbean.ModelMBeanOperationInfo;
-import mx4j.MX4JTestCase;
+import test.mx4j.MX4JTestCase;
/**
- * @version $Revision$
+ * @version $Revision:2260 $
* @see
*/
Modified: trunk/mx4j/jsr003/src/test/java/test/javax/management/modelmbean/ModelMBeanNotificationInfoTest.java
===================================================================
--- trunk/mx4j/jsr003/src/test/java/test/javax/management/modelmbean/ModelMBeanNotificationInfoTest.java 2007-03-20 22:29:42 UTC (rev 2261)
+++ trunk/mx4j/jsr003/src/test/java/test/javax/management/modelmbean/ModelMBeanNotificationInfoTest.java 2007-03-21 00:09:32 UTC (rev 2262)
@@ -12,10 +12,10 @@
import javax.management.modelmbean.DescriptorSupport;
import javax.management.modelmbean.ModelMBeanNotificationInfo;
-import mx4j.MX4JTestCase;
+import test.mx4j.MX4JTestCase;
/**
- * @version $Revision$
+ * @version $Revision:2260 $
* @see
*/
Modified: trunk/mx4j/jsr003/src/test/java/test/javax/management/modelmbean/ModelMBeanOperationInfoTest.java
===================================================================
--- trunk/mx4j/jsr003/src/test/java/test/javax/management/modelmbean/ModelMBeanOperationInfoTest.java 2007-03-20 22:29:42 UTC (rev 2261)
+++ trunk/mx4j/jsr003/src/test/java/test/javax/management/modelmbean/ModelMBeanOperationInfoTest.java 2007-03-21 00:09:32 UTC (rev 2262)
@@ -17,13 +17,13 @@
import javax.management.modelmbean.DescriptorSupport;
import javax.management.modelmbean.ModelMBeanOperationInfo;
-import mx4j.MX4JTestCase;
+import test.mx4j.MX4JTestCase;
/**
* Test case of ModelMBeanOperationInfo. It will try to verify an appropriate
* behaviour in particular with respect to the descriptor values
*
- * @version $Revision$
+ * @version $Revision:2260 $
* @see
*/
Modified: trunk/mx4j/jsr003/src/test/java/test/javax/management/modelmbean/RequiredModelMBeanTest.java
===================================================================
--- trunk/mx4j/jsr003/src/test/java/test/javax/management/modelmbean/RequiredModelMBeanTest.java 2007-03-20 22:29:42 UTC (rev 2261)
+++ trunk/mx4j/jsr003/src/test/java/test/javax/management/modelmbean/RequiredModelMBeanTest.java 2007-03-21 00:09:32 UTC (rev 2262)
@@ -32,13 +32,13 @@
import javax.management.modelmbean.ModelMBeanOperationInfo;
import javax.management.modelmbean.RequiredModelMBean;
-import mx4j.MX4JTestCase;
-import mx4j.MutableBoolean;
-import mx4j.MutableInteger;
import test.javax.management.modelmbean.support.ModelMBeanTarget;
+import test.mx4j.MX4JTestCase;
+import test.mx4j.MutableBoolean;
+import test.mx4j.MutableInteger;
/**
- * @version $Revision$
+ * @version $Revision:2260 $
*/
public class RequiredModelMBeanTest extends MX4JTestCase
{
Modified: trunk/mx4j/jsr003/src/test/java/test/javax/management/modelmbean/support/ModelMBeanTarget.java
===================================================================
--- trunk/mx4j/jsr003/src/test/java/test/javax/management/modelmbean/support/ModelMBeanTarget.java 2007-03-20 22:29:42 UTC (rev 2261)
+++ trunk/mx4j/jsr003/src/test/java/test/javax/management/modelmbean/support/ModelMBeanTarget.java 2007-03-21 00:09:32 UTC (rev 2262)
@@ -11,10 +11,10 @@
import java.util.ArrayList;
import java.util.List;
-import mx4j.MutableInteger;
+import test.mx4j.MutableInteger;
/**
- * @version $Revision$
+ * @version $Revision:2260 $
* @see
*/
public class ModelMBeanTarget
Modified: trunk/mx4j/jsr003/src/test/java/test/javax/management/monitor/CounterMonitorTest.java
===================================================================
--- trunk/mx4j/jsr003/src/test/java/test/javax/management/monitor/CounterMonitorTest.java 2007-03-20 22:29:42 UTC (rev 2261)
+++ trunk/mx4j/jsr003/src/test/java/test/javax/management/monitor/CounterMonitorTest.java 2007-03-21 00:09:32 UTC (rev 2262)
@@ -16,8 +16,8 @@
import javax.management.monitor.Monitor;
import javax.management.monitor.MonitorNotification;
-import mx4j.MutableInteger;
-import mx4j.MutableObject;
+import test.mx4j.MutableInteger;
+import test.mx4j.MutableObject;
/**
* @version : $Revision 1.2 $
Modified: trunk/mx4j/jsr003/src/test/java/test/javax/management/monitor/GaugeMonitorTest.java
===================================================================
--- trunk/mx4j/jsr003/src/test/java/test/javax/management/monitor/GaugeMonitorTest.java 2007-03-20 22:29:42 UTC (rev 2261)
+++ trunk/mx4j/jsr003/src/test/java/test/javax/management/monitor/GaugeMonitorTest.java 2007-03-21 00:09:32 UTC (rev 2262)
@@ -16,11 +16,11 @@
import javax.management.monitor.Monitor;
import javax.management.monitor.MonitorNotification;
-import mx4j.MutableInteger;
-import mx4j.MutableObject;
+import test.mx4j.MutableInteger;
+import test.mx4j.MutableObject;
/**
- * @version $Revision$
+ * @version $Revision:2260 $
*/
public class GaugeMonitorTest extends MonitorTestCase
{
Modified: trunk/mx4j/jsr003/src/test/java/test/javax/management/monitor/MonitorTestCase.java
===================================================================
--- trunk/mx4j/jsr003/src/test/java/test/javax/management/monitor/MonitorTestCase.java 2007-03-20 22:29:42 UTC (rev 2261)
+++ trunk/mx4j/jsr003/src/test/java/test/javax/management/monitor/MonitorTestCase.java 2007-03-21 00:09:32 UTC (rev 2262)
@@ -16,9 +16,9 @@
import javax.management.monitor.Monitor;
import javax.management.monitor.MonitorNotification;
-import mx4j.MX4JTestCase;
-import mx4j.MutableInteger;
-import mx4j.MutableObject;
+import test.mx4j.MX4JTestCase;
+import test.mx4j.MutableInteger;
+import test.mx4j.MutableObject;
/**
* @version : 1.2 $
Modified: trunk/mx4j/jsr003/src/test/java/test/javax/management/monitor/StringMonitorTest.java
===================================================================
--- trunk/mx4j/jsr003/src/test/java/test/javax/management/monitor/StringMonitorTest.java 2007-03-20 22:29:42 UTC (rev 2261)
+++ trunk/mx4j/jsr003/src/test/java/test/javax/management/monitor/StringMonitorTest.java 2007-03-21 00:09:32 UTC (rev 2262)
@@ -16,11 +16,11 @@
import javax.management.monitor.MonitorNotification;
import javax.management.monitor.StringMonitor;
-import mx4j.MutableInteger;
-import mx4j.MutableObject;
+import test.mx4j.MutableInteger;
+import test.mx4j.MutableObject;
/**
- * @version $Revision$
+ * @version $Revision:2260 $
*/
public class StringMonitorTest extends MonitorTestCase
{
Modified: trunk/mx4j/jsr003/src/test/java/test/javax/management/openmbean/ArrayTypeTest.java
===================================================================
--- trunk/mx4j/jsr003/src/test/java/test/javax/management/openmbean/ArrayTypeTest.java 2007-03-20 22:29:42 UTC (rev 2261)
+++ trunk/mx4j/jsr003/src/test/java/test/javax/management/openmbean/ArrayTypeTest.java 2007-03-21 00:09:32 UTC (rev 2262)
@@ -8,7 +8,7 @@
package test.javax.management.openmbean;
/**
- * @version $Revision$
+ * @version $Revision:2260 $
*/
import javax.management.openmbean.ArrayType;
@@ -18,7 +18,7 @@
import javax.management.openmbean.OpenType;
import javax.management.openmbean.SimpleType;
-import mx4j.MX4JTestCase;
+import test.mx4j.MX4JTestCase;
public class ArrayTypeTest extends MX4JTestCase
Modified: trunk/mx4j/jsr003/src/test/java/test/javax/management/openmbean/CompositeDataSupportTest.java
===================================================================
--- trunk/mx4j/jsr003/src/test/java/test/javax/management/openmbean/CompositeDataSupportTest.java 2007-03-20 22:29:42 UTC (rev 2261)
+++ trunk/mx4j/jsr003/src/test/java/test/javax/management/openmbean/CompositeDataSupportTest.java 2007-03-21 00:09:32 UTC (rev 2262)
@@ -16,10 +16,10 @@
import javax.management.openmbean.TabularDataSupport;
import javax.management.openmbean.TabularType;
-import mx4j.MX4JTestCase;
+import test.mx4j.MX4JTestCase;
/**
- * @version $Revision$
+ * @version $Revision:2260 $
*/
public class CompositeDataSupportTest extends MX4JTestCase
{
Modified: trunk/mx4j/jsr003/src/test/java/test/javax/management/openmbean/CompositeTypeTest.java
===================================================================
--- trunk/mx4j/jsr003/src/test/java/test/javax/management/openmbean/CompositeTypeTest.java 2007-03-20 22:29:42 UTC (rev 2261)
+++ trunk/mx4j/jsr003/src/test/java/test/javax/management/openmbean/CompositeTypeTest.java 2007-03-21 00:09:32 UTC (rev 2262)
@@ -15,10 +15,10 @@
import javax.management.openmbean.SimpleType;
import junit.framework.TestCase;
-import test.javax.management.compliance.serialization.support.Serializer;
+import test.mx4j.compliance.serialization.Serializer;
/**
- * @version $Revision$
+ * @version $Revision:2260 $
*/
public class CompositeTypeTest extends TestCase
{
Modified: trunk/mx4j/jsr003/src/test/java/test/javax/management/openmbean/OpenMBeanAttributeInfoSupportTest.java
===================================================================
--- trunk/mx4j/jsr003/src/test/java/test/javax/management/openmbean/OpenMBeanAttributeInfoSupportTest.java 2007-03-20 22:29:42 UTC (rev 2261)
+++ trunk/mx4j/jsr003/src/test/java/test/javax/management/openmbean/OpenMBeanAttributeInfoSupportTest.java 2007-03-21 00:09:32 UTC (rev 2262)
@@ -8,7 +8,7 @@
package test.javax.management.openmbean;
/**
- * @version $Revision$
+ * @version $Revision:2260 $
*/
import java.util.Iterator;
@@ -19,7 +19,7 @@
import javax.management.openmbean.OpenMBeanAttributeInfoSupport;
import javax.management.openmbean.SimpleType;
-import mx4j.MX4JTestCase;
+import test.mx4j.MX4JTestCase;
public class OpenMBeanAttributeInfoSupportTest extends MX4JTestCase
Modified: trunk/mx4j/jsr003/src/test/java/test/javax/management/openmbean/OpenMBeanInfoSupportTest.java
===================================================================
--- trunk/mx4j/jsr003/src/test/java/test/javax/management/openmbean/OpenMBeanInfoSupportTest.java 2007-03-20 22:29:42 UTC (rev 2261)
+++ trunk/mx4j/jsr003/src/test/java/test/javax/management/openmbean/OpenMBeanInfoSupportTest.java 2007-03-21 00:09:32 UTC (rev 2262)
@@ -25,7 +25,7 @@
import javax.management.openmbean.SimpleType;
import junit.textui.TestRunner;
-import mx4j.MX4JTestCase;
+import test.mx4j.MX4JTestCase;
/**
*/
Modified: trunk/mx4j/jsr003/src/test/java/test/javax/management/openmbean/OpenMBeanOperationInfoSupportTest.java
===================================================================
--- trunk/mx4j/jsr003/src/test/java/test/javax/management/openmbean/OpenMBeanOperationInfoSupportTest.java 2007-03-20 22:29:42 UTC (rev 2261)
+++ trunk/mx4j/jsr003/src/test/java/test/javax/management/openmbean/OpenMBeanOperationInfoSupportTest.java 2007-03-21 00:09:32 UTC (rev 2262)
@@ -8,7 +8,7 @@
package test.javax.management.openmbean;
/**
- * @version $Revision$
+ * @version $Revision:2260 $
*/
import java.util.Arrays;
@@ -20,7 +20,7 @@
import javax.management.openmbean.OpenMBeanParameterInfoSupport;
import javax.management.openmbean.SimpleType;
-import mx4j.MX4JTestCase;
+import test.mx4j.MX4JTestCase;
public class OpenMBeanOperationInfoSupportTest extends MX4JTestCase
Modified: trunk/mx4j/jsr003/src/test/java/test/javax/management/openmbean/OpenMBeanParameterInfoSupportTest.java
===================================================================
--- trunk/mx4j/jsr003/src/test/java/test/javax/management/openmbean/OpenMBeanParameterInfoSupportTest.java 2007-03-20 22:29:42 UTC (rev 2261)
+++ trunk/mx4j/jsr003/src/test/java/test/javax/management/openmbean/OpenMBeanParameterInfoSupportTest.java 2007-03-21 00:09:32 UTC (rev 2262)
@@ -16,11 +16,11 @@
import javax.management.openmbean.OpenMBeanParameterInfoSupport;
import javax.management.openmbean.SimpleType;
-import mx4j.MX4JTestCase;
-import test.javax.management.compliance.serialization.support.Serializer;
+import test.mx4j.MX4JTestCase;
+import test.mx4j.compliance.serialization.Serializer;
/**
- * @version $Revision$
+ * @version $Revision:2260 $
*/
public class OpenMBeanParameterInfoSupportTest extends MX4JTestCase
Modified: trunk/mx4j/jsr003/src/test/java/test/javax/management/openmbean/TabularDataSupportTest.java
===================================================================
--- trunk/mx4j/jsr003/src/test/java/test/javax/management/openmbean/TabularDataSupportTest.java 2007-03-20 22:29:42 UTC (rev 2261)
+++ trunk/mx4j/jsr003/src/test/java/test/javax/management/openmbean/TabularDataSupportTest.java 2007-03-21 00:09:32 UTC (rev 2262)
@@ -19,10 +19,10 @@
import javax.management.openmbean.TabularDataSupport;
import javax.management.openmbean.TabularType;
-import mx4j.MX4JTestCase;
+import test.mx4j.MX4JTestCase;
/**
- * @version $Revision$
+ * @version $Revision:2260 $
*/
public class TabularDataSupportTest extends MX4JTestCase
{
Modified: trunk/mx4j/jsr003/src/test/java/test/javax/management/openmbean/TabularTypeTest.java
===================================================================
--- trunk/mx4j/jsr003/src/test/java/test/javax/management/openmbean/TabularTypeTest.java 2007-03-20 22:29:42 UTC (rev 2261)
+++ trunk/mx4j/jsr003/src/test/java/test/javax/management/openmbean/TabularTypeTest.java 2007-03-21 00:09:32 UTC (rev 2262)
@@ -18,10 +18,10 @@
import javax.management.openmbean.SimpleType;
import javax.management.openmbean.TabularType;
-import mx4j.MX4JTestCase;
+import test.mx4j.MX4JTestCase;
/**
- * @version $Revision$
+ * @version $Revision:2260 $
*/
public class TabularTypeTest extends MX4JTestCase
{
Modified: trunk/mx4j/jsr003/src/test/java/test/javax/management/relation/RelationServiceTest.java
===================================================================
--- trunk/mx4j/jsr003/src/test/java/test/javax/management/relation/RelationServiceTest.java 2007-03-20 22:29:42 UTC (rev 2261)
+++ trunk/mx4j/jsr003/src/test/java/test/javax/management/relation/RelationServiceTest.java 2007-03-21 00:09:32 UTC (rev 2262)
@@ -29,10 +29,10 @@
import javax.management.relation.RoleResult;
import javax.management.relation.RoleStatus;
-import mx4j.MX4JTestCase;
+import test.mx4j.MX4JTestCase;
/**
- * @version $Revision$
+ * @version $Revision:2260 $
*/
public class RelationServiceTest extends MX4JTestCase
{
Modified: trunk/mx4j/jsr003/src/test/java/test/javax/management/relation/RoleTest.java
===================================================================
--- trunk/mx4j/jsr003/src/test/java/test/javax/management/relation/RoleTest.java 2007-03-20 22:29:42 UTC (rev 2261)
+++ trunk/mx4j/jsr003/src/test/java/test/javax/management/relation/RoleTest.java 2007-03-21 00:09:32 UTC (rev 2262)
@@ -14,10 +14,10 @@
import javax.management.ObjectName;
import javax.management.relation.Role;
-import mx4j.MX4JTestCase;
+import test.mx4j.MX4JTestCase;
/**
- * @version $Revision$
+ * @version $Revision:2260 $
*/
public class RoleTest extends MX4JTestCase
{
Modified: trunk/mx4j/jsr003/src/test/java/test/javax/management/support/ExceptionGeneratingDMB.java
===================================================================
--- trunk/mx4j/jsr003/src/test/java/test/javax/management/support/ExceptionGeneratingDMB.java 2007-03-20 22:29:42 UTC (rev 2261)
+++ trunk/mx4j/jsr003/src/test/java/test/javax/management/support/ExceptionGeneratingDMB.java 2007-03-21 00:09:32 UTC (rev 2262)
@@ -25,7 +25,7 @@
import javax.management.ReflectionException;
/**
- * @version $Revision$
+ * @version $Revision:2260 $
*/
public class ExceptionGeneratingDMB
implements DynamicMBean, MBeanRegistration
@@ -47,7 +47,7 @@
else
{
invoked = true;
- return new MBeanInfo("test.test.javax.management.support.test.ExceptionGeneratingDMB",
+ return new MBeanInfo("test.javax.management.support.test.ExceptionGeneratingDMB",
"Exception generating DynamicMBean",
new MBeanAttributeInfo[0],
new MBeanConstructorInfo[0],
Modified: trunk/mx4j/jsr003/src/test/java/test/javax/management/support/NullMBeanInfoDMB.java
===================================================================
--- trunk/mx4j/jsr003/src/test/java/test/javax/management/support/NullMBeanInfoDMB.java 2007-03-20 22:29:42 UTC (rev 2261)
+++ trunk/mx4j/jsr003/src/test/java/test/javax/management/support/NullMBeanInfoDMB.java 2007-03-21 00:09:32 UTC (rev 2262)
@@ -25,7 +25,7 @@
import javax.management.ReflectionException;
/**
- * @version $Revision$
+ * @version $Revision:2260 $
*/
public class NullMBeanInfoDMB implements DynamicMBean, MBeanRegistration
{
@@ -35,7 +35,7 @@
{
return (registered)
? null
- : new MBeanInfo("test.test.javax.management.support.NullMBeanInfoDMB",
+ : new MBeanInfo("test.javax.management.support.NullMBeanInfoDMB",
"A DynamicMBean that returns null in response to getMBeanInfo() invocations",
new MBeanAttributeInfo[0],
new MBeanConstructorInfo[0],
Modified: trunk/mx4j/jsr003/src/test/java/test/javax/management/support/RegistrationSupport.java
===================================================================
--- trunk/mx4j/jsr003/src/test/java/test/javax/management/support/RegistrationSupport.java 2007-03-20 22:29:42 UTC (rev 2261)
+++ trunk/mx4j/jsr003/src/test/java/test/javax/management/support/RegistrationSupport.java 2007-03-21 00:09:32 UTC (rev 2262)
@@ -18,11 +18,11 @@
import javax.management.ObjectName;
import mx4j.AbstractDynamicMBean;
-import mx4j.MutableBoolean;
-import mx4j.MutableObject;
+import test.mx4j.MutableBoolean;
+import test.mx4j.MutableObject;
/**
- * @version $Revision$
+ * @version $Revision:2260 $
*/
public class RegistrationSupport
{
Modified: trunk/mx4j/jsr003/src/test/java/test/javax/management/support/StandardMBeanSupport.java
===================================================================
--- trunk/mx4j/jsr003/src/test/java/test/javax/management/support/StandardMBeanSupport.java 2007-03-20 22:29:42 UTC (rev 2261)
+++ trunk/mx4j/jsr003/src/test/java/test/javax/management/support/StandardMBeanSupport.java 2007-03-21 00:09:32 UTC (rev 2262)
@@ -16,10 +16,10 @@
import javax.management.NotCompliantMBeanException;
import javax.management.StandardMBean;
-import mx4j.MutableInteger;
+import test.mx4j.MutableInteger;
/**
- * @version $Revision$
+ * @version $Revision:2260 $
*/
public class StandardMBeanSupport
{
Modified: trunk/mx4j/jsr003/src/test/java/test/javax/management/timer/TimerTest.java
===================================================================
--- trunk/mx4j/jsr003/src/test/java/test/javax/management/timer/TimerTest.java 2007-03-20 22:29:42 UTC (rev 2261)
+++ trunk/mx4j/jsr003/src/test/java/test/javax/management/timer/TimerTest.java 2007-03-21 00:09:32 UTC (rev 2262)
@@ -23,13 +23,13 @@
import javax.management.timer.TimerMBean;
import javax.management.timer.TimerNotification;
-import mx4j.MX4JTestCase;
-import mx4j.MutableBoolean;
-import mx4j.MutableInteger;
-import mx4j.MutableLong;
+import test.mx4j.MX4JTestCase;
+import test.mx4j.MutableBoolean;
+import test.mx4j.MutableInteger;
+import test.mx4j.MutableLong;
/**
- * @version $Revision$
+ * @version $Revision:2260 $
*/
public class TimerTest extends MX4JTestCase
{
Modified: trunk/mx4j/jsr003/src/test/java/test/mx4j/AbstractDynamicMBeanTest.java
===================================================================
--- trunk/mx4j/jsr003/src/test/java/test/mx4j/AbstractDynamicMBeanTest.java 2007-03-20 22:29:42 UTC (rev 2261)
+++ trunk/mx4j/jsr003/src/test/java/test/mx4j/AbstractDynamicMBeanTest.java 2007-03-21 00:09:32 UTC (rev 2262)
@@ -27,10 +27,9 @@
import javax.management.ReflectionException;
import mx4j.AbstractDynamicMBean;
-import mx4j.MX4JTestCase;
/**
- * @version $Revision$
+ * @version $Revision:2260 $
*/
public class AbstractDynamicMBeanTest extends MX4JTestCase
{
Modified: trunk/mx4j/jsr003/src/test/java/test/mx4j/MiscellaneousTest.java
===================================================================
--- trunk/mx4j/jsr003/src/test/java/test/mx4j/MiscellaneousTest.java 2007-03-20 22:29:42 UTC (rev 2261)
+++ trunk/mx4j/jsr003/src/test/java/test/mx4j/MiscellaneousTest.java 2007-03-21 00:09:32 UTC (rev 2262)
@@ -8,11 +8,10 @@
package test.mx4j;
-import mx4j.MX4JTestCase;
import mx4j.util.Utils;
/**
- * @version $Revision$
+ * @version $Revision:2260 $
*/
public class MiscellaneousTest extends MX4JTestCase
{
Modified: trunk/mx4j/jsr003/src/test/java/test/mx4j/log/LogRedirectionTest.java
===================================================================
--- trunk/mx4j/jsr003/src/test/java/test/mx4j/log/LogRedirectionTest.java 2007-03-20 22:29:42 UTC (rev 2261)
+++ trunk/mx4j/jsr003/src/test/java/test/mx4j/log/LogRedirectionTest.java 2007-03-21 00:09:32 UTC (rev 2262)
@@ -21,17 +21,17 @@
import javax.management.NotificationListener;
import javax.management.ObjectName;
-import mx4j.MX4JTestCase;
-import mx4j.MutableInteger;
import mx4j.log.Log;
import mx4j.log.Log4JLogger;
import mx4j.log.Logger;
import mx4j.log.LoggerBroadcasterMBean;
import org.apache.log4j.ConsoleAppender;
import org.apache.log4j.PatternLayout;
+import test.mx4j.MX4JTestCase;
+import test.mx4j.MutableInteger;
/**
- * @version $Revision$
+ * @version $Revision:2260 $
* @see
*/
public class LogRedirectionTest extends MX4JTestCase
Modified: trunk/mx4j/jsr003/src/test/java/test/mx4j/server/BCELMBeanInvokerTest.java
===================================================================
--- trunk/mx4j/jsr003/src/test/java/test/mx4j/server/BCELMBeanInvokerTest.java 2007-03-20 22:29:42 UTC (rev 2261)
+++ trunk/mx4j/jsr003/src/test/java/test/mx4j/server/BCELMBeanInvokerTest.java 2007-03-21 00:09:32 UTC (rev 2262)
@@ -15,11 +15,11 @@
import javax.management.ObjectName;
import mx4j.MX4JSystemKeys;
-import mx4j.MX4JTestCase;
-import mx4j.MutableInteger;
+import test.mx4j.MX4JTestCase;
+import test.mx4j.MutableInteger;
/**
- * @version $Revision$
+ * @version $Revision:2260 $
*/
public class BCELMBeanInvokerTest extends MX4JTestCase
{
Modified: trunk/mx4j/jsr003/src/test/java/test/mx4j/server/MX4JMBeanServerTest.java
===================================================================
--- trunk/mx4j/jsr003/src/test/java/test/mx4j/server/MX4JMBeanServerTest.java 2007-03-20 22:29:42 UTC (rev 2261)
+++ trunk/mx4j/jsr003/src/test/java/test/mx4j/server/MX4JMBeanServerTest.java 2007-03-21 00:09:32 UTC (rev 2262)
@@ -25,16 +25,16 @@
import mx4j.MBeanDescriptionAdapter;
import mx4j.MX4JSystemKeys;
-import mx4j.MX4JTestCase;
-import mx4j.MutableInteger;
import mx4j.server.MBeanMetaData;
import mx4j.server.MBeanRepository;
import mx4j.server.interceptor.DefaultMBeanServerInterceptor;
import mx4j.server.interceptor.MBeanServerInterceptor;
import mx4j.server.interceptor.MBeanServerInterceptorConfigurator;
+import test.mx4j.MX4JTestCase;
+import test.mx4j.MutableInteger;
/**
- * @version $Revision$
+ * @version $Revision:2260 $
*/
public class MX4JMBeanServerTest extends MX4JTestCase
{
Modified: trunk/mx4j/jsr003/src/test/java/test/mx4j/server/NotificationListenerMBeanServerInterceptorTest.java
===================================================================
--- trunk/mx4j/jsr003/src/test/java/test/mx4j/server/NotificationListenerMBeanServerInterceptorTest.java 2007-03-20 22:29:42 UTC (rev 2261)
+++ trunk/mx4j/jsr003/src/test/java/test/mx4j/server/NotificationListenerMBeanServerInterceptorTest.java 2007-03-21 00:09:32 UTC (rev 2262)
@@ -14,14 +14,14 @@
import javax.management.ObjectInstance;
import javax.management.ObjectName;
-import mx4j.MX4JTestCase;
import mx4j.server.MBeanInvoker;
import mx4j.server.MBeanMetaData;
import mx4j.server.interceptor.MBeanServerInterceptor;
import mx4j.server.interceptor.NotificationListenerMBeanServerInterceptor;
+import test.mx4j.MX4JTestCase;
/**
- * $Rev$
+ * $Rev:2260 $
*/
public class NotificationListenerMBeanServerInterceptorTest extends MX4JTestCase
{
Modified: trunk/mx4j/jsr003/src/test/java/test/mx4j/timer/TimeQueueTest.java
===================================================================
--- trunk/mx4j/jsr003/src/test/java/test/mx4j/timer/TimeQueueTest.java 2007-03-20 22:29:42 UTC (rev 2261)
+++ trunk/mx4j/jsr003/src/test/java/test/mx4j/timer/TimeQueueTest.java 2007-03-21 00:09:32 UTC (rev 2262)
@@ -10,12 +10,12 @@
import java.lang.reflect.Field;
-import mx4j.MX4JTestCase;
import mx4j.timer.TimeQueue;
import mx4j.timer.TimeTask;
+import test.mx4j.MX4JTestCase;
/**
- * @version $Revision$
+ * @version $Revision:2260 $
*/
public class TimeQueueTest extends MX4JTestCase
{
Modified: trunk/mx4j/jsr160/pom.xml
===================================================================
--- trunk/mx4j/jsr160/pom.xml 2007-03-20 22:29:42 UTC (rev 2261)
+++ trunk/mx4j/jsr160/pom.xml 2007-03-21 00:09:32 UTC (rev 2262)
@@ -13,6 +13,22 @@
<name>MX4J :: JSR 160</name>
<packaging>jar</packaging>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <testExcludes>
+ <exclude>**/RMIJRMPMultiThreadMBeanServerConnectionTest.java</exclude>
+ <exclude>**/RemoteSecurityManagerTestCase.java</exclude>
+ <exclude>**/RMIJRMPRemoteSecurityManagerTest.java</exclude>
+ </testExcludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+
<dependencies>
<dependency>
<groupId>mx4j</groupId>
@@ -20,7 +36,7 @@
</dependency>
<dependency>
<groupId>mx4j</groupId>
- <artifactId>mx4j-tests</artifactId>
+ <artifactId>mx4j-tests-support</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
Deleted: trunk/mx4j/jsr160/src/test/java/javax/management/remote/JMXConnectorFactoryTest.java
===================================================================
--- trunk/mx4j/jsr160/src/test/java/javax/management/remote/JMXConnectorFactoryTest.java 2007-03-20 22:29:42 UTC (rev 2261)
+++ trunk/mx4j/jsr160/src/test/java/javax/management/remote/JMXConnectorFactoryTest.java 2007-03-21 00:09:32 UTC (rev 2262)
@@ -1,125 +0,0 @@
-/*
- * Copyright (C) The MX4J Contributors.
- * All rights reserved.
- *
- * This software is distributed under the terms of the MX4J License version 1.0.
- * See the terms of the MX4J License in the documentation provided with this software.
- */
-
-package javax.management.remote;
-
-import java.net.MalformedURLException;
-import java.util.HashMap;
-
-import mx4j.MX4JTestCase;
-
-/**
- * @version $Revision$
- */
-public class JMXConnectorFactoryTest extends MX4JTestCase
-{
- public void testInvalidURLs() throws Exception
- {
- try
- {
- JMXConnectorFactory.connect(null);
- fail();
- }
- catch (NullPointerException x)
- {
- }
- }
-
- public void testInvalidPackages() throws Exception
- {
- HashMap env = new HashMap();
- JMXServiceURL url = new JMXServiceURL("service:jmx:rmi://host");
-
- // Only Strings
- env.put(JMXConnectorFactory.PROTOCOL_PROVIDER_PACKAGES, new Object());
- try
- {
- JMXConnectorFactory.newJMXConnector(url, env);
- fail("Only Strings can be specified as provider packages");
- }
- catch (JMXProviderException x)
- {
- }
-
- // Empty not allowed
- env.put(JMXConnectorFactory.PROTOCOL_PROVIDER_PACKAGES, "");
- try
- {
- JMXConnectorFactory.newJMXConnector(url, env);
- fail("Provider package string cannot be empty");
- }
- catch (JMXProviderException x)
- {
- }
-
- // Empty not allowed
- env.put(JMXConnectorFactory.PROTOCOL_PROVIDER_PACKAGES, "dummy| |dummy");
- try
- {
- JMXConnectorFactory.newJMXConnector(url, env);
- fail("Provider package string cannot contain an empty string");
- }
- catch (JMXProviderException x)
- {
- }
- }
-
- public void testInvalidProtocol() throws Exception
- {
- JMXServiceURL url = new JMXServiceURL("service:jmx:dummy://host");
- try
- {
- JMXConnectorFactory.newJMXConnector(url, null);
- fail();
- }
- catch (MalformedURLException x)
- {
- }
- }
-
- public void testInvalidClassLoader() throws Exception
- {
- HashMap env = new HashMap();
- JMXServiceURL url = new JMXServiceURL("service:jmx:rmi://host");
-
- env.put(JMXConnectorFactory.PROTOCOL_PROVIDER_CLASS_LOADER, new Object());
- try
- {
- JMXConnectorFactory.newJMXConnector(url, env);
- fail();
- }
- catch (IllegalArgumentException x)
- {
- }
- }
-
- public void testLoadProviderWithProvidedClassLoader() throws Exception
- {
- HashMap env = new HashMap();
- JMXServiceURL url = new JMXServiceURL("service:jmx:rmi://host");
- ClassLoader old = Thread.currentThread().getContextClassLoader();
- try
- {
- Thread.currentThread().setContextClassLoader(getClass().getClassLoader().getParent());
- env.put(JMXConnectorFactory.PROTOCOL_PROVIDER_CLASS_LOADER, getClass().getClassLoader());
- JMXConnector connector = JMXConnectorFactory.newJMXConnector(url, env);
- assertNotNull(connector);
- }
- finally
- {
- Thread.currentThread().setContextClassLoader(old);
- }
- }
-
- public void testRMIProvider() throws Exception
- {
- JMXServiceURL url = new JMXServiceURL("service:jmx:rmi://host");
- JMXConnector connector = JMXConnectorFactory.newJMXConnector(url, null);
- assertNotNull(connector);
- }
-}
Deleted: trunk/mx4j/jsr160/src/test/java/javax/management/remote/JMXConnectorInvocationTestCase.java
===================================================================
--- trunk/mx4j/jsr160/src/test/java/javax/management/remote/JMXConnectorInvocationTestCase.java 2007-03-20 22:29:42 UTC (rev 2261)
+++ trunk/mx4j/jsr160/src/test/java/javax/management/remote/JMXConnectorInvocationTestCase.java 2007-03-21 00:09:32 UTC (rev 2262)
@@ -1,496 +0,0 @@
-/*
- * Copyright (C) The MX4J Contributors.
- * All rights reserved.
- *
- * This software is distributed under the terms of the MX4J License version 1.0.
- * See the terms of the MX4J License in the documentation provided with this software.
- */
-
-package javax.management.remote;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.security.AccessController;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import javax.management.Attribute;
-import javax.management.AttributeList;
-import javax.management.AttributeNotFoundException;
-import javax.management.InstanceNotFoundException;
-import javax.management.MBeanException;
-import javax.management.MBeanInfo;
-import javax.management.MBeanServer;
-import javax.management.MBeanServerConnection;
-import javax.management.MBeanServerFactory;
-import javax.management.ObjectInstance;
-import javax.management.ObjectName;
-import javax.management.RuntimeMBeanException;
-import javax.security.auth.Subject;
-
-import mx4j.MX4JTestCase;
-
-/**
- * @version $Revision$
- */
-public abstract class JMXConnectorInvocationTestCase extends MX4JTestCase
-{
- private JMXConnectorServer connectorServer;
-
- public abstract JMXServiceURL createJMXConnectorServerAddress() throws MalformedURLException;
-
- public abstract Map getEnvironment();
-
- private MBeanServer newMBeanServer()
- {
- return MBeanServerFactory.newMBeanServer();
- }
-
- private MBeanServerConnection getMBeanServerConnection(MBeanServer server) throws IOException
- {
- JMXServiceURL url = createJMXConnectorServerAddress();
- connectorServer = JMXConnectorServerFactory.newJMXConnectorServer(url, getEnvironment(), server);
- connectorServer.start();
- sleep(5000);
- JMXConnector connector = JMXConnectorFactory.connect(connectorServer.getAddress(), getEnvironment());
- return connector.getMBeanServerConnection();
- }
-
- protected void tearDown() throws Exception
- {
- if (connectorServer != null) connectorServer.stop();
- sleep(5000);
- }
-
- public void testCallToMBeanServerWithAttributeNotFoundException() throws Exception
- {
- MBeanServerConnection mbsc = getMBeanServerConnection(newMBeanServer());
- try
- {
- // The attribute does not exist
- mbsc.getAttribute(new ObjectName("JMImplementation:type=MBeanServerDelegate"), "dummy");
- fail();
- }
- catch (AttributeNotFoundException e)
- {
- }
- }
-
- public void testCallToMBeanServerWithInstanceNotFoundException() throws Exception
- {
- MBeanServerConnection mbsc = getMBeanServerConnection(newMBeanServer());
- try
- {
- // The mbean does not exist
- mbsc.getAttribute(new ObjectName(":type=dummy"), "ImplementationVersion");
- fail();
- }
- catch (InstanceNotFoundException x)
- {
- }
- }
-
- public void testCreateMBeanWith3Params() throws Exception
- {
- MBeanServerConnection mbsc = getMBeanServerConnection(newMBeanServer());
- ObjectName name = ObjectName.getInstance("", "test", "invocation");
- ObjectInstance instance = mbsc.createMBean(Support.class.getName(), name, null);
- assertNotNull(instance);
- }
-
- public void testCreateMBeanWith5Params() throws Exception
- {
- MBeanServerConnection mbsc = getMBeanServerConnection(newMBeanServer());
- String value = "mx4j";
- ObjectName name = ObjectName.getInstance("", "test", "invocation");
- ObjectInstance instance = mbsc.createMBean(Support.class.getName(), name, null, new Object[]{value}, new String[]{String.class.getName()});
- assertNotNull(instance);
-
- // Be sure the argument arrived to the MBean
- String result = (String)mbsc.getAttribute(name, "Name");
- assertEquals(result, value);
- }
-
- public void testGetAttribute() throws Exception
- {
- MBeanServerConnection mbsc = getMBeanServerConnection(newMBeanServer());
- String value = "mx4j";
- ObjectName name = ObjectName.getInstance("", "test", "invocation");
- ObjectInstance instance = mbsc.createMBean(Support.class.getName(), name, null, new Object[]{value}, new String[]{String.class.getName()});
- assertNotNull(instance);
-
- // Be sure the argument arrived to the MBean
- String result = (String)mbsc.getAttribute(name, "Name");
- assertEquals(result, value);
- }
-
- public void testGetAttributes() throws Exception
- {
- MBeanServerConnection mbsc = getMBeanServerConnection(newMBeanServer());
- String value = "mx4j";
- ObjectName name = ObjectName.getInstance("", "test", "invocation");
- ObjectInstance instance = mbsc.createMBean(Support.class.getName(), name, null, new Object[]{value}, new String[]{String.class.getName()});
- assertNotNull(instance);
-
- // Be sure the argument arrived to the MBean
- String attribute = "Name";
- String[] attributes = new String[]{attribute};
- AttributeList result = mbsc.getAttributes(name, attributes);
- assertNotNull(result);
- assertEquals(result.size(), attributes.length);
- assertEquals(((Attribute)result.get(0)).getName(), attribute);
- assertEquals(((Attribute)result.get(0)).getValue(), value);
- }
-
- public void testGetDefaultDomain() throws Exception
- {
- String domain = "DOMAIN";
- MBeanServer server = MBeanServerFactory.newMBeanServer(domain);
- MBeanServerConnection mbsc = getMBeanServerConnection(server);
-
- String defaultDomain = mbsc.getDefaultDomain();
- assertEquals(defaultDomain, domain);
- }
-
- public void testGetDomains() throws Exception
- {
- MBeanServerConnection mbsc = getMBeanServerConnection(newMBeanServer());
-
- String[] domains = mbsc.getDomains();
- if (domains.length < 1) fail();
- }
-
- public void testGetMBeanCount() throws Exception
- {
- MBeanServerConnection mbsc = getMBeanServerConnection(newMBeanServer());
-
- Integer count = mbsc.getMBeanCount();
- if (count.intValue() < 1) fail();
- }
-
- public void testGetMBeanInfo() throws Exception
- {
- MBeanServerConnection mbsc = getMBeanServerConnection(newMBeanServer());
-
- ObjectName name = ObjectName.getInstance("JMImplementation", "type", "MBeanServerDelegate");
- MBeanInfo info = mbsc.getMBeanInfo(name);
- assertNotNull(info);
- if (info.getAttributes().length < 1) fail();
- }
-
- public void testGetObjectInstance() throws Exception
- {
- MBeanServerConnection mbsc = getMBeanServerConnection(newMBeanServer());
- ObjectName name = ObjectName.getInstance("", "test", "invocation");
- ObjectInstance instance = mbsc.createMBean(Support.class.getName(), name, null);
- assertNotNull(instance);
-
- ObjectInstance result = mbsc.getObjectInstance(name);
- assertNotNull(result);
- assertEquals(result, instance);
- }
-
- public void testInvoke() throws Exception
- {
- MBeanServerConnection mbsc = getMBeanServerConnection(newMBeanServer());
- ObjectName name = ObjectName.getInstance("", "test", "invocation");
- ObjectInstance instance = mbsc.createMBean(Support.class.getName(), name, null);
- assertNotNull(instance);
-
- String value = "value";
- String result = (String)mbsc.invoke(name, "echo", new Object[]{value}, new String[]{String.class.getName()});
- assertNotNull(result);
- assertEquals(result, value);
- }
-
- public void testInvokeThrowsCustomException() throws Exception
- {
- MBeanServerConnection mbsc = getMBeanServerConnection(newMBeanServer());
- ObjectName name = ObjectName.getInstance("", "test", "invocation");
- ObjectInstance instance = mbsc.createMBean(Support.class.getName(), name, null);
- assertNotNull(instance);
-
- try
- {
- mbsc.invoke(name, "throwCustomException", null, null);
- }
- catch (MBeanException x)
- {
- Exception xx = x.getTargetException();
- if (xx != null && xx.getClass() != SupportException.class) fail();
- }
- }
-
- public void testInvokeThrowsRuntimeException() throws Exception
- {
- MBeanServerConnection mbsc = getMBeanServerConnection(newMBeanServer());
- ObjectName name = ObjectName.getInstance("", "test", "invocation");
- ObjectInstance instance = mbsc.createMBean(Support.class.getName(), name, null);
- assertNotNull(instance);
-
- try
- {
- mbsc.invoke(name, "throwRuntimeException", null, null);
- }
- catch (RuntimeMBeanException x)
- {
- Exception xx = x.getTargetException();
- if (xx != null && xx.getClass() != IllegalArgumentException.class) fail();
- }
- }
-
- public void testIsInstanceOf() throws Exception
- {
- MBeanServerConnection mbsc = getMBeanServerConnection(newMBeanServer());
- ObjectName name = ObjectName.getInstance("", "test", "invocation");
- ObjectInstance instance = mbsc.createMBean(Support.class.getName(), name, null);
- assertNotNull(instance);
-
- boolean isInstanceOf = mbsc.isInstanceOf(name, Support.class.getName());
- if (!isInstanceOf) fail("Class");
-
- isInstanceOf = mbsc.isInstanceOf(name, SupportMBean.class.getName());
- if (!isInstanceOf) fail("Interface");
- }
-
- public void testIsRegistered() throws Exception
- {
- MBeanServerConnection mbsc = getMBeanServerConnection(newMBeanServer());
- ObjectName name = ObjectName.getInstance("", "test", "invocation");
- ObjectInstance instance = mbsc.createMBean(Support.class.getName(), name, null);
- assertNotNull(instance);
-
- boolean isRegistered = mbsc.isRegistered(name);
- if (!isRegistered) fail();
- }
-
- public void testQueryMBeansNullNull() throws Exception
- {
- MBeanServerConnection mbsc = getMBeanServerConnection(newMBeanServer());
-
- Set mbeans = mbsc.queryMBeans(null, null);
- assertNotNull(mbeans);
- if (mbeans.size() < 1) fail();
- }
-
- public void testQueryMBeansObjectNameNull() throws Exception
- {
- MBeanServerConnection mbsc = getMBeanServerConnection(newMBeanServer());
-
- Set mbeans = mbsc.queryMBeans(ObjectName.getInstance("JMImplementation:*"), null);
- assertNotNull(mbeans);
- if (mbeans.size() < 1) fail();
- }
-
- public void testQueryMBeansObjectNameQueryExp() throws Exception
- {
- MBeanServerConnection mbsc = getMBeanServerConnection(newMBeanServer());
-
- Set mbeans = mbsc.queryMBeans(ObjectName.getInstance("JMImplementation:*"), new ObjectName("*:type=MBeanServerDelegate"));
- assertNotNull(mbeans);
- if (mbeans.size() != 1) fail();
- }
-
- public void testSetAttribute() throws Exception
- {
- MBeanServerConnection mbsc = getMBeanServerConnection(newMBeanServer());
- ObjectName name = ObjectName.getInstance("", "test", "invocation");
- ObjectInstance instance = mbsc.createMBean(Support.class.getName(), name, null);
- assertNotNull(instance);
-
- String attribute = "Name";
- String value = "mx4j";
- mbsc.setAttribute(name, new Attribute(attribute, value));
-
- String result = (String)mbsc.getAttribute(name, attribute);
- assertEquals(result, value);
- }
-
- public void testSetAttributes() throws Exception
- {
- MBeanServerConnection mbsc = getMBeanServerConnection(newMBeanServer());
- ObjectName name = ObjectName.getInstance("", "test", "invocation");
- ObjectInstance instance = mbsc.createMBean(Support.class.getName(), name, null);
- assertNotNull(instance);
-
- String attribute = "Name";
- String value = "mx4j";
- AttributeList attributes = new AttributeList();
- attributes.add(new Attribute(attribute, value));
- AttributeList result = mbsc.setAttributes(name, attributes);
- assertNotNull(result);
- assertEquals(result, attributes);
- }
-
- public void testUnregisterMBean() throws Exception
- {
- MBeanServerConnection mbsc = getMBeanServerConnection(newMBeanServer());
- ObjectName name = ObjectName.getInstance("", "test", "invocation");
- ObjectInstance instance = mbsc.createMBean(Support.class.getName(), name, null);
- assertNotNull(instance);
-
- mbsc.unregisterMBean(name);
- if (mbsc.isRegistered(name)) fail();
- }
-
- public void testAuthenticatedInvoke() throws Exception
- {
- final String principalName = "authenticatedPrincipal";
-
- JMXServiceURL url = createJMXConnectorServerAddress();
- Map serverEnv = getEnvironment();
- serverEnv.put(JMXConnectorServer.AUTHENTICATOR, new JMXAuthenticator()
- {
- public Subject authenticate(Object credentials) throws SecurityException
- {
- Set principals = new HashSet();
- principals.add(new JMXPrincipal(principalName));
- return new Subject(true, principals, Collections.EMPTY_SET, Collections.EMPTY_SET);
- }
- });
-
- JMXConnectorServer cntorServer = null;
- try
- {
- cntorServer = JMXConnectorServerFactory.newJMXConnectorServer(url, serverEnv, newMBeanServer());
- cntorServer.start();
-
- Map clientEnv = getEnvironment();
- clientEnv.put(JMXConnector.CREDENTIALS, new String[0]);
-
- JMXConnector cntor = JMXConnectorFactory.connect(cntorServer.getAddress(), clientEnv);
- MBeanServerConnection mbsc = cntor.getMBeanServerConnection();
-
- ObjectName name = ObjectName.getInstance("", "test", "invocation");
- ObjectInstance instance = mbsc.createMBean(Support.class.getName(), name, null);
- assertNotNull(instance);
-
- Boolean result = (Boolean)mbsc.invoke(name, "authenticated", new Object[]{principalName}, new String[]{String.class.getName()});
- assertTrue(result.booleanValue());
- }
- finally
- {
- if (cntorServer != null) cntorServer.stop();
- }
- }
-
- public void testDelegatedInvoke() throws Exception
- {
- JMXServiceURL url = createJMXConnectorServerAddress();
- Map serverEnv = getEnvironment();
- serverEnv.put(JMXConnectorServer.AUTHENTICATOR, new JMXAuthenticator()
- {
- public Subject authenticate(Object credentials) throws SecurityException
- {
- Set principals = new HashSet();
- principals.add(new JMXPrincipal("authenticatedPrincipal"));
- return new Subject(true, principals, Collections.EMPTY_SET, Collections.EMPTY_SET);
- }
- });
- JMXConnectorServer cntorServer = null;
- try
- {
- cntorServer = JMXConnectorServerFactory.newJMXConnectorServer(url, serverEnv, newMBeanServer());
- cntorServer.start();
-
- Map clientEnv = getEnvironment();
- clientEnv.put(JMXConnector.CREDENTIALS, new String[0]);
-
- JMXConnector cntor = JMXConnectorFactory.connect(cntorServer.getAddress(), clientEnv);
- Set principals = new HashSet();
- String delegatedName = "delegatedPrincipal";
- principals.add(new JMXPrincipal(delegatedName));
- Subject delegate = new Subject(true, principals, Collections.EMPTY_SET, Collections.EMPTY_SET);
- MBeanServerConnection mbsc = cntor.getMBeanServerConnection(delegate);
-
- ObjectName name = ObjectName.getInstance("", "test", "invocation");
- ObjectInstance instance = mbsc.createMBean(Support.class.getName(), name, null);
- assertNotNull(instance);
-
- Boolean result = (Boolean)mbsc.invoke(name, "delegated", new Object[]{delegatedName}, new String[]{String.class.getName()});
- assertTrue(result.booleanValue());
- }
- finally
- {
- if (cntorServer != null) cntorServer.stop();
- }
- }
-
- public static class SupportException extends Exception
- {
- }
-
- public interface SupportMBean
- {
- public String getName();
-
- public void setName(String name);
-
- public void throwCustomException() throws SupportException;
-
- public void throwRuntimeException() throws IllegalArgumentException;
-
- public String echo(String argument);
-
- public boolean authenticated(String name);
-
- public boolean delegated(String name);
- }
-
- public static class Support implements SupportMBean
- {
- private String name;
-
- public Support()
- {
- }
-
- public Support(String name)
- {
- this.name = name;
- }
-
- public String getName()
- {
- return name;
- }
-
- public void setName(String name)
- {
- this.name = name;
- }
-
- public void throwCustomException() throws SupportException
- {
- throw new SupportException();
- }
-
- public void throwRuntimeException() throws IllegalArgumentException
- {
- throw new IllegalArgumentException();
- }
-
- public String echo(String argument)
- {
- return argument;
- }
-
- public boolean authenticated(String name)
- {
- Subject subject = Subject.getSubject(AccessController.getContext());
- if (subject == null) return false;
- Set principals = subject.getPrincipals();
- return principals.contains(new JMXPrincipal(name));
- }
-
- public boolean delegated(String name)
- {
- Subject subject = Subject.getSubject(AccessController.getContext());
- if (subject == null) return false;
- Set principals = subject.getPrincipals();
- return principals.contains(new JMXPrincipal(name));
- }
- }
-}
Deleted: trunk/mx4j/jsr160/src/test/java/javax/management/remote/JMXConnectorServerFactoryTest.java
===================================================================
--- trunk/mx4j/jsr160/src/test/java/javax/management/remote/JMXConnectorServerFactoryTest.java 2007-03-20 22:29:42 UTC (rev 2261)
+++ trunk/mx4j/jsr160/src/test/java/javax/management/remote/JMXConnectorServerFactoryTest.java 2007-03-21 00:09:32 UTC (rev 2262)
@@ -1,116 +0,0 @@
-/*
- * Copyright (C) The MX4J Contributors.
- * All rights reserved.
- *
- * This software is distributed under the terms of the MX4J License version 1.0.
- * See the terms of the MX4J License in the documentation provided with this software.
- */
-
-package javax.management.remote;
-
-import java.net.MalformedURLException;
-import java.util.HashMap;
-
-import mx4j.MX4JTestCase;
-
-/**
- * @version $Revision$
- */
-public class JMXConnectorServerFactoryTest extends MX4JTestCase
-{
- public void testInvalidURLs() throws Exception
- {
- try
- {
- JMXConnectorServerFactory.newJMXConnectorServer(null, null, null);
- fail();
- }
- catch (NullPointerException x)
- {
- }
- }
-
- public void testInvalidPackages() throws Exception
- {
- HashMap env = new HashMap();
- JMXServiceURL url = new JMXServiceURL("service:jmx:rmi://host");
-
- // Only Strings
- env.put(JMXConnectorServerFactory.PROTOCOL_PROVIDER_PACKAGES, new Object());
- try
- {
- JMXConnectorServerFactory.newJMXConnectorServer(url, env, null);
- fail("Only Strings can be specified as provider packages");
- }
- catch (JMXProviderException x)
- {
- }
-
- // Empty not allowed
- env.put(JMXConnectorServerFactory.PROTOCOL_PROVIDER_PACKAGES, "");
- try
- {
- JMXConnectorServerFactory.newJMXConnectorServer(url, env, null);
- fail("Provider package string cannot be empty");
- }
- catch (JMXProviderException x)
- {
- }
-
- // Empty not allowed
- env.put(JMXConnectorServerFactory.PROTOCOL_PROVIDER_PACKAGES, "dummy| |dummy");
- try
- {
- JMXConnectorServerFactory.newJMXConnectorServer(url, env, null);
- fail("Provider package string cannot contain an empty string");
- }
- catch (JMXProviderException x)
- {
- }
- }
-
- public void testInvalidProtocol() throws Exception
- {
- JMXServiceURL url = new JMXServiceURL("service:jmx:dummy://host");
- try
- {
- JMXConnectorServerFactory.newJMXConnectorServer(url, null, null);
- fail();
- }
- catch (MalformedURLException x)
- {
- }
- }
-
- public void testInvalidClassLoader() throws Exception
- {
- HashMap env = new HashMap();
- JMXServiceURL url = new JMXServiceURL("service:jmx:rmi://host");
-
- env.put(JMXConnectorServerFactory.PROTOCOL_PROVIDER_CLASS_LOADER, new Object());
- try
- {
- JMXConnectorServerFactory.newJMXConnectorServer(url, env, null);
- fail();
- }
- catch (IllegalArgumentException x)
- {
- }
- }
-
- public void testLoadProviderWithProvidedClassLoader() throws Exception
- {
- HashMap env = new HashMap();
- JMXServiceURL url = new JMXServiceURL("service:jmx:rmi://host");
-
- env.put(JMXConnectorServerFactory.PROTOCOL_PROVIDER_CLASS_LOADER, getClass().getClassLoader());
- JMXConnectorServerFactory.newJMXConnectorServer(url, env, null);
- }
-
- public void testRMIProvider() throws Exception
- {
- JMXServiceURL url = new JMXServiceURL("service:jmx:rmi://host");
- JMXConnectorServer connector = JMXConnectorServerFactory.newJMXConnectorServer(url, null, null);
- assertNotNull(connector);
- }
-}
Deleted: trunk/mx4j/jsr160/src/test/java/javax/management/remote/JMXConnectorServerTestCase.java
===================================================================
--- trunk/mx4j/jsr160/src/test/java/javax/management/remote/JMXConnectorServerTestCase.java 2007-03-20 22:29:42 UTC (rev 2261)
+++ trunk/mx4j/jsr160/src/test/java/javax/management/remote/JMXConnectorServerTestCase.java 2007-03-21 00:09:32 UTC (rev 2262)
@@ -1,242 +0,0 @@
-/*
- * Copyright (C) The MX4J Contributors.
- * All rights reserved.
- *
- * This software is distributed under the terms of the MX4J License version 1.0.
- * See the terms of the MX4J License in the documentation provided with this software.
- */
-
-package javax.management.remote;
-
-import java.io.IOException;
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
-import java.net.MalformedURLException;
-import java.util.Map;
-
-import javax.management.MBeanServer;
-import javax.management.MBeanServerFactory;
-
-import mx4j.MX4JTestCase;
-
-/**
- * @version $Revision$
- */
-public abstract class JMXConnectorServerTestCase extends MX4JTestCase
-{
- public abstract JMXServiceURL createJMXConnectorServerAddress() throws MalformedURLException;
-
- public abstract Map getEnvironment();
-
- protected MBeanServer newMBeanServer()
- {
- return MBeanServerFactory.newMBeanServer();
- }
-
- public void testNewJMXConnectorServerWithNullURL() throws Exception
- {
- try
- {
- JMXConnectorServerFactory.newJMXConnectorServer(null, null, null);
- fail();
- }
- catch (NullPointerException x)
- {
- }
- }
-
- public void testNewJMXConnectorServerWithFactory() throws Exception
- {
- JMXServiceURL url = createJMXConnectorServerAddress();
- JMXConnectorServer server = JMXConnectorServerFactory.newJMXConnectorServer(url, getEnvironment(), null);
- if (server == null) fail();
- }
-
- public void testStartWithoutMBeanServer() throws Exception
- {
- JMXServiceURL url = createJMXConnectorServerAddress();
- JMXConnectorServer server = JMXConnectorServerFactory.newJMXConnectorServer(url, getEnvironment(), null);
- try
- {
- server.start();
- fail();
- }
- catch (IllegalStateException x)
- {
- }
- }
-
- public void testMBeanServerForwarderNoMBeanServer() throws Exception
- {
- JMXServiceURL url = createJMXConnectorServerAddress();
- JMXConnectorServer server = JMXConnectorServerFactory.newJMXConnectorServer(url, getEnvironment(), null);
- MBeanServerForwarder forwarder = (MBeanServerForwarder)Proxy.newProxyInstance(getClass().getClassLoader(), new Class[]{MBeanServerForwarder.class}, new InvocationHandler()
- {
- public Object invoke(Object proxy, Method method, Object[] args)
- throws Throwable
- {
- return null;
- }
- });
-
- try
- {
- server.setMBeanServerForwarder(forwarder);
- fail("No MBeanServer to forward to");
- }
- catch (IllegalStateException x)
- {
- }
- }
-
- public void testMBeanServerForwarder() throws Exception
- {
- JMXServiceURL url = createJMXConnectorServerAddress();
- JMXConnectorServer server = JMXConnectorServerFactory.newJMXConnectorServer(url, getEnvironment(), newMBeanServer());
- MBeanServerForwarder forwarder = (MBeanServerForwarder)Proxy.newProxyInstance(getClass().getClassLoader(), new Class[]{MBeanServerForwarder.class}, new InvocationHandler()
- {
- public Object invoke(Object proxy, Method method, Object[] args)
- throws Throwable
- {
- return null;
- }
- });
-
- server.setMBeanServerForwarder(forwarder);
-
- try
- {
- server.start();
- if (server.getMBeanServer() != forwarder) fail();
- }
- finally
- {
- server.stop();
- }
- }
-
- public void testStart() throws Exception
- {
- JMXConnectorServer cntorServer = null;
- try
- {
- JMXServiceURL url = createJMXConnectorServerAddress();
- cntorServer = JMXConnectorServerFactory.newJMXConnectorServer(url, getEnvironment(), newMBeanServer());
- cntorServer.start();
- }
- finally
- {
- if (cntorServer != null) cntorServer.stop();
- }
- }
-
- public void testStartStart() throws Exception
- {
- JMXConnectorServer cntorServer = null;
- try
- {
- JMXServiceURL url = createJMXConnectorServerAddress();
- cntorServer = JMXConnectorServerFactory.newJMXConnectorServer(url, getEnvironment(), newMBeanServer());
- cntorServer.start();
- cntorServer.start();
- }
- finally
- {
- if (cntorServer != null) cntorServer.stop();
- }
- }
-
- public void testStartStop() throws Exception
- {
- JMXServiceURL url = createJMXConnectorServerAddress();
- JMXConnectorServer cntorServer = JMXConnectorServerFactory.newJMXConnectorServer(url, getEnvironment(), newMBeanServer());
- cntorServer.start();
- cntorServer.stop();
- }
-
- public void testStartStopStart() throws Exception
- {
- JMXServiceURL url = createJMXConnectorServerAddress();
- JMXConnectorServer cntorServer = JMXConnectorServerFactory.newJMXConnectorServer(url, getEnvironment(), newMBeanServer());
- cntorServer.start();
- cntorServer.stop();
- try
- {
- cntorServer.start();
- fail();
- }
- catch (IOException x)
- {
- }
- }
-
- public void testStartStopStop() throws Exception
- {
- JMXServiceURL url = createJMXConnectorServerAddress();
- JMXConnectorServer cntorServer = JMXConnectorServerFactory.newJMXConnectorServer(url, getEnvironment(), newMBeanServer());
- cntorServer.start();
- cntorServer.stop();
- cntorServer.stop();
- }
-
- public void testTwoConnectorServers() throws Exception
- {
- JMXConnectorServer cntorServer1 = null;
- JMXConnectorServer cntorServer2 = null;
- JMXConnector cntor10 = null;
- JMXConnector cntor11 = null;
- JMXConnector cntor12 = null;
- JMXConnector cntor20 = null;
- try
- {
- JMXServiceURL url1 = createJMXConnectorServerAddress();
- JMXServiceURL url2 = new JMXServiceURL(url1.getProtocol(), url1.getHost(), (url1.getPort() > 0) ? (url1.getPort() + 1) : 0, url1.getURLPath());
-
- MBeanServer server = newMBeanServer();
- cntorServer1 = JMXConnectorServerFactory.newJMXConnectorServer(url1, getEnvironment(), server);
- cntorServer2 = JMXConnectorServerFactory.newJMXConnectorServer(url2, getEnvironment(), server);
- cntorServer1.start();
- cntorServer2.start();
-
- cntor10 = JMXConnectorFactory.connect(cntorServer1.getAddress(), getEnvironment());
- cntor11 = JMXConnectorFactory.connect(cntorServer1.getAddress(), getEnvironment());
- cntor12 = JMXConnectorFactory.connect(cntorServer1.getAddress(), getEnvironment());
- cntor20 = JMXConnectorFactory.connect(cntorServer2.getAddress(), getEnvironment());
-
- if (cntor10.getConnectionId().equals(cntor11.getConnectionId())) fail();
- if (cntor10.getConnectionId().equals(cntor12.getConnectionId())) fail();
- if (cntor10.getConnectionId().equals(cntor20.getConnectionId())) fail();
-
- }
- finally
- {
- if (cntor20 != null) cntor20.close();
- if (cntor12 != null) cntor12.close();
- if (cntor11 != null) cntor11.close();
- if (cntor10 != null) cntor10.close();
-
- if (cntorServer2 != null) cntorServer2.stop();
- if (cntorServer1 != null) cntorServer1.stop();
- }
- }
-
- public void testStartWithProviderClassLoader() throws Exception
- {
- JMXConnectorServer cntorServer = null;
- try
- {
- JMXServiceURL url = createJMXConnectorServerAddress();
- MBeanServer server = newMBeanServer();
- Map serverEnv = getEnvironment();
- serverEnv.put(JMXConnectorServerFactory.PROTOCOL_PROVIDER_CLASS_LOADER, getClass().getClassLoader());
- Thread.currentThread().setContextClassLoader(getClass().getClassLoader().getParent());
- cntorServer = JMXConnectorServerFactory.newJMXConnectorServer(url, serverEnv, server);
- cntorServer.start();
- }
- finally
- {
- if (cntorServer != null) cntorServer.stop();
- }
- }
-}
Deleted: trunk/mx4j/jsr160/src/test/java/javax/management/remote/JMXConnectorTestCase.java
===================================================================
--- trunk/mx4j/jsr160/src/test/java/javax/management/remote/JMXConnectorTestCase.java 2007-03-20 22:29:42 UTC (rev 2261)
+++ trunk/mx4j/jsr160/src/test/java/javax/management/remote/JMXConnectorTestCase.java 2007-03-21 00:09:32 UTC (rev 2262)
@@ -1,405 +0,0 @@
-/*
- * Copyright (C) The MX4J Contributors.
- * All rights reserved.
- *
- * This software is distributed under the terms of the MX4J License version 1.0.
- * See the terms of the MX4J License in the documentation provided with this software.
- */
-
-package javax.management.remote;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.net.MalformedURLException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.management.ListenerNotFoundException;
-import javax.management.MBeanNotificationInfo;
-import javax.management.MBeanServer;
-import javax.management.MBeanServerConnection;
-import javax.management.MBeanServerFactory;
-import javax.management.Notification;
-import javax.management.NotificationEmitter;
-import javax.management.NotificationFilter;
-import javax.management.NotificationListener;
-import javax.management.ObjectName;
-import javax.security.auth.Subject;
-
-import mx4j.MX4JTestCase;
-
-/**
- * @version $Revision$
- */
-public abstract class JMXConnectorTestCase extends MX4JTestCase
-{
- protected void tearDown() throws Exception
- {
- sleep(5000);
- }
-
- public abstract JMXServiceURL createJMXConnectorServerAddress() throws MalformedURLException;
-
- public abstract Map getEnvironment();
-
- protected MBeanServer newMBeanServer()
- {
- return MBeanServerFactory.newMBeanServer();
- }
-
- public void testNewJMXConnectorWithNullURL() throws Exception
- {
- try
- {
- JMXConnectorFactory.connect(null);
- fail();
- }
- catch (NullPointerException x)
- {
- }
- }
-
- public void testConnectionId() throws Exception
- {
- // Format is:
- // protocol:[[host]:port] [clientId] [arbitrary]
- // Spaces are mandatory, brackets indicates optional parts
-
- JMXConnectorServer cntorServer = null;
- JMXConnector cntor = null;
- try
- {
- JMXServiceURL url = createJMXConnectorServerAddress();
- cntorServer = JMXConnectorServerFactory.newJMXConnectorServer(url, getEnvironment(), newMBeanServer());
- cntorServer.start();
- sleep(5000);
-
- cntor = JMXConnectorFactory.connect(cntorServer.getAddress(), getEnvironment());
- String connectionId = cntor.getConnectionId();
- String protocol = connectionId.substring(0, connectionId.indexOf(':'));
- assertEquals(protocol, url.getProtocol());
-
- // Match first mandatory space
- int space = connectionId.indexOf(' ');
- String remaining = connectionId.substring(space + 1);
- // Match second mandatory space
- space = remaining.indexOf(' ');
- String arbitrary = remaining.substring(space + 1);
- if (arbitrary.length() < 1) fail("Missing MX4J arbitrary test");
- }
- finally
- {
- if (cntor != null) cntor.close();
- if (cntorServer != null) cntorServer.stop();
- }
- }
-
- public void testConnectionWithNoPath() throws Exception
- {
- JMXConnectorServer cntorServer = null;
- JMXConnector cntor = null;
- try
- {
- JMXServiceURL url = createJMXConnectorServerAddress();
@@ Diff output truncated at 100000 characters. @@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV