incubator-composer-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r618234 [1/2] - in /incubator/composer/trunk: composer-core/src/main/java/org/apache/composer/core/ composer-core/src/main/java/org/apache/composer/core/adapters/ composer-core/src/main/java/org/apache/composer/core/behaviors/ composer-core...
Date Mon, 04 Feb 2008 11:06:19 GMT
Author: mauro
Date: Mon Feb  4 03:06:06 2008
New Revision: 618234

URL: http://svn.apache.org/viewvc?rev=618234&view=rev
Log:
Cleanup after import of docs and gems.

Added:
    incubator/composer/trunk/composer-site/src/site/resources/images/container-hierarchy.png
      - copied unchanged from r618229, incubator/composer/trunk/composer-site/src/site/resources/images/pico-hierarchy.png
    incubator/composer/trunk/composer-site/src/site/resources/images/container-needs-stuff.png
      - copied unchanged from r618229, incubator/composer/trunk/composer-site/src/site/resources/images/pico-needs-stuff.png
    incubator/composer/trunk/composer-site/src/site/resources/style/composer.css
      - copied unchanged from r618229, incubator/composer/trunk/composer-site/src/site/resources/style/pico.css
Removed:
    incubator/composer/trunk/composer-site/src/site/resources/images/pico-hierarchy.png
    incubator/composer/trunk/composer-site/src/site/resources/images/pico-logo.png
    incubator/composer/trunk/composer-site/src/site/resources/images/pico-needs-stuff.png
    incubator/composer/trunk/composer-site/src/site/resources/style/pico.css
Modified:
    incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/adapters/StaticFactoryAdapter.java
    incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/adapters/ThreadLocalized.java
    incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/adapters/ThreadLocalizing.java
    incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/behaviors/Assimilated.java
    incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/behaviors/Assimilating.java
    incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/behaviors/HotSwapping.java
    incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/behaviors/Pooled.java
    incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/monitors/ComponentDependencyMonitor.java
    incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/monitors/Log4JComponentMonitor.java
    incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/package.html
    incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/adapters/Elephant.java
    incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/adapters/ElephantImpl.java
    incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/adapters/ElephantProxy.java
    incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/adapters/ThreadLocalComponentAdapterTest.java
    incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/adapters/ThreadLocalReferenceTest.java
    incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/adapters/ThreadLocalizingTestCase.java
    incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/behaviors/AsmImplementationHidingTestCase.java
    incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/behaviors/AssimilatedTestCase.java
    incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/behaviors/AssimilatingTestCase.java
    incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/behaviors/HotSwappingTestCase.java
    incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/behaviors/PooledTestCase.java
    incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/monitors/prefuse/AggregateDemoHacks.java
    incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/monitors/prefuse/DependencySetTestCase.java
    incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/testmodel/CompatibleTouchable.java
    incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/testmodel/DependsOnDependsOnListAndVector.java
    incubator/composer/trunk/composer-site/   (props changed)
    incubator/composer/trunk/composer-site/src/site/content/CommandLineArgumentsContainer.html
    incubator/composer/trunk/composer-site/src/site/content/DefaultContainer.html
    incubator/composer/trunk/composer-site/src/site/content/SystemPropertiesContainer.html
    incubator/composer/trunk/composer-site/src/site/content/adapters.html
    incubator/composer/trunk/composer-site/src/site/content/antipatterns/container-dependency-antipattern.html
    incubator/composer/trunk/composer-site/src/site/content/antipatterns/tests-use-container-antipattern.html
    incubator/composer/trunk/composer-site/src/site/content/behaviors.html
    incubator/composer/trunk/composer-site/src/site/content/builder.html
    incubator/composer/trunk/composer-site/src/site/content/component-configuration.html
    incubator/composer/trunk/composer-site/src/site/content/disambiguation.html
    incubator/composer/trunk/composer-site/src/site/content/faq.html
    incubator/composer/trunk/composer-site/src/site/content/fluent-style.html
    incubator/composer/trunk/composer-site/src/site/content/help/ambiguous-injectable-help.html
    incubator/composer/trunk/composer-site/src/site/content/help/unprocessed-properties-help.html
    incubator/composer/trunk/composer-site/src/site/content/index.html
    incubator/composer/trunk/composer-site/src/site/content/injection.html
    incubator/composer/trunk/composer-site/src/site/content/interception.html
    incubator/composer/trunk/composer-site/src/site/content/introduction.html
    incubator/composer/trunk/composer-site/src/site/content/lifecycle.html
    incubator/composer/trunk/composer-site/src/site/content/mock-objects.html
    incubator/composer/trunk/composer-site/src/site/content/properties.html
    incubator/composer/trunk/composer-site/src/site/content/scopes.html
    incubator/composer/trunk/composer-site/src/site/content/setter-injection.html
    incubator/composer/trunk/composer-site/src/site/content/team.html
    incubator/composer/trunk/composer-site/src/site/templates/skin.html

Modified: incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/adapters/StaticFactoryAdapter.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/adapters/StaticFactoryAdapter.java?rev=618234&r1=618233&r2=618234&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/adapters/StaticFactoryAdapter.java (original)
+++ incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/adapters/StaticFactoryAdapter.java Mon Feb  4 03:06:06 2008
@@ -56,7 +56,7 @@
 
     /**
      * @return Returns the component created by the static factory.
-     * @see org.picocontainer.ComponentAdapter#getComponentInstance(org.picocontainer.PicoContainer)
+     * @see org.apache.composer.core.ComponentAdapter#getComponentInstance(org.apache.composer.core.Container)
      */
     public Object getComponentInstance(Container container) throws CompositionException {
         return staticFactory.get();
@@ -65,7 +65,7 @@
     /**
      * {@inheritDoc}
      *
-     * @see org.picocontainer.ComponentAdapter#verify(org.picocontainer.PicoContainer)
+     * @see org.apache.composer.core.ComponentAdapter#verify(org.apache.composer.core.Container)
      */
     public void verify(Container container) throws VerificationException {
     }

Modified: incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/adapters/ThreadLocalized.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/adapters/ThreadLocalized.java?rev=618234&r1=618233&r2=618234&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/adapters/ThreadLocalized.java (original)
+++ incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/adapters/ThreadLocalized.java Mon Feb  4 03:06:06 2008
@@ -1,12 +1,19 @@
-/*****************************************************************************
- * Copyright (c) PicoContainer Organization. All rights reserved.            *
- * ------------------------------------------------------------------------- *
- * The software in this package is published under the terms of the BSD      *
- * style license a copy of which has been included with this distribution in *
- * the LICENSE.txt file.                                                     *
- *                                                                           *
- * Original code by Joerg Schaible                                           *
- *****************************************************************************/
+/**
+ * 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.composer.core.adapters;
 
 import com.thoughtworks.proxy.Invoker;

Modified: incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/adapters/ThreadLocalizing.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/adapters/ThreadLocalizing.java?rev=618234&r1=618233&r2=618234&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/adapters/ThreadLocalizing.java (original)
+++ incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/adapters/ThreadLocalizing.java Mon Feb  4 03:06:06 2008
@@ -1,12 +1,19 @@
-/*****************************************************************************
- * Copyright (c) PicoContainer Organization. All rights reserved.            *
- * ------------------------------------------------------------------------- *
- * The software in this package is published under the terms of the BSD      *
- * style license a copy of which has been included with this distribution in *
- * the LICENSE.txt file.                                                     *
- *                                                                           *
- * Original code by Joerg Schaible                                           *
- *****************************************************************************/
+/**
+ * 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.composer.core.adapters;
 

Modified: incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/behaviors/Assimilated.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/behaviors/Assimilated.java?rev=618234&r1=618233&r2=618234&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/behaviors/Assimilated.java (original)
+++ incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/behaviors/Assimilated.java Mon Feb  4 03:06:06 2008
@@ -1,12 +1,19 @@
-/*****************************************************************************
- * Copyright (C) NanoContainer Organization. All rights reserved.            *
- * ------------------------------------------------------------------------- *
- * The software in this package is published under the terms of the BSD      *
- * style license a copy of which has been included with this distribution in *
- * the LICENSE.txt file.                                                     *
- *                                                                           *
- * Original code by Joerg Schaibe                                            *
- *****************************************************************************/
+/**
+ * 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.composer.core.behaviors;
 
@@ -106,7 +113,7 @@
      * Create and return a component instance. If the component instance and the type to assimilate is not compatible, a proxy
      * for the instance is generated, that implements the assimilated type.
      * 
-     * @see AbstractBehavior#getComponentInstance(org.picocontainer.PicoContainer)
+     * @see AbstractBehavior#getComponentInstance(org.apache.composer.core.Container)
      */
     public Object getComponentInstance(final Container container)
             throws CompositionException  {

Modified: incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/behaviors/Assimilating.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/behaviors/Assimilating.java?rev=618234&r1=618233&r2=618234&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/behaviors/Assimilating.java (original)
+++ incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/behaviors/Assimilating.java Mon Feb  4 03:06:06 2008
@@ -1,12 +1,19 @@
-/*****************************************************************************
- * Copyright (C) NanoContainer Organization. All rights reserved.            *
- * ------------------------------------------------------------------------- *
- * The software in this package is published under the terms of the BSD      *
- * style license a copy of which has been included with this distribution in *
- * the LICENSE.txt file.                                                     *
- *                                                                           *
- * Original code by Joerg Schaibe                                            *
- *****************************************************************************/
+/**
+ * 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.composer.core.behaviors;
 

Modified: incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/behaviors/HotSwapping.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/behaviors/HotSwapping.java?rev=618234&r1=618233&r2=618234&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/behaviors/HotSwapping.java (original)
+++ incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/behaviors/HotSwapping.java Mon Feb  4 03:06:06 2008
@@ -1,12 +1,19 @@
-/*****************************************************************************
- * Copyright (c) PicoContainer Organization. All rights reserved.            *
- * ------------------------------------------------------------------------- *
- * The software in this package is published under the terms of the BSD      *
- * style license a copy of which has been included with this distribution in *
- * the LICENSE.txt file.                                                     *
- *                                                                           *
- * Idea by Rachel Davies, Original code by Aslak Hellesoy and Paul Hammant   *
- *****************************************************************************/
+/**
+ * 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.composer.core.behaviors;
 

Modified: incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/behaviors/Pooled.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/behaviors/Pooled.java?rev=618234&r1=618233&r2=618234&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/behaviors/Pooled.java (original)
+++ incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/behaviors/Pooled.java Mon Feb  4 03:06:06 2008
@@ -1,12 +1,19 @@
-/*****************************************************************************
- * Copyright (C) NanoContainer Organization. All rights reserved.            *
- * ------------------------------------------------------------------------- *
- * The software in this package is published under the terms of the BSD      *
- * style license a copy of which has been included with this distribution in *
- * the LICENSE.txt file.                                                     *
- *                                                                           *
- * Original code by Aslak Hellesoy & Joerg Schaible                                       *
- *****************************************************************************/
+/**
+ * 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.composer.core.behaviors;
 
 import com.thoughtworks.proxy.ProxyFactory;
@@ -378,7 +385,7 @@
 
     /**
      * Stop of the container has no effect for the pool. Applies only if the delegated
-     * {@link ComponentAdapter} supports a lifecylce by implementing {@link org.picocontainer.LifecycleStrategy}.
+     * {@link ComponentAdapter} supports a lifecylce by implementing {@link org.apache.composer.core.LifecycleStrategy}.
      * 
      * @throws IllegalStateException if pool was already disposed
      */

Modified: incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/monitors/ComponentDependencyMonitor.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/monitors/ComponentDependencyMonitor.java?rev=618234&r1=618233&r2=618234&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/monitors/ComponentDependencyMonitor.java (original)
+++ incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/monitors/ComponentDependencyMonitor.java Mon Feb  4 03:06:06 2008
@@ -23,8 +23,7 @@
 import java.lang.reflect.Constructor;
 
 /**
- * Understands how to capture component dependency information from
- * picocontainer.
+ * Understands how to capture component dependency information from the container.
  * 
  * @author Peter Barry
  * @author Kent R. Spillner

Modified: incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/monitors/Log4JComponentMonitor.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/monitors/Log4JComponentMonitor.java?rev=618234&r1=618233&r2=618234&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/monitors/Log4JComponentMonitor.java (original)
+++ incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/monitors/Log4JComponentMonitor.java Mon Feb  4 03:06:06 2008
@@ -34,7 +34,7 @@
 
 
 /**
- * A {@link org.picocontainer.ComponentMonitor} which writes to a Log4J {@link org.apache.log4j.Logger} instance.
+ * A {@link org.apache.composer.core.ComponentMonitor} which writes to a Log4J {@link org.apache.log4j.Logger} instance.
  * The Logger instance can either be injected or, if not set, the {@link LogManager LogManager}
  * will be used to retrieve it at every invocation of the monitor.
  *

Modified: incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/package.html
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/package.html?rev=618234&r1=618233&r2=618234&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/package.html (original)
+++ incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/package.html Mon Feb  4 03:06:06 2008
@@ -21,7 +21,7 @@
 
 <p>An extensive user guide,
 a list of Frequently Asked Questions (FAQ) with answers and a lot more information is available from the
-<a href="http://www.picocontainer.org/">Apache Composer</a> website. You can also find various extensions, wrappers
+<a href="http://incubator.apache.org/composer">Apache Composer</a> website. You can also find various extensions, wrappers
 and utility libraries that are based on this core API there.</p>
 </body>
 </html>

Modified: incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/adapters/Elephant.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/adapters/Elephant.java?rev=618234&r1=618233&r2=618234&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/adapters/Elephant.java (original)
+++ incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/adapters/Elephant.java Mon Feb  4 03:06:06 2008
@@ -1,11 +1,19 @@
-/*****************************************************************************
- * Copyright (c) PicoContainer Organization. All rights reserved.            *
- * ------------------------------------------------------------------------- *
- * The software in this package is published under the terms of the BSD      *
- * style license a copy of which has been included with this distribution in *
- * the LICENSE.txt file.                                                     *
- *                                                                           *
- *****************************************************************************/
+/**
+ * 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.composer.core.adapters;
 

Modified: incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/adapters/ElephantImpl.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/adapters/ElephantImpl.java?rev=618234&r1=618233&r2=618234&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/adapters/ElephantImpl.java (original)
+++ incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/adapters/ElephantImpl.java Mon Feb  4 03:06:06 2008
@@ -1,11 +1,19 @@
-/*****************************************************************************
- * Copyright (c) PicoContainer Organization. All rights reserved.            *
- * ------------------------------------------------------------------------- *
- * The software in this package is published under the terms of the BSD      *
- * style license a copy of which has been included with this distribution in *
- * the LICENSE.txt file.                                                     *
- *                                                                           *
- *****************************************************************************/
+/**
+ * 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.composer.core.adapters;
 

Modified: incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/adapters/ElephantProxy.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/adapters/ElephantProxy.java?rev=618234&r1=618233&r2=618234&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/adapters/ElephantProxy.java (original)
+++ incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/adapters/ElephantProxy.java Mon Feb  4 03:06:06 2008
@@ -1,11 +1,19 @@
-/*****************************************************************************
- * Copyright (c) PicoContainer Organization. All rights reserved.            *
- * ------------------------------------------------------------------------- *
- * The software in this package is published under the terms of the BSD      *
- * style license a copy of which has been included with this distribution in *
- * the LICENSE.txt file.                                                     *
- *                                                                           *
- *****************************************************************************/
+/**
+ * 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.composer.core.adapters;
 

Modified: incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/adapters/ThreadLocalComponentAdapterTest.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/adapters/ThreadLocalComponentAdapterTest.java?rev=618234&r1=618233&r2=618234&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/adapters/ThreadLocalComponentAdapterTest.java (original)
+++ incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/adapters/ThreadLocalComponentAdapterTest.java Mon Feb  4 03:06:06 2008
@@ -1,13 +1,20 @@
-/*****************************************************************************
- * Copyright (c) PicoContainer Organization. All rights reserved.            *
- * ------------------------------------------------------------------------- *
- * The software in this package is published under the terms of the BSD      *
- * style license a copy of which has been included with this distribution in *
- * the LICENSE.txt file.                                                     *
- *                                                                           *
- * Original code by Joerg Schaible                                           *
- *****************************************************************************/
-package org.picocontainer.gems.adapters;
+/**
+ * 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.composer.core.adapters;
 
 
 import org.apache.composer.core.ComponentAdapter;
@@ -55,12 +62,12 @@
     }
 
     @Override
-    protected ComponentAdapter prepDEF_verifyWithoutDependencyWorks(MutableContainer picoContainer) {
+    protected ComponentAdapter prepDEF_verifyWithoutDependencyWorks(MutableContainer container) {
         return createComponentAdapterWithSimpleTouchable();
     }
 
     @Override
-    protected ComponentAdapter prepDEF_verifyDoesNotInstantiate(MutableContainer picoContainer) {
+    protected ComponentAdapter prepDEF_verifyDoesNotInstantiate(MutableContainer container) {
         return createComponentAdapterWithSimpleTouchable();
     }
 
@@ -70,18 +77,18 @@
     }
 
     @Override
-    protected ComponentAdapter prepDEF_isAbleToTakeParameters(MutableContainer picoContainer) {
+    protected ComponentAdapter prepDEF_isAbleToTakeParameters(MutableContainer container) {
         return new ThreadLocalized(new ConstructorInjector(
             List.class, ArrayList.class, new Parameter[] {new ConstantParameter(10)}, new NullComponentMonitor(), new NullLifecycleStrategy(), false));
     }
 
     @Override
-    protected ComponentAdapter prepSER_isSerializable(MutableContainer picoContainer) {
+    protected ComponentAdapter prepSER_isSerializable(MutableContainer container) {
         return createComponentAdapterWithSimpleTouchable();
     }
 
     @Override
-    protected ComponentAdapter prepSER_isXStreamSerializable(MutableContainer picoContainer) {
+    protected ComponentAdapter prepSER_isXStreamSerializable(MutableContainer container) {
         return createComponentAdapterWithSimpleTouchable();
     }
 

Modified: incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/adapters/ThreadLocalReferenceTest.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/adapters/ThreadLocalReferenceTest.java?rev=618234&r1=618233&r2=618234&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/adapters/ThreadLocalReferenceTest.java (original)
+++ incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/adapters/ThreadLocalReferenceTest.java Mon Feb  4 03:06:06 2008
@@ -1,13 +1,20 @@
-/*****************************************************************************
- * Copyright (c) PicoContainer Organization. All rights reserved.            *
- * ------------------------------------------------------------------------- *
- * The software in this package is published under the terms of the BSD      *
- * style license a copy of which has been included with this distribution in *
- * the LICENSE.txt file.                                                     *
- *                                                                           *
- * Original code by Joerg Schaible                                           *
- *****************************************************************************/
-package org.picocontainer.gems.adapters;
+/**
+ * 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.composer.core.adapters;
 
 import org.apache.composer.core.ObjectReference;
 import org.apache.composer.core.references.ThreadLocalReference;

Modified: incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/adapters/ThreadLocalizingTestCase.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/adapters/ThreadLocalizingTestCase.java?rev=618234&r1=618233&r2=618234&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/adapters/ThreadLocalizingTestCase.java (original)
+++ incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/adapters/ThreadLocalizingTestCase.java Mon Feb  4 03:06:06 2008
@@ -1,12 +1,19 @@
-/*****************************************************************************
- * Copyright (c) PicoContainer Organization. All rights reserved.            *
- * ------------------------------------------------------------------------- *
- * The software in this package is published under the terms of the BSD      *
- * style license a copy of which has been included with this distribution in *
- * the LICENSE.txt file.                                                     *
- *                                                                           *
- * Original code by Joerg Schaible                                           *
- *****************************************************************************/
+/**
+ * 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.composer.core.adapters;
 

Modified: incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/behaviors/AsmImplementationHidingTestCase.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/behaviors/AsmImplementationHidingTestCase.java?rev=618234&r1=618233&r2=618234&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/behaviors/AsmImplementationHidingTestCase.java (original)
+++ incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/behaviors/AsmImplementationHidingTestCase.java Mon Feb  4 03:06:06 2008
@@ -1,11 +1,19 @@
-/*****************************************************************************
- * Copyright (c) PicoContainer Organization. All rights reserved.            *
- * ------------------------------------------------------------------------- *
- * The software in this package is published under the terms of the BSD      *
- * style license a copy of which has been included with this distribution in *
- * the LICENSE.txt file.                                                     *
- *                                                                           *
- *****************************************************************************/
+/**
+ * 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.composer.core.behaviors;
 

Modified: incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/behaviors/AssimilatedTestCase.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/behaviors/AssimilatedTestCase.java?rev=618234&r1=618233&r2=618234&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/behaviors/AssimilatedTestCase.java (original)
+++ incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/behaviors/AssimilatedTestCase.java Mon Feb  4 03:06:06 2008
@@ -141,11 +141,11 @@
                 CompatibleTouchable.class, CompatibleTouchable.class, null, new NullComponentMonitor(), new NullLifecycleStrategy(), false));
     }
 
-    protected ComponentAdapter prepDEF_verifyWithoutDependencyWorks(MutableContainer picoContainer) {
+    protected ComponentAdapter prepDEF_verifyWithoutDependencyWorks(MutableContainer container) {
         return createComponentAdapterWithTouchable();
     }
 
-    protected ComponentAdapter prepDEF_verifyDoesNotInstantiate(MutableContainer picoContainer) {
+    protected ComponentAdapter prepDEF_verifyDoesNotInstantiate(MutableContainer container) {
         return createComponentAdapterWithTouchable();
     }
 
@@ -153,13 +153,13 @@
         return createComponentAdapterWithTouchable();
     }
 
-    protected ComponentAdapter prepSER_isSerializable(MutableContainer picoContainer) {
+    protected ComponentAdapter prepSER_isSerializable(MutableContainer container) {
         return new Assimilated(Touchable.class, new InstanceAdapter<CompatibleTouchable>(
                 CompatibleTouchable.class, new CompatibleTouchable(), new NullLifecycleStrategy(),
                                                                         new NullComponentMonitor()), new CglibProxyFactory());
     }
 
-    protected ComponentAdapter prepSER_isXStreamSerializable(MutableContainer picoContainer) {
+    protected ComponentAdapter prepSER_isXStreamSerializable(MutableContainer container) {
         return createComponentAdapterWithTouchable();
     }
 }

Modified: incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/behaviors/AssimilatingTestCase.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/behaviors/AssimilatingTestCase.java?rev=618234&r1=618233&r2=618234&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/behaviors/AssimilatingTestCase.java (original)
+++ incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/behaviors/AssimilatingTestCase.java Mon Feb  4 03:06:06 2008
@@ -1,12 +1,19 @@
-/*****************************************************************************
- * Copyright (C) NanoContainer Organization. All rights reserved.            *
- * ------------------------------------------------------------------------- *
- * The software in this package is published under the terms of the BSD      *
- * style license a copy of which has been included with this distribution in *
- * the LICENSE.txt file.                                                     *
- *                                                                           *
- * Original code by Joerg Schaibe                                            *
- *****************************************************************************/
+/**
+ * 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.composer.core.behaviors;
 
@@ -29,7 +36,7 @@
 public class AssimilatingTestCase extends AbstractComponentFactoryTest {
 
     /**
-     * @see org.picocontainer.tck.AbstractComponentFactoryTestCase#createComponentFactory()
+     * @see org.apache.composer.core.tck.AbstractComponentFactoryTestCase#createComponentFactory()
      */
     protected ComponentFactory createComponentFactory() {
         return new Assimilating(Touchable.class).wrap(new ConstructorInjection());

Modified: incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/behaviors/HotSwappingTestCase.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/behaviors/HotSwappingTestCase.java?rev=618234&r1=618233&r2=618234&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/behaviors/HotSwappingTestCase.java (original)
+++ incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/behaviors/HotSwappingTestCase.java Mon Feb  4 03:06:06 2008
@@ -1,11 +1,19 @@
-/*****************************************************************************
- * Copyright (c) PicoContainer Organization. All rights reserved.            *
- * ------------------------------------------------------------------------- *
- * The software in this package is published under the terms of the BSD      *
- * style license a copy of which has been included with this distribution in *
- * the LICENSE.txt file.                                                     *
- *                                                                           *
- *****************************************************************************/
+/**
+ * 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.composer.core.behaviors;
 

Modified: incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/behaviors/PooledTestCase.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/behaviors/PooledTestCase.java?rev=618234&r1=618233&r2=618234&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/behaviors/PooledTestCase.java (original)
+++ incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/behaviors/PooledTestCase.java Mon Feb  4 03:06:06 2008
@@ -260,18 +260,18 @@
     }
 
     /**
-     * Prepare the test <em>lifecycleManagerSupport</em>. Prepare the delivered PicoContainer with an adapter, that
+     * Prepare the test <em>lifecycleManagerSupport</em>. Prepare the delivered container with an adapter, that
      * has a lifecycle and use a StringBuffer registered in the container to record the lifecycle method invocations.
      * The recorded String in the buffer must result in <strong>&qout;&lt;OneOne&gt;!One&qout;</strong>. The addAdapter
      * top test should be registered in the container and delivered as return value.
-     * @param picoContainer the container
+     * @param container the container
      * @return the adapter to test
      */
-    private ComponentAdapter prepDEF_lifecycleManagerSupport(MutableContainer picoContainer) {
-        picoContainer.addComponent(RecordingLifecycle.One.class);
+    private ComponentAdapter prepDEF_lifecycleManagerSupport(MutableContainer container) {
+        container.addComponent(RecordingLifecycle.One.class);
         Pooled poolingBehavior = new Pooled(new ConstructorInjector(
                 RecordingLifecycle.Recorder.class, RecordingLifecycle.Two.class, null, new NullComponentMonitor(), new NullLifecycleStrategy(), false), new Pooled.DefaultContext());
-        return picoContainer.addAdapter(poolingBehavior).getComponentAdapter(RecordingLifecycle.One.class, (NameBinding) null);
+        return container.addAdapter(poolingBehavior).getComponentAdapter(RecordingLifecycle.One.class, (NameBinding) null);
     }
 
     public void testDEF_lifecycleManagerSupport() {
@@ -279,15 +279,15 @@
             final Class type = getComponentAdapterType();
             if (Behavior.class.isAssignableFrom(type)) {
                 final StringBuffer buffer = new StringBuffer();
-                final MutableContainer picoContainer = new DefaultContainer(
+                final MutableContainer container = new DefaultContainer(
                         createDefaultComponentFactory());
-                picoContainer.addComponent(buffer);
-                final ComponentAdapter componentAdapter = prepDEF_lifecycleManagerSupport(picoContainer);
+                container.addComponent(buffer);
+                final ComponentAdapter componentAdapter = prepDEF_lifecycleManagerSupport(container);
                 assertSame(getComponentAdapterType(), componentAdapter.getClass());
                 assertEquals(0, buffer.length());
-                picoContainer.start();
-                picoContainer.stop();
-                picoContainer.dispose();
+                container.start();
+                container.stop();
+                container.dispose();
                 // @todo Move test to AbstractAbstractCATC
                 assertEquals("<OneOne>!One", buffer.toString());
             }
@@ -295,19 +295,19 @@
     }
 
     /**
-     * Prepare the test <em>lifecycleManagerHonorsInstantiationSequence</em>. Prepare the delivered PicoContainer
+     * Prepare the test <em>lifecycleManagerHonorsInstantiationSequence</em>. Prepare the delivered container
      * with addAdapter(s), that have dependend components, have a lifecycle and use a StringBuffer registered in the
      * container to record the lifecycle method invocations. The recorded String in the buffer must result in
      * <strong>&qout;&lt;One&lt;TwoTwo&gt;One&gt;!Two!One&qout;</strong>. The adapter top test should be registered in
      * the container and delivered as return value.
-     * @param picoContainer the container
+     * @param container the container
      * @return the adapter to test
      */
-    private ComponentAdapter prepRES_lifecycleManagerHonorsInstantiationSequence(MutableContainer picoContainer) {
-        picoContainer.addComponent(RecordingLifecycle.One.class);
+    private ComponentAdapter prepRES_lifecycleManagerHonorsInstantiationSequence(MutableContainer container) {
+        container.addComponent(RecordingLifecycle.One.class);
         Pooled poolingBehavior = new Pooled(new ConstructorInjector(
                 RecordingLifecycle.Recorder.class, RecordingLifecycle.Two.class, null, new NullComponentMonitor(), new NullLifecycleStrategy(), false), new Pooled.DefaultContext());
-        return picoContainer.addAdapter(poolingBehavior).getComponentAdapter(RecordingLifecycle.Two.class, (NameBinding) null);
+        return container.addAdapter(poolingBehavior).getComponentAdapter(RecordingLifecycle.Two.class, (NameBinding) null);
     }
 
     public void testRES_lifecycleManagerHonorsInstantiationSequence() {
@@ -315,15 +315,15 @@
             final Class type = getComponentAdapterType();
             if (Behavior.class.isAssignableFrom(type)) {
                 final StringBuffer buffer = new StringBuffer();
-                final MutableContainer picoContainer = new DefaultContainer(
+                final MutableContainer container = new DefaultContainer(
                         createDefaultComponentFactory());
-                picoContainer.addComponent(buffer);
-                final ComponentAdapter componentAdapter = prepRES_lifecycleManagerHonorsInstantiationSequence(picoContainer);
+                container.addComponent(buffer);
+                final ComponentAdapter componentAdapter = prepRES_lifecycleManagerHonorsInstantiationSequence(container);
                 assertSame(getComponentAdapterType(), componentAdapter.getClass());
                 assertEquals(0, buffer.length());
-                picoContainer.start();
-                picoContainer.stop();
-                picoContainer.dispose();
+                container.start();
+                container.stop();
+                container.dispose();
                 // @todo Move test to AbstractAbstractCATC
                 assertEquals("<One<TwoTwo>One>!Two!One", buffer.toString());
             }
@@ -345,11 +345,11 @@
                 Touchable.class, SimpleTouchable.class, null, new NullComponentMonitor(), new NullLifecycleStrategy(), false), new Pooled.DefaultContext());
     }
 
-    protected ComponentAdapter prepDEF_verifyWithoutDependencyWorks(MutableContainer picoContainer) {
+    protected ComponentAdapter prepDEF_verifyWithoutDependencyWorks(MutableContainer container) {
         return createPoolOfTouchables();
     }
 
-    protected ComponentAdapter prepDEF_verifyDoesNotInstantiate(MutableContainer picoContainer) {
+    protected ComponentAdapter prepDEF_verifyDoesNotInstantiate(MutableContainer container) {
         return createPoolOfTouchables();
     }
 
@@ -362,11 +362,11 @@
                 Identifiable.class, InstanceCounter.class, null, new NullComponentMonitor(), new NullLifecycleStrategy(), false), new Pooled.DefaultContext());
     }
 
-    protected ComponentAdapter prepSER_isSerializable(MutableContainer picoContainer) {
+    protected ComponentAdapter prepSER_isSerializable(MutableContainer container) {
         return createSerializable();
     }
 
-    protected ComponentAdapter prepSER_isXStreamSerializable(MutableContainer picoContainer) {
+    protected ComponentAdapter prepSER_isXStreamSerializable(MutableContainer container) {
         return createSerializable();
     }
 

Modified: incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/monitors/prefuse/AggregateDemoHacks.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/monitors/prefuse/AggregateDemoHacks.java?rev=618234&r1=618233&r2=618234&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/monitors/prefuse/AggregateDemoHacks.java (original)
+++ incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/monitors/prefuse/AggregateDemoHacks.java Mon Feb  4 03:06:06 2008
@@ -1,4 +1,20 @@
-package org.picocontainer.gems.monitors.prefuse;
+/**
+ * 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.composer.core.monitors.prefuse;
 
 import java.awt.Cursor;
 import java.awt.event.MouseEvent;

Modified: incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/monitors/prefuse/DependencySetTestCase.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/monitors/prefuse/DependencySetTestCase.java?rev=618234&r1=618233&r2=618234&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/monitors/prefuse/DependencySetTestCase.java (original)
+++ incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/monitors/prefuse/DependencySetTestCase.java Mon Feb  4 03:06:06 2008
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.composer.monitors.prefuse;
+package org.apache.composer.core.monitors.prefuse;
 
 import org.apache.composer.core.monitors.ComponentDependencyMonitor;
 import org.apache.composer.core.monitors.prefuse.ComponentDependencyListener;

Modified: incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/testmodel/CompatibleTouchable.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/testmodel/CompatibleTouchable.java?rev=618234&r1=618233&r2=618234&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/testmodel/CompatibleTouchable.java (original)
+++ incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/testmodel/CompatibleTouchable.java Mon Feb  4 03:06:06 2008
@@ -1,12 +1,19 @@
-/*****************************************************************************
- * Copyright (C) NanoContainer Organization. All rights reserved.            *
- * ------------------------------------------------------------------------- *
- * The software in this package is published under the terms of the BSD      *
- * style license a copy of which has been included with this distribution in *
- * the LICENSE.txt file.                                                     *
- *                                                                           *
- * Original code by Joerg Schaibe                                            *
- *****************************************************************************/
+/**
+ * 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.composer.core.testmodel;
 

Modified: incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/testmodel/DependsOnDependsOnListAndVector.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/testmodel/DependsOnDependsOnListAndVector.java?rev=618234&r1=618233&r2=618234&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/testmodel/DependsOnDependsOnListAndVector.java (original)
+++ incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/testmodel/DependsOnDependsOnListAndVector.java Mon Feb  4 03:06:06 2008
@@ -1,11 +1,19 @@
-/*****************************************************************************
- * Copyright (c) PicoContainer Organization. All rights reserved.            *
- * ------------------------------------------------------------------------- *
- * The software in this package is published under the terms of the BSD      *
- * style license a copy of which has been included with this distribution in *
- * the LICENSE.txt file.                                                     *
- *                                                                           *
- *****************************************************************************/
+/**
+ * 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.composer.core.testmodel;
 

Propchange: incubator/composer/trunk/composer-site/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Feb  4 03:06:06 2008
@@ -0,0 +1 @@
+target

Modified: incubator/composer/trunk/composer-site/src/site/content/CommandLineArgumentsContainer.html
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/CommandLineArgumentsContainer.html?rev=618234&r1=618233&r2=618234&view=diff
==============================================================================
--- incubator/composer/trunk/composer-site/src/site/content/CommandLineArgumentsContainer.html (original)
+++ incubator/composer/trunk/composer-site/src/site/content/CommandLineArgumentsContainer.html Mon Feb  4 03:06:06 2008
@@ -41,14 +41,14 @@
 
 ...
 
-java -jar myAppJar.jar -cp picocontainer-2.0.jar timeout=100 spellingWebServiceURL=http://ws.com/someService.wsdl</pre>
+java -jar myAppJar.jar -cp containercontainer-2.0.jar timeout=100 spellingWebServiceURL=http://ws.com/someService.wsdl</pre>
 </div>
 <p>Here is another manual use forcing an association between a item in the properties file, and the relative position of a parameter in the constructor:</p>
 <div class="source">
 <pre>mpc.addComponent(BigFatComponent.class, ConfigParameter(&quot;config1&quot;), ConfigParameter(&quot;moreConfig&quot;));
 ...
 
-java -jar myAppJar.jar -cp picocontainer-2.0.jar config1=http://ws.com/someService.wsd moreConfig=100 </pre>
+java -jar myAppJar.jar -cp containercontainer-2.0.jar config1=http://ws.com/someService.wsd moreConfig=100 </pre>
 </div>
 <p>Type conversion is automatic in many cases. Properties in a properties file are clearly strings. Parameters can be any of:</p>
         <ul>

Modified: incubator/composer/trunk/composer-site/src/site/content/DefaultContainer.html
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/DefaultContainer.html?rev=618234&r1=618233&r2=618234&view=diff
==============================================================================
--- incubator/composer/trunk/composer-site/src/site/content/DefaultContainer.html (original)
+++ incubator/composer/trunk/composer-site/src/site/content/DefaultContainer.html Mon Feb  4 03:06:06 2008
@@ -9,7 +9,7 @@
 DefaultApache Composer is the main workhorse container.  
 <p>Here is an example of use:
 <div class="source">
-<pre>DefaultApache Composer dpc = new DefaultApache Composer();
+<pre>DefaultApache Composer dpc = new DefaultContainer();
 dpc.addComponent(Foo.class, FooImpl.class);
 Foo foo = dpc.getComponent(Foo.class)</pre>
 </div>

Modified: incubator/composer/trunk/composer-site/src/site/content/SystemPropertiesContainer.html
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/SystemPropertiesContainer.html?rev=618234&r1=618233&r2=618234&view=diff
==============================================================================
--- incubator/composer/trunk/composer-site/src/site/content/SystemPropertiesContainer.html (original)
+++ incubator/composer/trunk/composer-site/src/site/content/SystemPropertiesContainer.html Mon Feb  4 03:06:06 2008
@@ -44,7 +44,7 @@
 <p> System properties can be set for the scope of the application only, as you start the application: </p>
 <div class="source">
 <pre>
-java -Dwebservice.url=http://servicehost/service -Dwebservice.timeout=50 -jar myAppJar.jar -cp picocontainer-2.0.jar</pre>
+java -Dwebservice.url=http://servicehost/service -Dwebservice.timeout=50 -jar myAppJar.jar -cp containercontainer-2.0.jar</pre>
 </div>
 <p>Type conversion is automatic in many cases. Properties in a properties file are clearly strings. Parameters can be any of:</p>
 <ul>

Modified: incubator/composer/trunk/composer-site/src/site/content/adapters.html
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/adapters.html?rev=618234&r1=618233&r2=618234&view=diff
==============================================================================
--- incubator/composer/trunk/composer-site/src/site/content/adapters.html (original)
+++ incubator/composer/trunk/composer-site/src/site/content/adapters.html Mon Feb  4 03:06:06 2008
@@ -13,8 +13,8 @@
   public MyAdapter() {
     super(QuantumEntanglement.class, QuantumEntanglementImpl.class);
   }
-  public Object getComponent(Apache Composer pico) {
-    Auditor a = pico.getComponent(Auditor.class);
+  public Object getComponent(Apache Composer container) {
+    Auditor a = container.getComponent(Auditor.class);
     a.audit("QE used", new Date());
     return qe;
   }
@@ -22,9 +22,9 @@
   }
 }
 ...
-pico = new DefaultApache Composer();
-pico.addAdapter(new MyAdapter());
-QuantumEntanglement e = pico.getComponent(QuantumEntanglement.class);
+container = new DefaultContainer();
+container.addAdapter(new MyAdapter());
+QuantumEntanglement e = container.getComponent(QuantumEntanglement.class);
 </pre>
 </div>
 </body>

Modified: incubator/composer/trunk/composer-site/src/site/content/antipatterns/container-dependency-antipattern.html
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/antipatterns/container-dependency-antipattern.html?rev=618234&r1=618233&r2=618234&view=diff
==============================================================================
--- incubator/composer/trunk/composer-site/src/site/content/antipatterns/container-dependency-antipattern.html (original)
+++ incubator/composer/trunk/composer-site/src/site/content/antipatterns/container-dependency-antipattern.html Mon Feb  4 03:06:06 2008
@@ -27,12 +27,12 @@
 public class BImpl implements B {
     private final A a;
 
-    BImpl(Apache Composer pico) {
-        a = (A) pico.getComponentOfType(A.class);
+    BImpl(Apache Composer container) {
+        a = (A) container.getComponentOfType(A.class);
         
         /*
         alternatively:
-        a = (A) pico.getComponent(&quot;a&quot;);
+        a = (A) container.getComponent(&quot;a&quot;);
         */
     }
 }</pre>
@@ -42,13 +42,13 @@
 
     <div class="source">
         <div>
-            <pre>MutableApache Composer pico = new DefaultApache Composer();
-pico.addComponent(&quot;a&quot;, AImpl.class);
-pico.addComponent(&quot;b&quot;, BImpl.class);
-pico.addComponent(pico);
+            <pre>MutableApache Composer container = new DefaultContainer();
+container.addComponent(&quot;a&quot;, AImpl.class);
+container.addComponent(&quot;b&quot;, BImpl.class);
+container.addComponent(container);
 
 ...
-B b = (B) pico.getComponent(&quot;b&quot;);</pre>
+B b = (B) container.getComponent(&quot;b&quot;);</pre>
         </div>
     </div>
     <p>This will work, but it's an antipattern. </p>

Modified: incubator/composer/trunk/composer-site/src/site/content/antipatterns/tests-use-container-antipattern.html
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/antipatterns/tests-use-container-antipattern.html?rev=618234&r1=618233&r2=618234&view=diff
==============================================================================
--- incubator/composer/trunk/composer-site/src/site/content/antipatterns/tests-use-container-antipattern.html (original)
+++ incubator/composer/trunk/composer-site/src/site/content/antipatterns/tests-use-container-antipattern.html Mon Feb  4 03:06:06 2008
@@ -26,7 +26,7 @@
     <div class="source">
         <div>
             <pre>public void testCocktailWithVodkaIsAlcoholic() {
-    DefaultApache Composer container = new DefaultApache Composer();
+    DefaultApache Composer container = new DefaultContainer();
     container.addComponent(Banana.class);
     container.addComponent(Vanilla.class);
     container.addComponent(Vodka.class);
@@ -89,15 +89,6 @@
                the interactions between a set of real components (not mocks). In this case, you may wish to create a
                container with the appropriate components registered for your test.</p>
 
-            <div>
-                <h3>NanoContainer
-                </h3>
-
-                <p>If you are using <a href="http://www.nanocontainer.org" title="Sister Projects">NanoContainer</a>,
-                   you can use NanoContainer's Standalone class (a bootstrapper) to start the application. All the
-                   container configuration can live in a script and NanoContainer (and thereby Apache Composer(s)) will be
-                   instantiated.</p>
-            </div>
         </div>
     </div>
 </div>



Mime
View raw message