[jboss-cvs] JBossAS SVN: r99424 - in trunk: component-matrix and 6 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Jan 14 14:49:54 EST 2010
Author: adrian at jboss.org
Date: 2010-01-14 14:49:53 -0500 (Thu, 14 Jan 2010)
New Revision: 99424
Removed:
trunk/testsuite/src/main/org/jboss/test/jbossmx/compliance/timer/JBossTimerBasicTestCase.java
trunk/testsuite/src/main/org/jboss/test/jbossmx/compliance/timer/JBossTimerPeriodTestCase.java
trunk/testsuite/src/main/org/jboss/test/jbossmx/implementation/util/AgentIDTestCase.java
Modified:
trunk/build/build.xml
trunk/build/pom.xml
trunk/component-matrix/pom.xml
trunk/jmx-remoting/src/main/java/javax/management/remote/rmi/RMIConnector.java
trunk/server/src/etc/conf/all/bootstrap/jmx.xml
trunk/testsuite/build.xml
trunk/testsuite/src/main/org/jboss/test/jbossmx/implementation/util/MBeanProxyTestCase.java
trunk/webservices/pom.xml
Log:
[JBAS-7260] - Update to jbossmx-6.0.0.Beta3
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2010-01-14 19:43:17 UTC (rev 99423)
+++ trunk/build/build.xml 2010-01-14 19:49:53 UTC (rev 99424)
@@ -432,6 +432,7 @@
<include name="jboss-javaee.jar"/>
<include name="jboss-integration.jar"/>
<include name="jboss-j2se.jar"/>
+ <include name="jboss-jmx-annotations.jar"/>
<include name="jboss-jmx.jar"/>
<include name="jboss-remoting.jar"/>
<include name="jboss-security-spi.jar"/>
@@ -2081,6 +2082,7 @@
<fileset refid="oswego-concurrent:concurrent:jar"/>
<fileset refid="dom4j:dom4j:jar"/>
<fileset refid="org.jboss.mx:jboss-j2se:jar"/>
+ <fileset refid="org.jboss.mx:jboss-jmx-annotations:jar"/>
<fileset refid="org.jboss.mx:jboss-mbeans:jar"/>
<fileset refid="org.jboss.mx:jboss-jmx:jar"/>
<fileset refid="org.jboss.cl:jboss-classloader:jar"/>
@@ -2145,6 +2147,7 @@
<fileset refid="org.jboss.naming:jnp-client:jar"/>
<fileset refid="org.jboss.security:jbosssx-client:jar"/>
<fileset refid="org.jboss.mx:jboss-j2se:jar"/>
+ <fileset refid="org.jboss.mx:jboss-jmx-annotations:jar"/>
<fileset refid="org.jboss.mx:jboss-jmx:jar"/>
<fileset refid="org.jboss.metadata:jboss-metadata-common:jar"/>
<fileset refid="org.jboss.metadata:jboss-metadata-client:jar"/>
Modified: trunk/build/pom.xml
===================================================================
--- trunk/build/pom.xml 2010-01-14 19:43:17 UTC (rev 99423)
+++ trunk/build/pom.xml 2010-01-14 19:49:53 UTC (rev 99424)
@@ -537,6 +537,12 @@
<groupId>org.jboss.seam.integration</groupId>
<artifactId>jboss-seam-int-jbossas</artifactId>
<optional>true</optional>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-dependency</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.security</groupId>
Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml 2010-01-14 19:43:17 UTC (rev 99423)
+++ trunk/component-matrix/pom.xml 2010-01-14 19:49:53 UTC (rev 99424)
@@ -115,7 +115,7 @@
<version.org.jboss.metadata.rar>2.0.0.Alpha</version.org.jboss.metadata.rar>
<version.org.jboss.metadata.war>2.0.0.Alpha13</version.org.jboss.metadata.war>
<version.org.jboss.mod_cluster>1.1.0.Beta1</version.org.jboss.mod_cluster>
- <version.org.jboss.mx>6.0.0.Beta1</version.org.jboss.mx>
+ <version.org.jboss.mx>6.0.0.Beta3</version.org.jboss.mx>
<version.org.jboss.naming>5.0.4.GA</version.org.jboss.naming>
<version.org.jboss.reflect>2.2.0.Alpha2</version.org.jboss.reflect>
<version.org.jboss.reloaded.naming>0.1.0-alpha-2</version.org.jboss.reloaded.naming>
@@ -162,6 +162,12 @@
<groupId>org.jboss.seam.integration</groupId>
<artifactId>jboss-seam-int-microcontainer</artifactId>
<version>${version.seam.integration}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-dependency</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -566,6 +572,10 @@
<groupId>org.jboss.aop</groupId>
<artifactId>jboss-aop</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-kernel</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -603,6 +613,12 @@
<groupId>org.jboss.logging</groupId>
<artifactId>logging-service-metadata</artifactId>
<version>${version.org.jboss.logging-service-metadata}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-kernel</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -680,6 +696,10 @@
<groupId>jboss</groupId>
<artifactId>jboss-test</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-dependency</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -693,6 +713,16 @@
<groupId>org.jboss.aop</groupId>
<artifactId>jboss-aop-deployers</artifactId>
<version>${version.org.jboss.aop}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-kernel</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-aop-mc-int</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -807,6 +837,12 @@
<dependency>
<groupId>org.jboss.mx</groupId>
+ <artifactId>jboss-jmx-annotations</artifactId>
+ <version>${version.org.jboss.mx}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.mx</groupId>
<artifactId>jboss-mbeans</artifactId>
<version>${version.org.jboss.mx}</version>
</dependency>
@@ -960,6 +996,12 @@
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-framework</artifactId>
<version>${version.jboss.jbossws-framework}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-kernel</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -1398,6 +1440,12 @@
<groupId>org.jboss.reloaded</groupId>
<artifactId>jboss-reloaded-naming-deployers</artifactId>
<version>${version.org.jboss.reloaded.naming.deployers}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-kernel</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -1586,6 +1634,12 @@
<groupId>org.jboss.cl</groupId>
<artifactId>jboss-classloading</artifactId>
<version>${version.org.jboss.cl}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-dependency</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -1771,6 +1825,12 @@
<artifactId>jboss-ejb3-common</artifactId>
<version>${version.org.jboss.ejb3.common.client}</version>
<classifier>client</classifier>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-kernel</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -1815,6 +1875,10 @@
<groupId>org.jboss.javaee</groupId>
<artifactId>jboss-servlet-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-aop-mc-int</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -1856,6 +1920,10 @@
<groupId>org.jboss.javaee</groupId>
<artifactId>jboss-servlet-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-kernel</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -1869,6 +1937,10 @@
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-core</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-kernel</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -1876,6 +1948,12 @@
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-jpa-int</artifactId>
<version>${version.org.jboss.ejb3.jpa.int}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-kernel</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -1894,6 +1972,10 @@
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-core</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-jmx-mc-int</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -1909,6 +1991,10 @@
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-interceptors</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-aop-mc-int</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -1976,6 +2062,12 @@
<groupId>org.jboss.bootstrap</groupId>
<artifactId>jboss-bootstrap-api-mc</artifactId>
<version>${version.org.jboss.bootstrap.api.mc}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-kernel</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -1994,6 +2086,12 @@
<groupId>org.jboss.bootstrap</groupId>
<artifactId>jboss-bootstrap-impl-mc</artifactId>
<version>${version.org.jboss.bootstrap.impl.mc}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-kernel</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -2012,6 +2110,12 @@
<groupId>org.jboss.bootstrap</groupId>
<artifactId>jboss-bootstrap-spi-mc</artifactId>
<version>${version.org.jboss.bootstrap.spi.mc}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-kernel</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -2096,6 +2200,12 @@
<groupId>org.jboss.jpa</groupId>
<artifactId>jboss-jpa-deployers</artifactId>
<version>${version.org.jboss.jpa.deployers}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-aop-mc-int</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -2108,6 +2218,12 @@
<groupId>org.jboss.jpa</groupId>
<artifactId>jboss-jpa-spi</artifactId>
<version>${version.org.jboss.jpa.spi}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-aop-mc-int</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -2228,6 +2344,12 @@
<groupId>org.jboss.integration</groupId>
<artifactId>jboss-profileservice-spi</artifactId>
<version>${version.org.jboss.integration}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-dependency</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -2264,6 +2386,16 @@
<groupId>org.jboss.threads</groupId>
<artifactId>jboss-threads-metadata</artifactId>
<version>${version.org.jboss.threads}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-kernel</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-aop-mc-int</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -2282,6 +2414,12 @@
<groupId>org.jboss.xnio</groupId>
<artifactId>xnio-metadata</artifactId>
<version>${version.org.jboss.xnio.metadata}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-kernel</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
Modified: trunk/jmx-remoting/src/main/java/javax/management/remote/rmi/RMIConnector.java
===================================================================
--- trunk/jmx-remoting/src/main/java/javax/management/remote/rmi/RMIConnector.java 2010-01-14 19:43:17 UTC (rev 99423)
+++ trunk/jmx-remoting/src/main/java/javax/management/remote/rmi/RMIConnector.java 2010-01-14 19:49:53 UTC (rev 99424)
@@ -47,7 +47,7 @@
import org.jboss.mx.remoting.rmi.ClientMBeanServerConnection;
import org.jboss.mx.remoting.rmi.ConnectionNotifier;
import org.jboss.mx.remoting.rmi.ClientNotifier;
-import org.jboss.mx.server.ObjectInputStreamWithClassLoader;
+import org.jboss.remoting.loading.ObjectInputStreamWithClassLoader;
import org.jboss.util.Base64;
/**
@@ -352,4 +352,4 @@
objectOutputStream.defaultWriteObject();
}
-}
\ No newline at end of file
+}
Modified: trunk/server/src/etc/conf/all/bootstrap/jmx.xml
===================================================================
--- trunk/server/src/etc/conf/all/bootstrap/jmx.xml 2010-01-14 19:43:17 UTC (rev 99423)
+++ trunk/server/src/etc/conf/all/bootstrap/jmx.xml 2010-01-14 19:49:53 UTC (rev 99424)
@@ -9,6 +9,7 @@
<classloader name="jmx-classloader" xmlns="urn:jboss:classloader:1.0" export-all="NON_EMPTY" import-all="true">
<root>${jboss.lib.url}jboss-j2se.jar</root>
+ <root>${jboss.lib.url}jboss-jmx-annotations.jar</root>
<root>${jboss.lib.url}jboss-mbeans.jar</root>
<root>${jboss.lib.url}jboss-jmx.jar</root>
<root>${jboss.lib.url}jboss-system-jmx.jar</root>
Modified: trunk/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml 2010-01-14 19:43:17 UTC (rev 99423)
+++ trunk/testsuite/build.xml 2010-01-14 19:49:53 UTC (rev 99424)
@@ -395,6 +395,7 @@
<path refid="jboss.internal-server.classpath"/>
<fileset refid="org.jboss.mx:jboss-j2se:jar"/>
<fileset refid="org.jboss.mx:jboss-jmx:jar"/>
+ <fileset refid="org.jboss.mx:jboss-jmx-annotations:jar"/>
<fileset refid="org.jboss.mx:jboss-mbeans:jar"/>
<fileset refid="org.jboss.javaee:jboss-jaspi-api:jar"/>
<fileset refid="org.jboss.javaee:jboss-javaee:jar"/>
Deleted: trunk/testsuite/src/main/org/jboss/test/jbossmx/compliance/timer/JBossTimerBasicTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jbossmx/compliance/timer/JBossTimerBasicTestCase.java 2010-01-14 19:43:17 UTC (rev 99423)
+++ trunk/testsuite/src/main/org/jboss/test/jbossmx/compliance/timer/JBossTimerBasicTestCase.java 2010-01-14 19:49:53 UTC (rev 99424)
@@ -1,50 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.jbossmx.compliance.timer;
-
-/**
- * Basic timer test, targeting org.jboss.mx.timer.JBossTimer.
- *
- * @see BasicTestCase
- *
- * @author <a href="mailto:dimitris at jboss.org">Dimitris Andreadis</a>
- */
-public class JBossTimerBasicTestCase extends BasicTestCase
-{
- // Constructor ---------------------------------------------------------------
-
- public JBossTimerBasicTestCase(String s)
- {
- super(s);
- }
-
- // Overrides -----------------------------------------------------------------
-
- /**
- * The timer class to test
- */
- protected String getTestedTimerClass()
- {
- // the jboss timer
- return "org.jboss.mx.timer.JBossTimer";
- }
-}
Deleted: trunk/testsuite/src/main/org/jboss/test/jbossmx/compliance/timer/JBossTimerPeriodTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jbossmx/compliance/timer/JBossTimerPeriodTestCase.java 2010-01-14 19:43:17 UTC (rev 99423)
+++ trunk/testsuite/src/main/org/jboss/test/jbossmx/compliance/timer/JBossTimerPeriodTestCase.java 2010-01-14 19:49:53 UTC (rev 99424)
@@ -1,50 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.jbossmx.compliance.timer;
-
-/**
- * Period timer test, targeting org.jboss.mx.timer.JBossTimer.
- *
- * @see PeriodTestCase
- *
- * @author <a href="mailto:dimitris at jboss.org">Dimitris Andreadis</a>
- */
-public class JBossTimerPeriodTestCase extends PeriodTestCase
-{
- // Constructor ---------------------------------------------------------------
-
- public JBossTimerPeriodTestCase(String s)
- {
- super(s);
- }
-
- // Overrides -----------------------------------------------------------------
-
- /**
- * The timer class to test
- */
- protected String getTestedTimerClass()
- {
- // the jboss timer
- return "org.jboss.mx.timer.JBossTimer";
- }
-}
Deleted: trunk/testsuite/src/main/org/jboss/test/jbossmx/implementation/util/AgentIDTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jbossmx/implementation/util/AgentIDTestCase.java 2010-01-14 19:43:17 UTC (rev 99423)
+++ trunk/testsuite/src/main/org/jboss/test/jbossmx/implementation/util/AgentIDTestCase.java 2010-01-14 19:49:53 UTC (rev 99424)
@@ -1,68 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.jbossmx.implementation.util;
-
-import javax.management.MBeanServer;
-import javax.management.MBeanServerFactory;
-import javax.management.ObjectName;
-
-import org.jboss.test.jbossmx.implementation.TestCase;
-
-import org.jboss.mx.server.ServerConstants;
-import org.jboss.mx.util.AgentID;
-
-
-public class AgentIDTestCase
- extends TestCase
- implements ServerConstants
-{
- public AgentIDTestCase(String s)
- {
- super(s);
- }
-
- public void testCreate()
- {
- String id1 = AgentID.create();
- String id2 = AgentID.create();
-
- assertTrue(!id1.equals(id2));
- }
-
- public void testGet()
- {
- try
- {
- MBeanServer server = MBeanServerFactory.createMBeanServer();
- String id1 = (String)server.getAttribute(new ObjectName(MBEAN_SERVER_DELEGATE), "MBeanServerId");
- String id2 = AgentID.get(server);
-
- assertTrue(id1.equals(id2));
- }
- catch (Throwable t)
- {
- log.debug("failed", t);
- fail("Unexpected error: " + t.toString());
- }
- }
-
-}
Modified: trunk/testsuite/src/main/org/jboss/test/jbossmx/implementation/util/MBeanProxyTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jbossmx/implementation/util/MBeanProxyTestCase.java 2010-01-14 19:43:17 UTC (rev 99423)
+++ trunk/testsuite/src/main/org/jboss/test/jbossmx/implementation/util/MBeanProxyTestCase.java 2010-01-14 19:49:53 UTC (rev 99424)
@@ -31,7 +31,7 @@
import org.jboss.test.jbossmx.implementation.util.support.TrivialMBean;
import org.jboss.mx.util.MBeanProxy;
-import org.jboss.mx.util.AgentID;
+import org.jboss.mx.util.MBeanServerLocator;
public class MBeanProxyTestCase
@@ -52,7 +52,7 @@
server.registerMBean(new Trivial(), oname);
TrivialMBean mbean = (TrivialMBean)MBeanProxy.get(
- TrivialMBean.class, oname, AgentID.get(server));
+ TrivialMBean.class, oname, MBeanServerLocator.getId(server));
}
catch (Throwable t)
{
@@ -71,7 +71,7 @@
server.registerMBean(new Trivial(), oname);
TrivialMBean mbean = (TrivialMBean)MBeanProxy.get(
- TrivialMBean.class, oname, AgentID.get(server));
+ TrivialMBean.class, oname, MBeanServerLocator.getId(server));
mbean.doOperation();
mbean.setSomething("JBossMX");
Modified: trunk/webservices/pom.xml
===================================================================
--- trunk/webservices/pom.xml 2010-01-14 19:43:17 UTC (rev 99423)
+++ trunk/webservices/pom.xml 2010-01-14 19:49:53 UTC (rev 99424)
@@ -140,6 +140,12 @@
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-common</artifactId>
<version>${version.org.jboss.ejb3.common.client}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-kernel</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- transitive dependencies -->
<dependency>
More information about the jboss-cvs-commits
mailing list