Author: dkulp
Date: Mon Mar 14 18:29:06 2011
New Revision: 1081506
URL: http://svn.apache.org/viewvc?rev=1081506&view=rev
Log:
Merged revisions 1081503 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1081503 | dkulp | 2011-03-14 14:27:17 -0400 (Mon, 14 Mar 2011) | 1 line
REmove @Override annotation
........
Modified:
cxf/branches/2.3.x-fixes/ (props changed)
cxf/branches/2.3.x-fixes/rt/management/src/test/java/org/apache/cxf/management/jmx/BusRegistrationTest.java
Propchange: cxf/branches/2.3.x-fixes/
('svn:mergeinfo' removed)
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.3.x-fixes/rt/management/src/test/java/org/apache/cxf/management/jmx/BusRegistrationTest.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/management/src/test/java/org/apache/cxf/management/jmx/BusRegistrationTest.java?rev=1081506&r1=1081505&r2=1081506&view=diff
==============================================================================
---
cxf/branches/2.3.x-fixes/rt/management/src/test/java/org/apache/cxf/management/jmx/BusRegistrationTest.java
(original)
+++
cxf/branches/2.3.x-fixes/rt/management/src/test/java/org/apache/cxf/management/jmx/BusRegistrationTest.java
Mon Mar 14 18:29:06 2011
@@ -68,7 +68,6 @@ public class BusRegistrationTest extends
serverIM = serverBus.getExtension(InstrumentationManager.class);
assertTrue("Instrumentation Manager should not be null", serverIM !=
null);
Thread t = new Thread(new Runnable() {
- @Override
public void run() {
clientBus = factory.createBus("no-connector-spring.xml");
clientIM =
clientBus.getExtension(InstrumentationManager.class);