You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by km...@apache.org on 2009/06/18 22:38:54 UTC
svn commit: r786254 - in
/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/management:
CustomMBeanServerBuilder.java CustomMBeanServerBuilderTest.java _Suite.java
Author: kmarsden
Date: Thu Jun 18 20:38:54 2009
New Revision: 786254
URL: http://svn.apache.org/viewvc?rev=786254&view=rev
Log:
DERBY-3887 Embedded Derby fails under JBoss because of JMX-related conflicts.
First pass at making a regression test for this issue. It is not ideal because it currently has to be run by itself to pop the issue without the fix.
I will work to improve it if I get a clue how to do that.
Added:
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/management/CustomMBeanServerBuilder.java (with props)
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/management/CustomMBeanServerBuilderTest.java (with props)
Modified:
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/management/_Suite.java
Added: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/management/CustomMBeanServerBuilder.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/management/CustomMBeanServerBuilder.java?rev=786254&view=auto
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/management/CustomMBeanServerBuilder.java (added)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/management/CustomMBeanServerBuilder.java Thu Jun 18 20:38:54 2009
@@ -0,0 +1,25 @@
+/*
+ *
+ * Derby - Class org.apache.derbyTesting.functionTests.tests.management.CustomMBeanServerBuilder
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the License.
+ */
+
+package org.apache.derbyTesting.functionTests.tests.management;
+
+public class CustomMBeanServerBuilder extends javax.management.MBeanServerBuilder {
+ // No Contents we just need our own CustomMbeanServerBuilder for the DERBY-3887 test
+}
Propchange: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/management/CustomMBeanServerBuilder.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/management/CustomMBeanServerBuilderTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/management/CustomMBeanServerBuilderTest.java?rev=786254&view=auto
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/management/CustomMBeanServerBuilderTest.java (added)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/management/CustomMBeanServerBuilderTest.java Thu Jun 18 20:38:54 2009
@@ -0,0 +1,59 @@
+/*
+ *
+ * Derby - Class org.apache.derbyTesting.functionTests.tests.management.CustomMBeanServerBuilderTest
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the License.
+ */
+
+package org.apache.derbyTesting.functionTests.tests.management;
+import java.sql.SQLException;
+import java.util.Properties;
+
+import junit.framework.Test;
+
+import org.apache.derbyTesting.functionTests.tests.lang.SimpleTest;
+import org.apache.derbyTesting.junit.BaseJDBCTestCase;
+import org.apache.derbyTesting.junit.BaseTestCase;
+import org.apache.derbyTesting.junit.DatabasePropertyTestSetup;
+import org.apache.derbyTesting.junit.SystemPropertyTestSetup;
+import org.apache.derbyTesting.junit.TestConfiguration;
+
+public class CustomMBeanServerBuilderTest extends BaseJDBCTestCase {
+
+ public CustomMBeanServerBuilderTest(String name) {
+ super(name);
+
+ }
+
+ /**
+ * Test that Derby will boot when user sets
+ * javax.management.builder.initial
+ * @throws SQLException
+ */
+ public void testDerbyBootWithCusomMBeanServerBuilderDerby3887() throws SQLException {
+ getConnection();
+
+ }
+
+ public static Test suite() {
+ Properties props = new Properties();
+ props.setProperty("javax.management.builder.initial",
+ "org.apache.derbyTesting.functionTests.tests.management.CustomMBeanServerBuilder");
+ Test suite = TestConfiguration.embeddedSuite(CustomMBeanServerBuilderTest.class);
+ return new SystemPropertyTestSetup(suite,props);
+ }
+
+}
Propchange: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/management/CustomMBeanServerBuilderTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/management/_Suite.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/management/_Suite.java?rev=786254&r1=786253&r2=786254&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/management/_Suite.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/management/_Suite.java Thu Jun 18 20:38:54 2009
@@ -57,7 +57,7 @@
suite.addTest(VersionMBeanTest.suite());
suite.addTest(JDBCMBeanTest.suite());
suite.addTest(NetworkServerMBeanTest.suite());
-
+ suite.addTest(CustomMBeanServerBuilderTest.suite());
return suite;
}
}