[CVS nano] corrections to packages

Paul Hammant <paul-yCVjj/[email protected]> Wed, 28 Jan 2004 16:50:19 -0600
Newsgroups	gmane.comp.java.nanocontainer.cvs
Message-ID	<[email protected]>
Commit in nano/src on MAIN

java/org/nanocontainer/script/ScriptedComposingLifecycleContainerBuilder.java +2 -2 1.1 -> 1.2

java/org/nanocontainer/script/bsh/BeanShellComponentAdapter.java +2 -2 1.3 -> 1.4

/BeanShellComponentAdapterFactory.java +2 -2 1.2 -> 1.3

/BeanShellScriptInitializationException.java +2 -2 1.1 -> 1.2

java/org/nanocontainer/script/deployer/Deployer.java +2 -2 1.1 -> 1.2

java/org/nanocontainer/script/jython/JythonContainerBuilder.java +2 -2 1.2 -> 1.3

java/org/nanocontainer/script/rhino/JavascriptContainerBuilder.java +1 -1 1.3 -> 1.4

java/org/nanocontainer/script/xml/BeanXMLPseudoComponentFactory.java +1 -1 1.1 -> 1.2

/EmptyCompositionException.java +1 -1 1.2 -> 1.3
/XMLContainerBuilder.java +3 -3 1.4 -> 1.5

/XMLPseudoComponentFactory.java +1 -1 1.1 -> 1.2 <
/tr>
/XStreamXMLPseudoComponentFactory.java +1 -1 1.1 -> 1.2

test/org/nanocontainer/script/AbstractScriptedComposingLifecycleContainerBuilderTestCase.java +2 -2 1.1 -> 1.2

test/org/nanocontainer/script/bsh/BeanShellComponentAdapterFactoryTestCase.java +2 -2 1.3 -> 1.4

/ScriptableDemoBean.java +2 -2 1.1 -> 1.2

test/org/nanocontainer/script/deployer/DeployerTestCase.java +1 -1 1.1 -> 1.2

test/org/nanocontainer/script/jython/JythonContainerBuilderTestCase.java +2 -2 1.2 -> 1.3

test/org/nanocontainer/script/rhino/JavascriptContainerBuilderTestCase.java +1 -1 1.3 -> 1.4

test/org/nanocontainer/script/xml/BeanXMLPseudoComponentFactoryTestCase.java +1 -1 1.4 -> 1.5

/TestPseudoComp.java +1 -1 1.2 -> 1.3

/XMLContainerBuilderTestCase.java +2 -2 1.2 -> 1.3
/XStreamXMLPseudoComponentFactoryTestCase.java +1 -1 1.1 -> 1.2

+35 -35

22 modified files

corrections to packages

----------

nano /src /java /org /nanocontainer /script

ScriptedComposingLifecycleContainerBuilder.java 1.1 -> 1.2

diff -u -r1.1 -r1.2
--- ScriptedComposingLifecycleContainerBuilder.java 26 Jan 2004 18:48:14 -0000 1.1
+++ ScriptedComposingLifecycleContainerBuilder.java 28 Jan 2004 22:50:18 -0000 1.2
@@ -1,8 +1,8 @@

/**
* @author Aslak Helles&oslash;y

- * @version $Revision: 1.1 $

+ * @version $Revision: 1.2 $

*/

-package org.picoextras.script;

+package org.nanocontainer.script;

import org.picoextras.integrationkit.ComposingLifecycleContainerBuilder;

----------

nano /src /java /org /nanocontainer /script /bsh

BeanShellComponentAdapter.java 1.3 -> 1.4

diff -u -r1.3 -r1.4
--- BeanShellComponentAdapter.java 18 Jan 2004 23:31:20 -0000 1.3
+++ BeanShellComponentAdapter.java 28 Jan 2004 22:50:18 -0000 1.4
@@ -7,7 +7,7 @@

* *
* Original code by Leo Simons *
*****************************************************************************/

-package org.picoextras.script.bsh;

+package org.nanocontainer.script.bsh;

import bsh.EvalError;
import bsh.Interpreter;

@@ -45,7 +45,7 @@

*
* @author <a href="mail at leosimons dot com">Leo Simons</a>
* @author Aslak Hellesoy

- * @version $Id: BeanShellComponentAdapter.java,v 1.3 2004/01/18 23:31:20 rinkrank Exp $

+ * @version $Id: BeanShellComponentAdapter.java,v 1.4 2004/01/28 22:50:18 paul Exp $

*/
public class BeanShellComponentAdapter extends AbstractComponentAdapter {
private final Parameter[] parameters;

----------

nano /src /java /org /nanocontainer /script /bsh

BeanShellComponentAdapterFactory.java 1.2 -> 1.3

diff -u -r1.2 -r1.3
--- BeanShellComponentAdapterFactory.java 24 Dec 2003 01:31:40 -0000 1.2
+++ BeanShellComponentAdapterFactory.java 28 Jan 2004 22:50:18 -0000 1.3
@@ -7,7 +7,7 @@

* *
* Original code by Leo Simons *
*****************************************************************************/

-package org.picoextras.script.bsh;

+package org.nanocontainer.script.bsh;

import org.picocontainer.ComponentAdapter;
import org.picocontainer.Parameter;

@@ -21,7 +21,7 @@

*
* @see BeanShellComponentAdapter
* @author <a href="mail at leosimons dot com">Leo Simons</a>

- * @version $Id: BeanShellComponentAdapterFactory.java,v 1.2 2003/12/24 01:31:40 rinkrank Exp $

+ * @version $Id: BeanShellComponentAdapterFactory.java,v 1.3 2004/01/28 22:50:18 paul Exp $

*/
public class BeanShellComponentAdapterFactory
implements ComponentAdapterFactory {

----------

nano /src /java /org /nanocontainer /script /bsh

BeanShellScriptInitializationException.java 1.1 -> 1.2

diff -u -r1.1 -r1.2
--- BeanShellScriptInitializationException.java 23 Dec 2003 23:12:34 -0000 1.1
+++ BeanShellScriptInitializationException.java 28 Jan 2004 22:50:18 -0000 1.2
@@ -7,7 +7,7 @@

* *
* Original code by Leo Simons *
*****************************************************************************/

-package org.picoextras.script.bsh;

+package org.nanocontainer.script.bsh;

import org.picocontainer.PicoInitializationException;

@@ -15,7 +15,7 @@

*
*
* @author <a href="mail at leosimons dot com">Leo Simons</a>

- * @version $Id: BeanShellScriptInitializationException.java,v 1.1 2003/12/23 23:12:34 rinkrank Exp $

+ * @version $Id: BeanShellScriptInitializationException.java,v 1.2 2004/01/28 22:50:18 paul Exp $

*/
public class BeanShellScriptInitializationException
extends PicoInitializationException {

----------

nano /src /java /org /nanocontainer /script /deployer

Deployer.java 1.1 -> 1.2

diff -u -r1.1 -r1.2
--- Deployer.java 28 Jan 2004 22:33:38 -0000 1.1
+++ Deployer.java 28 Jan 2004 22:50:18 -0000 1.2
@@ -1,8 +1,8 @@

/**
* @author Aslak Helles&oslash;y

- * @version $Revision: 1.1 $

+ * @version $Revision: 1.2 $

*/

-package org.picoextras.script.deployer;

+package org.nanocontainer.script.deployer;

import org.apache.commons.vfs.*;
import org.apache.commons.vfs.impl.VFSClassLoader;

----------

nano /src /java /org /nanocontainer /script /jython

JythonContainerBuilder.java 1.2 -> 1.3

diff -u -r1.2 -r1.3
--- JythonContainerBuilder.java 26 Jan 2004 01:31:19 -0000 1.2
+++ JythonContainerBuilder.java 28 Jan 2004 22:50:18 -0000 1.3
@@ -1,4 +1,4 @@

-package org.picoextras.script.jython;

+package org.nanocontainer.script.jython;

import org.picocontainer.MutablePicoContainer;
import org.picocontainer.defaults.DefaultPicoContainer;

@@ -15,7 +15,7 @@

* @author Paul Hammant
* @author Mike Royle
* @author Aslak Helles&oslash;y

- * @version $Revision: 1.2 $

+ * @version $Revision: 1.3 $

*/
public class JythonContainerBuilder extends ScriptedComposingLifecycleContainerBuilder {
public JythonContainerBuilder(Reader script, ClassLoader classLoader) {

----------

nano /src /java /org /nanocontainer /script /rhino

JavascriptContainerBuilder.java 1.3 -> 1.4

diff -u -r1.3 -r1.4
--- JavascriptContainerBuilder.java 28 Jan 2004 22:33:38 -0000 1.3
+++ JavascriptContainerBuilder.java 28 Jan 2004 22:50:18 -0000 1.4
@@ -1,4 +1,4 @@

-package org.picoextras.script.rhino;

+package org.nanocontainer.script.rhino;

import org.mozilla.javascript.*;
import org.picocontainer.MutablePicoContainer;

----------

nano /src /java /org /nanocontainer /script /xml

BeanXMLPseudoComponentFactory.java 1.1 -> 1.2

diff -u -r1.1 -r1.2
--- BeanXMLPseudoComponentFactory.java 26 Jan 2004 21:24:01 -0000 1.1
+++ BeanXMLPseudoComponentFactory.java 28 Jan 2004 22:50:18 -0000 1.2
@@ -6,7 +6,7 @@

* the LICENSE.txt file. *
* *
*****************************************************************************/

-package org.picoextras.script.xml;

+package org.nanocontainer.script.xml;

import org.picoextras.reflection.DefaultReflectionContainerAdapter;
import org.picoextras.reflection.ReflectionContainerAdapter;

----------

nano /src /java /org /nanocontainer /script /xml

EmptyCompositionException.java 1.2 -> 1.3

diff -u -r1.2 -r1.3
--- EmptyCompositionException.java 26 Jan 2004 01:12:29 -0000 1.2
+++ EmptyCompositionException.java 28 Jan 2004 22:50:18 -0000 1.3
@@ -7,7 +7,7 @@

* *
*****************************************************************************/

-package org.picoextras.script.xml;

+package org.nanocontainer.script.xml;

import org.picoextras.integrationkit.PicoAssemblyException;

----------

nano /src /java /org /nanocontainer /script /xml

XMLContainerBuilder.java 1.4 -> 1.5

diff -u -r1.4 -r1.5
--- XMLContainerBuilder.java 26 Jan 2004 01:31:55 -0000 1.4
+++ XMLContainerBuilder.java 28 Jan 2004 22:50:18 -0000 1.5
@@ -8,7 +8,7 @@

* Original code by Aslak Hellesoy and Paul Hammant *
*****************************************************************************/

-package org.picoextras.script.xml;

+package org.nanocontainer.script.xml;

import org.picocontainer.ComponentAdapter;
import org.picocontainer.MutablePicoContainer;

@@ -39,11 +39,11 @@

/**
* This class builds up a hierarchy of PicoContainers from an XML configuration file.

- *

+ *

* @author Paul Hammant
* @author Aslak Helles&oslash;y
* @author Jeppe Cramon

- * @version $Revision: 1.4 $

+ * @version $Revision: 1.5 $

*/
public class XMLContainerBuilder extends ScriptedComposingLifecycleContainerBuilder {
private final Element rootElement;

----------

nano /src /java /org /nanocontainer /script /xml

XMLPseudoComponentFactory.java 1.1 -> 1.2

diff -u -r1.1 -r1.2
--- XMLPseudoComponentFactory.java 26 Jan 2004 18:59:29 -0000 1.1
+++ XMLPseudoComponentFactory.java 28 Jan 2004 22:50:18 -0000 1.2
@@ -8,7 +8,7 @@

* Original code by Aslak Hellesoy and Paul Hammant *
*****************************************************************************/

-package org.picoextras.script.xml;

+package org.nanocontainer.script.xml;

import org.w3c.dom.Element;
import org.xml.sax.SAXException;

----------

nano /src /java /org /nanocontainer /script /xml

XStreamXMLPseudoComponentFactory.java 1.1 -> 1.2

diff -u -r1.1 -r1.2
--- XStreamXMLPseudoComponentFactory.java 26 Jan 2004 18:59:29 -0000 1.1
+++ XStreamXMLPseudoComponentFactory.java 28 Jan 2004 22:50:18 -0000 1.2
@@ -6,7 +6,7 @@

* the LICENSE.txt file. *
* *
*****************************************************************************/

-package org.picoextras.script.xml;

+package org.nanocontainer.script.xml;

import com.thoughtworks.xstream.XStream;
import com.thoughtworks.xstream.xml.dom.DomXMLReader;

----------

nano /src /test /org /nanocontainer /script

AbstractScriptedComposingLifecycleContainerBuilderTestCase.java 1.1 -> 1.2

diff -u -r1.1 -r1.2
--- AbstractScriptedComposingLifecycleContainerBuilderTestCase.java 26 Jan 2004 18:44:25 -0000 1.1
+++ AbstractScriptedComposingLifecycleContainerBuilderTestCase.java 28 Jan 2004 22:50:19 -0000 1.2
@@ -1,8 +1,8 @@

/**
* @author Aslak Helles&oslash;y

- * @version $Revision: 1.1 $

+ * @version $Revision: 1.2 $

*/

-package org.picoextras.script;

+package org.nanocontainer.script;

import junit.framework.TestCase;
import org.picocontainer.PicoContainer;

----------

nano /src /test /org /nanocontainer /script /bsh

BeanShellComponentAdapterFactoryTestCase.java 1.3 -> 1.4

diff -u -r1.3 -r1.4
--- BeanShellComponentAdapterFactoryTestCase.java 18 Jan 2004 23:31:20 -0000 1.3
+++ BeanShellComponentAdapterFactoryTestCase.java 28 Jan 2004 22:50:19 -0000 1.4
@@ -7,7 +7,7 @@

* *
* Original code by Leo Simons *
*****************************************************************************/

-package org.picoextras.script.bsh;

+package org.nanocontainer.script.bsh;

import junit.framework.TestCase;
import org.picocontainer.ComponentAdapter;

@@ -22,7 +22,7 @@

* BeanShellComponentAdapter.
*
* @author <a href="mail at leosimons dot com">Leo Simons</a>

- * @version $Id: BeanShellComponentAdapterFactoryTestCase.java,v 1.3 2004/01/18 23:31:20 rinkrank Exp $

+ * @version $Id: BeanShellComponentAdapterFactoryTestCase.java,v 1.4 2004/01/28 22:50:19 paul Exp $

*/
public class BeanShellComponentAdapterFactoryTestCase extends TestCase {
public void testGetComponentInstance() {

----------

nano /src /test /org /nanocontainer /script /bsh

ScriptableDemoBean.java 1.1 -> 1.2

diff -u -r1.1 -r1.2
--- ScriptableDemoBean.java 23 Dec 2003 23:12:34 -0000 1.1
+++ ScriptableDemoBean.java 28 Jan 2004 22:50:19 -0000 1.2
@@ -7,14 +7,14 @@

* *
* Original code by Leo Simons *
*****************************************************************************/

-package org.picoextras.script.bsh;

+package org.nanocontainer.script.bsh;

/**
*
*
* @author <a href="mail at leosimons dot com">Leo Simons</a>
* @author Aslak Hellesoy

- * @version $Id: ScriptableDemoBean.java,v 1.1 2003/12/23 23:12:34 rinkrank Exp $

+ * @version $Id: ScriptableDemoBean.java,v 1.2 2004/01/28 22:50:19 paul Exp $

*/
public class ScriptableDemoBean {
public Object key;

----------

nano /src /test /org /nanocontainer /script /deployer

DeployerTestCase.java 1.1 -> 1.2

diff -u -r1.1 -r1.2
--- DeployerTestCase.java 28 Jan 2004 22:33:38 -0000 1.1
+++ DeployerTestCase.java 28 Jan 2004 22:50:19 -0000 1.2
@@ -1,4 +1,4 @@

-package org.picoextras.script.deployer;

+package org.nanocontainer.script.deployer;

import junit.framework.TestCase;
import org.apache.commons.vfs.FileObject;

----------

nano /src /test /org /nanocontainer /script /jython

JythonContainerBuilderTestCase.java 1.2 -> 1.3

diff -u -r1.2 -r1.3
--- JythonContainerBuilderTestCase.java 26 Jan 2004 18:43:25 -0000 1.2
+++ JythonContainerBuilderTestCase.java 28 Jan 2004 22:50:19 -0000 1.3
@@ -1,4 +1,4 @@

-package org.picoextras.script.jython;

+package org.nanocontainer.script.jython;

import org.picocontainer.PicoContainer;
import org.picocontainer.defaults.UnsatisfiableDependenciesException;

@@ -12,7 +12,7 @@

/**
* @author Aslak Helles&oslash;y

- * @version $Revision: 1.2 $

+ * @version $Revision: 1.3 $

*/
public class JythonContainerBuilderTestCase extends AbstractScriptedComposingLifecycleContainerBuilderTestCase {

----------

nano /src /test /org /nanocontainer /script /rhino

JavascriptContainerBuilderTestCase.java 1.3 -> 1.4

diff -u -r1.3 -r1.4
--- JavascriptContainerBuilderTestCase.java 28 Jan 2004 22:33:38 -0000 1.3
+++ JavascriptContainerBuilderTestCase.java 28 Jan 2004 22:50:19 -0000 1.4
@@ -1,4 +1,4 @@

-package org.picoextras.script.rhino;

+package org.nanocontainer.script.rhino;

import org.mozilla.javascript.JavaScriptException;
import org.picocontainer.PicoContainer;

----------

nano /src /test /org /nanocontainer /script /xml

BeanXMLPseudoComponentFactoryTestCase.java 1.4 -> 1.5

diff -u -r1.4 -r1.5
--- BeanXMLPseudoComponentFactoryTestCase.java 26 Jan 2004 19:01:27 -0000 1.4
+++ BeanXMLPseudoComponentFactoryTestCase.java 28 Jan 2004 22:50:19 -0000 1.5
@@ -6,7 +6,7 @@

* the LICENSE.txt file. *
* *
*****************************************************************************/

-package org.picoextras.script.xml;

+package org.nanocontainer.script.xml;

import junit.framework.TestCase;
import org.w3c.dom.Document;

----------

nano /src /test /org /nanocontainer /script /xml

TestPseudoComp.java 1.2 -> 1.3

diff -u -r1.2 -r1.3
--- TestPseudoComp.java 24 Dec 2003 01:31:52 -0000 1.2
+++ TestPseudoComp.java 28 Jan 2004 22:50:19 -0000 1.3
@@ -7,7 +7,7 @@

* *
*****************************************************************************/

-package org.picoextras.script.xml;

+package org.nanocontainer.script.xml;

public class TestPseudoComp {
private int foo;

----------

nano /src /test /org /nanocontainer /script /xml

XMLContainerBuilderTestCase.java 1.2 -> 1.3

diff -u -r1.2 -r1.3
--- XMLContainerBuilderTestCase.java 26 Jan 2004 18:43:34 -0000 1.2
+++ XMLContainerBuilderTestCase.java 28 Jan 2004 22:50:19 -0000 1.3
@@ -8,7 +8,7 @@

* Original code by Aslak Hellesoy and Paul Hammant *
*****************************************************************************/

-package org.picoextras.script.xml;

+package org.nanocontainer.script.xml;

import org.picocontainer.PicoContainer;
import org.picocontainer.extras.ImplementationHidingComponentAdapterFactory;

@@ -31,7 +31,7 @@

* @author Paul Hammant
* @author Aslak Helles&oslash;y
* @author Jeppe Cramon

- * @version $Revision: 1.2 $

+ * @version $Revision: 1.3 $

*/
public class XMLContainerBuilderTestCase extends AbstractScriptedComposingLifecycleContainerBuilderTestCase {

----------

nano /src /test /org /nanocontainer /script /xml

XStreamXMLPseudoComponentFactoryTestCase.java 1.1 -> 1.2

diff -u -r1.1 -r1.2
--- XStreamXMLPseudoComponentFactoryTestCase.java 26 Jan 2004 19:01:27 -0000 1.1
+++ XStreamXMLPseudoComponentFactoryTestCase.java 28 Jan 2004 22:50:19 -0000 1.2
@@ -6,7 +6,7 @@

* the LICENSE.txt file. *
* *
*****************************************************************************/

-package org.picoextras.script.xml;

+package org.nanocontainer.script.xml;

import junit.framework.TestCase;
import org.w3c.dom.Document;