[CVS nano] Fixed PICO-60 and PICO-63

Commit in nano on MAIN

jmx/src/java/org/picoextras/jmx/NanoMXContainer.java +4 -3 1.1 -> 1.2

nanocontainer/src/test/org/nanocontainer/XmlCompositionNanoContainerTestCase.java +2 -3 1.5 -> 1.6

+6 -6

2 modified files

Fixed PICO-60 and PICO-63

----------

nano /jmx /src /java /org /picoextras /jmx

NanoMXContainer.java 1.1 -> 1.2

diff -u -r1.1 -r1.2
--- NanoMXContainer.java 17 Nov 2003 21:01:59 -0000 1.1
+++ NanoMXContainer.java 22 Nov 2003 19:06:36 -0000 1.2
@@ -11,6 +11,7 @@

package org.picoextras.jmx;

import org.picocontainer.PicoRegistrationException;

+import org.picocontainer.ComponentAdapter;

import org.picocontainer.defaults.*;
import org.picocontainer.defaults.ComponentAdapterFactory;

@@ -26,7 +27,7 @@

* @author Mauro Talevi
* @author Aslak Hellesøy
* @author Jeppe Cramon

- * @version $Revision: 1.1 $

+ * @version $Revision: 1.2 $

*/
public class NanoMXContainer extends DefaultPicoContainer implements Serializable {

@@ -57,12 +58,12 @@

* @param component is the component to be registered
* @throws PicoRegistrationException
*/

- public synchronized Object registerComponentInstance(Object key, Object component)

+ public synchronized ComponentAdapter registerComponentInstance(Object key, Object component)

throws PicoRegistrationException {
ObjectName name = null;
try {
name = NanoMXComponentAdapter.asObjectName(key);

- Object result = super.registerComponentInstance(key, component);

+ ComponentAdapter result = super.registerComponentInstance(key, component);

Object mbean = NanoMXComponentAdapter.asMBean(component);
mbeanServer.registerMBean(mbean, name);

----------

nano /nanocontainer /src /test /org /nanocontainer

XmlCompositionNanoContainerTestCase.java 1.5 -> 1.6

diff -u -r1.5 -r1.6
--- XmlCompositionNanoContainerTestCase.java 22 Nov 2003 17:44:08 -0000 1.5
+++ XmlCompositionNanoContainerTestCase.java 22 Nov 2003 19:06:36 -0000 1.6
@@ -30,7 +30,7 @@

* @author Aslak Hellesøy
* @author Paul Hammant
* @author Ward Cunningham

- * @version $Revision: 1.5 $

+ * @version $Revision: 1.6 $

*/
public class XmlCompositionNanoContainerTestCase extends TestCase {

@@ -220,9 +220,8 @@

public void testInstantiateWithHintedComponentResolution() throws SAXException, ParserConfigurationException, IOException, ClassNotFoundException, PicoCompositionException {

- NanoContainer nano = null;

try {

- nano = new XmlCompositionNanoContainer(new StringReader("" +

+ new XmlCompositionNanoContainer(new StringReader("" +

"<container>" +
" <component stringkey='one' class='java.util.ArrayList'/>" +
" <component stringkey='two' class='java.util.Vector'/>" +