composer-commits@incubator.apache.org Archives

svn commit: r655913 - in /incubator/composer/trunk: BUILD.txt LICENSE.txt composer-core/ composer-site/ composer-tck/ pom.xml

2008-05-13T15:26:44Z

Author: hammant
Date: Tue May 13 08:26:44 2008
New Revision: 655913

URL: http://svn.apache.org/viewvc?rev=655913&view=rev
Log:
marriage called off

Removed:
    incubator/composer/trunk/BUILD.txt
    incubator/composer/trunk/LICENSE.txt
    incubator/composer/trunk/composer-core/
    incubator/composer/trunk/composer-site/
    incubator/composer/trunk/composer-tck/
    incubator/composer/trunk/pom.xml

svn commit: r618315 - /incubator/composer/trunk/pom.xml

2008-02-04T16:21:13Z

Author: mauro
Date: Mon Feb  4 08:21:12 2008
New Revision: 618315

URL: http://svn.apache.org/viewvc?rev=618315&view=rev
Log:
Removed snapshot repositories - which should be activated on demand via settings profile.

Modified:
    incubator/composer/trunk/pom.xml

Modified: incubator/composer/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/pom.xml?rev=618315&r1=618314&r2=618315&view=diff
==============================================================================
--- incubator/composer/trunk/pom.xml (original)
+++ incubator/composer/trunk/pom.xml Mon Feb  4 08:21:12 2008
@@ -41,42 +41,8 @@
     
     https://svn.apache.org/repos/asf/incubator/composer/trunk
   
-  
-    
-      apache-snapshot-repository
-      Apache Snapshot Repository
-      http://people.apache.org/repo/m2-snapshot-repository
-      
-        true
-      
-    
-    
-      codehaus-snapshots-repository
-      Codehaus Snapshots Repository
-      http://snapshots.repository.codehaus.org
-      
-        true
-      
-    
-  
-  
-    
-      apache-snapshot-repository
-      Apache Snapshot Repository
-      http://people.apache.org/repo/m2-snapshot-repository
-      
-        true
-      
-    
-    
-      codehaus-snapshots-repository
-      Codehaus Snapshots Repository
-      http://snapshots.repository.codehaus.org
-      
-        true
-      
-    
-  
+  
+  
   
     
       apache.org

svn commit: r618279 - in /incubator/composer/trunk/composer-site/src: resources/ site/content/ site/content/containers/ site/resources/images/ site/templates/

2008-02-04T13:38:44Z

Author: mauro
Date: Mon Feb  4 05:38:42 2008
New Revision: 618279

URL: http://svn.apache.org/viewvc?rev=618279&view=rev
Log:
Yet more docs cleanup.

Added:
    incubator/composer/trunk/composer-site/src/site/resources/images/juicer-in-container-hierarchy.png
      - copied unchanged from r618229, incubator/composer/trunk/composer-site/src/site/resources/images/juicer-in-pico-hierarchy.png
Removed:
    incubator/composer/trunk/composer-site/src/resources/
    incubator/composer/trunk/composer-site/src/site/resources/images/juicer-in-pico-hierarchy.png
Modified:
    incubator/composer/trunk/composer-site/src/site/content/comparisons.html
    incubator/composer/trunk/composer-site/src/site/content/constructor-injection.html
    incubator/composer/trunk/composer-site/src/site/content/containers/command-line-arguments-container.html
    incubator/composer/trunk/composer-site/src/site/content/containers/system-properties-container.html
    incubator/composer/trunk/composer-site/src/site/content/faq.html
    incubator/composer/trunk/composer-site/src/site/content/index.html
    incubator/composer/trunk/composer-site/src/site/content/introduction.html
    incubator/composer/trunk/composer-site/src/site/content/inversion-of-control.html
    incubator/composer/trunk/composer-site/src/site/content/properties.html
    incubator/composer/trunk/composer-site/src/site/content/setter-injection.html
    incubator/composer/trunk/composer-site/src/site/templates/skin.html

Modified: incubator/composer/trunk/composer-site/src/site/content/comparisons.html
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/comparisons.html?rev=618279&r1=618278&r2=618279&view=diff
==============================================================================
--- incubator/composer/trunk/composer-site/src/site/content/comparisons.html (original)
+++ incubator/composer/trunk/composer-site/src/site/content/comparisons.html Mon Feb  4 05:38:42
2008
@@ -154,7 +154,7 @@

Familiar? Hopefully not Static plays no part in a good IoC container/component design. This includes static launching of Java Webstart (JNLP) applications. If you have to keep mainable functionaility separate your components away from the main() class so they may be instntiated separately. In .NET you'll have to make sure that the application assembly is a small bootstrap to a component one.

JNDI (Java API)

Modified: incubator/composer/trunk/composer-site/src/site/content/constructor-injection.html URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/constructor-injection.html?rev=618279&r1=618278&r2=618279&view=diff ============================================================================== --- incubator/composer/trunk/composer-site/src/site/content/constructor-injection.html (original) +++ incubator/composer/trunk/composer-site/src/site/content/constructor-injection.html Mon Feb 4 05:38:42 2008 @@ -21,11 +21,11 @@

A dependency may be made immutable by making the dependency reference final

Martin Fowler explains Constructor +

Martin Fowler explains Constructor Injection in more detail.

- Container also supports Setter Injection.

+ Container also supports Setter Injection.

Origin

Modified: incubator/composer/trunk/composer-site/src/site/content/containers/command-line-arguments-container.html URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/containers/command-line-arguments-container.html?rev=618279&r1=618278&r2=618279&view=diff ============================================================================== --- incubator/composer/trunk/composer-site/src/site/content/containers/command-line-arguments-container.html (original) +++ incubator/composer/trunk/composer-site/src/site/content/containers/command-line-arguments-container.html Mon Feb 4 05:38:42 2008 @@ -41,14 +41,14 @@ ... -java -jar myAppJar.jar -cp containercontainer-2.0.jar timeout=100 spellingWebServiceURL=http://ws.com/someService.wsdl +java -jar myAppJar.jar -cp composer-core.jar timeout=100 spellingWebServiceURL=http://ws.com/someService.wsdl

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:

mpc.addComponent(BigFatComponent.class, ConfigParameter("config1"),
ConfigParameter("moreConfig"));
 ...
 
-java -jar myAppJar.jar -cp containercontainer-2.0.jar config1=http://ws.com/someService.wsd
moreConfig=100

+java -jar myAppJar.jar -cp composer-core.jar config1=http://ws.com/someService.wsd moreConfig=100

Type conversion is automatic in many cases. Properties in a properties file are clearly strings. Parameters can be any of:

System properties can be set for the scope of the application only, as you start the application:

-java -Dwebservice.url=http://servicehost/service -Dwebservice.timeout=50 -jar myAppJar.jar
-cp containercontainer-2.0.jar

+java -Dwebservice.url=http://servicehost/service -Dwebservice.timeout=50 -jar myAppJar.jar -cp composer-core.jar

Type conversion is automatic in many cases. Properties in a properties file are clearly strings. Parameters can be any of:

The class loads, but the @Inject annotation is not present in the set of declared annotations, but another in the classpath is. Lastly when accessed explicitly, there is an exception thrown. Contrast to, the same run with Guice in the classpath:

What is Container?

What is Apache Composer?

Container is a highly embeddable full service Inversion of Control (IoC) container +

Apache Composer is a highly embeddable full service Inversion of Control (IoC) container for components honour the Dependency Injection pattern.

You could use it as a lightweight alternative to Sun's J2EE patterns for web applications or general solutions.

What is Dependency Injection? Martin Fowler has a good article from 2003, but here is another view: It is a good design pattern that, for large enterprise applications, facilitates:

has made development staff looking after it miserable
suffers repeated allegations of being unable to be developed without complete rewrite

Despite it being very compact in size (the core is ~128K and it -has no mandatory dependencies outside the JDK), Container supports different dependency injection types (Constructor, Setter, Annotated Field and Method) and offers multiple lifecycle and monitoring strategies.

Container has originally been implemented in Java but is also -available for other platforms and languages. These are detailed here.

Despite it being very compact in size (the core is ~128K and it has no mandatory dependencies outside the JDK), +Apache Composer supports different dependency injection types (Constructor, Setter, Annotated Field and Method) and offers multiple lifecycle and monitoring strategies.

Getting Started

Take a look at the introduction.

Modified: incubator/composer/trunk/composer-site/src/site/content/introduction.html URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/introduction.html?rev=618279&r1=618278&r2=618279&view=diff ============================================================================== --- incubator/composer/trunk/composer-site/src/site/content/introduction.html (original) +++ incubator/composer/trunk/composer-site/src/site/content/introduction.html Mon Feb 4 05:38:42 2008 @@ -5,14 +5,12 @@ -

Authors: Aslak Hellesoy, Jon Tirsen

Basics

This is a quick introduction to Container's most important features. Read through it to get an idea of what - Container is and isn't.

This is a quick introduction to Apache Composer's most important features. Read through it to get an idea of what + Composer is and isn't.

Container's most important feature is its ability to instantiate arbitrary objects. This is done through its API, +

Composer's most important feature is its ability to instantiate - or compose - arbitrary objects. This is done through its API, which is similar to a hash table. You can put java.lang.Class objects in and get object instances back.

Example:

@@ -26,8 +24,8 @@

(i)MutableContainer - API^{+ MutableContainer API}

With a trivial example such as this there is no point in using Container. This was just to illustrate the basic - API. Container becomes useful with larger number of classes and interfaces having complex dependencies between +

With a trivial example such as this there is no point in using a container. This was just to illustrate the basic + API. A container becomes useful with larger number of classes and interfaces having complex dependencies between each other:

Write some simple classes - and interfaces with - dependencies

Write some simple classes and interfaces with dependencies

The "Juicer Example" diagram above could translate to the following code (we added a concrete Peelable):

(i)MutableContainer - API^{MutableContainer
API}

Lifecycle

Container has support for Lifecycle. If your classes implement Startable^{Startable, you can control the lifecycle of all your objects
with a simple method call on the
container. The container will figure out the correct order of
invocation of start()/stop()

Modified: incubator/composer/trunk/composer-site/src/site/content/inversion-of-control.html
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/inversion-of-control.html?rev=618279&r1=618278&r2=618279&view=diff
==============================================================================
--- incubator/composer/trunk/composer-site/src/site/content/inversion-of-control.html (original)
+++ incubator/composer/trunk/composer-site/src/site/content/inversion-of-control.html Mon
Feb 4 05:38:42 2008
@@ -292,7 +292,7 @@}

Component is the correct name for things managed in an IoC sense. However very small ordinary classes are manageable using IoC tricks, though this is for the very brave or extremists

USE_NAMES - use the parameter names of the component's constructor (or injection method) for the binding of configuration or components.

Custom Properties

You can make your own properties quite easily - check out the source to Characteristics.java and the classes that refer to it in Container (various implementations of ComponentFactory and ComponentAdapter).

Dependency Injection

SetterInjectionComponentAdapter

SetterInjection

svn commit: r618262 - in /incubator/composer/trunk/composer-core/src/test/java: ./ org/apache/composer/core/monitors/

2008-02-04T12:54:59Z

Author: mauro
Date: Mon Feb  4 04:54:59 2008
New Revision: 618262

URL: http://svn.apache.org/viewvc?rev=618262&view=rev
Log:
Fixed configuration for monitors' tests.

Added:
    incubator/composer/trunk/composer-core/src/test/java/log4j.xml
    incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/monitors/AbstractComponentMonitorTestCase.java
      - copied, changed from r618229, incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/monitors/ComponentMonitorHelperTestCase.java
    incubator/composer/trunk/composer-core/src/test/java/test.properties   (with props)
Removed:
    incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/monitors/ComponentMonitorHelperTestCase.java
Modified:
    incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/monitors/MultipleLoggerCommonsLoggingComponentMonitorTestCase.java
    incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/monitors/MultipleLoggerLog4JComponentMonitorTestCase.java
    incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/monitors/SingleLoggerCommonsLoggingComponentMonitorTestCase.java
    incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/monitors/SingleLoggerLog4JComponentMonitorTestCase.java

Added: incubator/composer/trunk/composer-core/src/test/java/log4j.xml
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/src/test/java/log4j.xml?rev=618262&view=auto
==============================================================================
--- incubator/composer/trunk/composer-core/src/test/java/log4j.xml (added)
+++ incubator/composer/trunk/composer-core/src/test/java/log4j.xml Mon Feb  4 04:54:59 2008
@@ -0,0 +1,31 @@
+
+
+
+
+	
+	
+		
+			
+		
+	
+
+	
+		
+			
+		
+	
+
+	
+		
+		
+	
+
+    
+        
+        
+    
+
+	
+		
+	
+
\ No newline at end of file

Copied: incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/monitors/AbstractComponentMonitorTestCase.java
(from r618229, incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/monitors/ComponentMonitorHelperTestCase.java)
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/monitors/AbstractComponentMonitorTestCase.java?p2=incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/monitors/AbstractComponentMonitorTestCase.java&p1=incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/monitors/ComponentMonitorHelperTestCase.java&r1=618229&r2=618262&rev=618262&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/monitors/ComponentMonitorHelperTestCase.java
(original)
+++ incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/monitors/AbstractComponentMonitorTestCase.java
Mon Feb  4 04:54:59 2008
@@ -39,7 +39,7 @@
  * @author Mauro Talevi
  * @author Juze Peleteiro
  */
-public abstract class ComponentMonitorHelperTestCase {
+public abstract class AbstractComponentMonitorTestCase {
     private ComponentMonitor componentMonitor;
     private Constructor constructor;
     private Method method;

Modified: incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/monitors/MultipleLoggerCommonsLoggingComponentMonitorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/monitors/MultipleLoggerCommonsLoggingComponentMonitorTestCase.java?rev=618262&r1=618261&r2=618262&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/monitors/MultipleLoggerCommonsLoggingComponentMonitorTestCase.java
(original)
+++ incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/monitors/MultipleLoggerCommonsLoggingComponentMonitorTestCase.java
Mon Feb  4 04:54:59 2008
@@ -18,13 +18,13 @@
 
 import org.apache.composer.core.ComponentMonitor;
 import org.apache.composer.core.monitors.CommonsLoggingComponentMonitor;
-import org.apache.composer.core.monitors.ComponentMonitorHelperTestCase;
+import org.apache.composer.core.monitors.AbstractComponentMonitorTestCase;
 
 import java.io.IOException;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
 
-public class MultipleLoggerCommonsLoggingComponentMonitorTestCase extends ComponentMonitorHelperTestCase
{
+public class MultipleLoggerCommonsLoggingComponentMonitorTestCase extends AbstractComponentMonitorTestCase
{
 
     String logPrefixName = String.class.getName();
 

Modified: incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/monitors/MultipleLoggerLog4JComponentMonitorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/monitors/MultipleLoggerLog4JComponentMonitorTestCase.java?rev=618262&r1=618261&r2=618262&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/monitors/MultipleLoggerLog4JComponentMonitorTestCase.java
(original)
+++ incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/monitors/MultipleLoggerLog4JComponentMonitorTestCase.java
Mon Feb  4 04:54:59 2008
@@ -17,7 +17,7 @@
 package org.apache.composer.core.monitors;
 
 import org.apache.composer.core.ComponentMonitor;
-import org.apache.composer.core.monitors.ComponentMonitorHelperTestCase;
+import org.apache.composer.core.monitors.AbstractComponentMonitorTestCase;
 import org.apache.composer.core.monitors.Log4JComponentMonitor;
 
 import java.io.IOException;
@@ -28,7 +28,7 @@
  * @author Paul Hammant
  * @author Mauro Talevi
  */
-public class MultipleLoggerLog4JComponentMonitorTestCase extends ComponentMonitorHelperTestCase
{
+public class MultipleLoggerLog4JComponentMonitorTestCase extends AbstractComponentMonitorTestCase
{
 
     String logPrefixName = String.class.getName();
 

Modified: incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/monitors/SingleLoggerCommonsLoggingComponentMonitorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/monitors/SingleLoggerCommonsLoggingComponentMonitorTestCase.java?rev=618262&r1=618261&r2=618262&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/monitors/SingleLoggerCommonsLoggingComponentMonitorTestCase.java
(original)
+++ incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/monitors/SingleLoggerCommonsLoggingComponentMonitorTestCase.java
Mon Feb  4 04:54:59 2008
@@ -18,14 +18,14 @@
 
 import org.apache.composer.core.ComponentMonitor;
 import org.apache.composer.core.monitors.CommonsLoggingComponentMonitor;
-import org.apache.composer.core.monitors.ComponentMonitorHelperTestCase;
+import org.apache.composer.core.monitors.AbstractComponentMonitorTestCase;
 import org.junit.Test;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
 import java.io.IOException;
 
-public class SingleLoggerCommonsLoggingComponentMonitorTestCase extends ComponentMonitorHelperTestCase
{
+public class SingleLoggerCommonsLoggingComponentMonitorTestCase extends AbstractComponentMonitorTestCase
{
 
     protected ComponentMonitor makeComponentMonitor() {
         return new CommonsLoggingComponentMonitor(CommonsLoggingComponentMonitor.class);

Modified: incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/monitors/SingleLoggerLog4JComponentMonitorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/monitors/SingleLoggerLog4JComponentMonitorTestCase.java?rev=618262&r1=618261&r2=618262&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/monitors/SingleLoggerLog4JComponentMonitorTestCase.java
(original)
+++ incubator/composer/trunk/composer-core/src/test/java/org/apache/composer/core/monitors/SingleLoggerLog4JComponentMonitorTestCase.java
Mon Feb  4 04:54:59 2008
@@ -17,7 +17,7 @@
 package org.apache.composer.core.monitors;
 
 import org.apache.composer.core.ComponentMonitor;
-import org.apache.composer.core.monitors.ComponentMonitorHelperTestCase;
+import org.apache.composer.core.monitors.AbstractComponentMonitorTestCase;
 import org.apache.composer.core.monitors.Log4JComponentMonitor;
 
 import java.io.IOException;
@@ -28,7 +28,7 @@
  * @author Paul Hammant
  * @author Mauro Talevi
  */
-public class SingleLoggerLog4JComponentMonitorTestCase extends ComponentMonitorHelperTestCase
{
+public class SingleLoggerLog4JComponentMonitorTestCase extends AbstractComponentMonitorTestCase
{
 
     protected ComponentMonitor makeComponentMonitor() {
         return new Log4JComponentMonitor(Log4JComponentMonitor.class);

Added: incubator/composer/trunk/composer-core/src/test/java/test.properties
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/src/test/java/test.properties?rev=618262&view=auto
==============================================================================
--- incubator/composer/trunk/composer-core/src/test/java/test.properties (added)
+++ incubator/composer/trunk/composer-core/src/test/java/test.properties Mon Feb  4 04:54:59
2008
@@ -0,0 +1 @@
+foo=bar
\ No newline at end of file

Propchange: incubator/composer/trunk/composer-core/src/test/java/test.properties
------------------------------------------------------------------------------
    svn:executable = *

svn commit: r618244 - in /incubator/composer/trunk/composer-site: ./ src/site/content/ src/site/content/containers/

2008-02-04T11:46:50Z

Author: mauro
Date: Mon Feb  4 03:46:48 2008
New Revision: 618244

URL: http://svn.apache.org/viewvc?rev=618244&view=rev
Log:
Moved containers doc pages to separate folder.

Added:
    incubator/composer/trunk/composer-site/src/site/content/containers/
    incubator/composer/trunk/composer-site/src/site/content/containers/command-line-arguments-container.html
      - copied unchanged from r618243, incubator/composer/trunk/composer-site/src/site/content/command-line-arguments-container.html
    incubator/composer/trunk/composer-site/src/site/content/containers/default-container.html
      - copied unchanged from r618243, incubator/composer/trunk/composer-site/src/site/content/default-container.html
    incubator/composer/trunk/composer-site/src/site/content/containers/properties-container.html
      - copied unchanged from r618243, incubator/composer/trunk/composer-site/src/site/content/properties-container.html
    incubator/composer/trunk/composer-site/src/site/content/containers/system-properties-container.html
      - copied unchanged from r618243, incubator/composer/trunk/composer-site/src/site/content/system-properties-container.html
    incubator/composer/trunk/composer-site/src/site/content/containers/transient-container.html
      - copied unchanged from r618243, incubator/composer/trunk/composer-site/src/site/content/transient-container.html
Removed:
    incubator/composer/trunk/composer-site/src/site/content/command-line-arguments-container.html
    incubator/composer/trunk/composer-site/src/site/content/default-container.html
    incubator/composer/trunk/composer-site/src/site/content/properties-container.html
    incubator/composer/trunk/composer-site/src/site/content/system-properties-container.html
    incubator/composer/trunk/composer-site/src/site/content/transient-container.html
Modified:
    incubator/composer/trunk/composer-site/pom.xml
    incubator/composer/trunk/composer-site/src/site/content/sitemap.xml

Modified: incubator/composer/trunk/composer-site/pom.xml
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/pom.xml?rev=618244&r1=618243&r2=618244&view=diff
==============================================================================
--- incubator/composer/trunk/composer-site/pom.xml (original)
+++ incubator/composer/trunk/composer-site/pom.xml Mon Feb  4 03:46:48 2008
@@ -40,7 +40,6 @@
                 
                   org.apache.composer
                   composer-core
-                  ${pom.version}
                   javadoc
                   
                     ${project.build.directory}/site/javadoc/core
@@ -49,7 +48,6 @@
                 
                   org.apache.composer
                   composer-tck
-                  ${pom.version}
                   javadoc
                   
                     ${project.build.directory}/site/javadoc/tck

Modified: incubator/composer/trunk/composer-site/src/site/content/sitemap.xml
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/sitemap.xml?rev=618244&r1=618243&r2=618244&view=diff
==============================================================================
--- incubator/composer/trunk/composer-site/src/site/content/sitemap.xml (original)
+++ incubator/composer/trunk/composer-site/src/site/content/sitemap.xml Mon Feb  4 03:46:48
2008
@@ -37,11 +37,11 @@
     
     
         Containers
-        default-container.html
-	    command-line-arguments-container.html
-		properties-container.html
-		system-properties-container.html
-		transient-container.html
+        containers/default-container.html
+	    containers/command-line-arguments-container.html
+		containers/properties-container.html
+		containers/system-properties-container.html
+		containers/transient-container.html
     
     
          Applications

svn commit: r618243 [2/2] - in /incubator/composer/trunk/composer-site/src/site: content/ content/antipatterns/ content/help/ templates/

2008-02-04T11:44:05Z

Modified: incubator/composer/trunk/composer-site/src/site/content/mock-objects.html
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/mock-objects.html?rev=618243&r1=618242&r2=618243&view=diff
==============================================================================
--- incubator/composer/trunk/composer-site/src/site/content/mock-objects.html (original)
+++ incubator/composer/trunk/composer-site/src/site/content/mock-objects.html Mon Feb  4 03:43:57 2008
@@ -5,7 +5,7 @@
 Mock Objects
 
 
-If you have had it with codebases that drag along everything and the kitchen sink, (possibly using the Singleton) you must read this page. Classes that look up or instantiate heavyweight classes themselves are such beasts. As you might have experienced, they are a pain to test. (And ample proof that the authors didn't follow TDD ). Dependency Injection with Apache Composer and Mock Objects to the rescue!
+If you have had it with codebases that drag along everything and the kitchen sink, (possibly using the Singleton) you must read this page. Classes that look up or instantiate heavyweight classes themselves are such beasts. As you might have experienced, they are a pain to test. (And ample proof that the authors didn't follow TDD ). Dependency Injection with Container and Mock Objects to the rescue!
 Mock Objects are special objects used during testing. Mock Objects and classes that honour Constructor Injection are a perfect match, since such classes can be handed mocks during testing and "the real thing" when the application is run.
 This illustration shows how:

We won't go into further technical details about mocks, as there are many libraries to choose from. Check out JMock and EasyMock, or read about the ideas at MockObjects

Prime Time

It is left to Apache Composer to instantiate NeedsStuff. In order for it to succeed, we must also configure the container with some real BlueStuff and GreanStuff:

It is left to Container to instantiate NeedsStuff. In order for it to succeed, we must also configure the container with some real BlueStuff and GreanStuff:

 public class AppBootstrapper {
   public void runapp() {

Modified: incubator/composer/trunk/composer-site/src/site/content/monitors.html
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/monitors.html?rev=618243&r1=618242&r2=618243&view=diff
==============================================================================
--- incubator/composer/trunk/composer-site/src/site/content/monitors.html (original)
+++ incubator/composer/trunk/composer-site/src/site/content/monitors.html Mon Feb  4 03:43:57 2008
@@ -4,7 +4,7 @@
 
 Component Monitors
 
-A ComponentMonitor if injected into DefultApache Composer allows for certain events to me monitored at a container level. We are idealogically opposed to a forced choice of loging framework. If you're hell bent on logging, chose from a  ComponentMonitor imlementation below. For now though consider what events are monitored:
+A ComponentMonitor if injected into DefultContainer allows for certain events to me monitored at a container level. We are idealogically opposed to a forced choice of loging framework. If you're hell bent on logging, chose from a  ComponentMonitor imlementation below. For now though consider what events are monitored:
 
   instantiating - refering to a component 
   instantiated - refering to a component
@@ -13,7 +13,7 @@
   invoked - refering to a method on a component 
   invocationFailed - refering to a method on a component 
   lifecycleInvocationFailed - referring to start/stop/dispose methods on a component 
-  noComponentFound - referring to getComponent(..) on a Apache Composer instance. 
+  noComponentFound - referring to getComponent(..) on a Container instance. 
 
 Return Values 
 Instantiating returns a Constructor. An implementor of ComponentMonitor can choose to return a different Constructor reference. This is one way that implementations can be replaced or decorated (AOP style) with additional/changed functionality. 
@@ -22,7 +22,7 @@
 
   ComponentMonitor can generally be chained together. Meaning you can use them in combination. 
   Most have NullComponentMonitor (see below) as their end stop. 
-  Any method on ComponentMonitor is open for interpretation. That means they can throw exceptions as well as return different values, making them modify Apache Composer's behavior. 
+  Any method on ComponentMonitor is open for interpretation. That means they can throw exceptions as well as return different values, making them modify Container's behavior. 
 
 Logging or text-centric varieties of ComponentMonitor 
 Hopefully self explanatory:
@@ -33,7 +33,7 @@
   WriterComponentMonitor
 
 NullComponentMonitor
-This is Apache Composer's default ComponentMonitor. It generally fits the NullObject pattern, but it does add behavior. Specifically if it encounters a lifecycleInvocationFailed(..) method invocation, it throws a LifecycleException in response. If you use something other than NullComponentMonitor (bear in mind the default 'end stop' for most others is also NullComponentMonitor) then you could change the way Apache Composer responds to components it cannot start, stop of dispose of. 
+This is Container's default ComponentMonitor. It generally fits the NullObject pattern, but it does add behavior. Specifically if it encounters a lifecycleInvocationFailed(..) method invocation, it throws a LifecycleException in response. If you use something other than NullComponentMonitor (bear in mind the default 'end stop' for most others is also NullComponentMonitor) then you could change the way Container responds to components it cannot start, stop of dispose of. 
 LifecycleComponentMonitor
 This  ComponentMonitor stores lifecycle failures and rethrows them later if rethrowLifecycleFailuresException() is called. 
 Future work

Modified: incubator/composer/trunk/composer-site/src/site/content/news.html
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/news.html?rev=618243&r1=618242&r2=618243&view=diff
==============================================================================
--- incubator/composer/trunk/composer-site/src/site/content/news.html (original)
+++ incubator/composer/trunk/composer-site/src/site/content/news.html Mon Feb  4 03:43:57 2008
@@ -6,7 +6,7 @@
 
 
 Jan 19, 2008
-Apache Composer 2.0 released (190K jar) 
+Container 2.0 released (190K jar) 
 New (versus beta 2):
 
   Binding Annotations support (disambiguation)
@@ -16,11 +16,11 @@
 Changed (versus beta 2):
 
   Yet More Java5 generics
-  Build moved to JUnit 4.x and JMock 2.x (does not affect users of Apache Composer)
+  Build moved to JUnit 4.x and JMock 2.x (does not affect users of Container)
   Built-in parameter name access, as opposed jar dependency
 
 August 26, 2007
-Apache Composer 2.0 beta 2 released (152K jar) 
+Container 2.0 beta 2 released (152K jar) 
 New (versus beta 1):
 
   Rudimentary AOP capability for components built in
@@ -38,7 +38,7 @@
   Startable interface more easily overridden to own choice
 
 July 15, 2007
-Apache Composer 2.0 BETA-1 released (128K jar) 
+Container 2.0 BETA-1 released (128K jar) 
 New:
 
   Properties for components as they are added to containers makes for increased flexibility
@@ -54,15 +54,15 @@
   Fluent interface for adding of components to a container
 
 Mar 18, 2007
-Apache Composer 1.3 released (113K jar) 
+Container 1.3 released (113K jar) 
 January 19, 2006
-Apache Composer 1.2 released (112K jar) 
+Container 1.2 released (112K jar) 
 November 4, 2004
-Apache Composer 1.1 released (75K jar) 
+Container 1.1 released (75K jar) 
 June 5,  2004
-Apache Composer 1.0 released (49K jar) 
+Container 1.0 released (49K jar) 
 June 29,  2003
-Apache Composer 1.0 alpha (25K jar) 
+Container 1.0 alpha (25K jar) 
 
   
  

Modified: incubator/composer/trunk/composer-site/src/site/content/project.html
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/project.html?rev=618243&r1=618242&r2=618243&view=diff
==============================================================================
--- incubator/composer/trunk/composer-site/src/site/content/project.html (original)
+++ incubator/composer/trunk/composer-site/src/site/content/project.html Mon Feb  4 03:43:57 2008
@@ -5,11 +5,11 @@
     Project
 
 
-Apache Composer is hosted at The Apache Software Foundation, presently in its incubator. 
+Container is hosted at The Apache Software Foundation, presently in its incubator. 
 
 Project links
 
-Source control root for Apache Composer (you will need Maven2 installed to build):
+Source control root for Container (you will need Maven2 installed to build):
 
 https://svn.apache.org/repos/asf/incubator/composer/trunk
@@ -21,7 +21,7 @@
 
 
License
 
-Apache Composer is Apache licensed.
+
Container is Apache licensed.
 
 
 

Copied: incubator/composer/trunk/composer-site/src/site/content/properties-container.html (from r618229, incubator/composer/trunk/composer-site/src/site/content/PropertiesContainer.html)
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/properties-container.html?p2=incubator/composer/trunk/composer-site/src/site/content/properties-container.html&p1=incubator/composer/trunk/composer-site/src/site/content/PropertiesContainer.html&r1=618229&r2=618243&rev=618243&view=diff
==============================================================================
--- incubator/composer/trunk/composer-site/src/site/content/PropertiesContainer.html (original)
+++ incubator/composer/trunk/composer-site/src/site/content/properties-container.html Mon Feb  4 03:43:57 2008
@@ -2,12 +2,12 @@
 
 
 
-PropertiesApache Composer
+PropertiesContainer
 
 
 

-PropertiesApache Composer is a special type of Apache Composer that is populated from the entries in a properties file. 
-
Here is an example of how to use PropertiesApache Composer to map properties  as configuration for a component, with parameter names as the bindings.

+PropertiesContainer is a special type of Container that is populated from the entries in a properties file. 
+
Here is an example of how to use PropertiesContainer to map properties  as configuration for a component, with parameter names as the bindings.

 
Consider this component:
 

     public class BigFatComponent {
@@ -32,9 +32,9 @@
 defaultProperties.load("my-application.properties");
         
 // default properties are taken from here
-Apache Composer propsContainer = new PropertiesApache Composer(defaultProperties);
+Container propsContainer = new PropertiesContainer(defaultProperties);
                 
-MutableApache Composer mpc = new DefaultApache Composer(propsContainer);
+MutableContainer mpc = new DefaultContainer(propsContainer);
                 
 mpc.as(Characteristics.USE_NAMES).addComponent(BigFatComponent.class);
 
@@ -53,7 +53,7 @@
            java.sql.(Date|Time|Timestamp) 
            Any type sporting accessible constructor taking single string parameter. 
 
-        PropertiesApache Composer can be part of a tree of containers. It makes sense, of course, being more near the root of that tree.
+        PropertiesContainer can be part of a tree of containers. It makes sense, of course, being more near the root of that tree.
 
 
 

Modified: incubator/composer/trunk/composer-site/src/site/content/properties.html
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/properties.html?rev=618243&r1=618242&r2=618243&view=diff
==============================================================================
--- incubator/composer/trunk/composer-site/src/site/content/properties.html (original)
+++ incubator/composer/trunk/composer-site/src/site/content/properties.html Mon Feb  4 03:43:57 2008
@@ -5,15 +5,15 @@
     Component Properties
 
 
-DefaultApache Composer allows for some properties to be set
+
DefaultContainer allows for some properties to be set
    per component at the time each is added. A convenience class called Characteristics lists the supplied properties. 
 
 Properties can be set for a component in a method 'as' on
-   MutableApache Composer. If that is the case then the properties will
+   MutableContainer. If that is the case then the properties will
    affect the next component added only.
 
 They can also be set in a more persistent manner for the
-   MutableApache Composer in question, using the 'change' method. If so, they will affect all subsequent
+   MutableContainer in question, using the 'change' method. If so, they will affect all subsequent
    additions of component.
 
 Some examples :
@@ -54,14 +54,14 @@
 
 Every characteristics set for a component must be handled by a
    BehaviorFactory or InjectionFactory that recognises it. They are
-   typically chained together. DefaultApache Composer's default
+   typically chained together. DefaultContainer's default
    BehaviorFactory and InjectionFactory are AdaptiveBehaviorFactory and
    AdaptiveInjectionFactory. These can handle CDI and SDI as well as CACHE
    and HIDE_IMPL.
 
-If you setup DefaultApache Composer with a
+
If you setup DefaultContainer with a
    BehaviorFactory/InjectionFactory combination that is unaware of the
-   characteristics you subsequently use, Apache Composer will object by way of an
+   characteristics you subsequently use, Container will object by way of an
    exception as you add the component to the container. See Unprocessed Properties. 
 Supplied properties (from org.apache.composer.core.Characteristics) -
 
@@ -81,6 +81,6 @@
   USE_NAMES - use the parameter names of the component's constructor (or injection method) for the binding of configuration or components.
 
 Custom Properties
-You can make your own properties quite easily - check out the source to Characteristics.java and the classes that refer to it in Apache Composer (various implementations of ComponentFactory and ComponentAdapter). 
+You can make your own properties quite easily - check out the source to Characteristics.java and the classes that refer to it in Container (various implementations of ComponentFactory and ComponentAdapter). 
 
 

Modified: incubator/composer/trunk/composer-site/src/site/content/scopes.html
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/scopes.html?rev=618243&r1=618242&r2=618243&view=diff
==============================================================================
--- incubator/composer/trunk/composer-site/src/site/content/scopes.html (original)
+++ incubator/composer/trunk/composer-site/src/site/content/scopes.html Mon Feb  4 03:43:57 2008
@@ -5,8 +5,8 @@
 Scoped Containers
 
 
-Apache Composer's scope hinges on parent/child container
-relationships. From a Apache Composer instance you can make a child
+
Container's scope hinges on parent/child container
+relationships. From a Container instance you can make a child
 container via makeChildContainer() or addChildContainer(..).
 These hierarchies of container can be set up with parents and
 children refering to each other, or children referring to parents only,
@@ -15,7 +15,7 @@
 lean on it for component resolution (but not without). If a parent has
 its child registered asa child, then it can manage it (start, stop,
 dispose cascade into children).
-Web frameworks that leverage Apache Composer typically construct a tree of containers.  For example an application level container maintains components that can be shared across the application. The application container will have child containers to maintain session level components.  These session level containers can resolve dependencies through their parent containers, but the application container will have no visibility into its children.  Additionally these child container do not have visibility into their sibling containers.  With this design, containers can easily be garbage collected at the end of their scope. 
+Web frameworks that leverage Container typically construct a tree of containers.  For example an application level container maintains components that can be shared across the application. The application container will have child containers to maintain session level components.  These session level containers can resolve dependencies through their parent containers, but the application container will have no visibility into its children.  Additionally these child container do not have visibility into their sibling containers.  With this design, containers can easily be garbage collected at the end of their scope. 
 Simple Examples
 Here are examples of parent/child setup:
     
@@ -48,7 +48,7 @@
    parent = new DefaultContainer();
 parent.addComponent(Apple.class).addComponent(Orange.class).addComponent(Pear.class);
-child = parent.addChildContainer(new DefaultApache Composer(parent));
+child = parent.addChildContainer(new DefaultContainer(parent));
 child.addComponent(DependsOnApple.class);
 // this is OK
 parent.start();
@@ -57,7 +57,7 @@
 
 parent = new DefaultContainer();
 parent.addComponent(Apple.class).addComponent(Orange.class).addComponent(Pear.class);
-child = new DefaultApache Composer(parent);
+child = new DefaultContainer(parent);
 child.addComponent(DependsOnApple.class);
 // this is  OK
 parent.start();

Modified: incubator/composer/trunk/composer-site/src/site/content/setter-injection.html
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/setter-injection.html?rev=618243&r1=618242&r2=618243&view=diff
==============================================================================
--- incubator/composer/trunk/composer-site/src/site/content/setter-injection.html (original)
+++ incubator/composer/trunk/composer-site/src/site/content/setter-injection.html Mon Feb  4 03:43:57 2008
@@ -59,7 +59,7 @@
 
 Container support
 
-The Spring Framework project is the best example of a container that favors setter injection. Apache Composer does
+
The Spring Framework project is the best example of a container that favors setter injection. Container does
    too, but we really believe that constructor injector is superior.
 
 Refs + Comparison
@@ -67,11 +67,11 @@
 Setter Injection is a
     Dependency Injection variant where an object gets all
                                                                                    dependencies via setter methods.
-                                                                                   Apache Composer support this with
+                                                                                   Container support this with
     SetterInjectionComponentAdapter,
                                                                                                                                                                                          but
                                                                                                                                                                                          the
-                                                                                                                                                                                         Apache Composer
+                                                                                                                                                                                         Container
                                                                                                                                                                                          team
                                                                                                                                                                                          recommends
     Constructor Injection.

Modified: incubator/composer/trunk/composer-site/src/site/content/sitemap.xml
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/sitemap.xml?rev=618243&r1=618242&r2=618243&view=diff
==============================================================================
--- incubator/composer/trunk/composer-site/src/site/content/sitemap.xml (original)
+++ incubator/composer/trunk/composer-site/src/site/content/sitemap.xml Mon Feb  4 03:43:57 2008
@@ -37,11 +37,11 @@
     
     
         Containers
-        DefaultContainer.html
-	    CommandLineArgumentsContainer.html
-		PropertiesContainer.html
-		SystemPropertiesContainer.html
-		TransientContainer.html
+        default-container.html
+	    command-line-arguments-container.html
+		properties-container.html
+		system-properties-container.html
+		transient-container.html
     
     
          Applications

Copied: incubator/composer/trunk/composer-site/src/site/content/system-properties-container.html (from r618234, incubator/composer/trunk/composer-site/src/site/content/SystemPropertiesContainer.html)
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/system-properties-container.html?p2=incubator/composer/trunk/composer-site/src/site/content/system-properties-container.html&p1=incubator/composer/trunk/composer-site/src/site/content/SystemPropertiesContainer.html&r1=618234&r2=618243&rev=618243&view=diff
==============================================================================
--- incubator/composer/trunk/composer-site/src/site/content/SystemPropertiesContainer.html (original)
+++ incubator/composer/trunk/composer-site/src/site/content/system-properties-container.html Mon Feb  4 03:43:57 2008
@@ -2,12 +2,12 @@
 
 
 
-SystemPropertiesApache Composer
+SystemPropertiesContainer
 
 
 
-SystemPropertiesApache Composer is a special type of Apache Composer that is populated from the System Properties passed into the Java application when it started. 
-
Here is an example of how to use SystemPropertiesApache Composer to map system properties  as configuration for a component, with parameter names as the bindings.
+SystemPropertiesContainer is a special type of Container that is populated from the System Properties passed into the Java application when it started. 
+
Here is an example of how to use SystemPropertiesContainer to map system properties  as configuration for a component, with parameter names as the bindings.
 
Consider this component:
 
 

@@ -30,9 +30,9 @@
 For automatic binding of system properties to parameter names of the component:
 
   -Apache Composer syspropsContainer = new SystemPropertiesApache Composer();
+Container syspropsContainer = new SystemPropertiesContainer();
                 
-MutableApache Composer mpc = new DefaultApache Composer(syspropsContainer);
+MutableContainer mpc = new DefaultContainer(syspropsContainer);
                 
 mpc.as(Characteristics.USE_NAMES).addComponent(BigFatComponent.class);
 
@@ -56,7 +56,7 @@
    java.sql.(Date|Time|Timestamp) 
    Any type sporting accessible constructor taking single string parameter. 
 
-SystemPropertiesApache Composer can be part of a tree of containers. It makes sense, of course, being more near the root of that tree.
+SystemPropertiesContainer can be part of a tree of containers. It makes sense, of course, being more near the root of that tree.
 
 
 

Modified: incubator/composer/trunk/composer-site/src/site/content/team.html
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/team.html?rev=618243&r1=618242&r2=618243&view=diff
==============================================================================
--- incubator/composer/trunk/composer-site/src/site/content/team.html (original)
+++ incubator/composer/trunk/composer-site/src/site/content/team.html Mon Feb  4 03:43:57 2008
@@ -5,11 +5,11 @@
 Team
 
 
-A project like Apache Composer is always made possible by the effort of a lot of people. Read about the developers and the contributers' names below. All of them have worked together to make Apache Composer the most respected IoC framework.
+A project like Container is always made possible by the effort of a lot of people. Read about the developers and the contributers' names below. All of them have worked together to make Container the most respected IoC framework.
 Committers
-Apache Composer committers introduce themselves in their own words and are listed in alphabetical order.

+Container committers introduce themselves in their own words and are listed in alphabetical order.

 Paul Hammant
-Paul is 39, has worked for ThoughtWorks  since 2002 and is co-founder of the PicoContainer project (precursor to Apache Composer). He used to freelance but is now very happy at TW. Paul practices XP on client sites and loves open source on which he is chief zealot for TW. He formerly worked at Apache on the Avalon project and remains there working on AltRMI. He loves the simplest thing as a design metaphor, hates too much XML. He loves the lowest common denominator (LCD) as a mechanism for facilitating divergent designs. To that end, he encourages multiple implementations of LCD ideas and APIs. Paul hopes to see Milli, Kilo and Mega implementations of the Pico idea. He hopes to see a myriad of interchangeable Apache Composer Components. He hopes to see standard APIs for components emerge from those implementations, but never be forced when teams cannot agree. It would be fairly easy to guess that Paul does not like big up-front design. That not withstanding the fact that 
 he used to do bucket-loads of it Paul with Aslak, wrote the first lines. Paired, under the influence of a couple of beers, and based on Joe's story of Rachel Davies' comments to his setter injector IoC work at the start of June 2003.
+Paul is 39, has worked for ThoughtWorks  since 2002 and is co-founder of the PicoContainer project (precursor to Container). He used to freelance but is now very happy at TW. Paul practices XP on client sites and loves open source on which he is chief zealot for TW. He formerly worked at Apache on the Avalon project and remains there working on AltRMI. He loves the simplest thing as a design metaphor, hates too much XML. He loves the lowest common denominator (LCD) as a mechanism for facilitating divergent designs. To that end, he encourages multiple implementations of LCD ideas and APIs. Paul hopes to see Milli, Kilo and Mega implementations of the Pico idea. He hopes to see a myriad of interchangeable Container Components. He hopes to see standard APIs for components emerge from those implementations, but never be forced when teams cannot agree. It would be fairly easy to guess that Paul does not like big up-front design. That not withstanding the fact that he used to d
 o bucket-loads of it Paul with Aslak, wrote the first lines. Paired, under the influence of a couple of beers, and based on Joe's story of Rachel Davies' comments to his setter injector IoC work at the start of June 2003.
 Paul is also well known for Enterprise Object Broker and Jesktop, the original driven side of Selenium and other stupid ideas like Thicky and related early Web 3.0 references
 Konstantin Pribluda
 I'm 32 and live in Wiesbaden. I started programming at the age of 12 and had access to really cool systems ranging from WANG 3200 through PDP 8/11 to System-360 ( actually sovjet clones of them, but who cares? ). My first "paid for" work was in 1988, and from that point I financed my study freelance software development. I developed fiscal management systems, medical video archiving, internet applications for telcos and java applet games ( later was for personal fun )...
@@ -21,13 +21,13 @@
 My interests besides programming are my wife (who always gets too less time), reading books (a lot of fantasy and SF stuff), hearing celtic-rooted music (although I like others also lot), and - when in mood - cooking
 Last, but not least, beeing a Christian is a part of my life, where I have my roots.
 Mauro Talevi
-I first came across Paul at an XTC (eXtreme Tuesdays Club) on Agile development at the Ol' Bank of England Pub in London. Back then Apache Composer had yet to be born. We were both working with Avalon IoC and in particular the Phoenix microkernel. Ever since discussing all the limitations of the Avalon framework - in particular the dependency on an API - I knew that the way forward was the Pico way.
+I first came across Paul at an XTC (eXtreme Tuesdays Club) on Agile development at the Ol' Bank of England Pub in London. Back then Container had yet to be born. We were both working with Avalon IoC and in particular the Phoenix microkernel. Ever since discussing all the limitations of the Avalon framework - in particular the dependency on an API - I knew that the way forward was the Pico way.
 I've worked in Java and enterprise systems for several years in various business domains - ranging from space data search portal for ESA to real-time messaging at the BBC - and I've come to appreciate the beauty, elegance and power of CDI.
 Michael Ward
-I live in Chicago, or at least that is where all my bills are sent. As it seems to be the lingo, I was assimilated into ThoughtWorks back in 2003. I have been developing professionally since 1997 and have had the great opportunity to work and live in many great locations with some exceptionally talented individuals. I was immediately drawn to Apache Composer because of its simplicity. The API is small and does not force you to define all your configurations in XML. The projects I have worked on are easier to test, refactor, debug and extend because a natural side effect of utilizing CDI is a small and easy to comprehend code base. Mike leads the Waffle web framework project (the easiest for Java we think). 
-Have worked/contributed to MicroContainer, the JMX module for NanoContainer, Apache Composer.NET and NanoContainer.NET.
+I live in Chicago, or at least that is where all my bills are sent. As it seems to be the lingo, I was assimilated into ThoughtWorks back in 2003. I have been developing professionally since 1997 and have had the great opportunity to work and live in many great locations with some exceptionally talented individuals. I was immediately drawn to Container because of its simplicity. The API is small and does not force you to define all your configurations in XML. The projects I have worked on are easier to test, refactor, debug and extend because a natural side effect of utilizing CDI is a small and easy to comprehend code base. Mike leads the Waffle web framework project (the easiest for Java we think). 
+Have worked/contributed to MicroContainer, the JMX module for NanoContainer, Container.NET and NanoContainer.NET.
 Michael Rimov
-Michael came to the Java world after programming for about eight years in the Windows API.  He dove head first into Java J2EE frameworks by initially working with the popular heavyweight Expresso framework where he introduced unit testing to those developers. During his stint as Lead Developer, the framework's usage numbers exploded.  After about nine years working with J2EE, Michael found the joys of light weight components and Apache Composer and has been reaping the performance benefits of both ever since.  His goal is to see it NanoContainer/NanoWAR grow in the J2EE arena, while keeping Pico perfect for embedding in all applications.
+Michael came to the Java world after programming for about eight years in the Windows API.  He dove head first into Java J2EE frameworks by initially working with the popular heavyweight Expresso framework where he introduced unit testing to those developers. During his stint as Lead Developer, the framework's usage numbers exploded.  After about nine years working with J2EE, Michael found the joys of light weight components and Container and has been reaping the performance benefits of both ever since.  His goal is to see it NanoContainer/NanoWAR grow in the J2EE arena, while keeping Pico perfect for embedding in all applications.
 Michael works for Centerline Computers, Inc in Corvallis Oregon.
 Jose Peleteiro
 I live in Rio de Janeiro, Brazil.
@@ -37,7 +37,7 @@
 Emeritus committers are those committers who have contributed significantly to the development of the project, but have been inactive for a period amount of time.
  * Thomas Heller
 Aslak Hellesøy
-Aslak is very accomplished in the Open Source space and co-founder of Apache Composer. He leads XDoclet, and has taken over QDox from Joe. He wrote most of the impressive MiddleGen, and has refactored Generama out of both. From an observers point of view Aslak is prolific. Aslak was assimilated into ThoughtWorks in 2003. [ Words by Paul ]
+Aslak is very accomplished in the Open Source space and co-founder of Container. He leads XDoclet, and has taken over QDox from Joe. He wrote most of the impressive MiddleGen, and has refactored Generama out of both. From an observers point of view Aslak is prolific. Aslak was assimilated into ThoughtWorks in 2003. [ Words by Paul ]
  * Mike Hogan
  * Stephen L. Molitor
 Dan North
@@ -55,7 +55,7 @@
  
  
 Contributers
-A lot of people have contributed ideas and code to the Apache Composer's code base. See the names in the list below in alphabetical order.
+A lot of people have contributed ideas and code to the Container's code base. See the names in the list below in alphabetical order.
  * Nicolas Averseng

   * Mathias Bogaert

   * Rao Chejarla


Modified: incubator/composer/trunk/composer-site/src/site/content/terminology.html
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/terminology.html?rev=618243&r1=618242&r2=618243&view=diff
==============================================================================
--- incubator/composer/trunk/composer-site/src/site/content/terminology.html (original)
+++ incubator/composer/trunk/composer-site/src/site/content/terminology.html Mon Feb  4 03:43:57 2008
@@ -18,7 +18,7 @@
     
A Setter Dependency Injection (SDI) component is a JavaBean, and a JavaBean is an SDI component
     A Contructor Dependency Injection (CDI) Component is not a JavaBean, but is a POJO
     A JavaBean can be any of the three types of IoC and domain-specific all at the same time
-    Spring, Apache Composer, XWork and other frameworks all support both Components and Data Objects to some
+    
Spring, Container, XWork and other frameworks all support both Components and Data Objects to some
         extend. Avalon tries real hard to not support Data Objects, but that is nearly impossible.
     
 
@@ -123,11 +123,11 @@
    specification like "initialization completion" support), any object with a public default
    constructor that does not require any method calls to set up its state.
 
-Apache Composer-supported
+
Container-supported
                                                                                                                Object
 
 
-An object that can be 'natively' used in Apache Composer. Any Type-3 component.
+An object that can be 'natively' used in Container. Any Type-3 component.
 
 XWork-supported
                                                                                                Object

Copied: incubator/composer/trunk/composer-site/src/site/content/transient-container.html (from r618229, incubator/composer/trunk/composer-site/src/site/content/TransientContainer.html)
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/transient-container.html?p2=incubator/composer/trunk/composer-site/src/site/content/transient-container.html&p1=incubator/composer/trunk/composer-site/src/site/content/TransientContainer.html&r1=618229&r2=618243&rev=618243&view=diff
==============================================================================
--- incubator/composer/trunk/composer-site/src/site/content/TransientContainer.html (original)
+++ incubator/composer/trunk/composer-site/src/site/content/transient-container.html Mon Feb  4 03:43:57 2008
@@ -2,15 +2,15 @@
 
 
 
-TransientApache Composer
+TransientContainer
 
 
 
-TransientApache Composer is a for short term needs for object instantion, where the container is going to be de-referenced shortly after use.
+TransientContainer is a for short term needs for object instantion, where the container is going to be de-referenced shortly after use.
 
Here is an example of use:
 

 public Foo makeSuitableFoo() {
-    MutableApache Composer temp = new TransientApache Composer(someParentContainer);
+    MutableContainer temp = new TransientContainer(someParentContainer);
     temp.addComponent(somethingElseThatMightBeNeeded);  // by instance
     temp.addComponent(Foo.class, FooImpleThatNeedsTheAbove.class); // by type
     return temo.getComponent(Foo.class);

Modified: incubator/composer/trunk/composer-site/src/site/content/transparency.html
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/transparency.html?rev=618243&r1=618242&r2=618243&view=diff
==============================================================================
--- incubator/composer/trunk/composer-site/src/site/content/transparency.html (original)
+++ incubator/composer/trunk/composer-site/src/site/content/transparency.html Mon Feb  4 03:43:57 2008
@@ -5,15 +5,15 @@
 Transparency
 
 
-Transparency, for Apache Composer, means that components do not have to implement any interface or abstraction in order to be components. Moreover, components do not have to adhere to any naming conventions or bundle any meta-data in order to qualify as components.  
-Constructor Injection is what we recommend, so the minimum definition of a component is a simple class that takes its dependencies in its constructor. For Setter Injection, it is a class with dependencies delivered via simple setters. Your components may be interface / impl separated, but we are not forcing that for interop with Apache Composer.
-If you live with this ideal, you may be able to use the components you design for Apache Composer with other frameworks or containers. I.e. you are not locked in. We suggest you choose other technologies that are similarly light on API and framework, and could be characterised as transparent. Good examples are XStream, Sitemesh and anything that deals with POJOs.
+Transparency, for Container, means that components do not have to implement any interface or abstraction in order to be components. Moreover, components do not have to adhere to any naming conventions or bundle any meta-data in order to qualify as components.  
+Constructor Injection is what we recommend, so the minimum definition of a component is a simple class that takes its dependencies in its constructor. For Setter Injection, it is a class with dependencies delivered via simple setters. Your components may be interface / impl separated, but we are not forcing that for interop with Container.
+If you live with this ideal, you may be able to use the components you design for Container with other frameworks or containers. I.e. you are not locked in. We suggest you choose other technologies that are similarly light on API and framework, and could be characterised as transparent. Good examples are XStream, Sitemesh and anything that deals with POJOs.
 There are some exceptions, to this goal of ours.
 Lifecycle
 Java does not have a Startable interface, nor does it have a Disposable (.Net has IDisposable), so we made our own. You can use ours or your own in a similar design. If you use your own, you may want to extend StartableLifecycleStrategy and override a couple of methods. That's if you need lifecycle at all.
 If a Startable inerface goes into J2SE, then it will probably be supported.
 Annotations
-We also support @Inject as an annotation for methods and fields. This is a variation of Setter Injection. The annotations are part of our codebase. Again, you can use your own, or others if you override one of the two classes from Apache Composer's codebase AnnotatedFieldInjection and AnnotatedMethodInjection.
+We also support @Inject as an annotation for methods and fields. This is a variation of Setter Injection. The annotations are part of our codebase. Again, you can use your own, or others if you override one of the two classes from Container's codebase AnnotatedFieldInjection and AnnotatedMethodInjection.
 Annotations are a break with transparency, so we don't recomend them - stick to vanilla Constructor Injection if you can.
 If a simple @Inject annotation goes into J2SE, then it will probably be supported. 
 

Modified: incubator/composer/trunk/composer-site/src/site/content/web-frameworks.html
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/web-frameworks.html?rev=618243&r1=618242&r2=618243&view=diff
==============================================================================
--- incubator/composer/trunk/composer-site/src/site/content/web-frameworks.html (original)
+++ incubator/composer/trunk/composer-site/src/site/content/web-frameworks.html Mon Feb  4 03:43:57 2008
@@ -9,14 +9,14 @@
 There are only about a million Java web-frameworks for Java. There
 more recent and sophisticated ones try to do Dependency Injection for
 'actions' or 'controllers'. 
-If you want to use Apache Composer for a web framework, then you're
+
If you want to use Container for a web framework, then you're
 likely to end up with three container levels. The root container would
 be common to all and known as the application scoped container. Next is a session-scoped one, with the app one marked as its parent. Lastly a request scoped
 one, with the session one marked as its parent. There are two
 not-so-subtle varations on how they would be used. One, we poineered
-with Apache Composer 1.x in 2003, the other inroduced with Apache Composer
+with Container 1.x in 2003, the other inroduced with Container
 2.x in 2007.
-Apache Composer and web frameworks - the old way.
+Container and web frameworks - the old way.
 You make one instance of the app container. For each new HTTP
 Session you make a new session level container, and put it into the
 session itself - refer HttpSession.setAttribute(key,val). For each
@@ -28,7 +28,7 @@
 instantiated. 2) the serialization of the session (by Tomcat etc) might
 cause more things to be serialized than you intend - i.e. the session
 container refers to the application container.
-Apache Composer and web frameworks - the new way.
+Container and web frameworks - the new way.
 You make one instance of the app, session and request container on
 servlet load. For the Application one, you choose Caching as the
 behavior factory. For the session and request level ones, you choose
@@ -37,21 +37,21 @@
 

   public class MyTinyApacheComposerServlet extends HttpServlet {
 
-    private DefaultApache Composer requestContainer;
+    private DefaultContainer requestContainer;
 
     private HttpSessionStoring sessionStoring;
     private HttpSessionStoring requestStoring;
 
     public void init(ServletConfig cfg) throws ServletException {
 
-        Apache Composer appContainer = new DefaultApache Composer(new Caching()); // app scoped components are cached for all users/sessions
+        Container appContainer = new DefaultContainer(new Caching()); // app scoped components are cached for all users/sessions
 
         Storing storingBehavior1 = new Storing();
-        Apache Composer sessionContainer = new DefaultApache Composer(storingBehavior1, appContainer);
+        Container sessionContainer = new DefaultContainer(storingBehavior1, appContainer);
         sessionStoringAdapter = new HttpSessionStoringAdapter(storingBehavior1, "sessionStore");
 
         Storing storingBehavior2 = new Storing();
-        requestContainer = new DefaultApache Composer(storingBehavior2, sessionContainer);
+        requestContainer = new DefaultContainer(storingBehavior2, sessionContainer);
         requestStoringAdapter = new HttpSessionStoringAdapter(storingBehavior2, "requestStore");
 
         // populate app, session and request scoped containers.

Modified: incubator/composer/trunk/composer-site/src/site/templates/skin.html
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/templates/skin.html?rev=618243&r1=618242&r2=618243&view=diff
==============================================================================
--- incubator/composer/trunk/composer-site/src/site/templates/skin.html (original)
+++ incubator/composer/trunk/composer-site/src/site/templates/skin.html Mon Feb  4 03:43:57 2008
@@ -36,7 +36,7 @@
 
 
 
-Last Published: Jan 19 2008 (Apache Composer 2.0 released)
+Last Published: 
 
 
 
@@ -76,7 +76,7 @@
 
 
 
-© 2003-2007 Apache Composer Committers
+© 2008 Apache Software Foundation

svn commit: r618243 [1/2] - in /incubator/composer/trunk/composer-site/src/site: content/ content/antipatterns/ content/help/ templates/

2008-02-04T11:44:05Z

Author: mauro
Date: Mon Feb  4 03:43:57 2008
New Revision: 618243

URL: http://svn.apache.org/viewvc?rev=618243&view=rev
Log:
More docs cleanup.

Added:
    incubator/composer/trunk/composer-site/src/site/content/command-line-arguments-container.html
      - copied, changed from r618234, incubator/composer/trunk/composer-site/src/site/content/CommandLineArgumentsContainer.html
    incubator/composer/trunk/composer-site/src/site/content/default-container.html
      - copied, changed from r618234, incubator/composer/trunk/composer-site/src/site/content/DefaultContainer.html
    incubator/composer/trunk/composer-site/src/site/content/properties-container.html
      - copied, changed from r618229, incubator/composer/trunk/composer-site/src/site/content/PropertiesContainer.html
    incubator/composer/trunk/composer-site/src/site/content/system-properties-container.html
      - copied, changed from r618234, incubator/composer/trunk/composer-site/src/site/content/SystemPropertiesContainer.html
    incubator/composer/trunk/composer-site/src/site/content/transient-container.html
      - copied, changed from r618229, incubator/composer/trunk/composer-site/src/site/content/TransientContainer.html
Removed:
    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/PropertiesContainer.html
    incubator/composer/trunk/composer-site/src/site/content/SystemPropertiesContainer.html
    incubator/composer/trunk/composer-site/src/site/content/TransientContainer.html
Modified:
    incubator/composer/trunk/composer-site/src/site/content/ImmutableContainer.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/propagating-dependency-antipattern.html
    incubator/composer/trunk/composer-site/src/site/content/antipatterns/singleton-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/class-naming.html
    incubator/composer/trunk/composer-site/src/site/content/comparisons.html
    incubator/composer/trunk/composer-site/src/site/content/component-configuration.html
    incubator/composer/trunk/composer-site/src/site/content/constructor-injection.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/goals.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/inversion-of-control-history.html
    incubator/composer/trunk/composer-site/src/site/content/inversion-of-control.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/monitors.html
    incubator/composer/trunk/composer-site/src/site/content/news.html
    incubator/composer/trunk/composer-site/src/site/content/project.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/sitemap.xml
    incubator/composer/trunk/composer-site/src/site/content/team.html
    incubator/composer/trunk/composer-site/src/site/content/terminology.html
    incubator/composer/trunk/composer-site/src/site/content/transparency.html
    incubator/composer/trunk/composer-site/src/site/content/web-frameworks.html
    incubator/composer/trunk/composer-site/src/site/templates/skin.html

Modified: incubator/composer/trunk/composer-site/src/site/content/ImmutableContainer.html
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/ImmutableContainer.html?rev=618243&r1=618242&r2=618243&view=diff
==============================================================================
--- incubator/composer/trunk/composer-site/src/site/content/ImmutableContainer.html (original)
+++ incubator/composer/trunk/composer-site/src/site/content/ImmutableContainer.html Mon Feb  4 03:43:57 2008
@@ -2,16 +2,16 @@
 
 
 
-TransientApache Composer
+TransientContainer
 
 
 
-ImmutableApache Composer is wapper mechanims for a MutableApache Composer. The resulting reference is not able to accept mutating method invocations by any means.
+ImmutableContainer is wapper mechanims for a MutableContainer. The resulting reference is not able to accept mutating method invocations by any means.
 
Here is an example of use:
 

-Apache Composer imPC = new ImmutableApache Composer(someMutableContainer);
+Container imPC = new ImmutableContainer(someMutableContainer);
 
-// imPC has no addComponent methods nor is it castable back to MutableApache Composer
+// imPC has no addComponent methods nor is it castable back to MutableContainer
 
 
 

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=618243&r1=618242&r2=618243&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:43:57 2008
@@ -4,7 +4,7 @@
 
 Adapters
 
-Each time  you use addComponent(..) on Apache Composer, behind the scenes a ComponentAdapter instance is set up. There is one ComponentAdapter implementation per component instance. The ComponentAdapters can be added to a container directly, or made by the ComponentFactory the container is using. Both for BehaviorFactory and InjectionFactory implementations. Its all kinda hidden from you to make Apache Composer's API appear simple.
+Each time  you use addComponent(..) on Container, behind the scenes a ComponentAdapter instance is set up. There is one ComponentAdapter implementation per component instance. The ComponentAdapters can be added to a container directly, or made by the ComponentFactory the container is using. Both for BehaviorFactory and InjectionFactory implementations. Its all kinda hidden from you to make Container's API appear simple.
 Using ComponentAdapter directly. 
 Some examples : 
 
@@ -13,12 +13,12 @@
   public MyAdapter() {
     super(QuantumEntanglement.class, QuantumEntanglementImpl.class);
   }
-  public Object getComponent(Apache Composer container) {
+  public Object getComponent(Container container) {
     Auditor a = container.getComponent(Auditor.class);
     a.audit("QE used", new Date());
     return qe;
   }
-  public void verify(Apache Composer container) {
+  public void verify(Container container) {
   }
 }
 ...

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=618243&r1=618242&r2=618243&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:43:57 2008
@@ -27,7 +27,7 @@
 public class BImpl implements B {
     private final A a;
 
-    BImpl(Apache Composer container) {
+    BImpl(Container container) {
         a = (A) container.getComponentOfType(A.class);
         
         /*
@@ -42,7 +42,7 @@
 
     
         
-            MutableApache Composer container = new DefaultContainer();
+            MutableContainer container = new DefaultContainer();
 container.addComponent("a", AImpl.class);
 container.addComponent("b", BImpl.class);
 container.addComponent(container);
@@ -65,7 +65,7 @@
 
     Causes
 
-    Not sure. Poor understanding of how Apache Composer works? Not being able to think "simple"?
+    Not sure. Poor understanding of how Container works? Not being able to think "simple"?
 
 
     What to do
@@ -85,7 +85,7 @@
 }
         
     
-    Apache Composer will figure out that BImpl needs an A instance, and will pass in the AImpl, as this is an
+    
Container will figure out that BImpl needs an A instance, and will pass in the AImpl, as this is an
        implementation of A.
 
 

Modified: incubator/composer/trunk/composer-site/src/site/content/antipatterns/propagating-dependency-antipattern.html
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/antipatterns/propagating-dependency-antipattern.html?rev=618243&r1=618242&r2=618243&view=diff
==============================================================================
--- incubator/composer/trunk/composer-site/src/site/content/antipatterns/propagating-dependency-antipattern.html (original)
+++ incubator/composer/trunk/composer-site/src/site/content/antipatterns/propagating-dependency-antipattern.html Mon Feb  4 03:43:57 2008
@@ -110,7 +110,7 @@
 
         When [Migrating from executors to services], it can sometimes be difficult to avoid introducing a Propagating
            Dependency. In these cases, the Propogating Dependency can be considered as a good first step towards
-           making a set of classes good for Apache Composer. An effort should be made to complete decomposition at some stage by making a
+           making a set of classes good for Container. An effort should be made to complete decomposition at some stage by making a
            series of further steps as described above.

Modified: incubator/composer/trunk/composer-site/src/site/content/antipatterns/singleton-antipattern.html URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/antipatterns/singleton-antipattern.html?rev=618243&r1=618242&r2=618243&view=diff ============================================================================== --- incubator/composer/trunk/composer-site/src/site/content/antipatterns/singleton-antipattern.html (original) +++ incubator/composer/trunk/composer-site/src/site/content/antipatterns/singleton-antipattern.html Mon Feb 4 03:43:57 2008 @@ -17,7 +17,7 @@ that there are many transitive dependancies that are not easy to spot. Singletons cannot easily be replaced with Mock Objects for the sake of easy unit testing.

With Apache Composer we would replace this with a container managed single instance, possibly in a container +

With Container we would replace this with a container managed single instance, possibly in a container hierarchy (see Introduction and Caching).

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=618243&r1=618242&r2=618243&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:43:57 2008 @@ -11,7 +11,7 @@

Symptoms

A class is directly instantiating a Apache Composer and registering components within it.

A class is directly instantiating a Container and registering components within it.

Causes

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

public void testCocktailWithVodkaIsAlcoholic() {
-    DefaultApache Composer container = new DefaultContainer();
+    DefaultContainer container = new DefaultContainer();
     container.addComponent(Banana.class);
     container.addComponent(Vanilla.class);
     container.addComponent(Vodka.class);

Modified: incubator/composer/trunk/composer-site/src/site/content/behaviors.html
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/behaviors.html?rev=618243&r1=618242&r2=618243&view=diff
==============================================================================
--- incubator/composer/trunk/composer-site/src/site/content/behaviors.html (original)
+++ incubator/composer/trunk/composer-site/src/site/content/behaviors.html Mon Feb  4 03:43:57 2008
@@ -11,10 +11,10 @@
     
 
 
-Components as managed by Apache Composer can have behaviors added
+
Components as managed by Container can have behaviors added
    to them by the container during instantiation.
 
-Behaviors are deleivered by passing a BehaviorFactory reference into the Apache Composer instance on construction. For
+
Behaviors are deleivered by passing a BehaviorFactory reference into the Container instance on construction. For
    the most part BehaviorFactories are completely stateless.
 See below for details on Caching and Singletons, Implementation Hiding and Hot Swapping, as well as Other  behaviors
 General use
@@ -58,7 +58,7 @@
    rather that a new one created each time the container is asked for that
    type. Guice calls
    this a Singleton. After guice came out we debated this, and decided that
-   we should not call this a Singleton. Another Apache Composer instance
+   we should not call this a Singleton. Another Container instance
    could be manging another single instance of the same component, so it
    does not fit the definition of Singleton as defined in the Design
    Patterns book.
@@ -255,7 +255,7 @@
 Hot Swapping
 This builds on the ASMImplementationHiding behavior above, but also allows the hot swapping of component implementations during use. It has implicit caching behavior too.
 
-DefaultApache Composer container = new DefaultContainer(new HotSwapping());
container.addComponent(Map.class, HashMap.class);
Map firstMap = container.getComponent(Map.class);
firstMap.put("foo", "bar");
HotSwappable hs = (HotSwappable) container.getComponentAdapter(Map.class);
Object oldMap = hs.getSwappable().swap(new HashMap());
Map secondMap = container.getComponent(Map.class);
secondMap.put("apple", "orange");

+DefaultContainer container = new DefaultContainer(new HotSwapping());
container.addComponent(Map.class, HashMap.class);
Map firstMap = container.getComponent(Map.class);
firstMap.put("foo", "bar");
HotSwappable hs = (HotSwappable) container.getComponentAdapter(Map.class);
Object oldMap = hs.getSwappable().swap(new HashMap());
Map secondMap = container.getComponent(Map.class);
secondMap.put("apple", "orange");

 // first map and second map are the same
 // 'foo' is not a key in the map, wereas 'apple' is
 

Modified: incubator/composer/trunk/composer-site/src/site/content/builder.html
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/builder.html?rev=618243&r1=618242&r2=618243&view=diff
==============================================================================
--- incubator/composer/trunk/composer-site/src/site/content/builder.html (original)
+++ incubator/composer/trunk/composer-site/src/site/content/builder.html Mon Feb  4 03:43:57 2008
@@ -5,7 +5,7 @@
 Building Containers
 
 
-Rather than new up a Apache Composer instance with the right ComponentFactory, LifecycleStategy and ComponentMonitor, your can use  ContainerBuilder for conveniece. Refer to Martin's Rather than new up a Container instance with the right ComponentFactory, LifecycleStategy and ComponentMonitor, your can use  ContainerBuilder for conveniece. Refer to Martin's 'Fluent
 Interface' article, for some of the motivation behing this class.
 Some simple examples :
@@ -61,9 +61,9 @@
     .withCustomContainerComponent(new MyQuantumPhysicsConnector())
     .withComponentFactory(MyQuantumPhysicsConnectionNeedingComponentBehavior.class).build();
 container.addComponent(Apple.class);
-	A custom container implementation (DefaultApache Composer is the default): 
+	A custom container implementation (DefaultContainer is the default): 
     
-      MyCustomApache Composer container = (MyCustomApache Composer) new ContainerBuilder().implementedBy(MyCustomApache Composer.class).build();
+      MyCustomContainer container = (MyCustomContainer) new ContainerBuilder().implementedBy(MyCustomContainer.class).build();
 container.addComponent(Apple.class);
 
 

Modified: incubator/composer/trunk/composer-site/src/site/content/class-naming.html
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/class-naming.html?rev=618243&r1=618242&r2=618243&view=diff
==============================================================================
--- incubator/composer/trunk/composer-site/src/site/content/class-naming.html (original)
+++ incubator/composer/trunk/composer-site/src/site/content/class-naming.html Mon Feb  4 03:43:57 2008
@@ -5,15 +5,15 @@
 Class Naming
 
 
-Apache Composer's class naming changed substantially between 1.0 and 2.0. There are two major influences for this:
+Container's class naming changed substantially between 1.0 and 2.0. There are two major influences for this:
 
   Dan North's "Behavior Driven Design" agenda and his interest in Neuro Linguistic Programming (NLP)
   Steve Yegge's technical fable : Execution in the Kingdom of Nouns
 
 The take away from both is that we don't have to have long classnames like CachingComponentAdapterFactory and ImplementationHidingComponentAdapterFactory, we can in fact have shorter names, that read better in their intended use:
-  new DefaultApache Composer(new Caching());
+  new DefaultContainer(new Caching());
 Similarly,  method names can play a part in simplicity and meaning for real situations where they are used.
-  new DefaultApache Composer(new Caching().wrap(new ImplementationHiding()));
+  new DefaultContainer(new Caching().wrap(new ImplementationHiding()));
 
 Caching, the class, implements an abstraction called BehaviorFactory as do many others. All BehaviorFactory implementations make implementations of Behavior like 'Cached'. Similarly 'ConstructionInjection' (and similar) make implementations of Injector like 'ConstructorInjector' (and similar). Both BehaviorFactory and InjectionFactory are extensions of ComponentFactory.
 

Copied: incubator/composer/trunk/composer-site/src/site/content/command-line-arguments-container.html (from r618234, incubator/composer/trunk/composer-site/src/site/content/CommandLineArgumentsContainer.html)
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/command-line-arguments-container.html?p2=incubator/composer/trunk/composer-site/src/site/content/command-line-arguments-container.html&p1=incubator/composer/trunk/composer-site/src/site/content/CommandLineArgumentsContainer.html&r1=618234&r2=618243&rev=618243&view=diff
==============================================================================
--- incubator/composer/trunk/composer-site/src/site/content/CommandLineArgumentsContainer.html (original)
+++ incubator/composer/trunk/composer-site/src/site/content/command-line-arguments-container.html Mon Feb  4 03:43:57 2008
@@ -2,12 +2,12 @@
 
 
 
-CommandLineArgumentsApache Composer
+CommandLineArgumentsContainer
 
 
 
-CommandLineArgumentsApache Composer is a special type of Apache Composer that processes the arguments passed into from the command line, and sets them up as configuration for other components. 
-
Here is an example of how to use CommandLineArgumentsApache Composer to map command line arguments as configuration for a component, with parameter names as the bindings.
+CommandLineArgumentsContainer is a special type of Container that processes the arguments passed into from the command line, and sets them up as configuration for other components. 
+
Here is an example of how to use CommandLineArgumentsContainer to map command line arguments as configuration for a component, with parameter names as the bindings.
 
Consider this component:
 

     public class BigFatComponent {
@@ -29,9 +29,9 @@
 For automatic binding of command line arguments to parameter names of the component:
 
 public static void main(String[] args) {
-    Apache Composer argsContainer = new CommandLineArgumentsApache Composer(args);
+    Container argsContainer = new CommandLineArgumentsContainer(args);
                 
-    MutableApache Composer mpc = new DefaultApache Composer(argsContainer);
+    MutableContainer mpc = new DefaultContainer(argsContainer);
                 
     mpc.as(Characteristics.USE_NAMES).addComponent(BigFatComponent.class);
    
@@ -60,7 +60,7 @@
            java.sql.(Date|Time|Timestamp) 
            Any type sporting accessible constructor taking single string parameter. 
 
-        CommandLineArgumentsApache Composer can be part of a tree of containers. It makes sense, of course, being more near the root of that tree.
+        CommandLineArgumentsContainer can be part of a tree of containers. It makes sense, of course, being more near the root of that tree.
 
 
 

Modified: incubator/composer/trunk/composer-site/src/site/content/comparisons.html
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/comparisons.html?rev=618243&r1=618242&r2=618243&view=diff
==============================================================================
--- incubator/composer/trunk/composer-site/src/site/content/comparisons.html (original)
+++ incubator/composer/trunk/composer-site/src/site/content/comparisons.html Mon Feb  4 03:43:57 2008
@@ -11,14 +11,14 @@
     
       
         Overview
-        This document aims to compare Apache Composer to other IoC containers, both lightweight and not.
+        This document aims to compare Container to other IoC containers, both lightweight and not.
         There are a number of published API specifications since Java was initially released that proport to be container/component designs. We discuss then here, suggesting there are goals that some have met, and some not. This may help you make better design choices for your own components.
       
       
         IoC Containers
         
           Spring Framework
-          The Spring Framework is a J2EE framework. As such, Dependency Injection and Lifecycle is only one of its concerns. Apache Composer, on the other hand, is concerned only with Dependency Injection, configuration and Lifecycle.
+          The Spring Framework is a J2EE framework. As such, Dependency Injection and Lifecycle is only one of its concerns. Container, on the other hand, is concerned only with Dependency Injection, configuration and Lifecycle.
         
         
           Apache Avalon and its containers
@@ -29,7 +29,7 @@

Enterprise Java Beans

Clearly Entity and Session beans run inside a container. The API is well defined, and to varying degrees of success one can deploy EJB appllications to WebLogic, WebSphere, Orion and JBoss etc. For assembly and configuration, there is high use of element-normal XML . There are some mandated parent objects and interfaces for various to extend and/or implement. Resolution is done by the components themselves via JNDI more often than not.

Apache Composer Components are simpler in they they do not force an extensive XML markup, nor require the implementing of certaing interfaces or extening base classes. Quite importantly the relationship between factory (home), implementation (bean) and interface (remote) parts is much more real in Apache Composer-style components. EJB 2.0 components are nearly impossible to unit-test without much effort.

Container Components are simpler in they they do not force an extensive XML markup, nor require the implementing of certaing interfaces or extening base classes. Quite importantly the relationship between factory (home), implementation (bean) and interface (remote) parts is much more real in Container-style components. EJB 2.0 components are nearly impossible to unit-test without much effort.

With the advent of EJB 3.0 (which the our team directly influenced), things became easier for EJB developers. Annotations were used to mark fields, and methods for injection. Strangely constructors were not eligible for injection. It was reported back to the our team that it was felt that the J2EE container makers would not find it easy making multi-argument constructor injection a reality.

Servlets

Not so obvious - Servlets are contained by a servlet container. They are generally bundled with (or replaced by) value added propositions like JSP, but it is still a container/component design. High use of XML for assembly and configuration. Servlets have no concept of parent container or the conatainer above that (sometimes EJB) and its provision of components, which is very unfortunate. Servlets have a number of interfaces to honor, none of which is too malignent. Servlets typically deal with external (or parent) components via RMI or JNDI. In more recent releases of EJB, local interfaces rather than RMI may be the mechanism for connection the parent components. WebLogic have always provided an optimizing mechanism for this interoperation

As with EJB, Apache Composer Components are far simpler. This is probably because they offer no web experience, without an extension. Servlets again are not that unit-testable.

As with EJB, Container Components are far simpler. This is probably because they offer no web experience, without an extension. Servlets again are not that unit-testable.

Applets

Applets, though presently not so often used, are a good example of Container/Component separations. There is very little XML in use by Applets. Configuration is typically delivered in applet tags in HTML. Applets are granted some access to the parent container, the brower, and its DOM model for pages and other applets. There very little standardisation for Browser as a container.

As with EJB, Apache Composer Components are far simpler. Applets are unit-testable but with a little effort. Complex DOM interoperation is impossible under unit testing.

As with EJB, Container Components are far simpler. Applets are unit-testable but with a little effort. Complex DOM interoperation is impossible under unit testing.

Mainable (Not actually a container)

Modified: incubator/composer/trunk/composer-site/src/site/content/component-configuration.html URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/component-configuration.html?rev=618243&r1=618242&r2=618243&view=diff ============================================================================== --- incubator/composer/trunk/composer-site/src/site/content/component-configuration.html (original) +++ incubator/composer/trunk/composer-site/src/site/content/component-configuration.html Mon Feb 4 03:43:57 2008 @@ -7,11 +7,11 @@

Choices

In true IoC style, configuration for a component is pushed into it.

With Apache Composer, there are a few ways to do this:

With Container, there are a few ways to do this:

Design a class to hold the configuration and have getters on it to allow depending components to access configuration.
Manually set the configuration for components as you add them to a container
Leverage the fact that Apache Composer can pick up on named components
Leverage the fact that Container can pick up on named components

Configuration Object

@@ -80,21 +80,21 @@ System.out.println("bfc: " + bfc.toString()); // Prints .. "bfg: URL=http://foo.com/spelling.wsdl, timeout=120"

This feature of Apache Composer relies on the a non-JDK mechanism of accessing parameter names for methods and constructors. In this case named parameters spellingWebServiceURL and timeout.

This feature of Container relies on the a non-JDK mechanism of accessing parameter names for methods and constructors. In this case named parameters spellingWebServiceURL and timeout.

There are two ways for this to work:

relying on the fact that your component classes have debug info compiled into them.
post-processing component classes with Paranamer before placing them in their jar

If the parameter name information cannot be accessed at runtime by Apache Composer, then Apache Composer will be unable to differentiate between potential injectable classes of the same type and throws an exception that suggests that there is an ambiguity.

If the parameter name information cannot be accessed at runtime by Container, then Container will be unable to differentiate between potential injectable classes of the same type and throws an exception that suggests that there is an ambiguity.

This is not a global variable facility. Its scoped with the container in question and its child containers.

Taking configuration from the elsewhere

Configuration can also be bound to components with :

-
CommandLineArgumentsApache Composer
-
PropertiesApache Composer
-
SystemPropertiesApache Composer
+ Command Line Arguments Container
+
Properties Container
+
System Properties Container

Modified: incubator/composer/trunk/composer-site/src/site/content/constructor-injection.html URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/constructor-injection.html?rev=618243&r1=618242&r2=618243&view=diff ============================================================================== --- incubator/composer/trunk/composer-site/src/site/content/constructor-injection.html (original) +++ incubator/composer/trunk/composer-site/src/site/content/constructor-injection.html Mon Feb 4 03:43:57 2008 @@ -25,7 +25,7 @@ Injection in more detail.

- Apache Composer also supports Setter Injection.

+ Container also supports Setter Injection.

Origin

@@ -43,7 +43,7 @@

public class Shop {
    private final StockManager stockManager;
    private final String shopZipCode;
    public Shop(StockManager stockManager, String shopZipCode) {
        this.stockManager = stockManager;
        this.shopZipCode = shopZipCode;
    }
 }

Note, for this there is no need to declare needs in any other way. No interfaces, no doclet tags, no external - XML. Just your simple component(s) and Apache Composer. No need for post assembly/config initialization either. If + XML. Just your simple component(s) and Container. No need for post assembly/config initialization either. If it is constructed (not withstanding some asserts on nulls) it has its needs satisfied. Components need not be interface/implementation separated. This is the coder's choice.

Container support

Apache Composer was the first lightweight container to support and popularize this for of dependency injection. +

Container was the first lightweight container to support and popularize this for of dependency injection. Spring Framework has been retrofitted with constructor injection capability, but its primary focus is still setter injection. Even the once heavyweight technologies like Avalon and OSGi moved towards constructor injection.

DefaultApache Composer

DefaultContainer

-DefaultApache Composer is the main workhorse container. +DefaultContainer is the main workhorse container.

Here is an example of use:

DefaultApache Composer dpc = new DefaultContainer();
-dpc.addComponent(Foo.class, FooImpl.class);
-Foo foo = dpc.getComponent(Foo.class)

DefaultContainer container = new DefaultContainer();
+container.addComponent(Foo.class, FooImpl.class);
+Foo foo = container.getComponent(Foo.class)

Parameters in its constructors can be:

Overview

Disambiguation using parameter names

@@ -29,14 +29,14 @@ Access to parameter names was dropped from JDK 6.0 and it is uncertain whether it will be added as a feature in another release, so -Apache Composer relies on another open source library called Paranamer, +Container relies on another open source library called Paranamer, without requiring a dependency on its Jar. In other words, -Apache Composer has the same classes from Paranamer in its jar.
+Container has the same classes from Paranamer in its jar.

-See CommandLineArgumentsApache Composer, -PropertiesApache Composer -and SystemPropertiesApache Composer -for implementations of Apache Composer that set up components for +See Command Line Arguments Container, +Properties Container +and System Properties Container +for implementations of Container that set up components for subsequent parameter name binding.

Page component-configuration @@ -54,7 +54,7 @@

@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.FIELD, ElementType.PARAMETER})
@Bind
public static @interface WorkingDayStockManager {}

@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.FIELD, ElementType.PARAMETER})
@Bind
public static @interface AfterHoursStockManager {}

public class Store {
 public Store(@WorkingDayStockManager StockManager workingDayStockManager, 
 @AfterHoursStockManager StockManager afterHoursStockManager) {
 // etc
 }
}

Avalon Interface	Apache Composer equivalent	Container equivalent
LogEnabled

Why Apache Composer 2.0?

Why Container 2.0?

First EJB 3.0 then Google Guice seemed to copy the ideas from Apache Composer, adding some more value. EJB 3.0 ommitted the essential Constructor Injection, and Guice went far to far down a annotations road. Soon after Guice, even the Spring Framework team decided to do things the direct way with 'JavaConfig'.

So Apache Composer 1.x was refactored (not rewritten) into Apache Composer 2.0. All the unit tests were kept, and excerise took hundreds of commits, but the team is pleased with the result.

First EJB 3.0 then Google Guice seemed to copy the ideas from Container, adding some more value. EJB 3.0 ommitted the essential Constructor Injection, and Guice went far to far down a annotations road. Soon after Guice, even the Spring Framework team decided to do things the direct way with 'JavaConfig'.

So Container 1.x was refactored (not rewritten) into Container 2.0. All the unit tests were kept, and excerise took hundreds of commits, but the team is pleased with the result.

@@ -49,36 +49,36 @@

- +

How does Apache Composer decide what constructor to use? How does Container decide what constructor to use?

Apache Composer will instantiate a given component using the "greediest" satisfiable constructor. By greedy, we mean the constructor that takes the most parameters. By satisfiable, we mean constructors where all arguments can be satisfied by other registered components.

Container will instantiate a given component using the "greediest" satisfiable constructor. By greedy, we mean the constructor that takes the most parameters. By satisfiable, we mean constructors where all arguments can be satisfied by other registered components.

If you register a component with no satisfiable constructors, or two or more ambiguous "largest" constructors, a RuntimeException will be thrown when you ask for the component instance.

We recommend for most components, you use only one constructor, although this is by no means a requirement.

- +

How does Apache Composer compare to EJB containers? How does Container compare to EJB containers?

Oh blimey, it is rather different. EJB has loads of things you must extend, implement, provide and throw. It is also not an IoC design. It is close in that components are managed by a container, but the cumbersome and static nature of the JNDI lookups ensure that it is not actually IoC. Apache Composer is not a superset of EJB though, as it provides no remoting capability (but NanoContainer will). At least the Apache Composer compatible components hosted in this project do not.

Oh blimey, it is rather different. EJB has loads of things you must extend, implement, provide and throw. It is also not an IoC design. It is close in that components are managed by a container, but the cumbersome and static nature of the JNDI lookups ensure that it is not actually IoC. Container is not a superset of EJB though, as it provides no remoting capability (but NanoContainer will). At least the Container compatible components hosted in this project do not.

- +

How does Apache Composer decide what constructor to use? How does Container decide what constructor to use?

If you register a component with no satisfiable constructors, or two or more ambiguous "largest" constructors, a RuntimeException will be thrown when you ask for the component instance.

We recommend, for the sake of predictablility, that Apache Composer compatible components use only one constructor, although this is by no means a requirement.

We recommend, for the sake of predictablility, that Container compatible components use only one constructor, although this is by no means a requirement.

@@ -88,7 +88,7 @@

Apache Composer will look for the greediest constructor of your component. But if your component's constructor depends on primitive types you may set the values explicitly.

Container will look for the greediest constructor of your component. But if your component's constructor depends on primitive types you may set the values explicitly.

public interface ThreadPool {
@@ -107,7 +107,7 @@
   In this case you can set the parameters at registration time:
   
     
-      DefaultApache Composer container = new DefaultContainer();
+      DefaultContainer container = new DefaultContainer();
 container.addComponent(ThreadPool.class, DefaultThreadPool.class);
 container.addComponent(MyComp.class, MyComp.class, new Parameters[] {
 	new ComponentParameter(),
@@ -116,18 +116,18 @@
 MyComp myComp = (MyComp)container.getInstance(MyComp.class);
     
   
-  Use ConstantParameter to set constant values and the ComponentParameter to let Apache Composer resolve the dependency.
+  Use ConstantParameter to set constant values and the ComponentParameter to let Container resolve the dependency.

- +

When should I use Apache Composer? When should I use Container?

- We recommend using Apache Composer when your application consists of many different classes (components) that are related to each other. Instantiating and lacing/connecting a lot of objects can be difficult task.

+ We recommend using Container when your application consists of many different classes (components) that are related to each other. Instantiating and lacing/connecting a lot of objects can be difficult task.

@@ -143,7 +143,7 @@ design. One, perhaps, that considers the so-designed component as more important that the container.
When we set out to do this in 2003, there was nothing equivalent -to Apache Composer (xContainer originally). XWork, that underpinned +to Container (xContainer originally). XWork, that underpinned WebWork2 was a general/embeddable Setter Dependency Injection framework, but not well known. The Spring Framework started in the same timescale, and we were talking to its authors before Martin Fowlers Dependency @@ -175,7 +175,7 @@

We could compile Apache Composer against Guice.jar and leverage the @Inject method with a new InjectionFactory (and probably will). The problem is that there is no easy way to use an annotation without having its class in the classpath. There's no easy 'transparent' solution for this.

We could compile Container against Guice.jar and leverage the @Inject method with a new InjectionFactory (and probably will). The problem is that there is no easy way to use an annotation without having its class in the classpath. There's no easy 'transparent' solution for this.

Things fail silently if the jar is missing, unless the annotation is used - then it fails noisily. Meaning, the mere declaration of an annotation on a component is not enough to cause a ClassNotFoundException on load, if its not used:

@Retention(RetentionPolicy.RUNTIME)
 @Target(value={ElementType.METHOD})

Modified: incubator/composer/trunk/composer-site/src/site/content/fluent-style.html
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/fluent-style.html?rev=618243&r1=618242&r2=618243&view=diff
==============================================================================
--- incubator/composer/trunk/composer-site/src/site/content/fluent-style.html (original)
+++ incubator/composer/trunk/composer-site/src/site/content/fluent-style.html Mon Feb  4 03:43:57 2008
@@ -5,7 +5,7 @@
 Fluent Stype
 
 
-Apache Composer allows for a very fluent style of use. Refer to Martin's Container allows for a very fluent style of use. Refer to Martin's 'Fluent
 Interface' article.
 A simple example :

Modified: incubator/composer/trunk/composer-site/src/site/content/goals.html
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/goals.html?rev=618243&r1=618242&r2=618243&view=diff
==============================================================================
--- incubator/composer/trunk/composer-site/src/site/content/goals.html (original)
+++ incubator/composer/trunk/composer-site/src/site/content/goals.html Mon Feb  4 03:43:57 2008
@@ -5,7 +5,7 @@
 Our Goals
 
 
-Apache Composer's core was designed with some goals in mind:
+Container's core was designed with some goals in mind:
 
   No mandatory dependencies.
   No logging built in (we have a Monitor interface and implementations for Commons-Logging and Log4J etc)
@@ -13,7 +13,7 @@
   Small jar size.
   Embeddable by design (no main method entry point)
 
-If someone has a need for Apache Composer that we did not originally envision, or a feature that could be imlemented, we will try to accomodate it. The principle of Lowest Common Denominator (LCD) allows us for Apache Composer itself, to keep things small, while allowing extensions to deliver the larger visions. Thus, meta-data, dependancies, mainable are all OK for related extensions of Apache Composer.
+If someone has a need for Container that we did not originally envision, or a feature that could be imlemented, we will try to accomodate it. The principle of Lowest Common Denominator (LCD) allows us for Container itself, to keep things small, while allowing extensions to deliver the larger visions. Thus, meta-data, dependancies, mainable are all OK for related extensions of Container.
  
  
  

Modified: incubator/composer/trunk/composer-site/src/site/content/help/ambiguous-injectable-help.html
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/help/ambiguous-injectable-help.html?rev=618243&r1=618242&r2=618243&view=diff
==============================================================================
--- incubator/composer/trunk/composer-site/src/site/content/help/ambiguous-injectable-help.html (original)
+++ incubator/composer/trunk/composer-site/src/site/content/help/ambiguous-injectable-help.html Mon Feb  4 03:43:57 2008
@@ -4,7 +4,7 @@
 
     Ambiguous Injectable
 
-Apache Composer tries to determine what to inject into the constructor of each component as it instantiates (or setters/fields for other injection types). Sometimes there can be two or more classes that could equally satisfy a constructor: 
+Container tries to determine what to inject into the constructor of each component as it instantiates (or setters/fields for other injection types). Sometimes there can be two or more classes that could equally satisfy a constructor: 
 
   container.add(new Apple("Braeburn"));
 container.add(new Apple("Granny Smith"));
@@ -13,7 +13,7 @@
 
 
 
-The best advice is don't setup Apache Composer in a way that would allow ambiguities  (just put in one Apple in the case above).
+The best advice is don't setup Container in a way that would allow ambiguities  (just put in one Apple in the case above).
 An alternative strategy would be to use custom parameters (TODO)
 One more strategy would be to use names parameters 
 
@@ -34,13 +34,13 @@
 Pie pie = container.getComponent(Pie.class); // OK this time.

To use names Parameters, you are going to need Paranamer 1.0 (or above) in the classpath, as well as ASM 3.0 (or above). If you are expecting Apache Composer to work based on parameter names, but its not doing so, it is most likely that you do not have paranamer-1.0.jar in the classpath. See http://repository.codehaus.org/com/thoughtworks/paranamer/paranamer/ for versions of paranamer. Also http://maven.objectweb.org/maven2/asm/asm/ for the ASM jar.

To use names Parameters, you are going to need Paranamer 1.0 (or above) in the classpath, as well as ASM 3.0 (or above). If you are expecting Container to work based on parameter names, but its not doing so, it is most likely that you do not have paranamer-1.0.jar in the classpath. See http://repository.codehaus.org/com/thoughtworks/paranamer/paranamer/ for versions of paranamer. Also http://maven.objectweb.org/maven2/asm/asm/ for the ASM jar.

You also have to make a decision as to when parameter name data is made. There are two choices for this:

At runtime
At build time

When at runtime, Apache Composer will need to be accompanied by ASM and Paranamer in the classpath. You will also need to compile your Java classes with debug information.

When at runtime, Container will need to be accompanied by ASM and Paranamer in the classpath. You will also need to compile your Java classes with debug information.

When at build time, you will need to use and Ant or Maven fragment to post-process the compiled classes for your app to add the paramaeter name data. At runtime, neither Paranamer nor ASM will be needed. See http://paranamer.codehaus.org/ - specifically the quick start section pertinent to Ant and Maven.

Modified: incubator/composer/trunk/composer-site/src/site/content/help/unprocessed-properties-help.html URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/help/unprocessed-properties-help.html?rev=618243&r1=618242&r2=618243&view=diff ============================================================================== --- incubator/composer/trunk/composer-site/src/site/content/help/unprocessed-properties-help.html (original) +++ incubator/composer/trunk/composer-site/src/site/content/help/unprocessed-properties-help.html Mon Feb 4 03:43:57 2008 @@ -12,15 +12,15 @@

But with a custom ComponentFactory, it may not:

container = new DefaultApache Composer(new MyComponentFactory);
+  container = new DefaultContainer(new MyComponentFactory);
 container.as(HIDE_IMPL).addComponent(Apple.class); // fails with CompositionException

The trick is (in this case) to make sure that the right chain of component factories are setup:

container = new DefaultApache Composer(new MyComponentFactory().wrap(new AdaptiveBehaviorFactory()));
+  container = new DefaultContainer(new MyComponentFactory().wrap(new AdaptiveBehaviorFactory()));
 container.as(HIDE_IMPL).addComponent(Apple.class); // fails with CompositionException

A component may have many properties as it is added to the container. As each is processed, it is removed from the set. If there are any left after the component has been added the behavior or action that the property suggests has not been setup. Thus a CompositionException being thrown warning of unprocessed properties only happens one or more properties are left - whether they are Apache Composer's own properties or custom ones

Modified: incubator/composer/trunk/composer-site/src/site/content/index.html URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/index.html?rev=618243&r1=618242&r2=618243&view=diff ============================================================================== --- incubator/composer/trunk/composer-site/src/site/content/index.html (original) +++ incubator/composer/trunk/composer-site/src/site/content/index.html Mon Feb 4 03:43:57 2008 @@ -7,9 +7,9 @@ -

What is Apache Composer?

What is Container?

Apache Composer is a highly embeddable full service Inversion of Control (IoC) container +

Container is a highly embeddable full service Inversion of Control (IoC) container for components honour the Dependency Injection pattern.

You could use it as a lightweight alternative to Sun's J2EE patterns for web applications or general solutions.

What is Dependency Injection? Martin Fowler has a good article from 2003, but here is another view: It is a good design pattern that, for large enterprise applications, facilitates:

@@ -32,8 +32,8 @@

suffers repeated allegations of being unable to be developed without complete rewrite

Despite it being very compact in size (the core is ~128K and it -has no mandatory dependencies outside the JDK), Apache Composer supports different dependency injection types (Constructor, Setter, Annotated Field and Method) and offers multiple lifecycle and monitoring strategies.

Apache Composer has originally been implemented in Java but is also +has no mandatory dependencies outside the JDK), Container supports different dependency injection types (Constructor, Setter, Annotated Field and Method) and offers multiple lifecycle and monitoring strategies.

Container has originally been implemented in Java but is also available for other platforms and languages. These are detailed here.

Getting Started

Modified: incubator/composer/trunk/composer-site/src/site/content/injection.html URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/injection.html?rev=618243&r1=618242&r2=618243&view=diff ============================================================================== --- incubator/composer/trunk/composer-site/src/site/content/injection.html (original) +++ incubator/composer/trunk/composer-site/src/site/content/injection.html Mon Feb 4 03:43:57 2008 @@ -11,9 +11,9 @@

public class Apple {
  private final Orange orange;
  private final Pear pear;
  private final Banana banana;

  public Apple(Orange orange, Pear pear, Banana banana) {
    this.orange = orange;
    this.pear = pear;
    this.banana = banana;
  }

  // methods
}

-The Apache Composer team recomends CDI over other types. There is no need +The Container team recomends CDI over other types. There is no need to mark up the constructor with an annotation. Having more than one -constructor is OK too, as Apache Composer will try to use the one with +constructor is OK too, as Container will try to use the one with the most arguments and fall back to ones with fewer if it cannot satisfy the longer ones.

The component factory for this is ConstructorInjection. It only handles constructor injection types of components. Factory AdaptiveInjection @@ -26,7 +26,7 @@

Setter methods (those prefixed with 'set') may not be your preferred choice. You can force a different prefix to be choosable in -Apache Composer, such as 'init' or 'inject'.

+Container, such as 'init' or 'inject'.

The component factory for this is SetterInjection. It only handles setter injection types of components.

Factory AdaptiveInjection can also handle setter injection types, though it requires that the component was registered with the property 'SDI' in order to activate the Setter Injection functionality. AdaptiveInjection will also fall through to constructor injection if there is no SDI property.

If you want to use an prefix other than 'set', then specify your preferred prexix in the non-default constructor for SetterInjection.

@@ -43,7 +43,7 @@

The component factory for this is a class AnnotatedFieldInjection. It only handles field-annotation injection types of components.

Additionally component factory AdaptiveInjection can also handle field annotation types, if the @Inject annotation from -Apache Composer's codebase is used as the marker for injection. AdaptiveInjection will also fall through to constructor injection if there is no recognised @Inject annotation.

+Container's codebase is used as the marker for injection. AdaptiveInjection will also fall through to constructor injection if there is no recognised @Inject annotation.

If you want to use an @Inject annotation from another codebase, then specify the preferred annotation class in the constructor for AnnotatedFieldInjection.

Annotated Method Dependency Injection

@@ -56,7 +56,7 @@

The component factory for this is AnnotatedMethodInjection. It only handles method-annotation injection types of components.

Additionally component factory AdaptiveInjection can also handle method-annotation injection types, if the @Inject -annotation from Apache Composer's codebase is used as the marker for +annotation from Container's codebase is used as the marker for injection. AdaptiveInjection will also fall through to constructor injection if there is no recognised annotation.

If you want to use an @Inject annotation from another codebase, then @@ -71,10 +71,10 @@

The component factory for this is MethodInjection. It only handles method-injection types of components.

Additionally component factory AdaptiveInjection can also handle method-injection types, but only if the METHOD_INJECTION characteristic is specified.

Using Apache Composer with Injection Types

Using Container with Injection Types

Explicit Constructor Injection:

container = new DefaultApache Composer(new ConstructorInjection());
container.addComponent(Apple.class);

container = new DefaultContainer(new ConstructorInjection());
container.addComponent(Apple.class);

Constructor Injection, is a default too (via AdaptiveInjection):

@@ -82,31 +82,31 @@

Explicit Setter Injection:

container = new DefaultApache Composer(new SetterInjection());
container.addComponent(Apple.class);

container = new DefaultContainer(new SetterInjection());
container.addComponent(Apple.class);

Explicit Annotated Field injection:

container = new DefaultApache Composer(new AnnotatedFieldInjection();
container.addComponent(Apple.class);

container = new DefaultContainer(new AnnotatedFieldInjection();
container.addComponent(Apple.class);

Explicit Annotated Field injection, with alternate Annotation:

container = new DefaultApache Composer(new AnnotatedFieldInjection(MyInjectAnnotaton.class);
container.addComponent(Apple.class);

container = new DefaultContainer(new AnnotatedFieldInjection(MyInjectAnnotaton.class);
container.addComponent(Apple.class);

Explicit Annotated Method injection:

container = new DefaultApache Composer(new AnnotatedMethodInjection();
container.addComponent(Apple.class);

container = new DefaultContainer(new AnnotatedMethodInjection();
container.addComponent(Apple.class);

Explicit Annotated Method injection, with alternate Annotation:

container = new DefaultApache Composer(new AnnotatedMethodInjection(MyInjectAnnotaton.class);
container.addComponent(Apple.class);

container = new DefaultContainer(new AnnotatedMethodInjection(MyInjectAnnotaton.class);
container.addComponent(Apple.class);

Explicit Method injection, implicit injection method prefix ('inject'):

container = new DefaultApache Composer(new MethodInjection();
container.addComponent(Apple.class);

container = new DefaultContainer(new MethodInjection();
container.addComponent(Apple.class);

Explicit Method injection, explicit injection method prefix:

container = new DefaultApache Composer(new MethodInjection("setDependencies");
container.addComponent(Apple.class);

container = new DefaultContainer(new MethodInjection("setDependencies");
container.addComponent(Apple.class);

Method injection, via a characteristic:

Modified: incubator/composer/trunk/composer-site/src/site/content/interception.html URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/interception.html?rev=618243&r1=618242&r2=618243&view=diff ============================================================================== --- incubator/composer/trunk/composer-site/src/site/content/interception.html (original) +++ incubator/composer/trunk/composer-site/src/site/content/interception.html Mon Feb 4 03:43:57 2008 @@ -50,7 +50,7 @@ } } ... -container = new DefaultApache Composer(new Intercepting()); +container = new DefaultContainer(new Intercepting()); container.addComponent(Apple.class, BraeburnApple.class); Intercpeted intercepted = container.getComponentAdapter(Apple.class).findAdapterOfType(Intercpeted.class); intercepted.pre(Apple.class, new BiteReporter(intercepted.getController())); Modified: incubator/composer/trunk/composer-site/src/site/content/introduction.html URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/introduction.html?rev=618243&r1=618242&r2=618243&view=diff ============================================================================== --- incubator/composer/trunk/composer-site/src/site/content/introduction.html (original) +++ incubator/composer/trunk/composer-site/src/site/content/introduction.html Mon Feb 4 03:43:57 2008 @@ -9,24 +9,24 @@

Basics

This is a quick introduction to Apache Composer's most important features. Read through it to get an idea of what - Apache Composer is and isn't.

This is a quick introduction to Container's most important features. Read through it to get an idea of what + Container is and isn't.

Apache Composer's most important feature is its ability to instantiate arbitrary objects. This is done through its API, +

Container's most important feature is its ability to instantiate arbitrary objects. This is done through its API, which is similar to a hash table. You can put java.lang.Class objects in and get object instances back.

Example:

MutableApache Composer container = new DefaultContainer();
+                    MutableContainer container = new DefaultContainer();
 container.addComponent(ArrayList.class);
 List list = (List) container.getComponent(ArrayList.class);

(i)MutableApache Composer + href="http://www.containercontainer.org/containercontainer/latest/containercontainer/apidocs/org/containercontainer/MutableContainer.html">MutableContainer API

@@ -39,8 +39,8 @@

With a trivial example such as this there is no point in using Apache Composer. This was just to illustrate the basic - API. Apache Composer becomes useful with larger number of classes and interfaces having complex dependencies between +

With a trivial example such as this there is no point in using Container. This was just to illustrate the basic + API. Container becomes useful with larger number of classes and interfaces having complex dependencies between each other:

@@ -55,12 +55,12 @@

(Green means class, Yellow means interface).
- Apache Composer identifies dependencies by looking at the + Container identifies dependencies by looking at the constructors of registered classes (Constructor Injection). - Apache Composer can also be though of as a generic factory that - can be configured dynamically. Apache Composer is able to + Container can also be though of as a generic factory that + can be configured dynamically. Container is able to instantiate a complex graph of several interdependent objects.

Write some simple classes @@ -136,12 +136,12 @@

Assemble components

You tell Apache Composer what classes to manage by registering them like this (the order of registration has no +

You tell Container what classes to manage by registering them like this (the order of registration has no significance):

MutableApache Composer container = new DefaultContainer();
+                    MutableContainer container = new DefaultContainer();
 container.addComponent(Apple.class);
 container.addComponent(Juicer.class);
 container.addComponent(Peeler.class);
@@ -149,14 +149,14 @@

(i)MutableApache Composer + href="http://www.containercontainer.org/containercontainer/latest/containercontainer/apidocs/org/containercontainer/MutableContainer.html">MutableContainer API

Instantiate components

You can tell Apache Composer to give you an instance of a class like this (provided it has been registered +

You can tell Container to give you an instance of a class like this (provided it has been registered previously):

@@ -165,7 +165,7 @@

This will cause Apache Composer to do something similar to this behind the scenes (except that Apache Composer uses +

This will cause Container to do something similar to this behind the scenes (except that Container uses reflection):

@@ -178,12 +178,12 @@

Note how Apache Composer figures out that Apple is a Peelable, so that it can be passed to Peeler + border="0" /> Note how Container figures out that Apple is a Peelable, so that it can be passed to Peeler and Juicer's constructors.

Container hierarchies

Apache Composer provides a powerful alternative to the Container provides a powerful alternative to the Singleton. With container hierarchies you can create singleton-like objects where you have fine grained control over the visibility scope of @@ -206,9 +206,9 @@

// Create x hierarchy of containers
-MutableApache Composer x = new DefaultContainer();
-MutableApache Composer y = new DefaultApache Composer( x );
-MutableApache Composer z = new DefaultApache Composer( y );
+MutableContainer x = new DefaultContainer();
+MutableContainer y = new DefaultContainer( x );
+MutableContainer z = new DefaultContainer( y );
 
 // Assemble components
 x.addComponent(Apple.class);
@@ -245,7 +245,7 @@
 
         Lifecycle
 
-Apache Composer has support for Lifecycle. If your classes implement Container has support for Lifecycle. If your classes implement Startable, you can control the lifecycle of all your objects with a simple method call on the
@@ -258,8 +258,8 @@
 
-            
-            
+            
+            
@@ -274,8 +274,8 @@
 
     
          MutableApache Composer.start()  MutableApache Composer.stop()  MutableContainer.start()  MutableContainer.stop()
         
         
             
-            
-            
+            
+            
@@ -291,8 +291,8 @@
 
 
     
-                    MutableApache Composer parent = new DefaultApache Composer(new Caching());
-MutableApache Composer child = new DefaultApache Composer(parent);
+                    MutableContainer parent = new DefaultContainer(new Caching());
+MutableContainer child = new DefaultContainer(parent);
 // We must let the parent container know about the child container.
 parent.addComponent(child);
 // This will start the parent, which will start the child.
@@ -301,7 +301,7 @@
 
 
  Lifecycle is really only going to work for Apache Composers that are also caching component instances. Caching was a default in Apache Composer 1.x, but is not for 2.x - be warned!
+        border="0" /> Lifecycle is really only going to work for Containers that are also caching component instances. Caching was a default in Container 1.x, but is not for 2.x - be warned!
  Calling lifecycle methods on a container that has a parent container will not propagate the
   lifecycle to the parent container. 
@@ -312,7 +312,7 @@
 
             Contrasting Usage Styles 
 
-            With Apache Composer you add components and get instances out in two styles. 
+            With Container you add components and get instances out in two styles. 
 
             Classic bean style: 
 

Modified: incubator/composer/trunk/composer-site/src/site/content/inversion-of-control-history.html
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/inversion-of-control-history.html?rev=618243&r1=618242&r2=618243&view=diff
==============================================================================
--- incubator/composer/trunk/composer-site/src/site/content/inversion-of-control-history.html (original)
+++ incubator/composer/trunk/composer-site/src/site/content/inversion-of-control-history.html Mon Feb  4 03:43:57 2008
@@ -59,7 +59,7 @@
 by constructor was more elegant. Latterly we are inclined to agree. At
 that moment in time (the spring of 2003) there were no implementation
 of the constructor injection idea, so it seemed logical for the initial
-Apache Composer leads (Paul Hammant and Aslak Hellesoy) who liked the
+Container leads (Paul Hammant and Aslak Hellesoy) who liked the
 idea, to kick off the project.
 The added advantage is that CDI Components cannot be instantiated
 with missing dependencies. Thus the compiler or IDE will catch
@@ -76,7 +76,7 @@
 setter as "type 2" and constructor as "type 3". He went as far as
 publishing an article on it in Java Developer Journal.   
 December 2003; Rod Johnson of the Spring Framework team,
-Paul Hammant (former Avaloner, and co-lead of Apache Composer), Mike
+Paul Hammant (former Avaloner, and co-lead of Container), Mike
 Royle, with Martin Fowler (by email) say down and played with some of
 the language of Martin's forthcoming article. Martin had drafted this
 article entirely independently of this team but had be kind enough to

Modified: incubator/composer/trunk/composer-site/src/site/content/inversion-of-control.html
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/inversion-of-control.html?rev=618243&r1=618242&r2=618243&view=diff
==============================================================================
--- incubator/composer/trunk/composer-site/src/site/content/inversion-of-control.html (original)
+++ incubator/composer/trunk/composer-site/src/site/content/inversion-of-control.html Mon Feb  4 03:43:57 2008
@@ -22,7 +22,7 @@
 
 
Types of IoC
 
-There are many types of IoC, but we'll concentrate on the type of IoC that Apache Composer introduced to the community
+
There are many types of IoC, but we'll concentrate on the type of IoC that Container introduced to the community
    - Constructor Injection. 
 
 IoC History
@@ -44,7 +44,7 @@
    do its job. It instead declares these dependencies, and the container supplies them. Thus the name
    IoC/DIP/Hollywood Principle. The control of the dependencies for a given component is inverted. It is no longer the
    component itself that establishes its own dependencies, but something on the outside. That something could be a
-   container like Apache Composer, but could easily be normal code instantiating the component in an embedded sense.
+   container like Container, but could easily be normal code instantiating the component in an embedded sense.
 
 Examples
 
@@ -162,7 +162,7 @@
 
Notes 
 
-The lifecycle interfaces for Apache Composer are the only characterising API elements for a component. If Startable was
+
The lifecycle interfaces for Container are the only characterising API elements for a component. If Startable was
    in the JDK, there would be no need for this. Sadly, it also menas that every framework team has to write their own
    Startable interface. 
 
@@ -174,7 +174,7 @@
 Of course, in all of these discussions, it is important to point out that logging is a common exception to the IoC
    rule. Apache has two static logging frameworks that are in common use: Commons-Logging and Log4J. Neither of these is
    designed along IoC lines. Their typical use is static accessed whenever it is felt appropriate in an application.
-   Whilst static logging is common, the Apache Composer team do not recommend that developers of reusable components
+   Whilst static logging is common, the Container team do not recommend that developers of reusable components
    mandate a logging choice. We suggest instead that a Monitor component interface is created and default adapters are
    provided to a number of the logging frameworks are provided.
 
@@ -195,11 +195,11 @@
         
             Constructor Dependency Injection (CDI) 

                 

-                Examples: Apache Composer, Spring Framework, (not in EJB 3.x sadly), Guice with Annotations
+                Examples: Container, Spring Framework, (not in EJB 3.x sadly), Guice with Annotations
             
             Setter Dependency Injection

                 

-                Examples: Spring Framework, Apache Composer, EJB 3.0 & Guice with Annotations
+                Examples: Spring Framework, Container, EJB 3.0 & Guice with Annotations
             
             Interface Driven Setter Dependency Injection

                 

@@ -207,7 +207,7 @@
             
             Field Dependency Injection

                 

-                Examples: Plexus, Apache Composer & Guice with Annotations.
+                Examples: Plexus, Container & Guice with Annotations.
             
         
@@ -228,7 +228,7 @@
     href="setter-injection.html" title="Setter Injection">Setter Injection for more information.
Note Field Injection was categorised but there was was really no interest it until the EJB3.0 specification rolled out. Getter
-   Injection flourished for a while, but did not take and was never supported by the Apache Composer team.
+   Injection flourished for a while, but did not take and was never supported by the Container team.
Examples of Common Types
 

Modified: incubator/composer/trunk/composer-site/src/site/content/lifecycle.html
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/lifecycle.html?rev=618243&r1=618242&r2=618243&view=diff
==============================================================================
--- incubator/composer/trunk/composer-site/src/site/content/lifecycle.html (original)
+++ incubator/composer/trunk/composer-site/src/site/content/lifecycle.html Mon Feb  4 03:43:57 2008
@@ -15,14 +15,14 @@
 and stop may happen more than one for the life of an application.
 Disposal may happen once only, before the component is eligible for
 garbage collection.
-Lifecycle is really only going to work for Apache Composers that are also caching component instances. Caching was a default in Apache Composer 1.x, but is not for 2.x - be warned!
+Lifecycle is really only going to work for Containers that are also caching component instances. Caching was a default in Container 1.x, but is not for 2.x - be warned!
Thus lifecycle implies three methods:

   start
   stop
   dispose
 
-In Apache Composer we think allow a pluggable LifecycleStrategy.
+In Container we think allow a pluggable LifecycleStrategy.
Startable
Our own interface for startable. We wish it were in the JDK,
 because we're big into making components unecumbered by the trappings of
@@ -44,7 +44,7 @@
 ...
 
 
-container = new DefaultApache Composer(new StartableLifecycleStrategy());
+container = new DefaultContainer(new StartableLifecycleStrategy());
 container.addComponent(Apple.class);
 container.start();
 // start gets called
@@ -71,7 +71,7 @@
 ...
 
 
-container = new DefaultApache Composer(new ReflectionLifecycleStrategy());
+container = new DefaultContainer(new ReflectionLifecycleStrategy());
 container.addComponent(Apple.class);
 container.start();
 // start gets called
@@ -82,7 +82,7 @@
 
If you have other synonyms for start/stop/dispose, just extend
 the ReflectionLifecycleStrategy class and provide them.
No Lifecycle
-DefaultApache Composer does sets StartableLifecycleStrategy by
+
DefaultContainer does sets StartableLifecycleStrategy by
 default. You can specify NullLifecycleStrategy instead if you are sure
 that no components honor any lifecycle concept..
Custom Lifecycles

svn commit: r618240 - in /incubator/composer/trunk: composer-core/pom.xml composer-site/pom.xml composer-tck/pom.xml pom.xml
2008-02-04T11:30:55Z

Author: mauro
Date: Mon Feb  4 03:30:44 2008
New Revision: 618240

URL: http://svn.apache.org/viewvc?rev=618240&view=rev
Log:
Removed redundancy in artifactIds.  Moved site to distribution profile.

Modified:
    incubator/composer/trunk/composer-core/pom.xml
    incubator/composer/trunk/composer-site/pom.xml
    incubator/composer/trunk/composer-tck/pom.xml
    incubator/composer/trunk/pom.xml

Modified: incubator/composer/trunk/composer-core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/pom.xml?rev=618240&r1=618239&r2=618240&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/pom.xml (original)
+++ incubator/composer/trunk/composer-core/pom.xml Mon Feb  4 03:30:44 2008
@@ -5,7 +5,7 @@
     apache-composer
     1.0-SNAPSHOT
   
-  apache-composer-core
+  composer-core
   Apache Composer Core
   jar
   
@@ -77,7 +77,7 @@
       
         org.apache.maven.plugins
         maven-shade-plugin
-        1.0-alpha-15
+        1.0-beta-1
         
           
             package

Modified: incubator/composer/trunk/composer-site/pom.xml
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/pom.xml?rev=618240&r1=618239&r2=618240&view=diff
==============================================================================
--- incubator/composer/trunk/composer-site/pom.xml (original)
+++ incubator/composer/trunk/composer-site/pom.xml Mon Feb  4 03:30:44 2008
@@ -1,24 +1,24 @@
 
-
+
   4.0.0
   
     org.apache.composer
     apache-composer
     1.0-SNAPSHOT
   
-  apache-composer-site
+  composer-site
   pom
   Apache Composer Site
   
     
-      ${pom.groupId}
-      apache-composer-core
-      ${pom.version}
+      org.apache.composer
+      composer-core
     
     
-      ${pom.groupId}
-      apache-composer-tck
-      ${pom.version}
+      org.apache.composer
+      composer-tck
     
   
   
@@ -38,18 +38,22 @@
               true
               
                 
-                  ${pom.groupId}
-                  apache-composer
+                  org.apache.composer
+                  composer-core
                   ${pom.version}
                   javadoc
-                  ${project.build.directory}/site/javadoc/core
+                  
+                    ${project.build.directory}/site/javadoc/core
+                  
                 
                 
-                  ${pom.groupId}
-                  apache-composer-tck
+                  org.apache.composer
+                  composer-tck
                   ${pom.version}
                   javadoc
-                  ${project.build.directory}/site/javadoc/tck
+                  
+                    ${project.build.directory}/site/javadoc/tck
+                  
                 
               
             
@@ -60,7 +64,9 @@
         org.apache.maven.plugins
         maven-site-plugin
         
-          false
+          
+            false
+          
         
         
           
@@ -79,7 +85,9 @@
           content/sitemap.xml
           templates/skin.html
           resources
-          ${project.build.directory}/site
+          
+            ${project.build.directory}/site
+          
         
         
           

Modified: incubator/composer/trunk/composer-tck/pom.xml
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-tck/pom.xml?rev=618240&r1=618239&r2=618240&view=diff
==============================================================================
--- incubator/composer/trunk/composer-tck/pom.xml (original)
+++ incubator/composer/trunk/composer-tck/pom.xml Mon Feb  4 03:30:44 2008
@@ -5,13 +5,13 @@
         apache-composer
         1.0-SNAPSHOT
     
-    apache-composer-tck
+    composer-tck
     Apache Composer TCK
     jar
     
         
             org.apache.composer
-            apache-composer-core
+            composer-core
         
         
             org.jmock

Modified: incubator/composer/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/pom.xml?rev=618240&r1=618239&r2=618240&view=diff
==============================================================================
--- incubator/composer/trunk/pom.xml (original)
+++ incubator/composer/trunk/pom.xml Mon Feb  4 03:30:44 2008
@@ -11,7 +11,6 @@
   
     composer-core
     composer-tck
-    composer-site
   
   
     Apache
@@ -104,12 +103,12 @@
     
       
         org.apache.composer
-        apache-composer-core
+        composer-core
         ${pom.version}
       
       
         org.apache.composer
-        apache-composer-tck
+        composer-tck
         ${pom.version}
       
       
@@ -404,7 +403,7 @@
       
       distribution
       
-        distribution
+        composer-site
       
     
   







svn commit: r618234 [2/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...
2008-02-04T11:06:19Z

Modified: incubator/composer/trunk/composer-site/src/site/content/behaviors.html
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/behaviors.html?rev=618234&r1=618233&r2=618234&view=diff
==============================================================================
--- incubator/composer/trunk/composer-site/src/site/content/behaviors.html (original)
+++ incubator/composer/trunk/composer-site/src/site/content/behaviors.html Mon Feb  4 03:06:06 2008
@@ -18,38 +18,38 @@
    the most part BehaviorFactories are completely stateless.
 See below for details on Caching and Singletons, Implementation Hiding and Hot Swapping, as well as Other  behaviors
 General use
-DefaultApache Composer can take a behavior factory instance in its constructor:
+DefaultContainer can take a behavior factory instance in its constructor:
 
   -pico = new DefaultApache Composer(new BehaviorClass());
+container = new DefaultContainer(new BehaviorClass());
 
-pico.addComponent(Foo.class); // the behavior will affect Foo's instance
+container.addComponent(Foo.class); // the behavior will affect Foo's instance
 
 Or it can take behaviours that wrap each other:
 
   -pico = new DefaultApache Composer(new BehaviorClass().wrap(new AnotherBehaviorClass())); 
-pico.addComponent(Foo.class);  // both behaviors will affect Foo's instance
+container = new DefaultContainer(new BehaviorClass().wrap(new AnotherBehaviorClass())); 
+container.addComponent(Foo.class);  // both behaviors will affect Foo's instance
 
 
 Behaviors can be signalled by properties per component:
 
   -pico = new DefaultApache Composer();
-pico.as(SOME_BEHAVIOR).addComponent(Foo.class);  // the behavior has a property marking it, and the default 
+container = new DefaultContainer();
+container.as(SOME_BEHAVIOR).addComponent(Foo.class);  // the behavior has a property marking it, and the default 
                                                     component facory understands that property
 
 You can build a container with the applicable property:
 
-  pico = new ContainerBuilder().withXxxxxxxx().build();
-pico.addComponent(Foo.class); // the behavior will affect Foo's instance
+  container = new ContainerBuilder().withXxxxxxxx().build();
+container.addComponent(Foo.class); // the behavior will affect Foo's instance
 
 Behaviors can be chained together by ContainerBuilder:
 
-  import static org.picocontainer.behaviors.Behaviors.xxxxxxx;
+  import static org.apache.composer.core.behaviors.Behaviors.xxxxxxx;
 ...
-pico = new ContainerBuilder().withBehaviors(xxxxxxx(), yyyyyyy()).build();
-pico.addComponent(Foo.class); // both behaviors will affect Foo's instance
+container = new ContainerBuilder().withBehaviors(xxxxxxx(), yyyyyyy()).build();
+container.addComponent(Foo.class); // both behaviors will affect Foo's instance
 
 Cashing and Singletons
 Caching
@@ -66,35 +66,35 @@
 Choose your style for caching behavior:
 
 -pico = new DefaultApache Composer(new Caching());
-pico.addComponent(Apple.class);
-Apple a1 = pico.getComponent(Apple.class);
-Apple a2 = pico.getComponent(Apple.class);
+container = new DefaultContainer(new Caching());
+container.addComponent(Apple.class);
+Apple a1 = container.getComponent(Apple.class);
+Apple a2 = container.getComponent(Apple.class);
 // both the same instance
 
 
 -pico = new DefaultApache Composer();
-pico.as(CACHE).addComponent(Apple.class);
-Apple a1 = pico.getComponent(Apple.class);
-Apple a2 = pico.getComponent(Apple.class);
+container = new DefaultContainer();
+container.as(CACHE).addComponent(Apple.class);
+Apple a1 = container.getComponent(Apple.class);
+Apple a2 = container.getComponent(Apple.class);
 // both the same instance
 
 
-pico = new ContainerBuilder().withCaching().build();
-pico.addComponent(Apple.class);
-Apple a1 = pico.getComponent(Apple.class);
-Apple a2 = pico.getComponent(Apple.class);
+container = new ContainerBuilder().withCaching().build();
+container.addComponent(Apple.class);
+Apple a1 = container.getComponent(Apple.class);
+Apple a2 = container.getComponent(Apple.class);
 // both the same instance
 
 
 
-  import static org.picocontainer.behaviors.Behaviors.caching;
+  import static org.apache.composer.core.behaviors.Behaviors.caching;
 ...
-pico = new ContainerBuilder().withBehaviors(caching()).build();
-pico.addComponent(Apple.class);
-Apple a1 = pico.getComponent(Apple.class);
-Apple a2 = pico.getComponent(Apple.class);
+container = new ContainerBuilder().withBehaviors(caching()).build();
+container.addComponent(Apple.class);
+Apple a1 = container.getComponent(Apple.class);
+Apple a2 = container.getComponent(Apple.class);
 // both the same instance
 
 
@@ -102,19 +102,19 @@
 This is caching as above, but only when that property is set.
 
   -pico = new DefaultApache Composer(new OptinCaching());
-pico.addComponent(Apple.class);
-Apple a1 = pico.getComponent(Apple.class);
-Apple a2 = pico.getComponent(Apple.class);
+container = new DefaultContainer(new OptinCaching());
+container.addComponent(Apple.class);
+Apple a1 = container.getComponent(Apple.class);
+Apple a2 = container.getComponent(Apple.class);
 // different instances
 
 
 
   -pico = new DefaultApache Composer(new OptinCaching());
-pico.as(CACHE).addComponent(Apple.class);
-Apple a1 = pico.getComponent(Apple.class);
-Apple a2 = pico.getComponent(Apple.class);
+container = new DefaultContainer(new OptinCaching());
+container.as(CACHE).addComponent(Apple.class);
+Apple a1 = container.getComponent(Apple.class);
+Apple a2 = container.getComponent(Apple.class);
 // both the same instance
 
 
@@ -130,20 +130,20 @@
 
 
   -pico = new DefaultApache Composer(new ThreadCaching());
-pico.addComponent(Apple.class);
+container = new DefaultContainer(new ThreadCaching());
+container.addComponent(Apple.class);
 new Thread() {
   public void run() {
 
-    Apple a1 = pico.getComponent(Apple.class);
+    Apple a1 = container.getComponent(Apple.class);
 
-    Apple a2 = pico.getComponent(Apple.class);
+    Apple a2 = container.getComponent(Apple.class);
 
   }
 }).start();
 new Thread() {
   public void run() {
-    Apple a3 = pico.getComponent(Apple.class);
+    Apple a3 = container.getComponent(Apple.class);
   }
 }).start();
 // a1 and a2 are the same instance
@@ -152,14 +152,14 @@
 
 
   -pico = new DefaultApache Composer();
-pico.as(THREAD_CACHE).addComponent(Apple.class);
+container = new DefaultContainer();
+container.as(THREAD_CACHE).addComponent(Apple.class);
 
 
 
 
-    pico = new ContainerBuilder().withThreadCaching().build();
-pico.addComponent(Apple.class);
+    container = new ContainerBuilder().withThreadCaching().build();
+container.addComponent(Apple.class);
 
 Storing
 
@@ -176,22 +176,22 @@
 
 
   -pico = new DefaultApache Composer(new Storing());
-pico.addComponent(Apple.class);
+container = new DefaultContainer(new Storing());
+container.addComponent(Apple.class);
 Apple a1, a2, a3
 
 new Thread() {
   public void run() {
 
-    a1 = pico.getComponent(Apple.class);
+    a1 = container.getComponent(Apple.class);
 
-    a2 = pico.getComponent(Apple.class);
+    a2 = container.getComponent(Apple.class);
 
   }
 }).start();
 new Thread() {
   public void run() {
-    a3 = pico.getComponent(Apple.class);
+    a3 = container.getComponent(Apple.class);
   }
 }).start();
 // a1 and a2 are the same instance
@@ -203,7 +203,7 @@
 
 
   storing = new Storing();
-pico = new DefaultApache Composer(sc);
+container = new DefaultContainer(sc);
 ....
 storing.putCacheForThread(httpRequest.getSession().getAttribute("sessionComponentStore");
 // do other methods that process request in session concept and may do getComponent(..) from the sesion container.
@@ -219,32 +219,32 @@
    that it implements. 
 
 -pico = new DefaultApache Composer(new ImplementationHiding());
-pico.addComponent(Apple.class, AppleImpl.class);
-Apple a1 = pico.getComponent(Apple.class);
+container = new DefaultContainer(new ImplementationHiding());
+container.addComponent(Apple.class, AppleImpl.class);
+Apple a1 = container.getComponent(Apple.class);
 // cannot cast back to AppleImpl
 
 
 
   -pico = new DefaultApache Composer();
-pico.as(HIDE_IMPL).addComponent(Apple.class, AppleImpl.class);
-Apple a1 = pico.getComponent(Apple.class);
+container = new DefaultContainer();
+container.as(HIDE_IMPL).addComponent(Apple.class, AppleImpl.class);
+Apple a1 = container.getComponent(Apple.class);
 // cannot cast back to AppleImpl
 
 
-pico = new ContainerBuilder().withImplementationHiding().build();
-pico.addComponent(Apple.class, AppleImpl.class);
-Apple a1 = pico.getComponent(Apple.class);
+container = new ContainerBuilder().withImplementationHiding().build();
+container.addComponent(Apple.class, AppleImpl.class);
+Apple a1 = container.getComponent(Apple.class);
 // cannot cast back to AppleImpl
 
 
 
-  import static org.picocontainer.behaviors.Behaviors.implementationHiding;
+  import static org.apache.composer.core.behaviors.Behaviors.implementationHiding;
 ...
-pico = new ContainerBuilder().withBehaviors(implementationHiding()).build();
-pico.addComponent(Apple.class, AppleImpl.class);
-Apple a1 = pico.getComponent(Apple.class);
+container = new ContainerBuilder().withBehaviors(implementationHiding()).build();
+container.addComponent(Apple.class, AppleImpl.class);
+Apple a1 = container.getComponent(Apple.class);
 // cannot cast back to AppleImpl
 
 
@@ -255,7 +255,7 @@
 Hot Swapping
 This builds on the ASMImplementationHiding behavior above, but also allows the hot swapping of component implementations during use. It has implicit caching behavior too.
 
-DefaultApache Composer pico = new DefaultApache Composer(new HotSwapping());
pico.addComponent(Map.class, HashMap.class);
Map firstMap = pico.getComponent(Map.class);
firstMap.put("foo", "bar");
HotSwappable hs = (HotSwappable) pico.getComponentAdapter(Map.class);
Object oldMap = hs.getSwappable().swap(new HashMap());
Map secondMap = pico.getComponent(Map.class);
secondMap.put("apple", "orange");

+DefaultApache Composer container = new DefaultContainer(new HotSwapping());
container.addComponent(Map.class, HashMap.class);
Map firstMap = container.getComponent(Map.class);
firstMap.put("foo", "bar");
HotSwappable hs = (HotSwappable) container.getComponentAdapter(Map.class);
Object oldMap = hs.getSwappable().swap(new HashMap());
Map secondMap = container.getComponent(Map.class);
secondMap.put("apple", "orange");

 // first map and second map are the same
 // 'foo' is not a key in the map, wereas 'apple' is
 
@@ -267,38 +267,38 @@
 Synchronizing wraps object creation in Java's classic synchronize feature:
 
   -pico = new DefaultApache Composer(new Synchronizing().wrap(new Caching()));
-pico.addComponent(Apple.class);
-Apple a1 = pico.getComponent(Apple.class);
-Apple a2 = pico.getComponent(Apple.class);
+container = new DefaultContainer(new Synchronizing().wrap(new Caching()));
+container.addComponent(Apple.class);
+Apple a1 = container.getComponent(Apple.class);
+Apple a2 = container.getComponent(Apple.class);
 // both the same instance
 
 
 
   -pico = new DefaultApache Composer();
-pico.as(SYNCHRONIZE, CACHE).addComponent(Apple.class);
-Apple a1 = pico.getComponent(Apple.class);
-Apple a2 = pico.getComponent(Apple.class);
+container = new DefaultContainer();
+container.as(SYNCHRONIZE, CACHE).addComponent(Apple.class);
+Apple a1 = container.getComponent(Apple.class);
+Apple a2 = container.getComponent(Apple.class);
 // both the same instance
 
 
 
-    pico = new ContainerBuilder().withSynchronizing().withCaching().build();
-pico.addComponent(Apple.class);
-Apple a1 = pico.getComponent(Apple.class);
-Apple a2 = pico.getComponent(Apple.class);
+    container = new ContainerBuilder().withSynchronizing().withCaching().build();
+container.addComponent(Apple.class);
+Apple a1 = container.getComponent(Apple.class);
+Apple a2 = container.getComponent(Apple.class);
 // both the same instance
 
 
 
-  import static org.picocontainer.behaviors.Behaviors.synchronizing;
-import static org.picocontainer.behaviors.Behaviors.caching;
+  import static org.apache.composer.core.behaviors.Behaviors.synchronizing;
+import static org.apache.composer.core.behaviors.Behaviors.caching;
 ...
-pico = new ContainerBuilder().withBehaviors(synchronizing(), caching()).build();
-pico.addComponent(Apple.class);
-Apple a1 = pico.getComponent(Apple.class);
-Apple a2 = pico.getComponent(Apple.class);
+container = new ContainerBuilder().withBehaviors(synchronizing(), caching()).build();
+container.addComponent(Apple.class);
+Apple a1 = container.getComponent(Apple.class);
+Apple a2 = container.getComponent(Apple.class);
 // both the same instance
 
 
@@ -306,38 +306,38 @@
 Locking wraps object creation in JDK 1.5's ReentrantLock facility. It is suggested that this is a more efficient alternative to the Synchronizing behaviour above:
 
   -pico = new DefaultApache Composer(new Locking().wrap(new Caching()));
-pico.addComponent(Apple.class);
-Apple a1 = pico.getComponent(Apple.class);
-Apple a2 = pico.getComponent(Apple.class);
+container = new DefaultContainer(new Locking().wrap(new Caching()));
+container.addComponent(Apple.class);
+Apple a1 = container.getComponent(Apple.class);
+Apple a2 = container.getComponent(Apple.class);
 // both the same instance
 
 
 
   -pico = new DefaultApache Composer();
-pico.as(LOCK, CACHE).addComponent(Apple.class);
-Apple a1 = pico.getComponent(Apple.class);
-Apple a2 = pico.getComponent(Apple.class);
+container = new DefaultContainer();
+container.as(LOCK, CACHE).addComponent(Apple.class);
+Apple a1 = container.getComponent(Apple.class);
+Apple a2 = container.getComponent(Apple.class);
 // both the same instance
 
 
 
-  pico = new ContainerBuilder().withLocking().withCaching().build();
-pico.addComponent(Apple.class);
-Apple a1 = pico.getComponent(Apple.class);
-Apple a2 = pico.getComponent(Apple.class);
+  container = new ContainerBuilder().withLocking().withCaching().build();
+container.addComponent(Apple.class);
+Apple a1 = container.getComponent(Apple.class);
+Apple a2 = container.getComponent(Apple.class);
 // both the same instance
 
 
 
-  import static org.picocontainer.behaviors.Behaviors.locking;
-import static org.picocontainer.behaviors.Behaviors.caching;
+  import static org.apache.composer.core.behaviors.Behaviors.locking;
+import static org.apache.composer.core.behaviors.Behaviors.caching;
 ...
-pico = new ContainerBuilder().withBehaviors(synchronizing(), caching()).build();
-pico.addComponent(Apple.class);
-Apple a1 = pico.getComponent(Apple.class);
-Apple a2 = pico.getComponent(Apple.class);
+container = new ContainerBuilder().withBehaviors(synchronizing(), caching()).build();
+container.addComponent(Apple.class);
+Apple a1 = container.getComponent(Apple.class);
+Apple a2 = container.getComponent(Apple.class);
 // both the same instance
 
 
@@ -359,50 +359,50 @@
   }
 }
 ...
-pico = new DefaultApache Composer(new PropertyApplying());
-pico.addComponent(Foo.class);
-PropertyApplicator pa = (PropertyApplicator) pico.getAdapter(Foo.class);
+container = new DefaultContainer(new PropertyApplying());
+container.addComponent(Foo.class);
+PropertyApplicator pa = (PropertyApplicator) container.getAdapter(Foo.class);
 pa.setProperty("message", "hello");
-System.out.println(pico.getComponent(Foo.class)); // prints hello
+System.out.println(container.getComponent(Foo.class)); // prints hello
 
 
 
   -pico = new DefaultApache Composer();
-pico.as(APPLY_PROPERTIES).addComponent(Foo.class);
-PropertyApplicator pa = (PropertyApplicator) pico.getAdapter(Foo.class);
+container = new DefaultContainer();
+container.as(APPLY_PROPERTIES).addComponent(Foo.class);
+PropertyApplicator pa = (PropertyApplicator) container.getAdapter(Foo.class);
 pa.setProperty("message", "hello");
-System.out.println(pico.getComponent(Foo.class)); // prints hello
+System.out.println(container.getComponent(Foo.class)); // prints hello
 
 
 
-    pico = new ContainerBuilder().withProperties().build();
-pico.addComponent(Foo.class);
-PropertyApplicator pa = (PropertyApplicator) pico.getAdapter(Foo.class);
+    container = new ContainerBuilder().withProperties().build();
+container.addComponent(Foo.class);
+PropertyApplicator pa = (PropertyApplicator) container.getAdapter(Foo.class);
 pa.setProperty("message", "hello");
-System.out.println(pico.getComponent(Foo.class)); // prints hello
+System.out.println(container.getComponent(Foo.class)); // prints hello
 
 
 
-    import static org.picocontainer.behaviors.Behaviors.propertyApplying;
+    import static org.apache.composer.core.behaviors.Behaviors.propertyApplying;
 ...
-pico = new ContainerBuilder().withBehaviors(propertyApplying()).build();
-pico.addComponent(Foo.class);
-PropertyApplicator pa = (PropertyApplicator) pico.getAdapter(Foo.class);
+container = new ContainerBuilder().withBehaviors(propertyApplying()).build();
+container.addComponent(Foo.class);
+PropertyApplicator pa = (PropertyApplicator) container.getAdapter(Foo.class);
 pa.setProperty("message", "hello");
-System.out.println(pico.getComponent(Foo.class)); // prints hello
+System.out.println(container.getComponent(Foo.class)); // prints hello
 
 
 
-    import static org.picocontainer.behaviors.Behaviors.caching;
-import static org.picocontainer.behaviors.Behaviors.propertyApplying;
+    import static org.apache.composer.core.behaviors.Behaviors.caching;
+import static org.apache.composer.core.behaviors.Behaviors.propertyApplying;
 ...
-pico = new ContainerBuilder().withBehaviors(caching(), propertyApplying()).build();
-pico.addComponent(Foo.class);
-Cached cached = (Cached) pico.getAdapter(Foo.class);
+container = new ContainerBuilder().withBehaviors(caching(), propertyApplying()).build();
+container.addComponent(Foo.class);
+Cached cached = (Cached) container.getAdapter(Foo.class);
 PropertyApplicator pa = (PropertyApplicator) getDelegate(PropertyApplicator.class);
 pa.setProperty("message", "hello");
-System.out.println(pico.getComponent(Foo.class)); // prints hello
+System.out.println(container.getComponent(Foo.class)); // prints hello
 
 
 Automatic
@@ -427,35 +427,35 @@
 }
 
 ...
-pico = new DefaultApache Composer(new Automatic());
-pico.addComponent(Foo.class);
-pico.addComponent("bar", String.class);
-pico.getComponent("bar"); // Foo instantiated too.
+container = new DefaultContainer(new Automatic());
+container.addComponent(Foo.class);
+container.addComponent("bar", String.class);
+container.getComponent("bar"); // Foo instantiated too.
 
 
 
   -pico = new DefaultApache Composer();
-pico.as(AUTOMATIC).addComponent(Foo.class);
-pico.addComponent("bar", String.class);
-pico.getComponent("bar"); // Foo instantiated too.
+container = new DefaultContainer();
+container.as(AUTOMATIC).addComponent(Foo.class);
+container.addComponent("bar", String.class);
+container.getComponent("bar"); // Foo instantiated too.
 
 
 
   -pico = new ContainerBuilder().withAutomatic().build();
-pico.addComponent(Foo.class);
-pico.addComponent("bar", String.class);
-pico.getComponent("bar"); // Foo instantiated too.
+container = new ContainerBuilder().withAutomatic().build();
+container.addComponent(Foo.class);
+container.addComponent("bar", String.class);
+container.getComponent("bar"); // Foo instantiated too.
 
 
 
-    import static org.picocontainer.behaviors.Behaviors.automatic;
+    import static org.apache.composer.core.behaviors.Behaviors.automatic;
 ...
-pico = new ContainerBuilder().withBehaviors(automatic()).build();
-pico.addComponent(Foo.class);
-pico.addComponent("bar", String.class);
-pico.getComponent("bar"); // Foo instantiated too.
+container = new ContainerBuilder().withBehaviors(automatic()).build();
+container.addComponent(Foo.class);
+container.addComponent("bar", String.class);
+container.getComponent("bar"); // Foo instantiated too.
 
 
 

Modified: incubator/composer/trunk/composer-site/src/site/content/builder.html
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/builder.html?rev=618234&r1=618233&r2=618234&view=diff
==============================================================================
--- incubator/composer/trunk/composer-site/src/site/content/builder.html (original)
+++ incubator/composer/trunk/composer-site/src/site/content/builder.html Mon Feb  4 03:06:06 2008
@@ -10,33 +10,33 @@
 Interface' article, for some of the motivation behing this class.
 Some simple examples :
     -pico = new ContainerBuilder().build();
-pico.addComponent(Apple.class);
+container = new ContainerBuilder().build();
+container.addComponent(Apple.class);
 
-    pico = new ContainerBuilder().withCaching().build();
-pico.addComponent(Apple.class);
+    container = new ContainerBuilder().withCaching().build();
+container.addComponent(Apple.class);
     -pico = new ContainerBuilder().withCaching().build();
-pico.addComponent(Apple.class);
+container = new ContainerBuilder().withCaching().build();
+container.addComponent(Apple.class);
 
-    pico = new ContainerBuilder().withHiddenImplementations().build();
-pico.addComponent(Apple.class);
+    container = new ContainerBuilder().withHiddenImplementations().build();
+container.addComponent(Apple.class);
 
 More varations for behaviors :
 -pico = new ContainerBuilder().withLifecycle().withConsoleMonitor().build();
-pico.addComponent(Apple.class);
+container = new ContainerBuilder().withLifecycle().withConsoleMonitor().build();
+container.addComponent(Apple.class);
 
-    pico = new ContainerBuilder().withMonitor(ConsoleComponentMonitor.class).build();
-pico.addComponent(Apple.class);
+    container = new ContainerBuilder().withMonitor(ConsoleComponentMonitor.class).build();
+container.addComponent(Apple.class);
     -import static org.picocontainer.injectors.Injectors.SDI;
-import static org.picocontainer.behaviors.Behaviors.caching;
-import static org.picocontainer.behaviors.Behaviors.implementationHiding;
-import static org.picocontainer.behaviors.Behaviors.synchronizing;
+import static org.apache.composer.core.injectors.Injectors.SDI;
+import static org.apache.composer.core.behaviors.Behaviors.caching;
+import static org.apache.composer.core.behaviors.Behaviors.implementationHiding;
+import static org.apache.composer.core.behaviors.Behaviors.synchronizing;
 ...  
-pico = new ContainerBuilder(SDI()).withBehaviors(caching(), implementationHiding(), synchronizing()).build();
-pico.addComponent(Apple.class);
+container = new ContainerBuilder(SDI()).withBehaviors(caching(), implementationHiding(), synchronizing()).build();
+container.addComponent(Apple.class);
 
 Setting a parent container :
     child = new ContainerBuilder(parentContainer).build();
@@ -44,27 +44,27 @@
 
 Specifying an injection type:
     -pico = new ContainerBuilder().withAnnotationInjection().build();
-pico.addComponent(Apple.class);
+container = new ContainerBuilder().withAnnotationInjection().build();
+container.addComponent(Apple.class);
 
 Specifying an injection type a different way:
     -import static org.picocontainer.injectors.Injectors.SDI;
+import static org.apache.composer.core.injectors.Injectors.SDI;
 ...
-pico = new ContainerBuilder(SDI()).build();
-pico.addComponent(Apple.class);
+container = new ContainerBuilder(SDI()).build();
+container.addComponent(Apple.class);
 A custom container component used by a custom  ComponentBehavior (though could be used by ComponentMonitor or LifecycleStrategy as easily): 
 
     
       -pico = new ContainerBuilder()
+container = new ContainerBuilder()
     .withCustomContainerComponent(new MyQuantumPhysicsConnector())
     .withComponentFactory(MyQuantumPhysicsConnectionNeedingComponentBehavior.class).build();
-pico.addComponent(Apple.class);
+container.addComponent(Apple.class);
 	A custom container implementation (DefaultApache Composer is the default): 
     
-      MyCustomApache Composer pico = (MyCustomApache Composer) new ContainerBuilder().implementedBy(MyCustomApache Composer.class).build();
-pico.addComponent(Apple.class);
+      MyCustomApache Composer container = (MyCustomApache Composer) new ContainerBuilder().implementedBy(MyCustomApache Composer.class).build();
+container.addComponent(Apple.class);
 
 
 

Modified: incubator/composer/trunk/composer-site/src/site/content/component-configuration.html
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/component-configuration.html?rev=618234&r1=618233&r2=618234&view=diff
==============================================================================
--- incubator/composer/trunk/composer-site/src/site/content/component-configuration.html (original)
+++ incubator/composer/trunk/composer-site/src/site/content/component-configuration.html Mon Feb  4 03:06:06 2008
@@ -29,8 +29,8 @@
   // other methods
 }
 ...
-pico.addComponent(BigFatComponent.class)
-pico.addComponent(new BigFatComponentConfigBean("http://foo.com/foo.wsdl", 120))
+container.addComponent(BigFatComponent.class)
+container.addComponent(new BigFatComponentConfigBean("http://foo.com/foo.wsdl", 120))
   
   Setting config as part of addComponent(..) 
   
@@ -46,7 +46,7 @@
 
 
 ...
-pico.addComponent(BigFatComponent.class, new ConstantParameter("http://foo.com/foo.wsdl"), new ConstantParameter(120));
+container.addComponent(BigFatComponent.class, new ConstantParameter("http://foo.com/foo.wsdl"), new ConstantParameter(120));
     
   Configuration using parameter names 
   Consider this component ...
@@ -70,13 +70,13 @@
   And this composition ...
 
         -pico.addConfig("spellingWebServiceURL", "http://foo.com/spelling.wsdl"); // matches constructor parameter name
-pico.addConfig("somethingOtherURL", "http://bar.com/other.wsdl");
-pico.addConfig("timeout", 120); // matches constructor parameter name
-pico.addConfig("timeout2", 456);
-pico.as(Characteristics.USE_NAMES).addComponent(BigFatComponent.class);
+container.addConfig("spellingWebServiceURL", "http://foo.com/spelling.wsdl"); // matches constructor parameter name
+container.addConfig("somethingOtherURL", "http://bar.com/other.wsdl");
+container.addConfig("timeout", 120); // matches constructor parameter name
+container.addConfig("timeout2", 456);
+container.as(Characteristics.USE_NAMES).addComponent(BigFatComponent.class);
 
-BigFatComponent bfc = pico.getComponent(BigFatComponent.class);
+BigFatComponent bfc = container.getComponent(BigFatComponent.class);
 System.out.println("bfc: " + bfc.toString());
 // Prints .. "bfg: URL=http://foo.com/spelling.wsdl, timeout=120"
   

Modified: incubator/composer/trunk/composer-site/src/site/content/disambiguation.html
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/disambiguation.html?rev=618234&r1=618233&r2=618234&view=diff
==============================================================================
--- incubator/composer/trunk/composer-site/src/site/content/disambiguation.html (original)
+++ incubator/composer/trunk/composer-site/src/site/content/disambiguation.html Mon Feb  4 03:06:06 2008
@@ -24,7 +24,7 @@
 ' can be used in conjunction with similarly named components inject the
 right dependency in the right way:

 
-pico.as(Characteristics.USE_NAMES).addComponent(Store.class); 

+container.as(Characteristics.USE_NAMES).addComponent(Store.class); 

 
 
 Access to parameter names was dropped from JDK 6.0 and it is uncertain

Modified: incubator/composer/trunk/composer-site/src/site/content/faq.html
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/faq.html?rev=618234&r1=618233&r2=618234&view=diff
==============================================================================
--- incubator/composer/trunk/composer-site/src/site/content/faq.html (original)
+++ incubator/composer/trunk/composer-site/src/site/content/faq.html Mon Feb  4 03:06:06 2008
@@ -107,13 +107,13 @@
   In this case you can set the parameters at registration time:
   
     
-      DefaultApache Composer pico = new DefaultApache Composer();
-pico.addComponent(ThreadPool.class, DefaultThreadPool.class);
-pico.addComponent(MyComp.class, MyComp.class, new Parameters[] {
+      DefaultApache Composer container = new DefaultContainer();
+container.addComponent(ThreadPool.class, DefaultThreadPool.class);
+container.addComponent(MyComp.class, MyComp.class, new Parameters[] {
 	new ComponentParameter(),
 	new ConstantParameter(new Integer(5));
 })
-MyComp myComp = (MyComp)pico.getInstance(MyComp.class);
+MyComp myComp = (MyComp)container.getInstance(MyComp.class);
     
   
   Use ConstantParameter to set constant values and the ComponentParameter to let Apache Composer resolve the dependency.
@@ -217,15 +217,15 @@
 0>hellos
 1> 1
 2> @Foo$Bar()
-Exception in thread "main" java.lang.NoClassDefFoundError: org/picocontainer/annotations/Inject
+Exception in thread "main" java.lang.NoClassDefFoundError: org/containercontainer/annotations/Inject
         at Foo.main(Foo.java:32)
 
   The class loads, but the @Inject annotation is not present in the set of declared annotations, but another in the classpath is.  Lastly when accessed explicitly, there is an exception thrown.  Contrast to, the same run with Guice in the classpath:
 0>hello
 1> 2
-2> @org.picocontainer.annotations.Inject()
+2> @org.apache.composer.core.annotations.Inject()
 2> @Foo$Bar()
-3> @org.picocontainer.annotations.Inject()
+3> @org.apache.composer.core.annotations.Inject()
 
 
 

Modified: incubator/composer/trunk/composer-site/src/site/content/fluent-style.html
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/fluent-style.html?rev=618234&r1=618233&r2=618234&view=diff
==============================================================================
--- incubator/composer/trunk/composer-site/src/site/content/fluent-style.html (original)
+++ incubator/composer/trunk/composer-site/src/site/content/fluent-style.html Mon Feb  4 03:06:06 2008
@@ -11,15 +11,15 @@
 A simple example :
     
       -pico = new DefaultApache Composer();
-pico.addComponent(Apple.class).addComponent(Orange.class).addComponent(Pear.class)
+container = new DefaultContainer();
+container.addComponent(Apple.class).addComponent(Orange.class).addComponent(Pear.class)
     .addComponent(Banana.class)
     .addComponent(Grape.class, Grenache.class);
 
 One with per component properties:
 -pico = new DefaultApache Composer();
-pico.addComponent(Apple.class)
+container = new DefaultContainer();
+container.addComponent(Apple.class)
     .as(CACHE).addComponent(Orange.class)
     .as(CACHE, HIDE_IMPLEMENTATION).addComponent(Pear.class)
     .as(SYNCHRONIZE, CACHE).addComponent(Banana.class)
@@ -27,8 +27,8 @@
 
 One with properties that are persistently set, half way through.
 
-  pico = new DefaultApache Composer();
-pico.addComponent("Coxs", CoxsApple.class)
+  container = new DefaultContainer();
+container.addComponent("Coxs", CoxsApple.class)
     .addComponent("Golden", GoldenDeliciousApple.class)
     .addComponent(new ValenciaOrange())
     .change(SYNCHRONIZE, CACHE, HIDE_IMPLEMENTATION)

Modified: incubator/composer/trunk/composer-site/src/site/content/help/ambiguous-injectable-help.html
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/help/ambiguous-injectable-help.html?rev=618234&r1=618233&r2=618234&view=diff
==============================================================================
--- incubator/composer/trunk/composer-site/src/site/content/help/ambiguous-injectable-help.html (original)
+++ incubator/composer/trunk/composer-site/src/site/content/help/ambiguous-injectable-help.html Mon Feb  4 03:06:06 2008
@@ -6,10 +6,10 @@
 
 Apache Composer tries to determine what to inject into the constructor of each component as it instantiates (or setters/fields for other injection types). Sometimes there can be two or more classes that could equally satisfy a constructor: 
 
-  pico.add(new Apple("Braeburn"));
-pico.add(new Apple("Granny Smith"));
-pico.add(Pie.class); // needs Apple
-Pie pie = pico.getComponent(Pie.class); // throws AmbiguousComponentResolutionException citing there are two Apples.
+  container.add(new Apple("Braeburn"));
+container.add(new Apple("Granny Smith"));
+container.add(Pie.class); // needs Apple
+Pie pie = container.getComponent(Pie.class); // throws AmbiguousComponentResolutionException citing there are two Apples.
 
 
 
@@ -28,10 +28,10 @@
 ...
 
 
-pico.add("braeburn", new Apple("Braeburn"));
-pico.add("grannySmith", new Apple("Granny Smith"));
-pico.add(Pie.class); // needs Apple, specifically a Granny Smith.
-Pie pie = pico.getComponent(Pie.class); // OK this time.
+container.add("braeburn", new Apple("Braeburn"));
+container.add("grannySmith", new Apple("Granny Smith"));
+container.add(Pie.class); // needs Apple, specifically a Granny Smith.
+Pie pie = container.getComponent(Pie.class); // OK this time.
 
 
 To use names Parameters, you are going to need Paranamer 1.0 (or above) in the classpath, as well as ASM 3.0 (or above). If you are expecting Apache Composer to work based on parameter names, but its not doing so, it is most likely that you do not have paranamer-1.0.jar in the classpath. See http://repository.codehaus.org/com/thoughtworks/paranamer/paranamer/ for versions of paranamer. Also http://maven.objectweb.org/maven2/asm/asm/ for the ASM jar.

Modified: incubator/composer/trunk/composer-site/src/site/content/help/unprocessed-properties-help.html
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/help/unprocessed-properties-help.html?rev=618234&r1=618233&r2=618234&view=diff
==============================================================================
--- incubator/composer/trunk/composer-site/src/site/content/help/unprocessed-properties-help.html (original)
+++ incubator/composer/trunk/composer-site/src/site/content/help/unprocessed-properties-help.html Mon Feb  4 03:06:06 2008
@@ -7,18 +7,18 @@
 Properties are a powerful mechanism to add hints at registration time as to what the behavior of a component should be. It only works though when the right component factories are set for the container. Ones that recognise the property and can process it. For example, DefaultConstructor's default constructor sets up an adaptive ComponentFactory that can handle HIDE_IMPL: 
 
 
-  pico = new DefaultApache Composer();
-pico.as(HIDE_IMPL).addComponent(Apple.class);
+  container = new DefaultContainer();
+container.as(HIDE_IMPL).addComponent(Apple.class);
 
 But with a custom ComponentFactory, it may not:
 
-  pico = new DefaultApache Composer(new MyComponentFactory);
-pico.as(HIDE_IMPL).addComponent(Apple.class); // fails with CompositionException
+  container = new DefaultApache Composer(new MyComponentFactory);
+container.as(HIDE_IMPL).addComponent(Apple.class); // fails with CompositionException
 
 The trick is (in this case) to make sure that the right chain of component factories are setup:
 
-  pico = new DefaultApache Composer(new MyComponentFactory().wrap(new AdaptiveBehaviorFactory()));
-pico.as(HIDE_IMPL).addComponent(Apple.class); // fails with CompositionException
+  container = new DefaultApache Composer(new MyComponentFactory().wrap(new AdaptiveBehaviorFactory()));
+container.as(HIDE_IMPL).addComponent(Apple.class); // fails with CompositionException
 
 
 A component may have many properties as it is added to the container.  As each is processed, it is removed from the set.  If there are any left after the component has been added the behavior or action that the property suggests has not been setup.  Thus a CompositionException being thrown warning of unprocessed properties only happens one or more properties are left - whether they are Apache Composer's own properties or custom ones

Modified: incubator/composer/trunk/composer-site/src/site/content/index.html
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/index.html?rev=618234&r1=618233&r2=618234&view=diff
==============================================================================
--- incubator/composer/trunk/composer-site/src/site/content/index.html (original)
+++ incubator/composer/trunk/composer-site/src/site/content/index.html Mon Feb  4 03:06:06 2008
@@ -40,12 +40,6 @@
 Take a look at the introduction. 
 
 
-Related projects
-NanoContainer builds on top of Apache Composer the support for
-several scripting meta-languages (XML, Groovy, Bsh, Jython and Rhyno),
-AOP, Web frameworks (Struts and WebWork), Persistence (Hibernate) SOAP,
-JMX, and much more.
-
 
 
 

Modified: incubator/composer/trunk/composer-site/src/site/content/injection.html
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/injection.html?rev=618234&r1=618233&r2=618234&view=diff
==============================================================================
--- incubator/composer/trunk/composer-site/src/site/content/injection.html (original)
+++ incubator/composer/trunk/composer-site/src/site/content/injection.html Mon Feb  4 03:06:06 2008
@@ -52,7 +52,7 @@
 
   public class Apple {
  private Orange orange;
  private Pear pear;
  private Banana banana;

  @Inject
  public injectOrange(Orange orange) {
    this.orange = orange;
  }
  @Inject
  public setPear(Pear pear) {
    this.pear = pear;
  }
  @Inject
  public provideBanana(Banana banana) {
    this.banana = banana;
  }
  // other methods
}
 
-The method (whatever its name) needs an @Inject annotation.  That's from our codebase (org.picocontainer.Inject).
+The method (whatever its name) needs an @Inject annotation.  That's from our codebase (org.apache.composer.core.Inject).
 The  component factory for this is AnnotatedMethodInjection. It only handles method-annotation injection types of components.
 Additionally component factory AdaptiveInjection
 can also handle method-annotation injection types, if the @Inject
@@ -74,43 +74,43 @@
 
Using Apache Composer with Injection Types
 Explicit Constructor Injection:
 
-  pico = new DefaultApache Composer(new ConstructorInjection());
pico.addComponent(Apple.class);

+  container = new DefaultApache Composer(new ConstructorInjection());
container.addComponent(Apple.class);

 
 Constructor Injection, is a default too (via AdaptiveInjection):
 
-  pico = new DefaultApache Composer();
pico.addComponent(Apple.class);

+  container = new DefaultContainer();
container.addComponent(Apple.class);

 
 Explicit Setter Injection:
 
-  pico = new DefaultApache Composer(new SetterInjection());
pico.addComponent(Apple.class);

+  container = new DefaultApache Composer(new SetterInjection());
container.addComponent(Apple.class);

 
 Explicit Annotated Field injection:
 
-  pico = new DefaultApache Composer(new AnnotatedFieldInjection();
pico.addComponent(Apple.class);

+  container = new DefaultApache Composer(new AnnotatedFieldInjection();
container.addComponent(Apple.class);

 
 Explicit Annotated Field injection, with alternate Annotation:
 
-  pico = new DefaultApache Composer(new AnnotatedFieldInjection(MyInjectAnnotaton.class);
pico.addComponent(Apple.class);

+  container = new DefaultApache Composer(new AnnotatedFieldInjection(MyInjectAnnotaton.class);
container.addComponent(Apple.class);

 
 Explicit Annotated Method injection:
 
-  pico = new DefaultApache Composer(new AnnotatedMethodInjection();
pico.addComponent(Apple.class);

+  container = new DefaultApache Composer(new AnnotatedMethodInjection();
container.addComponent(Apple.class);

 
 Explicit Annotated Method injection, with alternate Annotation:
 
-  pico = new DefaultApache Composer(new AnnotatedMethodInjection(MyInjectAnnotaton.class);
pico.addComponent(Apple.class);

+  container = new DefaultApache Composer(new AnnotatedMethodInjection(MyInjectAnnotaton.class);
container.addComponent(Apple.class);

 
 Explicit  Method injection, implicit injection method prefix ('inject'):
 
-  pico = new DefaultApache Composer(new MethodInjection();
pico.addComponent(Apple.class);

+  container = new DefaultApache Composer(new MethodInjection();
container.addComponent(Apple.class);

 
 Explicit  Method injection, explicit injection method prefix:
 
-  pico = new DefaultApache Composer(new MethodInjection("setDependencies");
pico.addComponent(Apple.class);

+  container = new DefaultApache Composer(new MethodInjection("setDependencies");
container.addComponent(Apple.class);

 
   Method injection, via a characteristic:
 
-  pico = new DefaultApache Composer();
pico.as(Characteristics.METHOD_INJECTION).addComponent(Apple.class);

+  container = new DefaultContainer();
container.as(Characteristics.METHOD_INJECTION).addComponent(Apple.class);

 
  Leveraging Parameter Names 
 This is where the type alone is not enough to indicate which
@@ -118,7 +118,7 @@
 component has a need for two of the same type, with some subtly
 different characteristics.
 
-  public class AppleProcessor {
  private Apple dessertApple;
  private Apple cookingApple;

  public inject(Apple dessertApple, Apple cookingApple) {
    this.dessertApple = dessertApple;
    this.cookingApple = cookingApple;

  }
  // other methods
}

pico.addComponent("dessertApple", GoldenDeliciousApple.class);

pico.addComponent("cookingApple", BramleyApple.class);
pico.as(Characteristics.USE_NAMES).addComponent(AppleProcessor.class);
+  public class AppleProcessor {
  private Apple dessertApple;
  private Apple cookingApple;

  public inject(Apple dessertApple, Apple cookingApple) {
    this.dessertApple = dessertApple;
    this.cookingApple = cookingApple;

  }
  // other methods
}

container.addComponent("dessertApple", GoldenDeliciousApple.class);

container.addComponent("cookingApple", BramleyApple.class);
container.as(Characteristics.USE_NAMES).addComponent(AppleProcessor.class);
 
 In this case the constructor to AppleProcessor has carefully named
 parameters - 'dessertApple' and 'cookingApple'. This is picked up on

Modified: incubator/composer/trunk/composer-site/src/site/content/interception.html
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/interception.html?rev=618234&r1=618233&r2=618234&view=diff
==============================================================================
--- incubator/composer/trunk/composer-site/src/site/content/interception.html (original)
+++ incubator/composer/trunk/composer-site/src/site/content/interception.html Mon Feb  4 03:06:06 2008
@@ -50,30 +50,30 @@
     }
 }
 ...
-pico = new DefaultApache Composer(new Intercepting());
-pico.addComponent(Apple.class, BraeburnApple.class);
-Intercpeted intercepted = pico.getComponentAdapter(Apple.class).findAdapterOfType(Intercpeted.class);
+container = new DefaultApache Composer(new Intercepting());
+container.addComponent(Apple.class, BraeburnApple.class);
+Intercpeted intercepted = container.getComponentAdapter(Apple.class).findAdapterOfType(Intercpeted.class);
 intercepted.pre(Apple.class, new BiteReporter(intercepted.getController()));
 // see also Intercpeted.post(...) method.
-Apple a1 = pico.getComponent(Apple.class);
+Apple a1 = container.getComponent(Apple.class);
 a1.takeBite(100); 
 // prints Bite of 100 grams of apple 'Braeburn' 
 // ... irrespective of what else Braeburn.takeBite(int) does.
   
 
 

-    pico = new DefaultApache Composer();
-pico.as(INTERCEPT).addComponent(Apple.class, BraeburnApple.class);
+    container = new DefaultContainer();
+container.as(INTERCEPT).addComponent(Apple.class, BraeburnApple.class);
 // etc
 
 
-    pico = new ContainerBuilder.withInterception().build();
-pico.addComponent(Apple.class, BraeburnApple.class);
+    container = new ContainerBuilder.withInterception().build();
+container.addComponent(Apple.class, BraeburnApple.class);
 // etc
 
 
-    pico = new ContainerBuilder.withBehaviors(interception()).build();
-pico.addComponent(Apple.class, BraeburnApple.class);
+    container = new ContainerBuilder.withBehaviors(interception()).build();
+container.addComponent(Apple.class, BraeburnApple.class);
 // etc
 
 Fine grained participation in interception
Assuming you're passing in the Interceptor to the classes you're using for interception of a component, you can

Modified: incubator/composer/trunk/composer-site/src/site/content/introduction.html
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/introduction.html?rev=618234&r1=618233&r2=618234&view=diff
==============================================================================
--- incubator/composer/trunk/composer-site/src/site/content/introduction.html (original)
+++ incubator/composer/trunk/composer-site/src/site/content/introduction.html Mon Feb  4 03:06:06 2008
@@ -19,14 +19,14 @@
 
 

     
-                    MutableApache Composer pico = new DefaultApache Composer();
-pico.addComponent(ArrayList.class);
-List list = (List) pico.getComponent(ArrayList.class);
+                    MutableApache Composer container = new DefaultContainer();
+container.addComponent(ArrayList.class);
+List list = (List) container.getComponent(ArrayList.class);
     
 
 
 (i)MutableApache Composer
+    href="http://www.containercontainer.org/containercontainer/latest/containercontainer/apidocs/org/containercontainer/MutableApache Composer.html">MutableApache Composer
                                                                                                                                API
@@ -141,15 +141,15 @@
 
 
     
-                    MutableApache Composer pico = new DefaultApache Composer();
-pico.addComponent(Apple.class);
-pico.addComponent(Juicer.class);
-pico.addComponent(Peeler.class);
+                    MutableApache Composer container = new DefaultContainer();
+container.addComponent(Apple.class);
+container.addComponent(Juicer.class);
+container.addComponent(Peeler.class);
     
 
 
 (i)MutableApache Composer
+    href="http://www.containercontainer.org/containercontainer/latest/containercontainer/apidocs/org/containercontainer/MutableApache Composer.html">MutableApache Composer
                                                                                                                                API
@@ -161,7 +161,7 @@
 
 
     
-        Juicer juicer = (Juicer) pico.getComponent(Juicer.class);
+        Juicer juicer = (Juicer) container.getComponent(Juicer.class);
     
 
 
@@ -192,7 +192,7 @@
         anywhere. Not nice when you try to build a large enterprise
         application from it).
 
-        
+        
 
 A container (and its registered components) can get access to components registered in a parent container, but not
    vice-versa. Consider this example, using the classes from above:
@@ -206,7 +206,7 @@
 
     
                     // Create x hierarchy of containers
-MutableApache Composer x = new DefaultApache Composer();
+MutableApache Composer x = new DefaultContainer();
 MutableApache Composer y = new DefaultApache Composer( x );
 MutableApache Composer z = new DefaultApache Composer( y );
 
@@ -225,7 +225,7 @@
 
 
 This can be visualised as follows:

-    
+    
 
 Let's analyse what will happen here:
 
@@ -241,20 +241,12 @@
           src="/images/icons/emoticons/warning.gif" height="16"
           width="16" align="absmiddle" alt="" border="0" /> Since this
         obviously won't work, keep in mind that this was just an
-        exercise to illustrate how container hierarchies work.

-         For a more
-        concrete example of the usage of container hierarchies, see NanoContainer
-        NanoWar.
+        exercise to illustrate how container hierarchies work.
        
 
         Lifecycle
 
 Apache Composer has support for Lifecycle. If your classes implement Startable^{Startable, you can control the lifecycle of all your objects with a simple method call on the
                            container. The container will figure out the correct order of invocation of start()/stop()
@@ -326,13 +318,13 @@}

   -pico = new DefaultApache Composer();
-pico.addComponent(ComponentOneImpl.class) // by type
-pico.addComponent(ComponentTwoImpl.class) // by type
-pico.addComponent(new ComponentThreeImpl()) // by instance
-pico.addComponent(ComponentFourImpl.class) // by type
+container = new DefaultContainer();
+container.addComponent(ComponentOneImpl.class) // by type
+container.addComponent(ComponentTwoImpl.class) // by type
+container.addComponent(new ComponentThreeImpl()) // by instance
+container.addComponent(ComponentFourImpl.class) // by type
 
-ComponentFourImpl four = pico.getComponent(ComponentFourImpl.class);
+ComponentFourImpl four = container.getComponent(ComponentFourImpl.class);
 
             
             Or you can use a fluent style if you
@@ -340,7 +332,7 @@
 
             

   -ComponentFour four = new DefaultApache Composer()
+ComponentFour four = new DefaultContainer()
     .addComponent(ComponentOne.class)
     .addComponent(ComponentTwo.class)
     .addComponent(new ComponentThree())

Modified: incubator/composer/trunk/composer-site/src/site/content/lifecycle.html
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/lifecycle.html?rev=618234&r1=618233&r2=618234&view=diff
==============================================================================
--- incubator/composer/trunk/composer-site/src/site/content/lifecycle.html (original)
+++ incubator/composer/trunk/composer-site/src/site/content/lifecycle.html Mon Feb  4 03:06:06 2008
@@ -44,12 +44,12 @@
 ...
 
 
-pico = new DefaultApache Composer(new StartableLifecycleStrategy());
-pico.addComponent(Apple.class);
-pico.start();
+container = new DefaultApache Composer(new StartableLifecycleStrategy());
+container.addComponent(Apple.class);
+container.start();
 // start gets called
 
-Apple a = pico.getComponent(Apple.class);
+Apple a = container.getComponent(Apple.class);
 
 The StartableLifecycleStrategy can be extended if you prefer your
 own interface for Startable. Just override
@@ -71,12 +71,12 @@
 ...
 
 
-pico = new DefaultApache Composer(new ReflectionLifecycleStrategy());
-pico.addComponent(Apple.class);
-pico.start();
+container = new DefaultApache Composer(new ReflectionLifecycleStrategy());
+container.addComponent(Apple.class);
+container.start();
 // start gets called
 
-Apple a = pico.getComponent(Apple.class);
+Apple a = container.getComponent(Apple.class);
 
 
 If you have other synonyms for start/stop/dispose, just extend

Modified: incubator/composer/trunk/composer-site/src/site/content/mock-objects.html
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/mock-objects.html?rev=618234&r1=618233&r2=618234&view=diff
==============================================================================
--- incubator/composer/trunk/composer-site/src/site/content/mock-objects.html (original)
+++ incubator/composer/trunk/composer-site/src/site/content/mock-objects.html Mon Feb  4 03:06:06 2008
@@ -15,7 +15,7 @@
   
-    
+    
     
          MutableApache Composer.start()  MutableApache Composer.stop()  MutableContainer.start()  MutableContainer.stop()
         
         
             
 
     
 
 
 
 
 
 
 
 
 
 









   
     
   
 
 The class
@@ -59,14 +59,13 @@
  public class AppBootstrapper {
   public void runapp() {
-    pico = new DefaultApache Composer();
-    pico.addComponent(NeedsStuff.class);
-    pico.addComponent(SuperHeavyBlueStuff.class);
-    pico.addComponent(NuclearGreenStuff.class);
+    container = new DefaultContainer();
+    container.addComponent(NeedsStuff.class);
+    container.addComponent(SuperHeavyBlueStuff.class);
+    container.addComponent(NuclearGreenStuff.class);
   }
 }
 
- It is even possible to do this component wiring using a soft scripting language. See NanoContainer
 
 
 

Modified: incubator/composer/trunk/composer-site/src/site/content/properties.html
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/properties.html?rev=618234&r1=618233&r2=618234&view=diff
==============================================================================
--- incubator/composer/trunk/composer-site/src/site/content/properties.html (original)
+++ incubator/composer/trunk/composer-site/src/site/content/properties.html Mon Feb  4 03:06:06 2008
@@ -19,31 +19,31 @@
 Some examples :
 
 -import static org.picocontainer.Characteristics.SDI;
-import static org.picocontainer.Characteristics.CACHE;
+import static org.apache.composer.core.Characteristics.SDI;
+import static org.apache.composer.core.Characteristics.CACHE;
 ...
-pico = new DefaultApache Composer();
-pico.as(CACHE).addComponent(Apple.class);
-pico.as(CACHE, SDI).addComponent(Pear.class);
+container = new DefaultContainer();
+container.as(CACHE).addComponent(Apple.class);
+container.as(CACHE, SDI).addComponent(Pear.class);
 
 
-import static org.picocontainer.Characteristics.SDI;
-import static org.picocontainer.Characteristics.CACHE;
+import static org.apache.composer.core.Characteristics.SDI;
+import static org.apache.composer.core.Characteristics.CACHE;
 ...
-pico = new DefaultApache Composer();
-pico.change(CACHE).addComponent(Apple.class);
-pico.change(SDI).addComponent(Pear.class);
+container = new DefaultContainer();
+container.change(CACHE).addComponent(Apple.class);
+container.change(SDI).addComponent(Pear.class);
 
 -pico = new DefaultApache Composer();
-pico.as(Characteristics.CACHE).addComponent(Apple.class);
-pico.as(Characteristics.CACHE,
+container = new DefaultContainer();
+container.as(Characteristics.CACHE).addComponent(Apple.class);
+container.as(Characteristics.CACHE,
     Characteristics.SDI).addComponent(Pear.class);
 
 
-pico = new DefaultApache Composer();
-pico.change(Characteristics.CACHE).addComponent(Apple.class);
-pico.change(Characteristics.SDI).addComponent(Pear.class);
+container = new DefaultContainer();
+container.change(Characteristics.CACHE).addComponent(Apple.class);
+container.change(Characteristics.SDI).addComponent(Pear.class);
 
 
 Some characteristics are mutually exclusive. For example CDI,
@@ -63,7 +63,7 @@
    BehaviorFactory/InjectionFactory combination that is unaware of the
    characteristics you subsequently use, Apache Composer will object by way of an
    exception as you add the component to the container. See Unprocessed Properties. 
-Supplied properties (from org.picocontainer.Characteristics) -
+Supplied properties (from org.apache.composer.core.Characteristics) -
 
   CDI - added components will be Constructor Dependency Injection.
   SDI  - added components will be Setter Dependency Injection.
@@ -81,6 +81,6 @@
   USE_NAMES - use the parameter names of the component's constructor (or injection method) for the binding of configuration or components.
 
 Custom Properties
-You can make your own properties quite easily - check out the source to Characteristics.java and the classes that refer to it in Apache Composer (various implementations of ComponentFactory and ComponentAdapter). 
+You can make your own properties quite easily - check out the source to Characteristics.java and the classes that refer to it in Apache Composer (various implementations of ComponentFactory and ComponentAdapter). 
 
 

Modified: incubator/composer/trunk/composer-site/src/site/content/scopes.html
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/scopes.html?rev=618234&r1=618233&r2=618234&view=diff
==============================================================================
--- incubator/composer/trunk/composer-site/src/site/content/scopes.html (original)
+++ incubator/composer/trunk/composer-site/src/site/content/scopes.html Mon Feb  4 03:06:06 2008
@@ -20,7 +20,7 @@
 Here are examples of parent/child setup:
     
       -parent = new DefaultApache Composer();
+parent = new DefaultContainer();
 parent.addComponent(Apple.class);
 parent.addComponent(Orange.class);
 parent.addComponent(Pear.class);
@@ -33,11 +33,11 @@
 
 
   -parent = new DefaultApache Composer();
+parent = new DefaultContainer();
 parent.addComponent(Apple.class);
 parent.addComponent(Orange.class);
 parent.addComponent(Pear.class);
-child = parent.addChildContainer(new DefaultApache Composer());
+child = parent.addChildContainer(new DefaultContainer());
 child.addComponent(DependsOnApple.class);
 // this is NOT OK. child can't see parent
 parent.start();
@@ -46,7 +46,7 @@
 
 
   -parent = new DefaultApache Composer();
+parent = new DefaultContainer();
 parent.addComponent(Apple.class).addComponent(Orange.class).addComponent(Pear.class);
 child = parent.addChildContainer(new DefaultApache Composer(parent));
 child.addComponent(DependsOnApple.class);
@@ -55,7 +55,7 @@
 // cascades to child just fine
 
 
-parent = new DefaultApache Composer();
+parent = new DefaultContainer();
 parent.addComponent(Apple.class).addComponent(Orange.class).addComponent(Pear.class);
 child = new DefaultApache Composer(parent);
 child.addComponent(DependsOnApple.class);

Modified: incubator/composer/trunk/composer-site/src/site/content/setter-injection.html
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/setter-injection.html?rev=618234&r1=618233&r2=618234&view=diff
==============================================================================
--- incubator/composer/trunk/composer-site/src/site/content/setter-injection.html (original)
+++ incubator/composer/trunk/composer-site/src/site/content/setter-injection.html Mon Feb  4 03:06:06 2008
@@ -68,7 +68,7 @@
     Dependency Injection variant where an object gets all
                                                                                    dependencies via setter methods.
                                                                                    Apache Composer support this with
-    SetterInjectionComponentAdapter,
+    SetterInjectionComponentAdapter,
                                                                                                                                                                                          but
                                                                                                                                                                                          the
                                                                                                                                                                                          Apache Composer

Modified: incubator/composer/trunk/composer-site/src/site/content/team.html
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/team.html?rev=618234&r1=618233&r2=618234&view=diff
==============================================================================
--- incubator/composer/trunk/composer-site/src/site/content/team.html (original)
+++ incubator/composer/trunk/composer-site/src/site/content/team.html Mon Feb  4 03:06:06 2008
@@ -13,7 +13,7 @@
 Paul is also well known for Enterprise Object Broker and Jesktop, the original driven side of Selenium and other stupid ideas like Thicky and related early Web 3.0 references
 Konstantin Pribluda
 I'm 32 and live in Wiesbaden. I started programming at the age of 12 and had access to really cool systems ranging from WANG 3200 through PDP 8/11 to System-360 ( actually sovjet clones of them, but who cares? ). My first "paid for" work was in 1988, and from that point I financed my study freelance software development. I developed fiscal management systems, medical video archiving, internet applications for telcos and java applet games ( later was for personal fun )...
-After study I continued to freelance ( this time for better paying, but also fast failing ) companies and started to work on open source software ( xdoclet ). Now I'm permanently hired project leader, and I'am in position to use ( and develop ) whatever technologies I see fit - of course xdoclet, pico, nano and a lot of other stuff.
+After study I continued to freelance ( this time for better paying, but also fast failing ) companies and started to work on open source software ( xdoclet ). Now I'm permanently hired project leader, and I'am in position to use ( and develop ) whatever technologies I see fit - of course xdoclet, containers and a lot of other stuff.
 My biggest private interest ( besides open source programming ) is mountainbike racing.
 Jörg Schaible
 I was invited by Paul and Aslak early in 2004 to participate on the development of this project. I am currently 36 and write code for nearly 20 years in several languages and lately also Java. I have experience in AI software, did system programming and developed and maintained a plattform-independent GUI and database framework, and had to deal with CMS programming in JavaScript and J2EE. I was always involved in automated builds and tests for all these projects and one artifact left is JsUnit.

Modified: incubator/composer/trunk/composer-site/src/site/templates/skin.html
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/templates/skin.html?rev=618234&r1=618233&r2=618234&view=diff
==============================================================================
--- incubator/composer/trunk/composer-site/src/site/templates/skin.html (original)
+++ incubator/composer/trunk/composer-site/src/site/templates/skin.html Mon Feb  4 03:06:06 2008
@@ -4,7 +4,7 @@
 ${title}
 
 
@@ -30,7 +30,7 @@
 
 
 
-

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...

2008-02-04T11:06:19Z

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 @@
 
 An extensive user guide,
 a list of Frequently Asked Questions (FAQ) with answers and a lot more information is available from the
-Apache Composer website. You can also find various extensions, wrappers
+Apache Composer website. You can also find various extensions, wrappers
 and utility libraries that are based on this core API there.
 
 

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.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 lifecycleManagerSupport. Prepare the delivered PicoContainer with an adapter, that
+     * Prepare the test lifecycleManagerSupport. 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 &qout;<OneOne>!One&qout;. 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("!One", buffer.toString());
             }
@@ -295,19 +295,19 @@
     }
 
     /**
-     * Prepare the test lifecycleManagerHonorsInstantiationSequence. Prepare the delivered PicoContainer
+     * Prepare the test lifecycleManagerHonorsInstantiationSequence. 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
      * &qout;<One<TwoTwo>One>!Two!One&qout;. 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>!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

+java -jar myAppJar.jar -cp containercontainer-2.0.jar timeout=100 spellingWebServiceURL=http://ws.com/someService.wsdl

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:

mpc.addComponent(BigFatComponent.class, ConfigParameter("config1"), ConfigParameter("moreConfig"));
 ...
 
-java -jar myAppJar.jar -cp picocontainer-2.0.jar config1=http://ws.com/someService.wsd moreConfig=100

+java -jar myAppJar.jar -cp containercontainer-2.0.jar config1=http://ws.com/someService.wsd moreConfig=100

Type conversion is automatic in many cases. Properties in a properties file are clearly strings. Parameters can be any of:

Here is an example of use:

DefaultApache Composer dpc = new DefaultApache Composer();
+DefaultApache Composer dpc = new DefaultContainer();
 dpc.addComponent(Foo.class, FooImpl.class);
 Foo foo = dpc.getComponent(Foo.class)

System properties can be set for the scope of the application only, as you start the application:

-java -Dwebservice.url=http://servicehost/service -Dwebservice.timeout=50 -jar myAppJar.jar -cp picocontainer-2.0.jar

+java -Dwebservice.url=http://servicehost/service -Dwebservice.timeout=50 -jar myAppJar.jar -cp containercontainer-2.0.jar

Type conversion is automatic in many cases. Properties in a properties file are clearly strings. Parameters can be any of:

MutableApache Composer pico = new DefaultApache Composer();
-pico.addComponent("a", AImpl.class);
-pico.addComponent("b", BImpl.class);
-pico.addComponent(pico);
+            MutableApache Composer container = new DefaultContainer();
+container.addComponent("a", AImpl.class);
+container.addComponent("b", BImpl.class);
+container.addComponent(container);
 
 ...
-B b = (B) pico.getComponent("b");
+B b = (B) container.getComponent("b");

This will work, but it's an antipattern.

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.
 
-            
-                NanoContainer
-                
-
-                If you are using NanoContainer,
-                   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.
-

svn commit: r618227 - in /incubator/composer/trunk/composer-site: pico-distribution.iml picocontainer-distribution.iml

2008-02-04T10:35:58Z

Author: mauro
Date: Mon Feb  4 02:35:56 2008
New Revision: 618227

URL: http://svn.apache.org/viewvc?rev=618227&view=rev
Log:
Removed obsolete idea files.

Removed:
    incubator/composer/trunk/composer-site/pico-distribution.iml
    incubator/composer/trunk/composer-site/picocontainer-distribution.iml

svn commit: r618179 - in /incubator/composer/trunk: apache-composer.iml apache-composer.ipr composer-core/apache-composer-core.iml composer-site/apache-composer-site.iml composer-tck/apache-composer-tck.iml

2008-02-04T06:53:42Z

Author: hammant
Date: Sun Feb  3 22:53:39 2008
New Revision: 618179

URL: http://svn.apache.org/viewvc?rev=618179&view=rev
Log:
idea files should not be in Svn, with idea:idea goal, can be remade at any time

Removed:
    incubator/composer/trunk/apache-composer.iml
    incubator/composer/trunk/apache-composer.ipr
    incubator/composer/trunk/composer-core/apache-composer-core.iml
    incubator/composer/trunk/composer-site/apache-composer-site.iml
    incubator/composer/trunk/composer-tck/apache-composer-tck.iml

svn commit: r618178 - in /incubator/composer/trunk/composer-site/src/site/content: downloads.html javadoc.html web-frameworks.html

2008-02-04T06:50:13Z

Author: hammant
Date: Sun Feb  3 22:50:10 2008
New Revision: 618178

URL: http://svn.apache.org/viewvc?rev=618178&view=rev
Log:
doco changes no longer relevant to Composer

Modified:
    incubator/composer/trunk/composer-site/src/site/content/downloads.html
    incubator/composer/trunk/composer-site/src/site/content/javadoc.html
    incubator/composer/trunk/composer-site/src/site/content/web-frameworks.html

Modified: incubator/composer/trunk/composer-site/src/site/content/downloads.html
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/downloads.html?rev=618178&r1=618177&r2=618178&view=diff
==============================================================================
--- incubator/composer/trunk/composer-site/src/site/content/downloads.html (original)
+++ incubator/composer/trunk/composer-site/src/site/content/downloads.html Sun Feb  3 22:50:10
2008
@@ -3,13 +3,11 @@
 Downloads
 
 
-Released Jars (1.3 and 2.0) 
-Core  : http://repository.codehaus.org/org/picocontainer/picocontainer/
-Gems  : http://repository.codehaus.org/org/picocontainer/picocontainer-gems/
-Snapshot Jars (2.1) 
-Core : http://snapshots.repository.codehaus.org/org/picocontainer/picocontainer/
-Gems : http://snapshots.repository.codehaus.org/org/picocontainer/picocontainer-gems/
+Released Jars (2.x) 
+TBA
+Snapshot Jars (1.x) 
+TBA
 
-Currently, the Core jar is ~190K, and the Gems jar is ~89K. 
+Currently, the Core jar is xxxK, and the Gems jar is xxxK. 
 
 

Modified: incubator/composer/trunk/composer-site/src/site/content/javadoc.html
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/javadoc.html?rev=618178&r1=618177&r2=618178&view=diff
==============================================================================
--- incubator/composer/trunk/composer-site/src/site/content/javadoc.html (original)
+++ incubator/composer/trunk/composer-site/src/site/content/javadoc.html Sun Feb  3 22:50:10
2008
@@ -7,7 +7,6 @@
 
 
 Core
-Gems
 TCK
 
 

Modified: incubator/composer/trunk/composer-site/src/site/content/web-frameworks.html
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/web-frameworks.html?rev=618178&r1=618177&r2=618178&view=diff
==============================================================================
--- incubator/composer/trunk/composer-site/src/site/content/web-frameworks.html (original)
+++ incubator/composer/trunk/composer-site/src/site/content/web-frameworks.html Sun Feb  3
22:50:10 2008
@@ -83,9 +83,6 @@
 }

The HttpSessionStoring class is not in the core jar, its in the -'gems' one. If you don't want a second jar - copy the class (it's real -simple) to your web framework's codebase.

Real Web Frameworks

Waffle - hopefully the pinnacle of Java action/controller web-frameworks.

svn commit: r618177 - in /incubator/composer/trunk/composer-site: ./ src/site/content/

2008-02-04T06:45:06Z

Author: hammant
Date: Sun Feb  3 22:45:04 2008
New Revision: 618177

URL: http://svn.apache.org/viewvc?rev=618177&view=rev
Log:
renames

Added:
    incubator/composer/trunk/composer-site/src/site/content/CommandLineArgumentsContainer.html
      - copied unchanged from r618174, incubator/composer/trunk/composer-site/src/site/content/CommandLineArgumentsPicoContainer.html
    incubator/composer/trunk/composer-site/src/site/content/DefaultContainer.html
      - copied unchanged from r618174, incubator/composer/trunk/composer-site/src/site/content/DefaultPicoContainer.html
    incubator/composer/trunk/composer-site/src/site/content/ImmutableContainer.html
      - copied unchanged from r618174, incubator/composer/trunk/composer-site/src/site/content/ImmutablePicoContainer.html
    incubator/composer/trunk/composer-site/src/site/content/PropertiesContainer.html
      - copied unchanged from r618174, incubator/composer/trunk/composer-site/src/site/content/PropertiesPicoContainer.html
    incubator/composer/trunk/composer-site/src/site/content/SystemPropertiesContainer.html
      - copied unchanged from r618174, incubator/composer/trunk/composer-site/src/site/content/SystemPropertiesPicoContainer.html
    incubator/composer/trunk/composer-site/src/site/content/TransientContainer.html
      - copied unchanged from r618174, incubator/composer/trunk/composer-site/src/site/content/TransientPicoContainer.html
Removed:
    incubator/composer/trunk/composer-site/src/site/content/CommandLineArgumentsPicoContainer.html
    incubator/composer/trunk/composer-site/src/site/content/DefaultPicoContainer.html
    incubator/composer/trunk/composer-site/src/site/content/ImmutablePicoContainer.html
    incubator/composer/trunk/composer-site/src/site/content/PropertiesPicoContainer.html
    incubator/composer/trunk/composer-site/src/site/content/SystemPropertiesPicoContainer.html
    incubator/composer/trunk/composer-site/src/site/content/TransientPicoContainer.html
Modified:
    incubator/composer/trunk/composer-site/apache-composer-site.iml
    incubator/composer/trunk/composer-site/src/site/content/sitemap.xml

Modified: incubator/composer/trunk/composer-site/apache-composer-site.iml
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/apache-composer-site.iml?rev=618177&r1=618176&r2=618177&view=diff
==============================================================================
--- incubator/composer/trunk/composer-site/apache-composer-site.iml (original)
+++ incubator/composer/trunk/composer-site/apache-composer-site.iml Sun Feb  3 22:45:04 2008
@@ -1,123 +1,89 @@
 
-
-
- 
-   
-      
-      
-      
-      
-     
-        
-        
-      
-      
-      
-      
-    
-    
-    
+
+  
+    
+    
+    
+    
+      
+    
+    
+    
+    
     
       
         
-          
+          
         
+        
+        
       
     
     
       
         
-          
+          
         
+        
+        
       
     
     
       
         
-          
+          
         
+        
+        
       
     
     
       
         
-          
+          
         
+        
+        
       
     
     
       
         
-          
+          
         
+        
+        
       
     
     
       
         
-          
+          
         
+        
+        
       
     
     
       
         
-          
+          
         
+        
+        
       
     
-    
+    
     
       
         
-          
+          
         
+        
+        
       
     
-    
-    
-   
 
+

Modified: incubator/composer/trunk/composer-site/src/site/content/sitemap.xml
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/sitemap.xml?rev=618177&r1=618176&r2=618177&view=diff
==============================================================================
--- incubator/composer/trunk/composer-site/src/site/content/sitemap.xml (original)
+++ incubator/composer/trunk/composer-site/src/site/content/sitemap.xml Sun Feb  3 22:45:04
2008
@@ -37,11 +37,11 @@
     
     
         Containers
-        DefaultApache Composer.html
-	    CommandLineArgumentsApache Composer.html
-		PropertiesApache Composer.html
-		SystemPropertiesApache Composer.html
-		TransientApache Composer.html
+        DefaultContainer.html
+	    CommandLineArgumentsContainer.html
+		PropertiesContainer.html
+		SystemPropertiesContainer.html
+		TransientContainer.html
     
     
          Applications

svn commit: r618176 - in /incubator/composer/trunk: apache-composer.iml apache-composer.ipr composer-core/apache-composer-core.iml composer-site/apache-composer-site.iml composer-site/pom.xml composer-tck/apache-composer-tck.iml

2008-02-04T06:40:47Z

Author: hammant
Date: Sun Feb  3 22:40:46 2008
New Revision: 618176

URL: http://svn.apache.org/viewvc?rev=618176&view=rev
Log:
pom changes

Added:
    incubator/composer/trunk/composer-site/apache-composer-site.iml
Modified:
    incubator/composer/trunk/apache-composer.iml
    incubator/composer/trunk/apache-composer.ipr
    incubator/composer/trunk/composer-core/apache-composer-core.iml
    incubator/composer/trunk/composer-site/pom.xml
    incubator/composer/trunk/composer-tck/apache-composer-tck.iml

Modified: incubator/composer/trunk/apache-composer.iml
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/apache-composer.iml?rev=618176&r1=618175&r2=618176&view=diff
==============================================================================
--- incubator/composer/trunk/apache-composer.iml (original)
+++ incubator/composer/trunk/apache-composer.iml Sun Feb  3 22:40:46 2008
@@ -11,54 +11,54 @@
       
       
       
-    
-      
+     
+       
         
           
         
-      
-    
-    
-      
+       
+      
+     
+       
         
           
         
-      
-    
-    
-      
+       
+      
+     
+       
         
           
         
-      
-    
-    
-      
+       
+      
+     
+       
         
           
         
-      
-    
-    
-      
+       
+      
+     
+       
         
           
         
-      
-    
-    
-      
+       
+      
+     
+       
         
           
         
-      
-    
-    
-      
+       
+      
+     
+       
         
           
         
-      
-    
+       
+     
    
 

Modified: incubator/composer/trunk/apache-composer.ipr
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/apache-composer.ipr?rev=618176&r1=618175&r2=618176&view=diff
==============================================================================
--- incubator/composer/trunk/apache-composer.ipr (original)
+++ incubator/composer/trunk/apache-composer.ipr Sun Feb  3 22:40:46 2008
@@ -652,7 +652,7 @@
       
       
       
-      
+      
      
     
    
@@ -677,5 +677,5 @@
      
     
     
-   
+   
 

Modified: incubator/composer/trunk/composer-core/apache-composer-core.iml
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/apache-composer-core.iml?rev=618176&r1=618175&r2=618176&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/apache-composer-core.iml (original)
+++ incubator/composer/trunk/composer-core/apache-composer-core.iml Sun Feb  3 22:40:46 2008
@@ -15,111 +15,111 @@
       
       
       
-    
-      
+     
+       
         
           
         
-      
-    
-    
-      
+       
+      
+     
+       
         
           
         
-      
-    
-    
-      
+       
+      
+     
+       
         
           
         
-      
-    
-    
-      
+       
+      
+     
+       
         
           
         
-      
-    
-    
-      
+       
+      
+     
+       
         
           
         
-      
-    
-    
-      
+       
+      
+     
+       
         
           
         
-      
-    
-    
-      
+       
+      
+     
+       
         
           
         
-      
-    
-    
-      
+       
+      
+     
+       
         
           
         
-      
-    
-    
-      
+       
+      
+     
+       
         
           
         
-      
-    
-    
-      
+       
+      
+     
+       
         
           
         
-      
-    
-    
-      
+       
+      
+     
+       
         
           
         
-      
-    
-    
-      
+       
+      
+     
+       
         
           
         
-      
-    
-    
-      
+       
+      
+     
+       
         
           
         
-      
-    
-    
-      
+       
+      
+     
+       
         
           
         
-      
-    
-    
-      
+       
+      
+     
+       
         
           
         
-      
-    
+       
+     
     
    
      

Added: incubator/composer/trunk/composer-site/apache-composer-site.iml
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/apache-composer-site.iml?rev=618176&view=auto
==============================================================================
--- incubator/composer/trunk/composer-site/apache-composer-site.iml (added)
+++ incubator/composer/trunk/composer-site/apache-composer-site.iml Sun Feb  3 22:40:46 2008
@@ -0,0 +1,123 @@
+
+
+
+ 
+   
+      
+      
+      
+      
+     
+        
+        
+      
+      
+      
+      
+    
+    
+    
+    
+      
+        
+          
+        
+      
+    
+    
+      
+        
+          
+        
+      
+    
+    
+      
+        
+          
+        
+      
+    
+    
+      
+        
+          
+        
+      
+    
+    
+      
+        
+          
+        
+      
+    
+    
+      
+        
+          
+        
+      
+    
+    
+      
+        
+          
+        
+      
+    
+    
+    
+      
+        
+          
+        
+      
+    
+    
+    
+   
+

Modified: incubator/composer/trunk/composer-site/pom.xml
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/pom.xml?rev=618176&r1=618175&r2=618176&view=diff
==============================================================================
--- incubator/composer/trunk/composer-site/pom.xml (original)
+++ incubator/composer/trunk/composer-site/pom.xml Sun Feb  3 22:40:46 2008
@@ -6,9 +6,9 @@
     apache-composer
     1.0-SNAPSHOT
   
-  apache-composer-distribution
+  apache-composer-site
   pom
-  Apache Composer Distribution
+  Apache Composer Site
   
     
       ${pom.groupId}

Modified: incubator/composer/trunk/composer-tck/apache-composer-tck.iml
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-tck/apache-composer-tck.iml?rev=618176&r1=618175&r2=618176&view=diff
==============================================================================
--- incubator/composer/trunk/composer-tck/apache-composer-tck.iml (original)
+++ incubator/composer/trunk/composer-tck/apache-composer-tck.iml Sun Feb  3 22:40:46 2008
@@ -17,62 +17,62 @@
       
       
       
-    
-      
+     
+       
         
           
         
-      
-    
-    
-      
+       
+      
+     
+       
         
           
         
-      
-    
-    
-      
+       
+      
+     
+       
         
           
         
-      
-    
-    
-      
+       
+      
+     
+       
         
           
         
-      
-    
-    
-      
+       
+      
+     
+       
         
           
         
-      
-    
-    
-      
+       
+      
+     
+       
         
           
         
-      
-    
-    
-      
+       
+      
+     
+       
         
           
         
-      
-    
-    
-      
+       
+      
+     
+       
         
           
         
-      
-    
+       
+

svn commit: r618175 [3/3] - in /incubator/composer/trunk: apache-composer.iml apache-composer.ipr composer-core/apache-composer-core.iml composer-site/picocontainer-distribution.iml composer-site/pom.xml composer-tck/apache-composer-tck.iml pom.xml

2008-02-04T06:38:10Z

Modified: incubator/composer/trunk/composer-core/apache-composer-core.iml
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/apache-composer-core.iml?rev=618175&r1=618174&r2=618175&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/apache-composer-core.iml (original)
+++ incubator/composer/trunk/composer-core/apache-composer-core.iml Sun Feb  3 22:38:09 2008
@@ -1,325 +1,297 @@
 
-
-  
-    
-    
-    
-    
-      
-      
-      
-    
-    
-    
+
+ 
+   
+      
+      
+      
+     
+      
+      
+      
+      
+      
+      
+      
+      
+      
     
       
         
-          
+          
         
-        
-        
       
     
     
       
         
-          
+          
         
-        
-        
       
     
     
       
         
-          
+          
         
-        
-        
       
     
     
       
         
-          
+          
         
-        
-        
       
     
     
       
         
-          
+          
         
-        
-        
       
     
     
       
         
-          
+          
         
-        
-        
       
     
     
       
         
-          
+          
         
-        
-        
       
     
     
       
         
-          
+          
         
-        
-        
       
     
     
       
         
-          
+          
         
-        
-        
       
     
     
       
         
-          
+          
         
-        
-        
       
     
     
       
         
-          
+          
         
-        
-        
       
     
     
       
         
-          
+          
         
-        
-        
       
     
     
       
         
-          
+          
         
-        
-        
       
     
     
       
         
-          
+          
         
-        
-        
       
     
     
       
         
-          
+          
         
-        
-        
       
     
-    
-  
-  
-    
-      
-    
-    
-      
-      
-    
-      
-      
-    
-      
-      
-    
-      
-      
-    
-      
-      
-    
-      
-      
-    
-      
-      
-    
-      
-      
-  
+    
+   
+     
+       
+      
+     
+        
+        
+     
+        
+        
+     
+        
+        
+     
+        
+        
+     
+        
+        
+     
+        
+        
+     
+        
+        
+     
+        
+       
+   
 
-

Modified: incubator/composer/trunk/composer-site/picocontainer-distribution.iml
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/picocontainer-distribution.iml?rev=618175&r1=618174&r2=618175&view=diff
==============================================================================
--- incubator/composer/trunk/composer-site/picocontainer-distribution.iml (original)
+++ incubator/composer/trunk/composer-site/picocontainer-distribution.iml Sun Feb  3 22:38:09 2008
@@ -1,150 +1,85 @@
 
-
-  
-    
-    
-    
-    
-      
-      
-      
-    
-    
-    
-    
-      
+
+ 
+   
+      
+      
+      
+     
+      
+      
+      
+      
+    
+      
         
-          
+          
         
-        
-          
-        
-        
-          
-        
       
-    
-    
-      
+      
+    
+      
         
-          
+          
         
-        
-          
-        
-        
-          
-        
       
-    
-    
-      
+      
+    
+      
         
-          
+          
         
-        
-          
-        
-        
-          
-        
       
-    
-    
-      
+      
+      
+    
+      
         
-          
+          
         
-        
-          
-        
-        
-          
-        
       
     
-    
-      
+    
+      
         
-          
+          
         
-        
-          
-        
-        
-          
-        
       
     
-    
-      
+    
+      
         
-          
+          
         
-        
-          
-        
-        
-          
-        
       
     
-    
-      
+    
+      
         
-          
+          
         
-        
-          
-        
-        
-          
-        
       
     
-    
-      
+    
+      
         
-          
+          
         
-        
-          
-        
-        
-          
-        
       
     
-    
-      
+    
+      
         
-          
+          
         
-        
-          
-        
-        
-          
-        
       
     
-    
-    
-    
-    
-      
+    
+      
         
-          
+          
         
-        
-          
-        
-        
-          
-        
       
     
-    
-  
+   
 
-

Modified: incubator/composer/trunk/composer-site/pom.xml
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/pom.xml?rev=618175&r1=618174&r2=618175&view=diff
==============================================================================
--- incubator/composer/trunk/composer-site/pom.xml (original)
+++ incubator/composer/trunk/composer-site/pom.xml Sun Feb  3 22:38:09 2008
@@ -2,27 +2,22 @@
 
   4.0.0
   
-    org.picocontainer
-    picocontainer-parent
-    2.1-SNAPSHOT
+    org.apache.composer
+    apache-composer
+    1.0-SNAPSHOT
   
-  picocontainer-distribution
+  apache-composer-distribution
   pom
-  Picocontainer Distribution
+  Apache Composer Distribution
   
     
       ${pom.groupId}
-      picocontainer
+      apache-composer-core
       ${pom.version}
     
     
       ${pom.groupId}
-      picocontainer-gems
-      ${pom.version}
-    
-    
-      ${pom.groupId}
-      picocontainer-tck
+      apache-composer-tck
       ${pom.version}
     
   
@@ -44,21 +39,14 @@
               
                 
                   ${pom.groupId}
-                  picocontainer
+                  apache-composer
                   ${pom.version}
                   javadoc
                   ${project.build.directory}/site/javadoc/core
                 
                 
                   ${pom.groupId}
-                  picocontainer-gems
-                  ${pom.version}
-                  javadoc
-                  ${project.build.directory}/site/javadoc/gems
-                
-                
-                  ${pom.groupId}
-                  picocontainer-tck
+                  apache-composer-tck
                   ${pom.version}
                   javadoc
                   ${project.build.directory}/site/javadoc/tck
@@ -68,37 +56,6 @@
           
         
       
-      
       
         org.apache.maven.plugins
         maven-site-plugin

Modified: incubator/composer/trunk/composer-tck/apache-composer-tck.iml
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-tck/apache-composer-tck.iml?rev=618175&r1=618174&r2=618175&view=diff
==============================================================================
--- incubator/composer/trunk/composer-tck/apache-composer-tck.iml (original)
+++ incubator/composer/trunk/composer-tck/apache-composer-tck.iml Sun Feb  3 22:38:09 2008
@@ -1,266 +1,250 @@
 
-
-  
-    
-    
-    
-    
-      
-      
-    
-    
-      
-      
-    
-    
-    
-    
-    
-      
-        
-          
+
+ 
+   
+      
+      
+      
+     
+      
+      
+      
+     
+        
+       
+      
+      
+      
+      
+      
+    
+      
+        
+          
         
-        
-        
       
     
     
       
         
-          
+          
         
-        
-        
       
     
     
       
         
-          
+          
         
-        
-        
       
     
     
       
         
-          
+          
         
-        
-        
       
     
     
       
         
-          
+          
         
-        
-        
       
     
     
       
         
-          
+          
         
-        
-        
       
     
     
       
         
-          
+          
         
-        
-        
       
     
     
       
         
-          
-        
-        
-        
-      
-    
-    
-  
-  
-    
-      
-    
-    
-      
-      
-    
-      
-      
-    
-      
-      
-    
-      
-      
-    
-      
-      
-    
-      
-      
-    
-      
-      
-    
-      
-      
-  
+          
+        
+      
+    
+    
+   
+     
+       
+      
+     
+        
+        
+     
+        
+        
+     
+        
+        
+     
+        
+        
+     
+        
+        
+     
+        
+        
+     
+        
+        
+     
+        
+       
+   
 
-

Modified: incubator/composer/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/pom.xml?rev=618175&r1=618174&r2=618175&view=diff
==============================================================================
--- incubator/composer/trunk/pom.xml (original)
+++ incubator/composer/trunk/pom.xml Sun Feb  3 22:38:09 2008
@@ -11,6 +11,7 @@
   
     composer-core
     composer-tck
+    composer-site
   
   
     Apache

svn commit: r618175 [2/3] - in /incubator/composer/trunk: apache-composer.iml apache-composer.ipr composer-core/apache-composer-core.iml composer-site/picocontainer-distribution.iml composer-site/pom.xml composer-tck/apache-composer-tck.iml pom.xml

2008-02-04T06:38:10Z

Modified: incubator/composer/trunk/apache-composer.ipr
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/apache-composer.ipr?rev=618175&r1=618174&r2=618175&view=diff
==============================================================================
--- incubator/composer/trunk/apache-composer.ipr (original)
+++ incubator/composer/trunk/apache-composer.ipr Sun Feb  3 22:38:09 2008
@@ -1,682 +1,681 @@
 
-
-  
-    
-  
-  
-    
-  
-    
-  
-    
-  
-

svn commit: r618175 [1/3] - in /incubator/composer/trunk: apache-composer.iml apache-composer.ipr composer-core/apache-composer-core.iml composer-site/picocontainer-distribution.iml composer-site/pom.xml composer-tck/apache-composer-tck.iml pom.xml

2008-02-04T06:38:10Z

Author: hammant
Date: Sun Feb  3 22:38:09 2008
New Revision: 618175

URL: http://svn.apache.org/viewvc?rev=618175&view=rev
Log:
IDEA file changes

Modified:
    incubator/composer/trunk/apache-composer.iml
    incubator/composer/trunk/apache-composer.ipr
    incubator/composer/trunk/composer-core/apache-composer-core.iml
    incubator/composer/trunk/composer-site/picocontainer-distribution.iml
    incubator/composer/trunk/composer-site/pom.xml
    incubator/composer/trunk/composer-tck/apache-composer-tck.iml
    incubator/composer/trunk/pom.xml

Modified: incubator/composer/trunk/apache-composer.iml
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/apache-composer.iml?rev=618175&r1=618174&r2=618175&view=diff
==============================================================================
--- incubator/composer/trunk/apache-composer.iml (original)
+++ incubator/composer/trunk/apache-composer.iml Sun Feb  3 22:38:09 2008
@@ -1,79 +1,64 @@
 
-
-  
-    
-    
-    
-    
-      
-      
-    
-    
-    
+
+ 
+  

+      
+      
+      
+     
+      
+      
+      
+      
+      
     
       
         
-          
+          
         
-        
-        
       
     
     
       
         
-          
+          
         
-        
-        
       
     
     
       
         
-          
+          
         
-        
-        
       
     
     
       
         
-          
+          
         
-        
-        
       
     
     
       
         
-          
+          
         
-        
-        
       
     
     
       
         
-          
+          
         
-        
-        
       
     
     
       
         
-          
+          
         
-        
-        
       
     
-    
-  
+   
 
-

svn commit: r618174 [5/5] - in /incubator/composer/trunk: ./ composer-site/ composer-site/src/ composer-site/src/assembly/ composer-site/src/config/ composer-site/src/resources/ composer-site/src/resources/images/ composer-site/src/resources/style/ com...

2008-02-04T06:33:26Z

Added: incubator/composer/trunk/composer-site/src/site/resources/scripts/prototype.js
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/resources/scripts/prototype.js?rev=618174&view=auto
==============================================================================
--- incubator/composer/trunk/composer-site/src/site/resources/scripts/prototype.js (added)
+++ incubator/composer/trunk/composer-site/src/site/resources/scripts/prototype.js Sun Feb  3 22:33:20 2008
@@ -0,0 +1,2006 @@
+/*  Prototype JavaScript framework, version 1.5.0_rc0
+ *  (c) 2005 Sam Stephenson 
+ *
+ *  Prototype is freely distributable under the terms of an MIT-style license.
+ *  For details, see the Prototype web site: http://prototype.conio.net/
+ *
+/*--------------------------------------------------------------------------*/
+
+var Prototype = {
+  Version: '1.5.0_rc0',
+  ScriptFragment: '(?:)((\n|\r|.)*?)(?:<\/script>)',
+
+  emptyFunction: function() {},
+  K: function(x) {return x}
+}
+
+var Class = {
+  create: function() {
+    return function() {
+      this.initialize.apply(this, arguments);
+    }
+  }
+}
+
+var Abstract = new Object();
+
+Object.extend = function(destination, source) {
+  for (var property in source) {
+    destination[property] = source[property];
+  }
+  return destination;
+}
+
+Object.inspect = function(object) {
+  try {
+    if (object == undefined) return 'undefined';
+    if (object == null) return 'null';
+    return object.inspect ? object.inspect() : object.toString();
+  } catch (e) {
+    if (e instanceof RangeError) return '...';
+    throw e;
+  }
+}
+
+Function.prototype.bind = function() {
+  var __method = this, args = $A(arguments), object = args.shift();
+  return function() {
+    return __method.apply(object, args.concat($A(arguments)));
+  }
+}
+
+Function.prototype.bindAsEventListener = function(object) {
+  var __method = this;
+  return function(event) {
+    return __method.call(object, event || window.event);
+  }
+}
+
+Object.extend(Number.prototype, {
+  toColorPart: function() {
+    var digits = this.toString(16);
+    if (this < 16) return '0' + digits;
+    return digits;
+  },
+
+  succ: function() {
+    return this + 1;
+  },
+
+  times: function(iterator) {
+    $R(0, this, true).each(iterator);
+    return this;
+  }
+});
+
+var Try = {
+  these: function() {
+    var returnValue;
+
+    for (var i = 0; i < arguments.length; i++) {
+      var lambda = arguments[i];
+      try {
+        returnValue = lambda();
+        break;
+      } catch (e) {}
+    }
+
+    return returnValue;
+  }
+}
+
+/*--------------------------------------------------------------------------*/
+
+var PeriodicalExecuter = Class.create();
+PeriodicalExecuter.prototype = {
+  initialize: function(callback, frequency) {
+    this.callback = callback;
+    this.frequency = frequency;
+    this.currentlyExecuting = false;
+
+    this.registerCallback();
+  },
+
+  registerCallback: function() {
+    setInterval(this.onTimerEvent.bind(this), this.frequency * 1000);
+  },
+
+  onTimerEvent: function() {
+    if (!this.currentlyExecuting) {
+      try {
+        this.currentlyExecuting = true;
+        this.callback();
+      } finally {
+        this.currentlyExecuting = false;
+      }
+    }
+  }
+}
+Object.extend(String.prototype, {
+  gsub: function(pattern, replacement) {
+    var result = '', source = this, match;
+    replacement = arguments.callee.prepareReplacement(replacement);
+
+    while (source.length > 0) {
+      if (match = source.match(pattern)) {
+        result += source.slice(0, match.index);
+        result += (replacement(match) || '').toString();
+        source  = source.slice(match.index + match[0].length);
+      } else {
+        result += source, source = '';
+      }
+    }
+    return result;
+  },
+
+  sub: function(pattern, replacement, count) {
+    replacement = this.gsub.prepareReplacement(replacement);
+    count = count === undefined ? 1 : count;
+
+    return this.gsub(pattern, function(match) {
+      if (--count < 0) return match[0];
+      return replacement(match);
+    });
+  },
+
+  scan: function(pattern, iterator) {
+    this.gsub(pattern, iterator);
+    return this;
+  },
+
+  truncate: function(length, truncation) {
+    length = length || 30;
+    truncation = truncation === undefined ? '...' : truncation;
+    return this.length > length ?
+      this.slice(0, length - truncation.length) + truncation : this;
+  },
+
+  strip: function() {
+    return this.replace(/^\s+/, '').replace(/\s+$/, '');
+  },
+
+  stripTags: function() {
+    return this.replace(/<\/?[^>]+>/gi, '');
+  },
+
+  stripScripts: function() {
+    return this.replace(new RegExp(Prototype.ScriptFragment, 'img'), '');
+  },
+
+  extractScripts: function() {
+    var matchAll = new RegExp(Prototype.ScriptFragment, 'img');
+    var matchOne = new RegExp(Prototype.ScriptFragment, 'im');
+    return (this.match(matchAll) || []).map(function(scriptTag) {
+      return (scriptTag.match(matchOne) || ['', ''])[1];
+    });
+  },
+
+  evalScripts: function() {
+    return this.extractScripts().map(function(script) { return eval(script) });
+  },
+
+  escapeHTML: function() {
+    var div = document.createElement('div');
+    var text = document.createTextNode(this);
+    div.appendChild(text);
+    return div.innerHTML;
+  },
+
+  unescapeHTML: function() {
+    var div = document.createElement('div');
+    div.innerHTML = this.stripTags();
+    return div.childNodes[0] ? div.childNodes[0].nodeValue : '';
+  },
+
+  toQueryParams: function() {
+    var pairs = this.match(/^\??(.*)$/)[1].split('&');
+    return pairs.inject({}, function(params, pairString) {
+      var pair = pairString.split('=');
+      params[pair[0]] = pair[1];
+      return params;
+    });
+  },
+
+  toArray: function() {
+    return this.split('');
+  },
+
+  camelize: function() {
+    var oStringList = this.split('-');
+    if (oStringList.length == 1) return oStringList[0];
+
+    var camelizedString = this.indexOf('-') == 0
+      ? oStringList[0].charAt(0).toUpperCase() + oStringList[0].substring(1)
+      : oStringList[0];
+
+    for (var i = 1, len = oStringList.length; i < len; i++) {
+      var s = oStringList[i];
+      camelizedString += s.charAt(0).toUpperCase() + s.substring(1);
+    }
+
+    return camelizedString;
+  },
+
+  inspect: function() {
+    return "'" + this.replace(/\\/g, '\\\\').replace(/'/g, '\\\'') + "'";
+  }
+});
+
+String.prototype.gsub.prepareReplacement = function(replacement) {
+  if (typeof replacement == 'function') return replacement;
+  var template = new Template(replacement);
+  return function(match) { return template.evaluate(match) };
+}
+
+String.prototype.parseQuery = String.prototype.toQueryParams;
+
+var Template = Class.create();
+Template.Pattern = /(^|.|\r|\n)(#\{(.*?)\})/;
+Template.prototype = {
+  initialize: function(template, pattern) {
+    this.template = template.toString();
+    this.pattern  = pattern || Template.Pattern;
+  },
+
+  evaluate: function(object) {
+    return this.template.gsub(this.pattern, function(match) {
+      var before = match[1];
+      if (before == '\\') return match[2];
+      return before + (object[match[3]] || '').toString();
+    });
+  }
+}
+
+var $break    = new Object();
+var $continue = new Object();
+
+var Enumerable = {
+  each: function(iterator) {
+    var index = 0;
+    try {
+      this._each(function(value) {
+        try {
+          iterator(value, index++);
+        } catch (e) {
+          if (e != $continue) throw e;
+        }
+      });
+    } catch (e) {
+      if (e != $break) throw e;
+    }
+  },
+
+  all: function(iterator) {
+    var result = true;
+    this.each(function(value, index) {
+      result = result && !!(iterator || Prototype.K)(value, index);
+      if (!result) throw $break;
+    });
+    return result;
+  },
+
+  any: function(iterator) {
+    var result = true;
+    this.each(function(value, index) {
+      if (result = !!(iterator || Prototype.K)(value, index))
+        throw $break;
+    });
+    return result;
+  },
+
+  collect: function(iterator) {
+    var results = [];
+    this.each(function(value, index) {
+      results.push(iterator(value, index));
+    });
+    return results;
+  },
+
+  detect: function (iterator) {
+    var result;
+    this.each(function(value, index) {
+      if (iterator(value, index)) {
+        result = value;
+        throw $break;
+      }
+    });
+    return result;
+  },
+
+  findAll: function(iterator) {
+    var results = [];
+    this.each(function(value, index) {
+      if (iterator(value, index))
+        results.push(value);
+    });
+    return results;
+  },
+
+  grep: function(pattern, iterator) {
+    var results = [];
+    this.each(function(value, index) {
+      var stringValue = value.toString();
+      if (stringValue.match(pattern))
+        results.push((iterator || Prototype.K)(value, index));
+    })
+    return results;
+  },
+
+  include: function(object) {
+    var found = false;
+    this.each(function(value) {
+      if (value == object) {
+        found = true;
+        throw $break;
+      }
+    });
+    return found;
+  },
+
+  inject: function(memo, iterator) {
+    this.each(function(value, index) {
+      memo = iterator(memo, value, index);
+    });
+    return memo;
+  },
+
+  invoke: function(method) {
+    var args = $A(arguments).slice(1);
+    return this.collect(function(value) {
+      return value[method].apply(value, args);
+    });
+  },
+
+  max: function(iterator) {
+    var result;
+    this.each(function(value, index) {
+      value = (iterator || Prototype.K)(value, index);
+      if (result == undefined || value >= result)
+        result = value;
+    });
+    return result;
+  },
+
+  min: function(iterator) {
+    var result;
+    this.each(function(value, index) {
+      value = (iterator || Prototype.K)(value, index);
+      if (result == undefined || value < result)
+        result = value;
+    });
+    return result;
+  },
+
+  partition: function(iterator) {
+    var trues = [], falses = [];
+    this.each(function(value, index) {
+      ((iterator || Prototype.K)(value, index) ?
+        trues : falses).push(value);
+    });
+    return [trues, falses];
+  },
+
+  pluck: function(property) {
+    var results = [];
+    this.each(function(value, index) {
+      results.push(value[property]);
+    });
+    return results;
+  },
+
+  reject: function(iterator) {
+    var results = [];
+    this.each(function(value, index) {
+      if (!iterator(value, index))
+        results.push(value);
+    });
+    return results;
+  },
+
+  sortBy: function(iterator) {
+    return this.collect(function(value, index) {
+      return {value: value, criteria: iterator(value, index)};
+    }).sort(function(left, right) {
+      var a = left.criteria, b = right.criteria;
+      return a < b ? -1 : a > b ? 1 : 0;
+    }).pluck('value');
+  },
+
+  toArray: function() {
+    return this.collect(Prototype.K);
+  },
+
+  zip: function() {
+    var iterator = Prototype.K, args = $A(arguments);
+    if (typeof args.last() == 'function')
+      iterator = args.pop();
+
+    var collections = [this].concat(args).map($A);
+    return this.map(function(value, index) {
+      return iterator(collections.pluck(index));
+    });
+  },
+
+  inspect: function() {
+    return '#';
+  }
+}
+
+Object.extend(Enumerable, {
+  map:     Enumerable.collect,
+  find:    Enumerable.detect,
+  select:  Enumerable.findAll,
+  member:  Enumerable.include,
+  entries: Enumerable.toArray
+});
+var $A = Array.from = function(iterable) {
+  if (!iterable) return [];
+  if (iterable.toArray) {
+    return iterable.toArray();
+  } else {
+    var results = [];
+    for (var i = 0; i < iterable.length; i++)
+      results.push(iterable[i]);
+    return results;
+  }
+}
+
+Object.extend(Array.prototype, Enumerable);
+
+if (!Array.prototype._reverse)
+  Array.prototype._reverse = Array.prototype.reverse;
+
+Object.extend(Array.prototype, {
+  _each: function(iterator) {
+    for (var i = 0; i < this.length; i++)
+      iterator(this[i]);
+  },
+
+  clear: function() {
+    this.length = 0;
+    return this;
+  },
+
+  first: function() {
+    return this[0];
+  },
+
+  last: function() {
+    return this[this.length - 1];
+  },
+
+  compact: function() {
+    return this.select(function(value) {
+      return value != undefined || value != null;
+    });
+  },
+
+  flatten: function() {
+    return this.inject([], function(array, value) {
+      return array.concat(value && value.constructor == Array ?
+        value.flatten() : [value]);
+    });
+  },
+
+  without: function() {
+    var values = $A(arguments);
+    return this.select(function(value) {
+      return !values.include(value);
+    });
+  },
+
+  indexOf: function(object) {
+    for (var i = 0; i < this.length; i++)
+      if (this[i] == object) return i;
+    return -1;
+  },
+
+  reverse: function(inline) {
+    return (inline !== false ? this : this.toArray())._reverse();
+  },
+
+  inspect: function() {
+    return '[' + this.map(Object.inspect).join(', ') + ']';
+  }
+});
+var Hash = {
+  _each: function(iterator) {
+    for (var key in this) {
+      var value = this[key];
+      if (typeof value == 'function') continue;
+
+      var pair = [key, value];
+      pair.key = key;
+      pair.value = value;
+      iterator(pair);
+    }
+  },
+
+  keys: function() {
+    return this.pluck('key');
+  },
+
+  values: function() {
+    return this.pluck('value');
+  },
+
+  merge: function(hash) {
+    return $H(hash).inject($H(this), function(mergedHash, pair) {
+      mergedHash[pair.key] = pair.value;
+      return mergedHash;
+    });
+  },
+
+  toQueryString: function() {
+    return this.map(function(pair) {
+      return pair.map(encodeURIComponent).join('=');
+    }).join('&');
+  },
+
+  inspect: function() {
+    return '#';
+  }
+}
+
+function $H(object) {
+  var hash = Object.extend({}, object || {});
+  Object.extend(hash, Enumerable);
+  Object.extend(hash, Hash);
+  return hash;
+}
+ObjectRange = Class.create();
+Object.extend(ObjectRange.prototype, Enumerable);
+Object.extend(ObjectRange.prototype, {
+  initialize: function(start, end, exclusive) {
+    this.start = start;
+    this.end = end;
+    this.exclusive = exclusive;
+  },
+
+  _each: function(iterator) {
+    var value = this.start;
+    do {
+      iterator(value);
+      value = value.succ();
+    } while (this.include(value));
+  },
+
+  include: function(value) {
+    if (value < this.start)
+      return false;
+    if (this.exclusive)
+      return value < this.end;
+    return value <= this.end;
+  }
+});
+
+var $R = function(start, end, exclusive) {
+  return new ObjectRange(start, end, exclusive);
+}
+
+var Ajax = {
+  getTransport: function() {
+    return Try.these(
+      function() {return new XMLHttpRequest()},
+      function() {return new ActiveXObject('Msxml2.XMLHTTP')},
+      function() {return new ActiveXObject('Microsoft.XMLHTTP')}
+    ) || false;
+  },
+
+  activeRequestCount: 0
+}
+
+Ajax.Responders = {
+  responders: [],
+
+  _each: function(iterator) {
+    this.responders._each(iterator);
+  },
+
+  register: function(responderToAdd) {
+    if (!this.include(responderToAdd))
+      this.responders.push(responderToAdd);
+  },
+
+  unregister: function(responderToRemove) {
+    this.responders = this.responders.without(responderToRemove);
+  },
+
+  dispatch: function(callback, request, transport, json) {
+    this.each(function(responder) {
+      if (responder[callback] && typeof responder[callback] == 'function') {
+        try {
+          responder[callback].apply(responder, [request, transport, json]);
+        } catch (e) {}
+      }
+    });
+  }
+};
+
+Object.extend(Ajax.Responders, Enumerable);
+
+Ajax.Responders.register({
+  onCreate: function() {
+    Ajax.activeRequestCount++;
+  },
+
+  onComplete: function() {
+    Ajax.activeRequestCount--;
+  }
+});
+
+Ajax.Base = function() {};
+Ajax.Base.prototype = {
+  setOptions: function(options) {
+    this.options = {
+      method:       'post',
+      asynchronous: true,
+      contentType:  'application/x-www-form-urlencoded',
+      parameters:   ''
+    }
+    Object.extend(this.options, options || {});
+  },
+
+  responseIsSuccess: function() {
+    return this.transport.status == undefined
+        || this.transport.status == 0
+        || (this.transport.status >= 200 && this.transport.status < 300);
+  },
+
+  responseIsFailure: function() {
+    return !this.responseIsSuccess();
+  }
+}
+
+Ajax.Request = Class.create();
+Ajax.Request.Events =
+  ['Uninitialized', 'Loading', 'Loaded', 'Interactive', 'Complete'];
+
+Ajax.Request.prototype = Object.extend(new Ajax.Base(), {
+  initialize: function(url, options) {
+    this.transport = Ajax.getTransport();
+    this.setOptions(options);
+    this.request(url);
+  },
+
+  request: function(url) {
+    var parameters = this.options.parameters || '';
+    if (parameters.length > 0) parameters += '&_=';
+
+    try {
+      this.url = url;
+      if (this.options.method == 'get' && parameters.length > 0)
+        this.url += (this.url.match(/\?/) ? '&' : '?') + parameters;
+
+      Ajax.Responders.dispatch('onCreate', this, this.transport);
+
+      this.transport.open(this.options.method, this.url,
+        this.options.asynchronous);
+
+      if (this.options.asynchronous) {
+        this.transport.onreadystatechange = this.onStateChange.bind(this);
+        setTimeout((function() {this.respondToReadyState(1)}).bind(this), 10);
+      }
+
+      this.setRequestHeaders();
+
+      var body = this.options.postBody ? this.options.postBody : parameters;
+      this.transport.send(this.options.method == 'post' ? body : null);
+
+    } catch (e) {
+      this.dispatchException(e);
+    }
+  },
+
+  setRequestHeaders: function() {
+    var requestHeaders =
+      ['X-Requested-With', 'XMLHttpRequest',
+       'X-Prototype-Version', Prototype.Version,
+       'Accept', 'text/javascript, text/html, application/xml, text/xml, */*'];
+
+    if (this.options.method == 'post') {
+      requestHeaders.push('Content-type', this.options.contentType);
+
+      /* Force "Connection: close" for Mozilla browsers to work around
+       * a bug where XMLHttpReqeuest sends an incorrect Content-length
+       * header. See Mozilla Bugzilla #246651.
+       */
+      if (this.transport.overrideMimeType)
+        requestHeaders.push('Connection', 'close');
+    }
+
+    if (this.options.requestHeaders)
+      requestHeaders.push.apply(requestHeaders, this.options.requestHeaders);
+
+    for (var i = 0; i < requestHeaders.length; i += 2)
+      this.transport.setRequestHeader(requestHeaders[i], requestHeaders[i+1]);
+  },
+
+  onStateChange: function() {
+    var readyState = this.transport.readyState;
+    if (readyState != 1)
+      this.respondToReadyState(this.transport.readyState);
+  },
+
+  header: function(name) {
+    try {
+      return this.transport.getResponseHeader(name);
+    } catch (e) {}
+  },
+
+  evalJSON: function() {
+    try {
+      return eval('(' + this.header('X-JSON') + ')');
+    } catch (e) {}
+  },
+
+  evalResponse: function() {
+    try {
+      return eval(this.transport.responseText);
+    } catch (e) {
+      this.dispatchException(e);
+    }
+  },
+
+  respondToReadyState: function(readyState) {
+    var event = Ajax.Request.Events[readyState];
+    var transport = this.transport, json = this.evalJSON();
+
+    if (event == 'Complete') {
+      try {
+        (this.options['on' + this.transport.status]
+         || this.options['on' + (this.responseIsSuccess() ? 'Success' : 'Failure')]
+         || Prototype.emptyFunction)(transport, json);
+      } catch (e) {
+        this.dispatchException(e);
+      }
+
+      if ((this.header('Content-type') || '').match(/^text\/javascript/i))
+        this.evalResponse();
+    }
+
+    try {
+      (this.options['on' + event] || Prototype.emptyFunction)(transport, json);
+      Ajax.Responders.dispatch('on' + event, this, transport, json);
+    } catch (e) {
+      this.dispatchException(e);
+    }
+
+    /* Avoid memory leak in MSIE: clean up the oncomplete event handler */
+    if (event == 'Complete')
+      this.transport.onreadystatechange = Prototype.emptyFunction;
+  },
+
+  dispatchException: function(exception) {
+    (this.options.onException || Prototype.emptyFunction)(this, exception);
+    Ajax.Responders.dispatch('onException', this, exception);
+  }
+});
+
+Ajax.Updater = Class.create();
+
+Object.extend(Object.extend(Ajax.Updater.prototype, Ajax.Request.prototype), {
+  initialize: function(container, url, options) {
+    this.containers = {
+      success: container.success ? $(container.success) : $(container),
+      failure: container.failure ? $(container.failure) :
+        (container.success ? null : $(container))
+    }
+
+    this.transport = Ajax.getTransport();
+    this.setOptions(options);
+
+    var onComplete = this.options.onComplete || Prototype.emptyFunction;
+    this.options.onComplete = (function(transport, object) {
+      this.updateContent();
+      onComplete(transport, object);
+    }).bind(this);
+
+    this.request(url);
+  },
+
+  updateContent: function() {
+    var receiver = this.responseIsSuccess() ?
+      this.containers.success : this.containers.failure;
+    var response = this.transport.responseText;
+
+    if (!this.options.evalScripts)
+      response = response.stripScripts();
+
+    if (receiver) {
+      if (this.options.insertion) {
+        new this.options.insertion(receiver, response);
+      } else {
+        Element.update(receiver, response);
+      }
+    }
+
+    if (this.responseIsSuccess()) {
+      if (this.onComplete)
+        setTimeout(this.onComplete.bind(this), 10);
+    }
+  }
+});
+
+Ajax.PeriodicalUpdater = Class.create();
+Ajax.PeriodicalUpdater.prototype = Object.extend(new Ajax.Base(), {
+  initialize: function(container, url, options) {
+    this.setOptions(options);
+    this.onComplete = this.options.onComplete;
+
+    this.frequency = (this.options.frequency || 2);
+    this.decay = (this.options.decay || 1);
+
+    this.updater = {};
+    this.container = container;
+    this.url = url;
+
+    this.start();
+  },
+
+  start: function() {
+    this.options.onComplete = this.updateComplete.bind(this);
+    this.onTimerEvent();
+  },
+
+  stop: function() {
+    this.updater.onComplete = undefined;
+    clearTimeout(this.timer);
+    (this.onComplete || Prototype.emptyFunction).apply(this, arguments);
+  },
+
+  updateComplete: function(request) {
+    if (this.options.decay) {
+      this.decay = (request.responseText == this.lastText ?
+        this.decay * this.options.decay : 1);
+
+      this.lastText = request.responseText;
+    }
+    this.timer = setTimeout(this.onTimerEvent.bind(this),
+      this.decay * this.frequency * 1000);
+  },
+
+  onTimerEvent: function() {
+    this.updater = new Ajax.Updater(this.container, this.url, this.options);
+  }
+});
+function $() {
+  var results = [], element;
+  for (var i = 0; i < arguments.length; i++) {
+    element = arguments[i];
+    if (typeof element == 'string')
+      element = document.getElementById(element);
+    results.push(Element.extend(element));
+  }
+  return results.length < 2 ? results[0] : results;
+}
+
+document.getElementsByClassName = function(className, parentElement) {
+  var children = ($(parentElement) || document.body).getElementsByTagName('*');
+  return $A(children).inject([], function(elements, child) {
+    if (child.className.match(new RegExp("(^|\\s)" + className + "(\\s|$)")))
+      elements.push(Element.extend(child));
+    return elements;
+  });
+}
+
+/*--------------------------------------------------------------------------*/
+
+if (!window.Element)
+  var Element = new Object();
+
+Element.extend = function(element) {
+  if (!element) return;
+  if (_nativeExtensions) return element;
+
+  if (!element._extended && element.tagName && element != window) {
+    var methods = Element.Methods, cache = Element.extend.cache;
+    for (property in methods) {
+      var value = methods[property];
+      if (typeof value == 'function')
+        element[property] = cache.findOrStore(value);
+    }
+  }
+
+  element._extended = true;
+  return element;
+}
+
+Element.extend.cache = {
+  findOrStore: function(value) {
+    return this[value] = this[value] || function() {
+      return value.apply(null, [this].concat($A(arguments)));
+    }
+  }
+}
+
+Element.Methods = {
+  visible: function(element) {
+    return $(element).style.display != 'none';
+  },
+
+  toggle: function() {
+    for (var i = 0; i < arguments.length; i++) {
+      var element = $(arguments[i]);
+      Element[Element.visible(element) ? 'hide' : 'show'](element);
+    }
+  },
+
+  hide: function() {
+    for (var i = 0; i < arguments.length; i++) {
+      var element = $(arguments[i]);
+      element.style.display = 'none';
+    }
+  },
+
+  show: function() {
+    for (var i = 0; i < arguments.length; i++) {
+      var element = $(arguments[i]);
+      element.style.display = '';
+    }
+  },
+
+  remove: function(element) {
+    element = $(element);
+    element.parentNode.removeChild(element);
+  },
+
+  update: function(element, html) {
+    $(element).innerHTML = html.stripScripts();
+    setTimeout(function() {html.evalScripts()}, 10);
+  },
+
+  replace: function(element, html) {
+    element = $(element);
+    if (element.outerHTML) {
+      element.outerHTML = html.stripScripts();
+    } else {
+      var range = element.ownerDocument.createRange();
+      range.selectNodeContents(element);
+      element.parentNode.replaceChild(
+        range.createContextualFragment(html.stripScripts()), element);
+    }
+    setTimeout(function() {html.evalScripts()}, 10);
+  },
+
+  getHeight: function(element) {
+    element = $(element);
+    return element.offsetHeight;
+  },
+
+  classNames: function(element) {
+    return new Element.ClassNames(element);
+  },
+
+  hasClassName: function(element, className) {
+    if (!(element = $(element))) return;
+    return Element.classNames(element).include(className);
+  },
+
+  addClassName: function(element, className) {
+    if (!(element = $(element))) return;
+    return Element.classNames(element).add(className);
+  },
+
+  removeClassName: function(element, className) {
+    if (!(element = $(element))) return;
+    return Element.classNames(element).remove(className);
+  },
+
+  // removes whitespace-only text node children
+  cleanWhitespace: function(element) {
+    element = $(element);
+    for (var i = 0; i < element.childNodes.length; i++) {
+      var node = element.childNodes[i];
+      if (node.nodeType == 3 && !/\S/.test(node.nodeValue))
+        Element.remove(node);
+    }
+  },
+
+  empty: function(element) {
+    return $(element).innerHTML.match(/^\s*$/);
+  },
+
+  childOf: function(element, ancestor) {
+    element = $(element), ancestor = $(ancestor);
+    while (element = element.parentNode)
+      if (element == ancestor) return true;
+    return false;
+  },
+
+  scrollTo: function(element) {
+    element = $(element);
+    var x = element.x ? element.x : element.offsetLeft,
+        y = element.y ? element.y : element.offsetTop;
+    window.scrollTo(x, y);
+  },
+
+  getStyle: function(element, style) {
+    element = $(element);
+    var value = element.style[style.camelize()];
+    if (!value) {
+      if (document.defaultView && document.defaultView.getComputedStyle) {
+        var css = document.defaultView.getComputedStyle(element, null);
+        value = css ? css.getPropertyValue(style) : null;
+      } else if (element.currentStyle) {
+        value = element.currentStyle[style.camelize()];
+      }
+    }
+
+    if (window.opera && ['left', 'top', 'right', 'bottom'].include(style))
+      if (Element.getStyle(element, 'position') == 'static') value = 'auto';
+
+    return value == 'auto' ? null : value;
+  },
+
+  setStyle: function(element, style) {
+    element = $(element);
+    for (var name in style)
+      element.style[name.camelize()] = style[name];
+  },
+
+  getDimensions: function(element) {
+    element = $(element);
+    if (Element.getStyle(element, 'display') != 'none')
+      return {width: element.offsetWidth, height: element.offsetHeight};
+
+    // All *Width and *Height properties give 0 on elements with display none,
+    // so enable the element temporarily
+    var els = element.style;
+    var originalVisibility = els.visibility;
+    var originalPosition = els.position;
+    els.visibility = 'hidden';
+    els.position = 'absolute';
+    els.display = '';
+    var originalWidth = element.clientWidth;
+    var originalHeight = element.clientHeight;
+    els.display = 'none';
+    els.position = originalPosition;
+    els.visibility = originalVisibility;
+    return {width: originalWidth, height: originalHeight};
+  },
+
+  makePositioned: function(element) {
+    element = $(element);
+    var pos = Element.getStyle(element, 'position');
+    if (pos == 'static' || !pos) {
+      element._madePositioned = true;
+      element.style.position = 'relative';
+      // Opera returns the offset relative to the positioning context, when an
+      // element is position relative but top and left have not been defined
+      if (window.opera) {
+        element.style.top = 0;
+        element.style.left = 0;
+      }
+    }
+  },
+
+  undoPositioned: function(element) {
+    element = $(element);
+    if (element._madePositioned) {
+      element._madePositioned = undefined;
+      element.style.position =
+        element.style.top =
+        element.style.left =
+        element.style.bottom =
+        element.style.right = '';
+    }
+  },
+
+  makeClipping: function(element) {
+    element = $(element);
+    if (element._overflow) return;
+    element._overflow = element.style.overflow;
+    if ((Element.getStyle(element, 'overflow') || 'visible') != 'hidden')
+      element.style.overflow = 'hidden';
+  },
+
+  undoClipping: function(element) {
+    element = $(element);
+    if (element._overflow) return;
+    element.style.overflow = element._overflow;
+    element._overflow = undefined;
+  }
+}
+
+Object.extend(Element, Element.Methods);
+
+var _nativeExtensions = false;
+
+if(!HTMLElement && /Konqueror|Safari|KHTML/.test(navigator.userAgent)) {
+  var HTMLElement = {}
+  HTMLElement.prototype = document.createElement('div').__proto__;
+}
+
+Element.addMethods = function(methods) {
+  Object.extend(Element.Methods, methods || {});
+
+  if(typeof HTMLElement != 'undefined') {
+    var methods = Element.Methods, cache = Element.extend.cache;
+    for (property in methods) {
+      var value = methods[property];
+      if (typeof value == 'function')
+        HTMLElement.prototype[property] = cache.findOrStore(value);
+    }
+    _nativeExtensions = true;
+  }
+}
+
+Element.addMethods();
+
+var Toggle = new Object();
+Toggle.display = Element.toggle;
+
+/*--------------------------------------------------------------------------*/
+
+Abstract.Insertion = function(adjacency) {
+  this.adjacency = adjacency;
+}
+
+Abstract.Insertion.prototype = {
+  initialize: function(element, content) {
+    this.element = $(element);
+    this.content = content.stripScripts();
+
+    if (this.adjacency && this.element.insertAdjacentHTML) {
+      try {
+        this.element.insertAdjacentHTML(this.adjacency, this.content);
+      } catch (e) {
+        var tagName = this.element.tagName.toLowerCase();
+        if (tagName == 'tbody' || tagName == 'tr') {
+          this.insertContent(this.contentFromAnonymousTable());
+        } else {
+          throw e;
+        }
+      }
+    } else {
+      this.range = this.element.ownerDocument.createRange();
+      if (this.initializeRange) this.initializeRange();
+      this.insertContent([this.range.createContextualFragment(this.content)]);
+    }
+
+    setTimeout(function() {content.evalScripts()}, 10);
+  },
+
+  contentFromAnonymousTable: function() {
+    var div = document.createElement('div');
+    div.innerHTML = '' + this.content + '';
+    return $A(div.childNodes[0].childNodes[0].childNodes);
+  }
+}
+
+var Insertion = new Object();
+
+Insertion.Before = Class.create();
+Insertion.Before.prototype = Object.extend(new Abstract.Insertion('beforeBegin'), {
+  initializeRange: function() {
+    this.range.setStartBefore(this.element);
+  },
+
+  insertContent: function(fragments) {
+    fragments.each((function(fragment) {
+      this.element.parentNode.insertBefore(fragment, this.element);
+    }).bind(this));
+  }
+});
+
+Insertion.Top = Class.create();
+Insertion.Top.prototype = Object.extend(new Abstract.Insertion('afterBegin'), {
+  initializeRange: function() {
+    this.range.selectNodeContents(this.element);
+    this.range.collapse(true);
+  },
+
+  insertContent: function(fragments) {
+    fragments.reverse(false).each((function(fragment) {
+      this.element.insertBefore(fragment, this.element.firstChild);
+    }).bind(this));
+  }
+});
+
+Insertion.Bottom = Class.create();
+Insertion.Bottom.prototype = Object.extend(new Abstract.Insertion('beforeEnd'), {
+  initializeRange: function() {
+    this.range.selectNodeContents(this.element);
+    this.range.collapse(this.element);
+  },
+
+  insertContent: function(fragments) {
+    fragments.each((function(fragment) {
+      this.element.appendChild(fragment);
+    }).bind(this));
+  }
+});
+
+Insertion.After = Class.create();
+Insertion.After.prototype = Object.extend(new Abstract.Insertion('afterEnd'), {
+  initializeRange: function() {
+    this.range.setStartAfter(this.element);
+  },
+
+  insertContent: function(fragments) {
+    fragments.each((function(fragment) {
+      this.element.parentNode.insertBefore(fragment,
+        this.element.nextSibling);
+    }).bind(this));
+  }
+});
+
+/*--------------------------------------------------------------------------*/
+
+Element.ClassNames = Class.create();
+Element.ClassNames.prototype = {
+  initialize: function(element) {
+    this.element = $(element);
+  },
+
+  _each: function(iterator) {
+    this.element.className.split(/\s+/).select(function(name) {
+      return name.length > 0;
+    })._each(iterator);
+  },
+
+  set: function(className) {
+    this.element.className = className;
+  },
+
+  add: function(classNameToAdd) {
+    if (this.include(classNameToAdd)) return;
+    this.set(this.toArray().concat(classNameToAdd).join(' '));
+  },
+
+  remove: function(classNameToRemove) {
+    if (!this.include(classNameToRemove)) return;
+    this.set(this.select(function(className) {
+      return className != classNameToRemove;
+    }).join(' '));
+  },
+
+  toString: function() {
+    return this.toArray().join(' ');
+  }
+}
+
+Object.extend(Element.ClassNames.prototype, Enumerable);
+var Selector = Class.create();
+Selector.prototype = {
+  initialize: function(expression) {
+    this.params = {classNames: []};
+    this.expression = expression.toString().strip();
+    this.parseExpression();
+    this.compileMatcher();
+  },
+
+  parseExpression: function() {
+    function abort(message) { throw 'Parse error in selector: ' + message; }
+
+    if (this.expression == '')  abort('empty expression');
+
+    var params = this.params, expr = this.expression, match, modifier, clause, rest;
+    while (match = expr.match(/^(.*)\[([a-z0-9_:-]+?)(?:([~\|!]?=)(?:"([^"]*)"|([^\]\s]*)))?\]$/i)) {
+      params.attributes = params.attributes || [];
+      params.attributes.push({name: match[2], operator: match[3], value: match[4] || match[5] || ''});
+      expr = match[1];
+    }
+
+    if (expr == '*') return this.params.wildcard = true;
+
+    while (match = expr.match(/^([^a-z0-9_-])?([a-z0-9_-]+)(.*)/i)) {
+      modifier = match[1], clause = match[2], rest = match[3];
+      switch (modifier) {
+        case '#':       params.id = clause; break;
+        case '.':       params.classNames.push(clause); break;
+        case '':
+        case undefined: params.tagName = clause.toUpperCase(); break;
+        default:        abort(expr.inspect());
+      }
+      expr = rest;
+    }
+
+    if (expr.length > 0) abort(expr.inspect());
+  },
+
+  buildMatchExpression: function() {
+    var params = this.params, conditions = [], clause;
+
+    if (params.wildcard)
+      conditions.push('true');
+    if (clause = params.id)
+      conditions.push('element.id == ' + clause.inspect());
+    if (clause = params.tagName)
+      conditions.push('element.tagName.toUpperCase() == ' + clause.inspect());
+    if ((clause = params.classNames).length > 0)
+      for (var i = 0; i < clause.length; i++)
+        conditions.push('Element.hasClassName(element, ' + clause[i].inspect() + ')');
+    if (clause = params.attributes) {
+      clause.each(function(attribute) {
+        var value = 'element.getAttribute(' + attribute.name.inspect() + ')';
+        var splitValueBy = function(delimiter) {
+          return value + ' && ' + value + '.split(' + delimiter.inspect() + ')';
+        }
+
+        switch (attribute.operator) {
+          case '=':       conditions.push(value + ' == ' + attribute.value.inspect()); break;
+          case '~=':      conditions.push(splitValueBy(' ') + '.include(' + attribute.value.inspect() + ')'); break;
+          case '|=':      conditions.push(
+                            splitValueBy('-') + '.first().toUpperCase() == ' + attribute.value.toUpperCase().inspect()
+                          ); break;
+          case '!=':      conditions.push(value + ' != ' + attribute.value.inspect()); break;
+          case '':
+          case undefined: conditions.push(value + ' != null'); break;
+          default:        throw 'Unknown operator ' + attribute.operator + ' in selector';
+        }
+      });
+    }
+
+    return conditions.join(' && ');
+  },
+
+  compileMatcher: function() {
+    this.match = new Function('element', 'if (!element.tagName) return false; \
+      return ' + this.buildMatchExpression());
+  },
+
+  findElements: function(scope) {
+    var element;
+
+    if (element = $(this.params.id))
+      if (this.match(element))
+        if (!scope || Element.childOf(element, scope))
+          return [element];
+
+    scope = (scope || document).getElementsByTagName(this.params.tagName || '*');
+
+    var results = [];
+    for (var i = 0; i < scope.length; i++)
+      if (this.match(element = scope[i]))
+        results.push(Element.extend(element));
+
+    return results;
+  },
+
+  toString: function() {
+    return this.expression;
+  }
+}
+
+function $$() {
+  return $A(arguments).map(function(expression) {
+    return expression.strip().split(/\s+/).inject([null], function(results, expr) {
+      var selector = new Selector(expr);
+      return results.map(selector.findElements.bind(selector)).flatten();
+    });
+  }).flatten();
+}
+var Field = {
+  clear: function() {
+    for (var i = 0; i < arguments.length; i++)
+      $(arguments[i]).value = '';
+  },
+
+  focus: function(element) {
+    $(element).focus();
+  },
+
+  present: function() {
+    for (var i = 0; i < arguments.length; i++)
+      if ($(arguments[i]).value == '') return false;
+    return true;
+  },
+
+  select: function(element) {
+    $(element).select();
+  },
+
+  activate: function(element) {
+    element = $(element);
+    element.focus();
+    if (element.select)
+      element.select();
+  }
+}
+
+/*--------------------------------------------------------------------------*/
+
+var Form = {
+  serialize: function(form) {
+    var elements = Form.getElements($(form));
+    var queryComponents = new Array();
+
+    for (var i = 0; i < elements.length; i++) {
+      var queryComponent = Form.Element.serialize(elements[i]);
+      if (queryComponent)
+        queryComponents.push(queryComponent);
+    }
+
+    return queryComponents.join('&');
+  },
+
+  getElements: function(form) {
+    form = $(form);
+    var elements = new Array();
+
+    for (var tagName in Form.Element.Serializers) {
+      var tagElements = form.getElementsByTagName(tagName);
+      for (var j = 0; j < tagElements.length; j++)
+        elements.push(tagElements[j]);
+    }
+    return elements;
+  },
+
+  getInputs: function(form, typeName, name) {
+    form = $(form);
+    var inputs = form.getElementsByTagName('input');
+
+    if (!typeName && !name)
+      return inputs;
+
+    var matchingInputs = new Array();
+    for (var i = 0; i < inputs.length; i++) {
+      var input = inputs[i];
+      if ((typeName && input.type != typeName) ||
+          (name && input.name != name))
+        continue;
+      matchingInputs.push(input);
+    }
+
+    return matchingInputs;
+  },
+
+  disable: function(form) {
+    var elements = Form.getElements(form);
+    for (var i = 0; i < elements.length; i++) {
+      var element = elements[i];
+      element.blur();
+      element.disabled = 'true';
+    }
+  },
+
+  enable: function(form) {
+    var elements = Form.getElements(form);
+    for (var i = 0; i < elements.length; i++) {
+      var element = elements[i];
+      element.disabled = '';
+    }
+  },
+
+  findFirstElement: function(form) {
+    return Form.getElements(form).find(function(element) {
+      return element.type != 'hidden' && !element.disabled &&
+        ['input', 'select', 'textarea'].include(element.tagName.toLowerCase());
+    });
+  },
+
+  focusFirstElement: function(form) {
+    Field.activate(Form.findFirstElement(form));
+  },
+
+  reset: function(form) {
+    $(form).reset();
+  }
+}
+
+Form.Element = {
+  serialize: function(element) {
+    element = $(element);
+    var method = element.tagName.toLowerCase();
+    var parameter = Form.Element.Serializers[method](element);
+
+    if (parameter) {
+      var key = encodeURIComponent(parameter[0]);
+      if (key.length == 0) return;
+
+      if (parameter[1].constructor != Array)
+        parameter[1] = [parameter[1]];
+
+      return parameter[1].map(function(value) {
+        return key + '=' + encodeURIComponent(value);
+      }).join('&');
+    }
+  },
+
+  getValue: function(element) {
+    element = $(element);
+    var method = element.tagName.toLowerCase();
+    var parameter = Form.Element.Serializers[method](element);
+
+    if (parameter)
+      return parameter[1];
+  }
+}
+
+Form.Element.Serializers = {
+  input: function(element) {
+    switch (element.type.toLowerCase()) {
+      case 'submit':
+      case 'hidden':
+      case 'password':
+      case 'text':
+        return Form.Element.Serializers.textarea(element);
+      case 'checkbox':
+      case 'radio':
+        return Form.Element.Serializers.inputSelector(element);
+    }
+    return false;
+  },
+
+  inputSelector: function(element) {
+    if (element.checked)
+      return [element.name, element.value];
+  },
+
+  textarea: function(element) {
+    return [element.name, element.value];
+  },
+
+  select: function(element) {
+    return Form.Element.Serializers[element.type == 'select-one' ?
+      'selectOne' : 'selectMany'](element);
+  },
+
+  selectOne: function(element) {
+    var value = '', opt, index = element.selectedIndex;
+    if (index >= 0) {
+      opt = element.options[index];
+      value = opt.value || opt.text;
+    }
+    return [element.name, value];
+  },
+
+  selectMany: function(element) {
+    var value = [];
+    for (var i = 0; i < element.length; i++) {
+      var opt = element.options[i];
+      if (opt.selected)
+        value.push(opt.value || opt.text);
+    }
+    return [element.name, value];
+  }
+}
+
+/*--------------------------------------------------------------------------*/
+
+var $F = Form.Element.getValue;
+
+/*--------------------------------------------------------------------------*/
+
+Abstract.TimedObserver = function() {}
+Abstract.TimedObserver.prototype = {
+  initialize: function(element, frequency, callback) {
+    this.frequency = frequency;
+    this.element   = $(element);
+    this.callback  = callback;
+
+    this.lastValue = this.getValue();
+    this.registerCallback();
+  },
+
+  registerCallback: function() {
+    setInterval(this.onTimerEvent.bind(this), this.frequency * 1000);
+  },
+
+  onTimerEvent: function() {
+    var value = this.getValue();
+    if (this.lastValue != value) {
+      this.callback(this.element, value);
+      this.lastValue = value;
+    }
+  }
+}
+
+Form.Element.Observer = Class.create();
+Form.Element.Observer.prototype = Object.extend(new Abstract.TimedObserver(), {
+  getValue: function() {
+    return Form.Element.getValue(this.element);
+  }
+});
+
+Form.Observer = Class.create();
+Form.Observer.prototype = Object.extend(new Abstract.TimedObserver(), {
+  getValue: function() {
+    return Form.serialize(this.element);
+  }
+});
+
+/*--------------------------------------------------------------------------*/
+
+Abstract.EventObserver = function() {}
+Abstract.EventObserver.prototype = {
+  initialize: function(element, callback) {
+    this.element  = $(element);
+    this.callback = callback;
+
+    this.lastValue = this.getValue();
+    if (this.element.tagName.toLowerCase() == 'form')
+      this.registerFormCallbacks();
+    else
+      this.registerCallback(this.element);
+  },
+
+  onElementEvent: function() {
+    var value = this.getValue();
+    if (this.lastValue != value) {
+      this.callback(this.element, value);
+      this.lastValue = value;
+    }
+  },
+
+  registerFormCallbacks: function() {
+    var elements = Form.getElements(this.element);
+    for (var i = 0; i < elements.length; i++)
+      this.registerCallback(elements[i]);
+  },
+
+  registerCallback: function(element) {
+    if (element.type) {
+      switch (element.type.toLowerCase()) {
+        case 'checkbox':
+        case 'radio':
+          Event.observe(element, 'click', this.onElementEvent.bind(this));
+          break;
+        case 'password':
+        case 'text':
+        case 'textarea':
+        case 'select-one':
+        case 'select-multiple':
+          Event.observe(element, 'change', this.onElementEvent.bind(this));
+          break;
+      }
+    }
+  }
+}
+
+Form.Element.EventObserver = Class.create();
+Form.Element.EventObserver.prototype = Object.extend(new Abstract.EventObserver(), {
+  getValue: function() {
+    return Form.Element.getValue(this.element);
+  }
+});
+
+Form.EventObserver = Class.create();
+Form.EventObserver.prototype = Object.extend(new Abstract.EventObserver(), {
+  getValue: function() {
+    return Form.serialize(this.element);
+  }
+});
+if (!window.Event) {
+  var Event = new Object();
+}
+
+Object.extend(Event, {
+  KEY_BACKSPACE: 8,
+  KEY_TAB:       9,
+  KEY_RETURN:   13,
+  KEY_ESC:      27,
+  KEY_LEFT:     37,
+  KEY_UP:       38,
+  KEY_RIGHT:    39,
+  KEY_DOWN:     40,
+  KEY_DELETE:   46,
+
+  element: function(event) {
+    return event.target || event.srcElement;
+  },
+
+  isLeftClick: function(event) {
+    return (((event.which) && (event.which == 1)) ||
+            ((event.button) && (event.button == 1)));
+  },
+
+  pointerX: function(event) {
+    return event.pageX || (event.clientX +
+      (document.documentElement.scrollLeft || document.body.scrollLeft));
+  },
+
+  pointerY: function(event) {
+    return event.pageY || (event.clientY +
+      (document.documentElement.scrollTop || document.body.scrollTop));
+  },
+
+  stop: function(event) {
+    if (event.preventDefault) {
+      event.preventDefault();
+      event.stopPropagation();
+    } else {
+      event.returnValue = false;
+      event.cancelBubble = true;
+    }
+  },
+
+  // find the first node with the given tagName, starting from the
+  // node the event was triggered on; traverses the DOM upwards
+  findElement: function(event, tagName) {
+    var element = Event.element(event);
+    while (element.parentNode && (!element.tagName ||
+        (element.tagName.toUpperCase() != tagName.toUpperCase())))
+      element = element.parentNode;
+    return element;
+  },
+
+  observers: false,
+
+  _observeAndCache: function(element, name, observer, useCapture) {
+    if (!this.observers) this.observers = [];
+    if (element.addEventListener) {
+      this.observers.push([element, name, observer, useCapture]);
+      element.addEventListener(name, observer, useCapture);
+    } else if (element.attachEvent) {
+      this.observers.push([element, name, observer, useCapture]);
+      element.attachEvent('on' + name, observer);
+    }
+  },
+
+  unloadCache: function() {
+    if (!Event.observers) return;
+    for (var i = 0; i < Event.observers.length; i++) {
+      Event.stopObserving.apply(this, Event.observers[i]);
+      Event.observers[i][0] = null;
+    }
+    Event.observers = false;
+  },
+
+  observe: function(element, name, observer, useCapture) {
+    var element = $(element);
+    useCapture = useCapture || false;
+
+    if (name == 'keypress' &&
+        (navigator.appVersion.match(/Konqueror|Safari|KHTML/)
+        || element.attachEvent))
+      name = 'keydown';
+
+    this._observeAndCache(element, name, observer, useCapture);
+  },
+
+  stopObserving: function(element, name, observer, useCapture) {
+    var element = $(element);
+    useCapture = useCapture || false;
+
+    if (name == 'keypress' &&
+        (navigator.appVersion.match(/Konqueror|Safari|KHTML/)
+        || element.detachEvent))
+      name = 'keydown';
+
+    if (element.removeEventListener) {
+      element.removeEventListener(name, observer, useCapture);
+    } else if (element.detachEvent) {
+      element.detachEvent('on' + name, observer);
+    }
+  }
+});
+
+/* prevent memory leaks in IE */
+if (navigator.appVersion.match(/\bMSIE\b/))
+  Event.observe(window, 'unload', Event.unloadCache, false);
+var Position = {
+  // set to true if needed, warning: firefox performance problems
+  // NOT neeeded for page scrolling, only if draggable contained in
+  // scrollable elements
+  includeScrollOffsets: false,
+
+  // must be called before calling withinIncludingScrolloffset, every time the
+  // page is scrolled
+  prepare: function() {
+    this.deltaX =  window.pageXOffset
+                || document.documentElement.scrollLeft
+                || document.body.scrollLeft
+                || 0;
+    this.deltaY =  window.pageYOffset
+                || document.documentElement.scrollTop
+                || document.body.scrollTop
+                || 0;
+  },
+
+  realOffset: function(element) {
+    var valueT = 0, valueL = 0;
+    do {
+      valueT += element.scrollTop  || 0;
+      valueL += element.scrollLeft || 0;
+      element = element.parentNode;
+    } while (element);
+    return [valueL, valueT];
+  },
+
+  cumulativeOffset: function(element) {
+    var valueT = 0, valueL = 0;
+    do {
+      valueT += element.offsetTop  || 0;
+      valueL += element.offsetLeft || 0;
+      element = element.offsetParent;
+    } while (element);
+    return [valueL, valueT];
+  },
+
+  positionedOffset: function(element) {
+    var valueT = 0, valueL = 0;
+    do {
+      valueT += element.offsetTop  || 0;
+      valueL += element.offsetLeft || 0;
+      element = element.offsetParent;
+      if (element) {
+        p = Element.getStyle(element, 'position');
+        if (p == 'relative' || p == 'absolute') break;
+      }
+    } while (element);
+    return [valueL, valueT];
+  },
+
+  offsetParent: function(element) {
+    if (element.offsetParent) return element.offsetParent;
+    if (element == document.body) return element;
+
+    while ((element = element.parentNode) && element != document.body)
+      if (Element.getStyle(element, 'position') != 'static')
+        return element;
+
+    return document.body;
+  },
+
+  // caches x/y coordinate pair to use with overlap
+  within: function(element, x, y) {
+    if (this.includeScrollOffsets)
+      return this.withinIncludingScrolloffsets(element, x, y);
+    this.xcomp = x;
+    this.ycomp = y;
+    this.offset = this.cumulativeOffset(element);
+
+    return (y >= this.offset[1] &&
+            y <  this.offset[1] + element.offsetHeight &&
+            x >= this.offset[0] &&
+            x <  this.offset[0] + element.offsetWidth);
+  },
+
+  withinIncludingScrolloffsets: function(element, x, y) {
+    var offsetcache = this.realOffset(element);
+
+    this.xcomp = x + offsetcache[0] - this.deltaX;
+    this.ycomp = y + offsetcache[1] - this.deltaY;
+    this.offset = this.cumulativeOffset(element);
+
+    return (this.ycomp >= this.offset[1] &&
+            this.ycomp <  this.offset[1] + element.offsetHeight &&
+            this.xcomp >= this.offset[0] &&
+            this.xcomp <  this.offset[0] + element.offsetWidth);
+  },
+
+  // within must be called directly before
+  overlap: function(mode, element) {
+    if (!mode) return 0;
+    if (mode == 'vertical')
+      return ((this.offset[1] + element.offsetHeight) - this.ycomp) /
+        element.offsetHeight;
+    if (mode == 'horizontal')
+      return ((this.offset[0] + element.offsetWidth) - this.xcomp) /
+        element.offsetWidth;
+  },
+
+  clone: function(source, target) {
+    source = $(source);
+    target = $(target);
+    target.style.position = 'absolute';
+    var offsets = this.cumulativeOffset(source);
+    target.style.top    = offsets[1] + 'px';
+    target.style.left   = offsets[0] + 'px';
+    target.style.width  = source.offsetWidth + 'px';
+    target.style.height = source.offsetHeight + 'px';
+  },
+
+  page: function(forElement) {
+    var valueT = 0, valueL = 0;
+
+    var element = forElement;
+    do {
+      valueT += element.offsetTop  || 0;
+      valueL += element.offsetLeft || 0;
+
+      // Safari fix
+      if (element.offsetParent==document.body)
+        if (Element.getStyle(element,'position')=='absolute') break;
+
+    } while (element = element.offsetParent);
+
+    element = forElement;
+    do {
+      valueT -= element.scrollTop  || 0;
+      valueL -= element.scrollLeft || 0;
+    } while (element = element.parentNode);
+
+    return [valueL, valueT];
+  },
+
+  clone: function(source, target) {
+    var options = Object.extend({
+      setLeft:    true,
+      setTop:     true,
+      setWidth:   true,
+      setHeight:  true,
+      offsetTop:  0,
+      offsetLeft: 0
+    }, arguments[2] || {})
+
+    // find page position of source
+    source = $(source);
+    var p = Position.page(source);
+
+    // find coordinate system to use
+    target = $(target);
+    var delta = [0, 0];
+    var parent = null;
+    // delta [0,0] will do fine with position: fixed elements,
+    // position:absolute needs offsetParent deltas
+    if (Element.getStyle(target,'position') == 'absolute') {
+      parent = Position.offsetParent(target);
+      delta = Position.page(parent);
+    }
+
+    // correct by body offsets (fixes Safari)
+    if (parent == document.body) {
+      delta[0] -= document.body.offsetLeft;
+      delta[1] -= document.body.offsetTop;
+    }
+
+    // set position
+    if(options.setLeft)   target.style.left  = (p[0] - delta[0] + options.offsetLeft) + 'px';
+    if(options.setTop)    target.style.top   = (p[1] - delta[1] + options.offsetTop) + 'px';
+    if(options.setWidth)  target.style.width = source.offsetWidth + 'px';
+    if(options.setHeight) target.style.height = source.offsetHeight + 'px';
+  },
+
+  absolutize: function(element) {
+    element = $(element);
+    if (element.style.position == 'absolute') return;
+    Position.prepare();
+
+    var offsets = Position.positionedOffset(element);
+    var top     = offsets[1];
+    var left    = offsets[0];
+    var width   = element.clientWidth;
+    var height  = element.clientHeight;
+
+    element._originalLeft   = left - parseFloat(element.style.left  || 0);
+    element._originalTop    = top  - parseFloat(element.style.top || 0);
+    element._originalWidth  = element.style.width;
+    element._originalHeight = element.style.height;
+
+    element.style.position = 'absolute';
+    element.style.top    = top + 'px';;
+    element.style.left   = left + 'px';;
+    element.style.width  = width + 'px';;
+    element.style.height = height + 'px';;
+  },
+
+  relativize: function(element) {
+    element = $(element);
+    if (element.style.position == 'relative') return;
+    Position.prepare();
+
+    element.style.position = 'relative';
+    var top  = parseFloat(element.style.top  || 0) - (element._originalTop || 0);
+    var left = parseFloat(element.style.left || 0) - (element._originalLeft || 0);
+
+    element.style.top    = top + 'px';
+    element.style.left   = left + 'px';
+    element.style.height = element._originalHeight;
+    element.style.width  = element._originalWidth;
+  }
+}
+
+// Safari returns margins on body which is incorrect if the child is absolutely
+// positioned.  For performance reasons, redefine Position.cumulativeOffset for
+// KHTML/WebKit only.
+if (/Konqueror|Safari|KHTML/.test(navigator.userAgent)) {
+  Position.cumulativeOffset = function(element) {
+    var valueT = 0, valueL = 0;
+    do {
+      valueT += element.offsetTop  || 0;
+      valueL += element.offsetLeft || 0;
+      if (element.offsetParent == document.body)
+        if (Element.getStyle(element, 'position') == 'absolute') break;
+
+      element = element.offsetParent;
+    } while (element);
+
+    return [valueL, valueT];
+  }
+}
\ No newline at end of file

Added: incubator/composer/trunk/composer-site/src/site/resources/scripts/shBrushJava.js
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/resources/scripts/shBrushJava.js?rev=618174&view=auto
==============================================================================
--- incubator/composer/trunk/composer-site/src/site/resources/scripts/shBrushJava.js (added)
+++ incubator/composer/trunk/composer-site/src/site/resources/scripts/shBrushJava.js Sun Feb  3 22:33:20 2008
@@ -0,0 +1,26 @@
+dp.sh.Brushes.Java = function()
+{
+	var keywords =	'abstract assert boolean break byte case catch char class const ' +
+			'continue default do double else enum extends ' +
+			'false final finally float for goto if implements import ' +
+			'instanceof int interface long native new null ' +
+			'package private protected public return ' +
+			'short static strictfp super switch synchronized this throw throws true ' +
+			'transient try void volatile while';
+
+	this.regexList = [
+		{ regex: dp.sh.RegexLib.SingleLineCComments,							css: 'comment' },		// one line comments
+		{ regex: dp.sh.RegexLib.MultiLineCComments,								css: 'comment' },		// multiline comments
+		{ regex: dp.sh.RegexLib.DoubleQuotedString,								css: 'string' },		// strings
+		{ regex: dp.sh.RegexLib.SingleQuotedString,								css: 'string' },		// strings
+		{ regex: new RegExp('\\b([\\d]+(\\.[\\d]+)?|0x[a-f0-9]+)\\b', 'gi'),	css: 'number' },		// numbers
+		{ regex: new RegExp('(?!\\@interface\\b)\\@[\\$\\w]+\\b', 'g'),			css: 'annotation' },	// annotation @anno
+		{ regex: new RegExp('\\@interface\\b', 'g'),							css: 'keyword' },		// @interface keyword
+		{ regex: new RegExp(this.GetKeywords(keywords), 'gm'),					css: 'keyword' }		// java keyword
+		];
+
+	this.CssClass = 'dp-j';
+}
+
+dp.sh.Brushes.Java.prototype	= new dp.sh.Highlighter();
+dp.sh.Brushes.Java.Aliases	= ['java'];

Added: incubator/composer/trunk/composer-site/src/site/resources/scripts/shBrushXml.js
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/resources/scripts/shBrushXml.js?rev=618174&view=auto
==============================================================================
--- incubator/composer/trunk/composer-site/src/site/resources/scripts/shBrushXml.js (added)
+++ incubator/composer/trunk/composer-site/src/site/resources/scripts/shBrushXml.js Sun Feb  3 22:33:20 2008
@@ -0,0 +1,61 @@
+dp.sh.Brushes.Xml = function()
+{
+	this.CssClass = 'dp-xml';
+}
+
+dp.sh.Brushes.Xml.prototype	= new dp.sh.Highlighter();
+dp.sh.Brushes.Xml.Aliases	= ['xml', 'xhtml', 'xslt', 'html', 'xhtml'];
+
+dp.sh.Brushes.Xml.prototype.ProcessRegexList = function()
+{
+	function push(array, value)
+	{
+		array[array.length] = value;
+	}
+	
+	/* If only there was a way to get index of a group within a match, the whole XML
+	   could be matched with the expression looking something like that:
+	
+	   ()
+	   | ()
+	   | (<)*(\w+)*\s*(\w+)\s*=\s*(".*?"|'.*?'|\w+)(/*>)*
+	   | ()
+	*/
+	var index	= 0;
+	var match	= null;
+	var regex	= null;
+
+	// Match CDATA in the following format 
+	// <\!\[[\w\s]*?\[(.|\s)*?\]\]>
+	this.GetMatches(new RegExp('<\\!\\[[\\w\\s]*?\\[(.|\\s)*?\\]\\]>', 'gm'), 'cdata');
+	
+	// Match comments
+	// 
+	this.GetMatches(new RegExp('', 'gm'), 'comments');
+
+	// Match attributes and their values
+	// (:|\w+)\s*=\s*(".*?"|\'.*?\'|\w+)*
+	regex = new RegExp('([:\\w-\.]+)\\s*=\\s*(".*?"|\'.*?\'|\\w+)*', 'gm'); // Thanks to Tomi Blinnikka of Yahoo! for fixing namespaces in attributes
+	while((match = regex.exec(this.code)) != null)
+	{
+		push(this.matches, new dp.sh.Match(match[1], match.index, 'attribute'));
+	
+		// if xml is invalid and attribute has no property value, ignore it	
+		if(match[2] != undefined)
+		{
+			push(this.matches, new dp.sh.Match(match[2], match.index + match[0].indexOf(match[2]), 'attribute-value'));
+		}
+	}
+
+	// Match opening and closing tag brackets
+	// 
+	this.GetMatches(new RegExp('', 'gm'), 'tag');
+
+	// Match tag names
+	// About...dp.SyntaxHighlighter
Version: {V}
http://www.dreamprojections.com/SyntaxHighlighter
©2004-2005 Alex Gorbatchev. All right reserved.
"};dp.SyntaxHighlighter=dp.sh;dp.sh.Toolbar.Commands={ExpandSource:{label:"+ expand source",check:function(_1){return _1.collapse;},func:function(_2,_3){_2.parentNode.removeChild(_2);_3.div.className=_3.div.className.replace("collapsed","");}},ViewSource:{label:"view plain",func:function(_4,_5){var _6=_5.originalCode.replace(/"+_6+"");_7.document.close();}},CopyToClipboard:{label:"copy to clipboard",check:function(){return window.clipboardData!=null;},func:function(_8,_9){window.clipboardData.setData("text",_9.originalCode);alert("The code is in your clipboard now");}},PrintSource:{label:"print",func:function(_a,_b){var _c=document.createElement("IFRAME");var _d=null;_c.style.cssText="position:absolute;width:0px;height:0px;left:-500px;top:-500px;";document.body.appendChild(_c);_d=_c.contentWindow.document;dp.sh.Utils.CopyStyles(_d,window.document);_d.write(""+_b.div.innerHTML+"");_d.close();_c.contentWindow.focus();_c.contentWindow.print();alert("Printing...");document.body.removeChild(_c);}},About:{label:"?",func:function(_e){var _f=window
 .open("","_blank","dialog,width=300,height=150,scrollbars=0");var doc=_f.document;dp.sh.Utils.CopyStyles(doc,window.document);doc.write(dp.sh.Strings.AboutDialog.replace("{V}",dp.sh.Version));doc.close();_f.focus();}}};dp.sh.Toolbar.Create=function(_11){var div=document.createElement("DIV");div.className="tools";for(var _13 in dp.sh.Toolbar.Commands){var cmd=dp.sh.Toolbar.Commands[_13];if(cmd.check!=null&&!cmd.check(_11)){continue;}div.innerHTML+=""+cmd.label+"";}return div;};dp.sh.Toolbar.Command=function(_15,_16){var n=_16;while(n!=null&&n.className.indexOf("dp-highlighter")==-1){n=n.parentNode;}if(n!=null){dp.sh.Toolbar.Commands[_15].func(_16,n.highlighter);}};dp.sh.Utils.CopyStyles=function(_18,_19){var _1a=_19.getElementsByTagName("link");for(var i=0;i<_1a.length;i++){if(_1a[i].rel.toLowerCase()=="stylesheet"){_18.write("<
 /link>");}}};dp.sh.RegexLib={MultiLineCComments:new RegExp("/\\*[\\s\\S]*?\\*/","gm"),SingleLineCComments:new RegExp("//.*$","gm"),SingleLinePerlComments:new RegExp("#.*$","gm"),DoubleQuotedString:new RegExp("\"(?:\\.|(\\\\\\\")|[^\\\"\"])*\"","g"),SingleQuotedString:new RegExp("'(?:\\.|(\\\\\\')|[^\\''])*'","g")};dp.sh.Match=function(_1c,_1d,css){this.value=_1c;this.index=_1d;this.length=_1c.length;this.css=css;};dp.sh.Highlighter=function(){this.noGutter=false;this.addControls=true;this.collapse=false;this.tabsToSpaces=true;this.wrapColumn=80;this.showColumns=true;};dp.sh.Highlighter.SortCallback=function(m1,m2){if(m1.indexm2.index){return 1;}else{if(m1.lengthm2.length){return 1;}}}}return 0;};dp.sh.Highlighter.prototype.CreateElement=function(_21){var _22=document.createElement(_21);_22.highlighter=this;return _22;};dp.sh.Highlighter.prototype.GetMatches=function(_23,css){var _25=0;var _26=nul
 l;while((_26=_23.exec(this.code))!=null){this.matches[this.matches.length]=new dp.sh.Match(_26[0],_26.index,css);}};dp.sh.Highlighter.prototype.AddBit=function(str,css){if(str==null||str.length==0){return;}var _29=this.CreateElement("SPAN");str=str.replace(/&/g,"&");str=str.replace(/ /g," ");str=str.replace(/");if(css!=null){var _2a=new RegExp("
","gi");if(_2a.test(str)){var _2b=str.split(" 
");str="";for(var i=0;i<_2b.length;i++){_29=this.CreateElement("SPAN");_29.className=css;_29.innerHTML=_2b[i];this.div.appendChild(_29);if(i+1<_2b.length){this.div.appendChild(this.CreateElement("BR"));}}}else{_29.className=css;_29.innerHTML=str;this.div.appendChild(_29);}}else{_29.innerHTML=str;this.div.appendChild(_29);}};dp.sh.Highlighter.prototype.IsInside=function(_2d){if(_2d==null||_2d.length==0){return false;}for(var i=0;ic.index)&&(
 _2d.index/gi,"\n");var _43=_42.split("\n");if(this.addControls==true){this.bar.appendChild(dp.sh.Toolbar.Create(this));}if(this.showColumns){var div=
 this.CreateElement("div");var _45=this.CreateElement("div");var _46=10;var i=1;while(i<=150){if(i%_46==0){div.innerHTML+=i;i+=(i+"").length;}else{div.innerHTML+="·";i++;}}_45.className="columns";_45.appendChild(div);this.bar.appendChild(_45);}for(var i=0,lineIndex=this.firstLine;i<_43.length-1;i++,lineIndex++){var li=this.CreateElement("LI");var _4a=this.CreateElement("SPAN");li.className=(i%2==0)?"alt":"";_4a.innerHTML=_43[i]+" ";li.appendChild(_4a);this.ol.appendChild(li);}this.div.innerHTML="";};dp.sh.Highlighter.prototype.Highlight=function(_4b){function Trim(str){return str.replace(/^\s*(.*?)[\s\n]*$/g,"$1");}function Chop(str){return str.replace(/\n*$/,"").replace(/^\n*/,"");}function Unindent(str){var _4f=str.split("\n");var _50=new Array();var _51=new RegExp("^\\s*","g");var min=1000;for(var i=0;i<_4f.length&&min>0;i++){if(Trim(_4f[i]).length==0){continue;}var _54=_51.exec(_4f[i]);if(_54!=null&&_54.length>0){min=Math.min(_54[0].length,min);}}if(min>0){for
 (var i=0;i<_4f.length;i++){_4f[i]=_4f[i].substr(min);}}return _4f.join("\n");}function Copy(_56,_57,_58){return _56.substr(_57,_58-_57);}var pos=0;this.originalCode=_4b;this.code=Chop(Unindent(_4b));this.div=this.CreateElement("DIV");this.bar=this.CreateElement("DIV");this.ol=this.CreateElement("OL");this.matches=new Array();this.div.className="dp-highlighter";this.div.highlighter=this;this.bar.className="bar";this.ol.start=this.firstLine;if(this.CssClass!=null){this.ol.className=this.CssClass;}if(this.collapse){this.div.className+=" collapsed";}if(this.noGutter){this.div.className+=" nogutter";}if(this.tabsToSpaces==true){this.code=this.ProcessSmartTabs(this.code);}this.ProcessRegexList();if(this.matches.length==0){this.AddBit(this.code,null);this.SwitchToList();this.div.appendChild(this.ol);return;}this.matches=this.matches.sort(dp.sh.Highlighter.SortCallback);for(var i=0;i
+
+
+${title}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Last Published: Jan 19 2008 (Apache Composer 2.0 released)
+
+
+
+
+
+
+<#list sitemap.sections as section>
+${section.name}
+
+  <#list section.pages as otherPage> <#if otherPage = page>
+  ${otherPage.title}
+  <#else>
+  ${otherPage.title}
+  
+   
+
+
+Hosted by
+

+Tools
+ 

+
+

+
+
+
+
+
+${title}
+${body}
+
+
+
+
+
+
+© 2003-2007 Apache Composer Committers
+
+
+
+
+
+
+
+
+
+
+
+
+

svn commit: r618174 [2/5] - in /incubator/composer/trunk: ./ composer-site/ composer-site/src/ composer-site/src/assembly/ composer-site/src/config/ composer-site/src/resources/ composer-site/src/resources/images/ composer-site/src/resources/style/ com...

2008-02-04T06:33:26Z

Added: incubator/composer/trunk/composer-site/src/site/content/builder.html
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/builder.html?rev=618174&view=auto
==============================================================================
--- incubator/composer/trunk/composer-site/src/site/content/builder.html (added)
+++ incubator/composer/trunk/composer-site/src/site/content/builder.html Sun Feb  3 22:33:20 2008
@@ -0,0 +1,70 @@
+
+
+
+
+Building Containers
+
+
+Rather than new up a Apache Composer instance with the right ComponentFactory, LifecycleStategy and ComponentMonitor, your can use  ContainerBuilder for conveniece. Refer to Martin's 'Fluent
+Interface' article, for some of the motivation behing this class.
+Some simple examples :
+    +pico = new ContainerBuilder().build();
+pico.addComponent(Apple.class);
+
+    pico = new ContainerBuilder().withCaching().build();
+pico.addComponent(Apple.class);
+    +pico = new ContainerBuilder().withCaching().build();
+pico.addComponent(Apple.class);
+
+    pico = new ContainerBuilder().withHiddenImplementations().build();
+pico.addComponent(Apple.class);
+
+More varations for behaviors :
++pico = new ContainerBuilder().withLifecycle().withConsoleMonitor().build();
+pico.addComponent(Apple.class);
+
+    pico = new ContainerBuilder().withMonitor(ConsoleComponentMonitor.class).build();
+pico.addComponent(Apple.class);
+    +import static org.picocontainer.injectors.Injectors.SDI;
+import static org.picocontainer.behaviors.Behaviors.caching;
+import static org.picocontainer.behaviors.Behaviors.implementationHiding;
+import static org.picocontainer.behaviors.Behaviors.synchronizing;
+...  
+pico = new ContainerBuilder(SDI()).withBehaviors(caching(), implementationHiding(), synchronizing()).build();
+pico.addComponent(Apple.class);
+
+Setting a parent container :
+    child = new ContainerBuilder(parentContainer).build();
+child.addComponent(Apple.class);
+
+Specifying an injection type:
+    +pico = new ContainerBuilder().withAnnotationInjection().build();
+pico.addComponent(Apple.class);
+
+Specifying an injection type a different way:
+    +import static org.picocontainer.injectors.Injectors.SDI;
+...
+pico = new ContainerBuilder(SDI()).build();
+pico.addComponent(Apple.class);
+A custom container component used by a custom  ComponentBehavior (though could be used by ComponentMonitor or LifecycleStrategy as easily): 
+
+    
+      +pico = new ContainerBuilder()
+    .withCustomContainerComponent(new MyQuantumPhysicsConnector())
+    .withComponentFactory(MyQuantumPhysicsConnectionNeedingComponentBehavior.class).build();
+pico.addComponent(Apple.class);
+	A custom container implementation (DefaultApache Composer is the default): 
+    
+      MyCustomApache Composer pico = (MyCustomApache Composer) new ContainerBuilder().implementedBy(MyCustomApache Composer.class).build();
+pico.addComponent(Apple.class);
+
+
+

Added: incubator/composer/trunk/composer-site/src/site/content/class-naming.html
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/class-naming.html?rev=618174&view=auto
==============================================================================
--- incubator/composer/trunk/composer-site/src/site/content/class-naming.html (added)
+++ incubator/composer/trunk/composer-site/src/site/content/class-naming.html Sun Feb  3 22:33:20 2008
@@ -0,0 +1,23 @@
+
+
+
+
+Class Naming
+
+
+Apache Composer's class naming changed substantially between 1.0 and 2.0. There are two major influences for this:
+
+  Dan North's "Behavior Driven Design" agenda and his interest in Neuro Linguistic Programming (NLP)
+  Steve Yegge's technical fable : Execution in the Kingdom of Nouns
+
+The take away from both is that we don't have to have long classnames like CachingComponentAdapterFactory and ImplementationHidingComponentAdapterFactory, we can in fact have shorter names, that read better in their intended use:
+  new DefaultApache Composer(new Caching());
+Similarly,  method names can play a part in simplicity and meaning for real situations where they are used.
+  new DefaultApache Composer(new Caching().wrap(new ImplementationHiding()));
+
+Caching, the class, implements an abstraction called BehaviorFactory as do many others. All BehaviorFactory implementations make implementations of Behavior like 'Cached'. Similarly 'ConstructionInjection' (and similar) make implementations of Injector like 'ConstructorInjector' (and similar). Both BehaviorFactory and InjectionFactory are extensions of ComponentFactory.
+
+ 
+ 
+
+

Added: incubator/composer/trunk/composer-site/src/site/content/comparisons.html
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/comparisons.html?rev=618174&view=auto
==============================================================================
--- incubator/composer/trunk/composer-site/src/site/content/comparisons.html (added)
+++ incubator/composer/trunk/composer-site/src/site/content/comparisons.html Sun Feb  3 22:33:20 2008
@@ -0,0 +1,175 @@
+
+
+
+
+
+Container Comparisons
+
+
+    
+      
+        Overview
+        This document aims to compare Apache Composer to other IoC containers, both lightweight and not.
+        There are a number of published API specifications since Java was initially released that proport to be container/component designs. We discuss then here, suggesting there are goals that some have met, and some not. This may help you make better design choices for your own components.
+      
+      
+        IoC Containers
+        
+          Spring Framework
+          The Spring Framework is a J2EE framework. As such, Dependency Injection and Lifecycle is only one of its concerns. Apache Composer, on the other hand, is concerned only with Dependency Injection, configuration and Lifecycle.
+        
+        
+          Apache Avalon and its containers
+          (Avalon ceased development in 2005)
+          Apache hosted a project that had been running for many years called Avalon. It had many components that fit that its design and many containers is writtern in Java. Avalon components were characterised by implementation of many optional interfaces. Avalon components were distributed with meta-information in XML in the jar file. More XML is required to assemble components together for the same of a application. Avalon Phoenix, Excalibur Component Manager (ECM), Avalon Fortress and Avalon Merlin were the pertinent containers.
+          The Avalon Framework required implementing components to implement a number of interfaces. By the end of the the project, this had proven historically to be a bit of a turn-off for component writers.  Those interfaces were :-
+          
+            
+              
+                
+                
+              
+              
+                
+                
+              
+              
+                
+                
+              
+              
+                
+                
+              
+              
+                
+                
+              
+              
+                
+                
+              
+              
+                
+                
+              
+              
+                
+                
+              
+              
+                
+                
+              
+              
+                
+                
+              
+              
+                
+                
+              
+              
+                
+                
+              
+              
+                
+                
+              
+              
+                
+                
+              
+            
+           Avalon Interface  Apache Composer equivalent 
 LogEnabled  Logging agnostic 
 Contextualizable  n/a 
 Serviceable (was Composable) arguments are injected
 Configurable arguments are injected
 Parameterizable  n/a 
 Initializable  Constructor is the equivalent lifecycle concept 
 Startable  Startable 
 Suspendable  n/a 
 Recontextualizable  n/a 
 Recomposable  n/a 
 Reconfigurable  n/a 
 Reparameterizable  n/a 
 Disposable  Disposable 
+          Avalon is a Contextualized Lookup IoC design. 
+          
+    Example
+
+    
+        
+            import org.apache.avalon.framework.ServiceManager;
+import org.apache.avalon.framework.Serviceable;
+import org.apache.avalon.framework.ServiceException;
+
+public class Shop implements Serviceable, Initializable {
+    StockManager stockManager;
+    String shopZipCode;
+    public void service(ServiceManager sm) throws ServiceException {
+        stockManager = (StockManager) sm.lookup("StockManager");
+    }
+    public void initialize() {
+        // all service()ing has been done.
+    }
+}
+        
+    
+    A component has to have service (component) declarations in an external file. The  Loom  container (forked from
+       Phoenix) has .xinfo files for each component to meet such needs. All Avalon container have some mechanism for storing
+       configuration and assembly externally to the class. Cross referenced against the xinfo files, Loom's assembly.xml
+       defines the implementations to be used for component types. Thus all Avalon components must be
+       interface/implementation separated. Another Avalon using server technology is Keel. 
+    It has to be said that all post-Avalon projects are not as active as they could be.
+    
+      Using Contextualized Dependency Lookup Components
+          Without a Container.
+
+The downside of the this design is that components can only be used without the container with great
+           difficulty. If at all. Thus a proper container is needed at all times, and you have to choose one for
+           different purposes. If you do manage to instantiate components without a container, you might miss one of the
+           essential service dependencies. The component-using class will continue to compile, but at run time it will
+           be apparent that there are missing dependencies. Because of the these complexities, unit testing with frameworks like JUnit  is very difficult for of Avalon components. 
+    
+
+        
+      
+      
+        Sun specified nearly-IoC Containers & Component designs
+        Sun have specified several container/component designs over the years.
+        
+          Enterprise Java Beans
+          Clearly Entity and Session beans run inside a container. The API is well defined, and to varying degrees of success one can deploy EJB appllications to WebLogic, WebSphere, Orion and JBoss etc. For assembly and configuration, there is high use of element-normal XML . There are some mandated parent objects and interfaces for various to extend and/or implement. Resolution is done by the components themselves via JNDI more often than not.
+          Apache Composer Components are simpler in they they do not force an extensive XML markup, nor require the implementing of certaing interfaces or extening base classes. Quite importantly the relationship between factory (home), implementation (bean) and interface (remote) parts is much more real in Apache Composer-style components. EJB 2.0 components are nearly impossible to unit-test without much effort.
+          With the advent of EJB 3.0 (which the our team directly influenced), things became easier for EJB developers. Annotations were used to mark fields, and methods for injection. Strangely constructors were not eligible for injection. It was reported back to the our team that it was felt that the J2EE container makers would not find it easy making multi-argument constructor injection a reality.
+        
+        
+          Servlets
+          Not so obvious - Servlets are contained by a servlet container. They are generally bundled with (or replaced by) value added propositions like JSP, but it is still a container/component design. High use of XML for assembly and configuration. Servlets have no concept of parent container or the conatainer above that (sometimes EJB) and its provision of components, which is very unfortunate. Servlets have a number of interfaces to honor, none of which is too malignent. Servlets typically deal with external (or parent) components via RMI or JNDI. In more recent releases of EJB, local interfaces rather than RMI may be the mechanism for connection the parent components. WebLogic have always provided an optimizing mechanism for this interoperation
+          As with EJB, Apache Composer Components are far simpler. This is probably because they offer no web experience, without an extension. Servlets again are not that unit-testable.
+        
+        
+          Applets
+          Applets, though presently not so often used, are a good example of Container/Component separations. There is very little XML in use by Applets. Configuration is typically delivered in applet tags in HTML. Applets are granted some access to the parent container, the brower, and its DOM model for pages and other applets. There very little standardisation for Browser as a container.
+          As with EJB, Apache Composer Components are far simpler. Applets are unit-testable but with a little effort. Complex DOM interoperation is impossible under unit testing.
+        
+        
+          Mainable (Not actually a container)
+          
+            
+              public static void main(String[] args) {}
+            
+          
+          
+
+          Familiar? Hopefully not Static plays no part in a good IoC container/component design. This includes static launching of Java Webstart (JNLP) applications. If you have to keep mainable functionaility separate your components away from the main() class so they may be instntiated separately. In .NET you'll have to make sure that the application assembly is a small bootstrap to a component one.
+        
+        
+          JNDI (Java API)
+          A huge map of clunkily access components via a very non-IoC mechanism. It has to be strapped with much XML to prevent inappropriate access. This is not IoC because the component reaches out for external component dependancies whenever it feels like. This last fact clouds Serlvets and EJB use.
+        
+        
+          AWT, Swing, SWT (Java graphic toolkits)
+          Nice container/component designs. In the case of Swing, perhaps a little difficult for coders to easily assemble applications.
+        
+        
+          Eclipse (Java graphical application platform)
+          The Eclipse platform is very compelling. It supports the notion of a pluggable application concept. Each component statically accesses other components via a factory (which at least Paul does not like), though it is clear that some complex classloader magic is going on. The underpinning set of graphical components, SWT , are a simple and elegant design.
+        
+      
+    
+
+
+

Added: incubator/composer/trunk/composer-site/src/site/content/component-configuration.html
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/component-configuration.html?rev=618174&view=auto
==============================================================================
--- incubator/composer/trunk/composer-site/src/site/content/component-configuration.html (added)
+++ incubator/composer/trunk/composer-site/src/site/content/component-configuration.html Sun Feb  3 22:33:20 2008
@@ -0,0 +1,100 @@
+
+
+
+Component Configuration
+
+
+
+Choices
+In true IoC style,  configuration for a component is pushed into it. 
+With Apache Composer,  there are a few ways to do this:
+
+  Design a class to hold the configuration and have getters on it to allow depending components to access configuration.
+  Manually set the configuration for components as you add them to a container
+  Leverage the fact that Apache Composer can pick up on named components 
+
+Configuration Object
+
+    public interface BigFatComponentConfig {
+  String getSpellingWebServiceURL();
+  String getTimeout();
+}
+public class BigFatComponent {
+  URL spellWebService;
+  String timeout;
+  public BigFatComponent(BigFatComponentConfig config) {
+    this.spellWebService = new URL(config.getSpellingWebServiceURL());
+    this.timeout = config.getTimeout();
+  }  
+  // other methods
+}
+...
+pico.addComponent(BigFatComponent.class)
+pico.addComponent(new BigFatComponentConfigBean("http://foo.com/foo.wsdl", 120))
+  
+  Setting config as part of addComponent(..) 
+  
+      public class BigFatComponent {
+  URL spellWebService;
+  int timeout;
+  public BigFatComponent(String spellingWebServiceURL, int timeout) {
+    this.spellWebService = new URL(spellingWebServiceURL);
+    this.timeout = timeout;
+  }  
+  // other methods
+}
+
+
+...
+pico.addComponent(BigFatComponent.class, new ConstantParameter("http://foo.com/foo.wsdl"), new ConstantParameter(120));
+    
+  Configuration using parameter names 
+  Consider this component ...
+  
+    public class BigFatComponent {
+  URL spellWebService;
+  int timeout;
+  public BigFatComponent(String spellingWebServiceURL, int timeout) throws MalformedURLExeption {
+    this.spellWebService = new URL(spellingWebServiceURL);
+    this.timeout = timeout;
+  }  
+  public String toString() {
+    return "URL=" + spellWebService + ", timeout=" + timeout;  
+  }
+
+  // other methods
+}
+
+
+  
+  And this composition ...
+
+        +pico.addConfig("spellingWebServiceURL", "http://foo.com/spelling.wsdl"); // matches constructor parameter name
+pico.addConfig("somethingOtherURL", "http://bar.com/other.wsdl");
+pico.addConfig("timeout", 120); // matches constructor parameter name
+pico.addConfig("timeout2", 456);
+pico.as(Characteristics.USE_NAMES).addComponent(BigFatComponent.class);
+
+BigFatComponent bfc = pico.getComponent(BigFatComponent.class);
+System.out.println("bfc: " + bfc.toString());
+// Prints .. "bfg: URL=http://foo.com/spelling.wsdl, timeout=120"
+  
+  This feature of Apache Composer relies on the a non-JDK mechanism of accessing parameter names for methods and constructors. In this case named parameters spellingWebServiceURL and timeout.
+  There are two ways for this to work: 
+  
+    relying on the fact that  your component classes have debug info compiled into them. 
+    post-processing component classes with Paranamer before placing them in their jar 
+  
+  If the parameter name information cannot be accessed at runtime by Apache Composer, then Apache Composer will be unable to differentiate between potential injectable classes of the same type and throws an exception that suggests that there is an ambiguity.
+  This is not a global variable facility. Its scoped with the container in question and its child containers.
+
+Taking configuration from the elsewhere
+Configuration can also be bound to components with :
+
+  CommandLineArgumentsApache Composer
+  PropertiesApache Composer
+  SystemPropertiesApache Composer
+
+
+

Added: incubator/composer/trunk/composer-site/src/site/content/constructor-injection.html
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/constructor-injection.html?rev=618174&view=auto
==============================================================================
--- incubator/composer/trunk/composer-site/src/site/content/constructor-injection.html (added)
+++ incubator/composer/trunk/composer-site/src/site/content/constructor-injection.html Sun Feb  3 22:33:20 2008
@@ -0,0 +1,70 @@
+
+
+    
+    Constructor Injection
+
+
+
+Overview
+
+Constructor Injection is a Dependency Injection variant
+   where an object gets all its dependencies via the constructor.
+
+
+The most important benefits of Constructor Injection are:
+
+    It makes a strong dependency contract
+    It makes testing easy, since dependencies can be passed in as Mock Objects
+    It's very succinct in terms of lines of code
+    Classes that rely on Constructor Injection are generally Good
+                                                                                                              Citizens
+    
+    A dependency may be made immutable by making the dependency reference final
+
+ Martin Fowler explains Constructor
+                                                                                                     Injection
+                                                          in more detail.

+    

+     Apache Composer also supports Setter Injection.
+
+Origin
+
+Rachel Davies, while reviewing Joe's forthcoming book,
+left a Fermat-like margin note when looking at a coe sample that used
+Setter Injection: "Why not use constructors ?". Brilliant and simple.
+ Using constructors per se, is an ordinary OO feature, but having
+a container that works out what to inject where amongst a list of
+constructor arguments is something that is useful too.
+
+
+Example
+
+
+            public class Shop {
    private final StockManager stockManager;
    private final String shopZipCode;
    public Shop(StockManager stockManager, String shopZipCode) {
        this.stockManager = stockManager;
        this.shopZipCode = shopZipCode;
    }
 }
+
+Note, for this there is no need to declare needs in any other way. No interfaces, no doclet tags, no external
+   XML. Just your simple component(s) and Apache Composer. No need for post assembly/config initialization either. If
+   it is constructed (not withstanding some asserts on nulls) it has its needs satisfied. Components need not be
+   interface/implementation separated. This is the coder's choice.
+
+Using Constructor
+                                                                                          Injector Components
+                                                                                          Without a Container.
+
+
+The component can be used directly, without any container. The missing dependency scenario is not an issue
+   since it is impossible to instantiate an object without all dependencies being satisfied.
+
+
+    
+        Shop shop = new Shop(myStockManager);
+    
+
+Container support
+
+
+Apache Composer was the first lightweight container to support and popularize this for of dependency injection.
+   Spring Framework has been retrofitted with constructor injection capability, but its primary focus is still
+   setter injection. Even the once heavyweight technologies like Avalon and OSGi moved towards constructor
+   injection.
+
\ No newline at end of file

Added: incubator/composer/trunk/composer-site/src/site/content/disambiguation.html
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/disambiguation.html?rev=618174&view=auto
==============================================================================
--- incubator/composer/trunk/composer-site/src/site/content/disambiguation.html (added)
+++ incubator/composer/trunk/composer-site/src/site/content/disambiguation.html Sun Feb  3 22:33:20 2008
@@ -0,0 +1,61 @@
+
+
+Disambiguation
+
+
+
+
+
+Overview
+You may have a component that has a dependency on something that the
+container could ordinarily satisfy more than one.  By default,
+when Apache Composer is presented with such a situation, it will throw an
+exception suggesting the depency resolution is ambiguous.
+Disambiguation using parameter names
+With Apache Composer 2.0 we are able to leverage the parameter names of
+constructors and methods in order to remove the ambiguity on
+dependancies.

+
+public class Store {
 public Store(StockManager workingDayStockManager, StockManager afterHoursStockManager) {
 // etc
 }
}
+
+If Store is added to the container appropriately, then its parameter
+names 'workingHoursStockManager'
+and 'afterHoursStockManager
+' can be used in conjunction with similarly named components inject the
+right dependency in the right way:

+
+pico.as(Characteristics.USE_NAMES).addComponent(Store.class); 

+
+
+Access to parameter names was dropped from JDK 6.0 and it is uncertain
+whether it will be added as a feature in another release, so
+Apache Composer relies on another open source library called Paranamer,
+without requiring a dependency on its Jar.  In other words,
+Apache Composer has the same classes from Paranamer in its jar.

+

+See CommandLineArgumentsApache Composer,
+PropertiesApache Composer
+and SystemPropertiesApache Composer
+for implementations of Apache Composer that set up components for
+subsequent parameter name binding.

+

+Page component-configuration
+also shows parameter names being used for binding as does injection.

+

+Usage of parameter names is available for all types of
+Dependency-Injection where parameter names are present.

+
+Disambiguation using Binding Annotations
+
+This worls the same as Guice.  Namely you make an
+annotation that extends our 'Bind' annotation and mark it in your constructor or method's signature like so.
+
+
+@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.FIELD, ElementType.PARAMETER})
@Bind
public static @interface WorkingDayStockManager {}

@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.FIELD, ElementType.PARAMETER})
@Bind
public static @interface AfterHoursStockManager {}

public class Store {
 public Store(@WorkingDayStockManager StockManager workingDayStockManager, 
 @AfterHoursStockManager StockManager afterHoursStockManager) {
 // etc
 }
}
+
+
+Making Apache Composer leverage binding annotations if present is
+automatic.

Biniding
+annotations specified for constructor parameters (as shown above),
+method injection parameters as well as field injection.

+
\ No newline at end of file

Added: incubator/composer/trunk/composer-site/src/site/content/downloads.html
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/downloads.html?rev=618174&view=auto
==============================================================================
--- incubator/composer/trunk/composer-site/src/site/content/downloads.html (added)
+++ incubator/composer/trunk/composer-site/src/site/content/downloads.html Sun Feb  3 22:33:20 2008
@@ -0,0 +1,15 @@
+
+
+Downloads
+
+
+Released Jars (1.3 and 2.0) 
+Core  : http://repository.codehaus.org/org/picocontainer/picocontainer/
+Gems  : http://repository.codehaus.org/org/picocontainer/picocontainer-gems/
+Snapshot Jars (2.1) 
+Core : http://snapshots.repository.codehaus.org/org/picocontainer/picocontainer/
+Gems : http://snapshots.repository.codehaus.org/org/picocontainer/picocontainer-gems/
+
+Currently, the Core jar is ~190K, and the Gems jar is ~89K. 
+
+
\ No newline at end of file

Added: incubator/composer/trunk/composer-site/src/site/content/faq.html
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/faq.html?rev=618174&view=auto
==============================================================================
--- incubator/composer/trunk/composer-site/src/site/content/faq.html (added)
+++ incubator/composer/trunk/composer-site/src/site/content/faq.html Sun Feb  3 22:33:20 2008
@@ -0,0 +1,234 @@
+
+
+
+FAQ
+
+
+
+  
+    
+      
+    
+  Why Apache Composer 2.0?
+
+
+  First EJB 3.0 then Google Guice seemed to copy the ideas from Apache Composer, adding some more value. EJB 3.0 ommitted the essential Constructor Injection, and Guice went far to far down a annotations road. Soon after Guice, even the Spring Framework team decided to do things the direct way with 'JavaConfig'.
+  So Apache Composer 1.x was refactored (not rewritten) into Apache Composer 2.0. All the unit tests were kept, and excerise took hundreds of commits, but the team is pleased with the result.
+
+
+  
+    
+      
+    
+  Can my component use multiple constructors?
+
+
+  Yes.
+  You can code multiple constructors for a component:
+  
+    
+      class MyComp {
+
+  private ThreadPool theThreadPool;
+  
+  public MyComp(ThreadPool threadpool) {
+    theThreadPool = threadpool;
+  }
+
+  public MyComp() {
+    theThreadPool = new DefaultThreadPool();
+  }
+
+  // other methods.
+
+
+}
+    
+  
+
+
+  
+    
+      
+    
+  How does Apache Composer decide what constructor to use?
+
+
+  Apache Composer will instantiate a given component using the "greediest" satisfiable constructor. By greedy, we mean the constructor that takes the most parameters. By satisfiable, we mean constructors where all arguments can be satisfied by other registered components.
+  If you register a component with no satisfiable constructors, or two or more ambiguous "largest" constructors, a RuntimeException will be thrown when you ask for the component instance.
+  We recommend for most components, you use only one constructor, although this is by no means a requirement.
+
+
+  
+    
+      
+    
+  How does Apache Composer compare to EJB containers?
+
+
+  Oh blimey, it is rather different. EJB has loads of things you must extend, implement, provide and throw. It is also not an IoC design. It is close in that components are managed by a container, but the cumbersome and static nature of the JNDI lookups ensure that it is not actually IoC. Apache Composer is not a superset of EJB though, as it provides no remoting capability (but NanoContainer will). At least the Apache Composer compatible components hosted in this project do not.
+
+
+  
+    
+      
+    
+  How does Apache Composer decide what constructor to use?
+
+
+  Apache Composer will instantiate a given component using the "greediest" satisfiable constructor. By greedy, we mean the constructor that takes the most parameters. By satisfiable, we mean constructors where all arguments can be satisfied by other registered components.
+  If you register a component with no satisfiable constructors, or two or more ambiguous "largest" constructors, a RuntimeException will be thrown when you ask for the component instance.
+  We recommend, for the sake of predictablility, that Apache Composer compatible components use only one constructor, although this is by no means a requirement.
+
+
+  
+    
+      
+    
+  How to use primitive types in constructors?
+
+
+  Apache Composer will look for the greediest constructor of your component. But if your component's constructor depends on primitive types you may set the values explicitly.
+  
+    
+      public interface ThreadPool {
+	void setSize(int);
+}
+
+public class MyComp {
+	private ThreadPool threadPool;
+	public MyComp(ThreadPool pool, int size) {
+		threadPool = pool;
+		threadPool.setSize(size);
+	}
+}
+    
+  
+  In this case you can set the parameters at registration time:
+  
+    
+      DefaultApache Composer pico = new DefaultApache Composer();
+pico.addComponent(ThreadPool.class, DefaultThreadPool.class);
+pico.addComponent(MyComp.class, MyComp.class, new Parameters[] {
+	new ComponentParameter(),
+	new ConstantParameter(new Integer(5));
+})
+MyComp myComp = (MyComp)pico.getInstance(MyComp.class);
+    
+  
+  Use ConstantParameter to set constant values and the ComponentParameter to let Apache Composer resolve the dependency.
+
+
+  
+    
+      
+    
+  When should I use Apache Composer?
+
+
+  

+    We recommend using Apache Composer when your application consists of many different classes (components) that are related to each other. Instantiating and lacing/connecting a lot of objects can be difficult task.
+
+
+  
+    
+      
+    
+  Why Another IoC Framework?
+
+
+After a long period of watching Inversion of Control frameworks,
+and for some of us avoiding them because of their cumbersome nature, we
+got together to write what we believe is the simplest possible IoC
+design. One, perhaps, that considers the so-designed component as more
+important that the container.
+When we set out to do this in 2003, there was nothing equivalent
+to Apache Composer (xContainer originally). XWork, that underpinned
+WebWork2 was a general/embeddable Setter Dependency Injection framework,
+but not well known. The Spring Framework started in the same timescale,
+and we were talking to its authors before Martin Fowlers Dependency
+Injection article. Later we discovered that HiveMind (now at Apache)
+also was in the same space.
+
+
+  
+    
+      
+    
+  Why Constructor Injection?
+
+
+  Constructor Injection is hard to swallow for people who have been living with Interface Lookup or Setter Injection for long. We think it's like TDD. Once you get the grasp of it, you don't go back. Here are some benefits with this type of IoC:
+  
+    Constructor Injection makes a stronger dependency contract
+    It's more succinct in terms of lines of code
+    It's more succinct in terms dependency-statement-mechanism i.e. no XML, attributes, enabler interfaces etc
+    A component is characterized by InterfaceImplSeparation with the interface being the service offered to other comps, and the impl declaring whatever goddarned need it likes and that need being wholly up to the implementor of the component and nothing to do with the service contract.
+    No indeterminate state. Not all the post instantiation setters may be called. Consider the non-container case for comp usage, if v1.2 of that comp introduces a new dependancy, with Constructor Injection the compiler will tell me.
+  
+
+
+  
+    
+      
+    
+  Will we support Guice's @Inject annotation transparently? 
+
+
+  We could compile Apache Composer against Guice.jar and leverage the @Inject method with a new InjectionFactory (and probably will). The problem is that there is no easy way to use an annotation without having its class in the classpath. There's no easy 'transparent' solution for this. 
+  Things  fail silently if the jar is missing, unless the annotation is used - then it fails noisily. Meaning, the mere declaration of an annotation on a component is not enough to cause a ClassNotFoundException on load, if its not used:
+  @Retention(RetentionPolicy.RUNTIME)
+@Target(value={ElementType.METHOD})
+public static @interface Bar {
+}
+
++import com.google.inject.Inject;
+public class Foo {
+
+    @Inject
+    @Bar
+    public void setFoo(String str) {
+        System.out.println("0>" + str);
+    }
+
+    public static void main(String[] args) throws NoSuchMethodException {
+
+        Foo foo = new Foo();
+        foo.setFoo("hello");
+
+        Method m = Foo.class.getMethod("setFoo", String.class);
+
+        Annotation[] anns =  m.getDeclaredAnnotations();
+        System.out.println("1> " + anns.length);
+        for (int i = 0; i < anns.length; i++) {
+            Annotation ann = anns[i];
+            System.out.println("2> " + ann.toString());
+        }
+
+        Annotation ann =  m.getAnnotation(Inject.class);
+        System.out.println("3> " + ann);
+    }
+}
+
+Leaving Guice out of the classpath, and trying to launch Foo...
+
+  commandline: java -cp classes Foo
+0>hellos
+1> 1
+2> @Foo$Bar()
+Exception in thread "main" java.lang.NoClassDefFoundError: org/picocontainer/annotations/Inject
+        at Foo.main(Foo.java:32)
+
+  The class loads, but the @Inject annotation is not present in the set of declared annotations, but another in the classpath is.  Lastly when accessed explicitly, there is an exception thrown.  Contrast to, the same run with Guice in the classpath:
+0>hello
+1> 2
+2> @org.picocontainer.annotations.Inject()
+2> @Foo$Bar()
+3> @org.picocontainer.annotations.Inject()
+
+
+
+
+
+

Added: incubator/composer/trunk/composer-site/src/site/content/fluent-style.html
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/fluent-style.html?rev=618174&view=auto
==============================================================================
--- incubator/composer/trunk/composer-site/src/site/content/fluent-style.html (added)
+++ incubator/composer/trunk/composer-site/src/site/content/fluent-style.html Sun Feb  3 22:33:20 2008
@@ -0,0 +1,42 @@
+
+
+
+
+Fluent Stype
+
+
+Apache Composer allows for a very fluent style of use. Refer to Martin's 'Fluent
+Interface' article.
+A simple example :
+    
+      +pico = new DefaultApache Composer();
+pico.addComponent(Apple.class).addComponent(Orange.class).addComponent(Pear.class)
+    .addComponent(Banana.class)
+    .addComponent(Grape.class, Grenache.class);
+
+One with per component properties:
++pico = new DefaultApache Composer();
+pico.addComponent(Apple.class)
+    .as(CACHE).addComponent(Orange.class)
+    .as(CACHE, HIDE_IMPLEMENTATION).addComponent(Pear.class)
+    .as(SYNCHRONIZE, CACHE).addComponent(Banana.class)
+    .addComponent(Grape.class, Grenache.class);
+
+One with properties that are persistently set, half way through.
+
+  pico = new DefaultApache Composer();
+pico.addComponent("Coxs", CoxsApple.class)
+    .addComponent("Golden", GoldenDeliciousApple.class)
+    .addComponent(new ValenciaOrange())
+    .change(SYNCHRONIZE, CACHE, HIDE_IMPLEMENTATION)
+    .addComponent(Pear.class)
+    .addComponent(Banana.class)
+    .addComponent(Grape.class, Grenache.class);
+
+
+ 
+
+

Added: incubator/composer/trunk/composer-site/src/site/content/goals.html
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/goals.html?rev=618174&view=auto
==============================================================================
--- incubator/composer/trunk/composer-site/src/site/content/goals.html (added)
+++ incubator/composer/trunk/composer-site/src/site/content/goals.html Sun Feb  3 22:33:20 2008
@@ -0,0 +1,26 @@
+
+
+
+
+Our Goals
+
+
+Apache Composer's core was designed with some goals in mind:
+
+  No mandatory dependencies.
+  No logging built in (we have a Monitor interface and implementations for Commons-Logging and Log4J etc)
+  No meta-data requirement.
+  Small jar size.
+  Embeddable by design (no main method entry point)
+
+If someone has a need for Apache Composer that we did not originally envision, or a feature that could be imlemented, we will try to accomodate it. The principle of Lowest Common Denominator (LCD) allows us for Apache Composer itself, to keep things small, while allowing extensions to deliver the larger visions. Thus, meta-data, dependancies, mainable are all OK for related extensions of Apache Composer.
+ 
+ 
+ 
+ 
+  
+
+
+
+
+

Added: incubator/composer/trunk/composer-site/src/site/content/help/ambiguous-injectable-help.html
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/help/ambiguous-injectable-help.html?rev=618174&view=auto
==============================================================================
--- incubator/composer/trunk/composer-site/src/site/content/help/ambiguous-injectable-help.html (added)
+++ incubator/composer/trunk/composer-site/src/site/content/help/ambiguous-injectable-help.html Sun Feb  3 22:33:20 2008
@@ -0,0 +1,48 @@
+
+
+
+
+    Ambiguous Injectable
+
+Apache Composer tries to determine what to inject into the constructor of each component as it instantiates (or setters/fields for other injection types). Sometimes there can be two or more classes that could equally satisfy a constructor: 
+
+  pico.add(new Apple("Braeburn"));
+pico.add(new Apple("Granny Smith"));
+pico.add(Pie.class); // needs Apple
+Pie pie = pico.getComponent(Pie.class); // throws AmbiguousComponentResolutionException citing there are two Apples.
+
+
+
+The best advice is don't setup Apache Composer in a way that would allow ambiguities  (just put in one Apple in the case above).
+An alternative strategy would be to use custom parameters (TODO)
+One more strategy would be to use names parameters 
+
+  class Pie {
+  Pie(Apple grannySmith) {
+    // etc 
+
+  }
+
+}
+
+...
+
+
+pico.add("braeburn", new Apple("Braeburn"));
+pico.add("grannySmith", new Apple("Granny Smith"));
+pico.add(Pie.class); // needs Apple, specifically a Granny Smith.
+Pie pie = pico.getComponent(Pie.class); // OK this time.
+
+
+To use names Parameters, you are going to need Paranamer 1.0 (or above) in the classpath, as well as ASM 3.0 (or above). If you are expecting Apache Composer to work based on parameter names, but its not doing so, it is most likely that you do not have paranamer-1.0.jar in the classpath. See http://repository.codehaus.org/com/thoughtworks/paranamer/paranamer/ for versions of paranamer. Also http://maven.objectweb.org/maven2/asm/asm/ for the ASM jar.
+You also have to make a decision as to when parameter name data is made. There are two choices for this:
+
+  At runtime
+  At build time   
+
+When at runtime, Apache Composer will need to be accompanied by ASM and Paranamer in the classpath. You will also need to compile your Java classes with debug information.
+When at build time, you will need to use and Ant or Maven fragment to post-process the compiled classes for your app to add the paramaeter name data. At runtime, neither Paranamer nor ASM will be needed. See http://paranamer.codehaus.org/ - specifically the quick start section pertinent to Ant and Maven. 
+  
+ 
+
+

Added: incubator/composer/trunk/composer-site/src/site/content/help/unprocessed-properties-help.html
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/help/unprocessed-properties-help.html?rev=618174&view=auto
==============================================================================
--- incubator/composer/trunk/composer-site/src/site/content/help/unprocessed-properties-help.html (added)
+++ incubator/composer/trunk/composer-site/src/site/content/help/unprocessed-properties-help.html Sun Feb  3 22:33:20 2008
@@ -0,0 +1,26 @@
+
+
+
+
+    Unprocessed Properties
+
+Properties are a powerful mechanism to add hints at registration time as to what the behavior of a component should be. It only works though when the right component factories are set for the container. Ones that recognise the property and can process it. For example, DefaultConstructor's default constructor sets up an adaptive ComponentFactory that can handle HIDE_IMPL: 
+
+
+  pico = new DefaultApache Composer();
+pico.as(HIDE_IMPL).addComponent(Apple.class);
+
+But with a custom ComponentFactory, it may not:
+
+  pico = new DefaultApache Composer(new MyComponentFactory);
+pico.as(HIDE_IMPL).addComponent(Apple.class); // fails with CompositionException
+
+The trick is (in this case) to make sure that the right chain of component factories are setup:
+
+  pico = new DefaultApache Composer(new MyComponentFactory().wrap(new AdaptiveBehaviorFactory()));
+pico.as(HIDE_IMPL).addComponent(Apple.class); // fails with CompositionException
+
+
+A component may have many properties as it is added to the container.  As each is processed, it is removed from the set.  If there are any left after the component has been added the behavior or action that the property suggests has not been setup.  Thus a CompositionException being thrown warning of unprocessed properties only happens one or more properties are left - whether they are Apache Composer's own properties or custom ones
+
+

Added: incubator/composer/trunk/composer-site/src/site/content/index.html
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/index.html?rev=618174&view=auto
==============================================================================
--- incubator/composer/trunk/composer-site/src/site/content/index.html (added)
+++ incubator/composer/trunk/composer-site/src/site/content/index.html Sun Feb  3 22:33:20 2008
@@ -0,0 +1,52 @@
+
+
+
+
+Overview
+
+
+
+
+What is Apache Composer?
+
+Apache Composer is a  highly embeddable full service Inversion of Control (IoC) container
+for components honour the Dependency Injection pattern.
+You could use it as a lightweight alternative to Sun's J2EE patterns for web applications or general solutions. 
+What is Dependency Injection? Martin Fowler has a good article from 2003, but here is another view: It is a good design pattern that, for large enterprise applications, facilitates: 
+
+  easy best practice  unit testing vs little and difficult unit testing. 
+  component reuse vs  rewriting through ignorance or need 
+  centralized configuration vs components reading their own config (scattered) 
+  clean & declarative architecture vs nest of singletons that nobody can make sense of 
+  maintainability vs developers having difficulties fixing bugs 
+  adaptability vs developers not knowing where to start to add features
+
+Dependency Injection is
+  quite often, but not exclusively, used by Agile practicioners. It
+  counters the situation where the enterprise application:
+
+  has grown to be thousands of classes, with dozens if not
+  hundreds of Singletons
+  draws similarities to Spaghetti, Hairballs or Balls of Mud
+  has made development staff looking after it miserable
+  suffers repeated allegations of being unable to be developed without complete rewrite 
+
+Despite it being very compact in size (the core is ~128K and it
+has no mandatory dependencies outside the JDK), Apache Composer supports different dependency injection types (Constructor, Setter, Annotated Field and Method) and offers multiple lifecycle and monitoring strategies.
+Apache Composer has originally been implemented in Java but is also
+available for other platforms and languages. These are detailed here.
+
+Getting Started
+Take a look at the introduction. 
+
+
+Related projects
+NanoContainer builds on top of Apache Composer the support for
+several scripting meta-languages (XML, Groovy, Bsh, Jython and Rhyno),
+AOP, Web frameworks (Struts and WebWork), Persistence (Hibernate) SOAP,
+JMX, and much more.
+
+
+
+
+

Added: incubator/composer/trunk/composer-site/src/site/content/injection.html
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/injection.html?rev=618174&view=auto
==============================================================================
--- incubator/composer/trunk/composer-site/src/site/content/injection.html (added)
+++ incubator/composer/trunk/composer-site/src/site/content/injection.html Sun Feb  3 22:33:20 2008
@@ -0,0 +1,132 @@
+
+
+Dependency Injection
+
+
+
+See Martin Fowlers's Inversion of Control Containers and the Dependency Injection  article from 2003 for a thorough description. Surely everyone has read this by now? 
+ Injection Types 
+Constructor Dependency Injection (CDI) 
+This is where a component has a constructor, with arguments that are its dependencies:
+
+  public class Apple {
  private final Orange orange;
  private final Pear pear;
  private final Banana banana;

  public Apple(Orange orange, Pear pear, Banana banana) {
    this.orange = orange;
    this.pear = pear;
    this.banana = banana;
  }

  // methods
}
+
+The Apache Composer team recomends CDI over other types. There is no need
+to mark up the constructor with an annotation. Having more than one
+constructor is OK too, as Apache Composer will try to use the one with
+the most arguments and fall back to ones with fewer if it cannot
+satisfy the longer ones.
+The  component factory for this is ConstructorInjection. It only handles constructor injection types of components.  Factory AdaptiveInjection
+defaults to constructor injection, after checking first to see it the
+component in question is a Annotated Method or Field type (see below). 
+Setter Dependency Injection (SDI) 
+This is where a component has an empty constructor with dependencies provided by setters after instantiation:
+
+  public class Apple {
  private Orange orange;
  private Pear pear;
  private Banana banana;

  public setOrange(Orange orange) {
    this.orange = orange;
  }
  public setPear(Pear pear) {
    this.pear = pear;
  }
  public setBanana(Banana banana) {
    this.banana = banana;
  }
  // other methods
}

+
+  Setter methods (those prefixed with 'set') may not be your
+preferred choice. You can force a different prefix to be choosable in
+Apache Composer, such as 'init' or 'inject'.
+  The  component factory for this is SetterInjection. It only handles setter injection types of components.
+Factory AdaptiveInjection can also handle setter injection types, though it requires that the component was registered with the property 'SDI' in order to activate the Setter Injection functionality. AdaptiveInjection will also fall through to constructor injection if there is no SDI property. 
+If you want to use an prefix other than 'set', then specify your preferred prexix in the non-default constructor for SetterInjection.
+Annotated Field Dependency Injection 
+This is where a component has an empty constructor with dependencies
+indicated by a field annotation and provided automatically by the
+container after instantiation.
+
+  public class Apple {
  @Inject
  private Orange orange;
  @Inject
  private Pear pear;
  @Inject
  private Banana banana;

  // methods
}
+
+
+Yes thats's right, there's no constructor needed. It means that for a
+Unit Test, you cannot simply 'new' the class, which is a downside.
+The  component factory for this is a class AnnotatedFieldInjection. It only handles field-annotation injection types of components.
+Additionally component factory AdaptiveInjection
+can also handle field annotation types, if the @Inject annotation from
+Apache Composer's codebase is used as the marker for injection. AdaptiveInjection will also fall through to constructor injection if there is no recognised @Inject annotation.
+If you want to use an @Inject annotation from another codebase, then
+specify the preferred annotation class in the constructor for AnnotatedFieldInjection.
+Annotated Method Dependency Injection 
+This is where a component has an empty constructor and gets its
+dependencies injected into annotated methods after instantiation:
+
+  public class Apple {
  private Orange orange;
  private Pear pear;
  private Banana banana;

  @Inject
  public injectOrange(Orange orange) {
    this.orange = orange;
  }
  @Inject
  public setPear(Pear pear) {
    this.pear = pear;
  }
  @Inject
  public provideBanana(Banana banana) {
    this.banana = banana;
  }
  // other methods
}
+
+The method (whatever its name) needs an @Inject annotation.  That's from our codebase (org.picocontainer.Inject).
+The  component factory for this is AnnotatedMethodInjection. It only handles method-annotation injection types of components.
+Additionally component factory AdaptiveInjection
+can also handle method-annotation injection types, if the @Inject
+annotation from Apache Composer's codebase is used as the marker for
+injection. AdaptiveInjection will also fall through to constructor
+injection if there is no recognised annotation.
+If you want to use an @Inject annotation from another codebase, then
+specify the preferred annotation class in the constructor for AnnotatedMethodInjection.
+ Method Dependency Injection 
+This is where a component has an empty constructor and gets all its
+dependencies injected into single method after instantiation:
+
+  public class Apple {
  private Orange orange;
  private Pear pear;
  private Banana banana;
  public inject(Orange orange, Pear pear, Banana banana) {
    this.orange = orange;
    this.pear = pear;
    this.banana = banana;
  }
  // other methods
}
+
+The method name needs be 'inject' unless overridden in the InjectionFactory.
+The  component factory for this is MethodInjection. It only handles method-injection types of components.
+Additionally component factory AdaptiveInjection can also handle method-injection types, but only if the METHOD_INJECTION characteristic is specified.
+
+Using Apache Composer with Injection Types
+Explicit Constructor Injection:
+
+  pico = new DefaultApache Composer(new ConstructorInjection());
pico.addComponent(Apple.class);

+
+Constructor Injection, is a default too (via AdaptiveInjection):
+
+  pico = new DefaultApache Composer();
pico.addComponent(Apple.class);

+
+Explicit Setter Injection:
+
+  pico = new DefaultApache Composer(new SetterInjection());
pico.addComponent(Apple.class);

+
+Explicit Annotated Field injection:
+
+  pico = new DefaultApache Composer(new AnnotatedFieldInjection();
pico.addComponent(Apple.class);

+
+Explicit Annotated Field injection, with alternate Annotation:
+
+  pico = new DefaultApache Composer(new AnnotatedFieldInjection(MyInjectAnnotaton.class);
pico.addComponent(Apple.class);

+
+Explicit Annotated Method injection:
+
+  pico = new DefaultApache Composer(new AnnotatedMethodInjection();
pico.addComponent(Apple.class);

+
+Explicit Annotated Method injection, with alternate Annotation:
+
+  pico = new DefaultApache Composer(new AnnotatedMethodInjection(MyInjectAnnotaton.class);
pico.addComponent(Apple.class);

+
+Explicit  Method injection, implicit injection method prefix ('inject'):
+
+  pico = new DefaultApache Composer(new MethodInjection();
pico.addComponent(Apple.class);

+
+Explicit  Method injection, explicit injection method prefix:
+
+  pico = new DefaultApache Composer(new MethodInjection("setDependencies");
pico.addComponent(Apple.class);

+
+  Method injection, via a characteristic:
+
+  pico = new DefaultApache Composer();
pico.as(Characteristics.METHOD_INJECTION).addComponent(Apple.class);

+
+ Leveraging Parameter Names 
+This is where the type alone is not enough to indicate which
+dependency should be put one or more constructor args. The following
+component has a need for two of the same type, with some subtly
+different characteristics.
+
+  public class AppleProcessor {
  private Apple dessertApple;
  private Apple cookingApple;

  public inject(Apple dessertApple, Apple cookingApple) {
    this.dessertApple = dessertApple;
    this.cookingApple = cookingApple;

  }
  // other methods
}

pico.addComponent("dessertApple", GoldenDeliciousApple.class);

pico.addComponent("cookingApple", BramleyApple.class);
pico.as(Characteristics.USE_NAMES).addComponent(AppleProcessor.class);
+
+In this case the constructor to AppleProcessor has carefully named
+parameters - 'dessertApple' and 'cookingApple'. This is picked up on
+for the two named components GoldenDeliciousApple and BramleyApple also
+set up in the container.
+There are two ways for this to work:
+
+  relying on the fact that  your component classes have debug info compiled into them. 
+  post-processing component classes with Paranamer before placing them in their jar 
+
+
\ No newline at end of file

Added: incubator/composer/trunk/composer-site/src/site/content/interception.html
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/interception.html?rev=618174&view=auto
==============================================================================
--- incubator/composer/trunk/composer-site/src/site/content/interception.html (added)
+++ incubator/composer/trunk/composer-site/src/site/content/interception.html Sun Feb  3 22:33:20 2008
@@ -0,0 +1,123 @@
+
+
+
+
+    Interception
+
+    
+
+
+This is a rudimentary Aspect Orientated Programing (AOP) capability. With respect to the methods of a component, both
+   before and after invocation, control can be handed to an interceptor. You can intercept a method call:
+
+     before it is invoked (and optionally veto its invocation, with an alternate return value).
+     after it is invoked (and optionally override the return value).
+
+There are some limitations:
+
+    it will only work for interface/impl separated components
+    it needs a class that implements the interface in question
+        
+            all of the methods need null implementations, even if not intended to be intercepted
+        
+    
+    will (likely) break if there's deep recursion into Intercepted instances
+    you can't intercept an implementation's static methods
+    it is not possible to modify a method's arguments
+    the constructor's invocation for the component is not interceptable
+    the component's fields are not interceptable
+    only one component invoking the methods on another component will be intercepted.
+      
+        components and related classes calling their own methods will not be intercepted
+      
+    
+
+
+      public static class BiteReporter implements Apple {
+    private Intercepted.Controller controller;
+
+    public BiteReporter(Intercepted.Controller controller) {
+        this.controller = controller;
+
+    } 
+    public boolean takeBite(int grams) {
+        System.out.println("Bite of " + grams + " grams of apple '" + controller.instance().getName() + "'");
+        return false; // ignored, but necessary.
+    }
+}
+...
+pico = new DefaultApache Composer(new Intercepting());
+pico.addComponent(Apple.class, BraeburnApple.class);
+Intercpeted intercepted = pico.getComponentAdapter(Apple.class).findAdapterOfType(Intercpeted.class);
+intercepted.pre(Apple.class, new BiteReporter(intercepted.getController()));
+// see also Intercpeted.post(...) method.
+Apple a1 = pico.getComponent(Apple.class);
+a1.takeBite(100); 
+// prints Bite of 100 grams of apple 'Braeburn' 
+// ... irrespective of what else Braeburn.takeBite(int) does.
+  
+
+
+    pico = new DefaultApache Composer();
+pico.as(INTERCEPT).addComponent(Apple.class, BraeburnApple.class);
+// etc
+
+
+    pico = new ContainerBuilder.withInterception().build();
+pico.addComponent(Apple.class, BraeburnApple.class);
+// etc
+
+
+    pico = new ContainerBuilder.withBehaviors(interception()).build();
+pico.addComponent(Apple.class, BraeburnApple.class);
+// etc
+
+Fine grained participation in interception
Assuming you're passing in the Interceptor to the classes you're using for interception of a component, you can
+   participate in the fate of the method call. For a 'pre' invocation, you can veto the calling of the 'real'
+   method. 
+
+
+        public boolean takeBite(int grams) {
+        if (grams > 50) {
+             controller.veto();
+
+        }
+        return false; // will be passed back to the caller.
+    }
+
+
+For a 'post' invocation, you can override the return value of the 'real' method. 
+
+
+        public boolean takeBite(int grams) {        
+
+        if (grams > 50) {
+             controller.override();
+             (Apple) realApple = (Apple) controller.instance();
+             realApple.takeBite(-1 * grams); // undo !
+        }
+        return false; // will be passed back to the caller.
+    }
+
+
+Also for a 'post' invocation, you can access the return value of the 'real' method. 
+
+
+        public boolean takeBite(int grams) {        
+
+        boolean rv = (boolean) controller.getOriginalRetVal();
+        if (rv == false) {
+             // do something !
+        }
+        return true; // ignored as no 'override'
+    }
+
+
+
+
+
+

Added: incubator/composer/trunk/composer-site/src/site/content/introduction.html
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/introduction.html?rev=618174&view=auto
==============================================================================
--- incubator/composer/trunk/composer-site/src/site/content/introduction.html (added)
+++ incubator/composer/trunk/composer-site/src/site/content/introduction.html Sun Feb  3 22:33:20 2008
@@ -0,0 +1,364 @@
+
+
+
+    Introduction
+
+
+
+Authors: Aslak Hellesoy, Jon Tirsen
+
+Basics
+
+This is a quick introduction to Apache Composer's most important features. Read through it to get an idea of what
+   Apache Composer is and isn't. 
+
+Apache Composer's most important feature is its ability to instantiate arbitrary objects. This is done through its API,
+   which is similar to a hash table. You can put java.lang.Class objects in and get object instances back.
+
+Example:
+
+
+    
+                    MutableApache Composer pico = new DefaultApache Composer();
+pico.addComponent(ArrayList.class);
+List list = (List) pico.getComponent(ArrayList.class);
+    
+
+
+(i)MutableApache Composer
+                                                                                                                               API
+
+This code does the same as this:
+
+
+    
+        List list = new ArrayList();
+    
+
+
+With a trivial example such as this there is no point in using Apache Composer. This was just to illustrate the basic
+   API. Apache Composer becomes useful with larger number of classes and interfaces having complex dependencies between
+   each other:
+
+    
+        
+            
+            
+        
+        
+            
+            
+        
+    
+ Complex Dependencies  Juicer Example

+        (Green means class, Yellow means interface).

+        Apache Composer identifies dependencies by looking at the
+        constructors of registered classes (Constructor Injection).
+        Apache Composer can also be though of as a generic factory that
+        can be configured dynamically. Apache Composer is able to
+        instantiate a complex graph of several interdependent objects.
+
+        Write some simple classes
+                                                                                             and interfaces with
+                                                                                             dependencies
+
+The "Juicer Example" diagram above could translate to the following code (we added a concrete Peelable):
+
+
+
+
+    
+                    public interface Peelable {
+    void peel();
+}
+    
+
+
+
+    
+                    public class Apple implements Peelable {
+    public void peel() {
+    }
+}
+    
+
+
+
+    
+                    public class Peeler implements Startable {
+    private final Peelable peelable;
+
+    public Peeler(Peelable peelable) {
+        this.peelable = peelable;
+    }
+
+    public void start() {
+        peelable.peel();
+    }
+
+    public void stop() {
+
+    }
+}
+    
+
+
+
+    
+                    public class Juicer {
+    private final Peelable peelable;
+    private final Peeler peeler;
+
+    public Juicer(Peelable peelable, Peeler peeler) {
+        this.peelable = peelable;
+        this.peeler = peeler;
+    }
+}
+    
+
+
+(Note that this code suffers from the antipattern Propagating Dependency but
+                                                                                                                  let's
+                                                                                                                  not
+                                                                                                                  worry
+                                                                                                                  about
+                                                                                                                  that
+                                                                                                                  for
+                                                                                                                  now
+    )
+
+Assemble components
+
+You tell Apache Composer what classes to manage by registering them like this (the order of registration has no
+   significance):
+
+
+    
+                    MutableApache Composer pico = new DefaultApache Composer();
+pico.addComponent(Apple.class);
+pico.addComponent(Juicer.class);
+pico.addComponent(Peeler.class);
+    
+
+
+(i)MutableApache Composer
+                                                                                                                               API
+
+Instantiate components
+
+You can tell Apache Composer to give you an instance of a class like this (provided it has been registered
+   previously):
+
+
+    
+        Juicer juicer = (Juicer) pico.getComponent(Juicer.class);
+    
+
+
+This will cause Apache Composer to do something similar to this behind the scenes (except that Apache Composer uses
+   reflection):
+
+
+    
+                    Peelable peelable = new Apple();
+Peeler peeler = new Peeler(peelable);
+Juicer juicer = new Juicer(peelable, peeler);
+return juicer;
+    
+
+
+ Note how Apache Composer figures out that Apple is a Peelable, so that it can be passed to Peeler
+                      and Juicer's constructors.
+
+Container hierarchies
+
+        Apache Composer provides a powerful alternative to the Singleton.
+        With container hierarchies you can create singleton-like objects
+        where you have fine grained control over the visibility scope of
+        the instance. (The singleton pattern is static and global - it
+        won't allow more than one instance, and it is visible from
+        anywhere. Not nice when you try to build a large enterprise
+        application from it).
+
+        
+
+A container (and its registered components) can get access to components registered in a parent container, but not
+   vice-versa. Consider this example, using the classes from above:
+
+

+    THIS WON'T WORK! It is for illustration purposes only!

+    
+
+
+    
+                    // Create x hierarchy of containers
+MutableApache Composer x = new DefaultApache Composer();
+MutableApache Composer y = new DefaultApache Composer( x );
+MutableApache Composer z = new DefaultApache Composer( y );
+
+// Assemble components
+x.addComponent(Apple.class);
+y.addComponent(Juicer.class);
+z.addComponent(Peeler.class);
+
+// Instantiate components
+Peeler peeler = (Peeler) z.getComponent(Peeler.class);
+// WON'T WORK! peeler will be null
+peeler = (Peeler) x.getComponent(Peeler.class);
+// WON'T WORK! This will throw an exception
+Juicer juicer = (Juicer) y.getComponent(Juicer.class);
+    
+
+
+This can be visualised as follows:

+    
+
+Let's analyse what will happen here:
+
+    Line 12 will work fine. z will be able to resolve the dependencies for Peeler (which is Fruit) from the parent
+        container.
+    
+  Line 14 will return null, as x can't see Peeler.
+    Line 16 will throw an exception, since Juicer's dependency to Peeler can't be satisfied (z can't be seen by
+        y).
+    
+
+         Since this
+        obviously won't work, keep in mind that this was just an
+        exercise to illustrate how container hierarchies work.

+         For a more
+        concrete example of the usage of container hierarchies, see NanoContainer
+        NanoWar.
+
+        Lifecycle
+
+Apache Composer has support for Lifecycle. If your classes implement Startable, you can control the lifecycle of all your objects with a simple method call on the
+                           container. The container will figure out the correct order of invocation of start()/stop()
+                           all the objects managed by the container.
+
+Calling start() on the container will call start() on all container managed objects in the order of their
+   instantiation. This means starting with the ones that have no dependencies, and ending with the ones that have
+   dependencies on others:
+
+    
+        
+            
+            
+        
+        
+            
+            
+        
+    
+ MutableApache Composer.start()  MutableApache Composer.stop()

+Lifecycle also works for hierarchies of containers. Calling start() on a container with child containers will start
+   all the containers in a breadth-first order, starting with itself. Likewise, calling stop() will call stop() on all
+   containers in the hierarchy in a depth-first order. The pictures below show what happens when start() and stop() are
+   called on a container with children.
+
+    
+        
+            
+            
+        
+        
+            
+            
+        
+    
+ MutableApache Composer.start()  MutableApache Composer.stop()

+ In order for hierarchy-aware lifecycle to work, child containers must be registered as components
+                      in their parent container. Just creating a container with another one as a parent will not
+                      cause the parent container to know about the child container.
+Example
+
+
+    
+                    MutableApache Composer parent = new DefaultApache Composer(new Caching());
+MutableApache Composer child = new DefaultApache Composer(parent);
+// We must let the parent container know about the child container.
+parent.addComponent(child);
+// This will start the parent, which will start the child.
+parent.start();
+    
+
+
+ Lifecycle is really only going to work for Apache Composers that are also caching component instances. Caching was a default in Apache Composer 1.x, but is not for 2.x - be warned!
+ Calling lifecycle methods on a container that has a parent container will not propagate the
+  lifecycle to the parent container. 
+Read more about lifecycle here.
+
+    
+        
+
+            Contrasting Usage Styles 
+
+            With Apache Composer you add components and get instances out in two styles. 
+
+            Classic bean style: 
+
+            
+  +pico = new DefaultApache Composer();
+pico.addComponent(ComponentOneImpl.class) // by type
+pico.addComponent(ComponentTwoImpl.class) // by type
+pico.addComponent(new ComponentThreeImpl()) // by instance
+pico.addComponent(ComponentFourImpl.class) // by type
+
+ComponentFourImpl four = pico.getComponent(ComponentFourImpl.class);
+
+            
+            Or you can use a fluent style if you
+               want:
+
+            
+  +ComponentFour four = new DefaultApache Composer()
+    .addComponent(ComponentOne.class)
+    .addComponent(ComponentTwo.class)
+    .addComponent(new ComponentThree())
+    .addComponent(ComponentFour.class)
+    .getComponent(ComponentFour.class);
+            
+
+        
+    
+
+
+
+
+
+
+
+
+
+
+
+

Avalon Interface	Apache Composer equivalent
LogEnabled	Logging agnostic
Contextualizable	n/a
Serviceable (was Composable)	arguments are injected
Configurable	arguments are injected
Parameterizable	n/a
Initializable	Constructor is the equivalent lifecycle concept
Startable	Startable
Suspendable	n/a
Recontextualizable	n/a
Recomposable	n/a
Reconfigurable	n/a
Reparameterizable	n/a
Disposable	Disposable

svn commit: r618174 [3/5] - in /incubator/composer/trunk: ./ composer-site/ composer-site/src/ composer-site/src/assembly/ composer-site/src/config/ composer-site/src/resources/ composer-site/src/resources/images/ composer-site/src/resources/style/ com...

2008-02-04T06:33:26Z

Added: incubator/composer/trunk/composer-site/src/site/content/inversion-of-control-history.html
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/inversion-of-control-history.html?rev=618174&view=auto
==============================================================================
--- incubator/composer/trunk/composer-site/src/site/content/inversion-of-control-history.html (added)
+++ incubator/composer/trunk/composer-site/src/site/content/inversion-of-control-history.html Sun Feb  3 22:33:20 2008
@@ -0,0 +1,115 @@
+
+
+Inversion of Control History
+
+
+
+Here is some of the history of the pattern or principle known as
+Inversion of Control (IoC). There is some confusion online as to
+whether IoC has been renamed Dependency Injection (DI). This is not the
+case, DI concerns just one aspect of IoC - component assembly. The
+other two are configuration and lifecycle. 
+See also the comparisons page. 
+Avalon
+Inversion of Control, as a term, was popularised in 1998 by Stefano Mazzocchi
+as consequence of trying to engineer a 'Java Apache Server Framework'
+for the growing set of server side Java components and tools at Apache.
+Sun were just starting to protect the word Java when used for
+branding/naming of software and computing functions, so Apache had to
+look for alternative names. Avalon was chosen as a project name (queue
+images of Arthurian legend).
+To the Avalon team, it was clear that components receiving various aspects of component assembly, configuration and lifecycle was a superior design to those components going at getting the same themselves. 
+It is important to point out that The Open Services Gateway (OSGi)
+initiative was also started around the same time as the Avalon
+framework and was similar to a degree. It was born in Europe and
+specified/controlled by a foundation formed around it.  
+Latterly this type of IoC has been given a new name - Contextualized Dependency Lookup.
+Avalon was cancelled as an Apache project in 2004, by the Apache Software Foundation.
+Setter Injection
+Joe Walnes, Mike Cannon Brookes and others found themselves writing XWork and WebWork2 to support their forthcoming book, Java Open Source Programming.
+Joe pointed out that the concepts were very much like those from
+IoC/Avalon that Paul had been trying to convince Joe to adopt for a
+couple of years, but that dependencies were passed into the component
+via setters. The need for those dependencies was declared in some
+accompanying XML.
+Paul who worked with Joe at an Energy Trading Company in London,
+suggested this was a different type of Inversion of Control. That, as a
+term, has been obsoleted for "Setter Injection" of course. 
+Rod Johnson, lead for the Spring Framework wrote a book Expert  One-on-One J2EE Design and Development
+(published Oct 2002) that also discussed the concepts of setter
+injection, and introduced the codeline that ultimately became the Spring Framework at SourceForge in February of 2003. 
+Martin Fowler has suggested that it may be better to have such
+dependency resolving methods prefixed with init rather than setter.
+With init or set prefixes to dependency receiving methods, a container
+could automatically assemble SDI components without the manifest. SDI,
+under container control, works best with the manifest though. Without a
+container, SDI Components are very much like simple Java beans to use:
+A downside of direct bean user of an SDI component is that it is
+possible to instantiate a component without setting all the
+dependencies. As mistakes, these should be quite quick to catch
+post-compile with a simple test of that application. Months later
+though, when a jar of components is replaced in an application with a
+latter version of the same, a new dependency may be missed, and a
+non-functioning application may be shipped to live. Again, that could
+be caught with diligent testing.
+Constructor  Injection 
+Rachel Davies, as one of the enthusiastic reviewers of Joe's book,
+left a margin note for the paragraphs that discussed the elegance of
+type two. The margin-note simply suggested that resolving dependencies
+by constructor was more elegant. Latterly we are inclined to agree. At
+that moment in time (the spring of 2003) there were no implementation
+of the constructor injection idea, so it seemed logical for the initial
+Apache Composer leads (Paul Hammant and Aslak Hellesoy) who liked the
+idea, to kick off the project.
+The added advantage is that CDI Components cannot be instantiated
+with missing dependencies. Thus the compiler or IDE will catch
+mismatches between any constructor and the parameters passed into the
+class on instantiation.
+ATG Dynamo
+was a commercial product that was successful in the market place in the
+late 90's. It also used constructors for dependency resolution.
+Dynamo's commercial success yielded a little when Apache made Struts,
+but it should not be forgotten that Dynamo casually used constructors
+for dependencies in web-applications first. 
+Types 1, 2 & 3 renamed 
+In 2003, Paul was refering to the Avalon style of IoC as "type 1",
+setter as "type 2" and constructor as "type 3". He went as far as
+publishing an article on it in Java Developer Journal.   
+December 2003; Rod Johnson of the Spring Framework team,
+Paul Hammant (former Avaloner, and co-lead of Apache Composer), Mike
+Royle, with Martin Fowler (by email) say down and played with some of
+the language of Martin's forthcoming article. Martin had drafted this
+article entirely independently of this team but had be kind enough to
+show a draft to them. The problem the team had was with the naming of
+the patterns related to Inversion of Control, and the examples of use
+that Martin had shown. Rod had been using the injection phrase before
+so it was felt that the component resolving style being "Dependency
+Injection" would be a good thing. 
+
+Thus when Dependency Injection rightly took over:
+
+
+  	Type 1 becomes Contextualized Dependency Lookup

+    

+    Type 2 becomes Setter Dependency Injection

+    

+    Type 3 becomes Constructor Dependency Injection
+  Type 4 was Field Injection or getter injection depending on who you spoke to. 
+
+Timelines
+
+Prior Art
+As a concept, Inversion of Control was not entirely new when
+Steffano popularised it at Apache in 1998. Parts of it been talked
+about before as Dependency Inversion Principle (Bob Martin) and the
+'Hollywood Principle' (don't call us, we'll call you), and the term
+cropped had been cropping up since 1996. 
+Gang of Four, Design Patterns, 1994 "Hollywood Pattern" (don't call us, we'll call you) as discussion point on 'Template' Pattern. 
+Robert C. Martin, "Dependency Inversion" in posting on comp.lang.c++, August 1994: OO Design Quality Metrics: An Analysis of Dependencies 
+Robert C. Martin, : "Principle of Depenency Inversion" in posting on comp.lang.c++, June 1995: The Principles of OOD with follow up postings through July 1995 
+Robert C. Martin, The Dependency Inversion Principle, In: C++ Report, Vol. 8, May 1996. See more recent PDF
+Michael Mattesson, 1996, Object-Oriented Frameworks : A survey of methodological issues "inversion of control" used in passing. 
+Brian Foote and Joseph Yoder, June 1998. Big Ball of Mud. Not so much on IoC, but setting the scene. 
+Ralph E. Johnson and Brian Foote, June 1998, Designing Reusable Classes "inversion of control" used in passing. 
+ 
+
\ No newline at end of file

Added: incubator/composer/trunk/composer-site/src/site/content/inversion-of-control.html
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/inversion-of-control.html?rev=618174&view=auto
==============================================================================
--- incubator/composer/trunk/composer-site/src/site/content/inversion-of-control.html (added)
+++ incubator/composer/trunk/composer-site/src/site/content/inversion-of-control.html Sun Feb  3 22:33:20 2008
@@ -0,0 +1,357 @@
+
+
+
+
+    
+    Inversion of Control
+
+
+Overview
+
+Inversion of Control (IoC) is a design pattern that addresses a
+component's dependency
+resolution, configuration and lifecycle. It suggests that the control of those three should not be the concern of the component itself. Thus it is inverted back. Note to confuse
+things slightly, IoC is also relevant to simple classes, not just
+components, but we will refer to components throughout this text. The
+most significant aspect to IoC is dependency resolution and most of the
+discussion surrounding IoC dwells solely on that. Dependency mis-management is acknowledged to be the biggest problem that IoC is trying to solve.
+
+Types of IoC
+
+There are many types of IoC, but we'll concentrate on the type of IoC that Apache Composer introduced to the community
+   - Constructor Injection. 
+
+IoC History
+
+Some detail about the history of Inversion of Control - IoC History
+
+Component Dependencies
+
+It generally favors loose coupling between components. Loose coupling in turn favours:
+
+    More reusable classes
+    Classes that are easier to test
+    Systems that are easier to assemble and configure
+
+Explanation
+
+Simply put, a component designed according to IoC does not go off and get other components that it needs in order to
+   do its job. It instead declares these dependencies, and the container supplies them. Thus the name
+   IoC/DIP/Hollywood Principle. The control of the dependencies for a given component is inverted. It is no longer the
+   component itself that establishes its own dependencies, but something on the outside. That something could be a
+   container like Apache Composer, but could easily be normal code instantiating the component in an embedded sense.
+
+Examples
+
+Here is the simplest possible IoC component :
+
+
+              public interface Orange {
+  // methods
+}
+public class AppleImpl implements Apple {
+  private Orange orange;
+  public AppleImpl(Orange orange) {
+    this.orange = orange;
+  }
+  // other methods
+}
+
+Here are some common smells that should lead you to refactor to IoC :
+
+
+              public class AppleImpl implements Apple{
+  private Orange orange;
+  public Apple() {
+    this.orange = new OrangeImpl();
+  }  
+  // other methods
+}
+
+The problem is that you are tied to the OrangleImpl implementation for provision of Orange services. Simply put, the
+   above apple cannot be a (configurable) component. It's an application. All hard coded. Not reusable. It is going to
+   be very difficult to have multiple instances in the same classloader with different assembly.
+
+Here are some other smells along the same line :
+
+
+              public class AppleImpl implements Apple {
+  private static Orange orange = OrangeFactory.getOrange();
+  public Apple() {
+  }  
+  // other methods
+}
+
+
+Component Configuration
+
+Sometimes we see configuration like so ...
+
+
+            public class BigFatComponent {
+  String config01;
+  String config02;
+  public BigFatComponent() {
+    ResourceFactory resources = new ResourceFactory(new File("mycomp.properties"));
+    config01 = resources.get("config01");
+    config02 = resources.get("config02");
+  }  
+  // other methods
+}
+
+In the IoC world, it might be better to see the following for simple component designs :
+
+
+            public class BigFatComponent {
+  String config01;
+  String config02;
+  public BigFatComponent(String config01, String config02) {
+    this.config01 = config01;
+    this.config02 = config02;
+  }  
+  // other methods
+}
+
+Or this for more complex ones, or ones designed to be more open to reimplementation ..
+
+
+            public interface BigFatComponentConfig {
+  String getConfig01();
+  String getConfig02();
+}
+public class BigFatComponent {
+  String config01;
+  String config02;
+  public BigFatComponent(BigFatComponentConfig config) {
+    this.config01 = config.getConfig01();
+    this.config02 = config.getConfig02();
+  }  
+  // other methods
+}
+
+With the latter design there could be many different implementations of BigFatComponentConfig. Implementations such
+   as:
+
+    Hard coded (a default impl)
+    Implementations that take config from an XML document (file, URL based or inlined in using class)
+    Properties File.
+
+It is the deployer's, embeddor's or container maker's choice on which to use.
+
+Component Lifecycle
+
+Simply put, the lifecycle of a component is what happens to it in a controlled sense after it has been instantiated.
+   Say a component has to start threads, do some timed activity or listen on a socket. The component, if not IoC, might
+   do its start in its contructor. Better would be to honor some start/stop functionality from an interface, and have
+   the container or embeddor manage the starting and stopping when they feel it is appropriate:
+
+
+            public class SomeDaemonComponent implements Startable {
+  public void start() {
+    // listen or whatever
+  }
+  public void stop() {
+  }
+  // other methods
+}
+
+Notes 
+
+The lifecycle interfaces for Apache Composer are the only characterising API elements for a component. If Startable was
+   in the JDK, there would be no need for this. Sadly, it also menas that every framework team has to write their own
+   Startable interface. 
+
+The vast majority of components do not require lifecycle functionality, and thus don't have to implement
+   anything.
+
+IoC Exceptions
+
+Of course, in all of these discussions, it is important to point out that logging is a common exception to the IoC
+   rule. Apache has two static logging frameworks that are in common use: Commons-Logging and Log4J. Neither of these is
+   designed along IoC lines. Their typical use is static accessed whenever it is felt appropriate in an application.
+   Whilst static logging is common, the Apache Composer team do not recommend that developers of reusable components
+   mandate a logging choice. We suggest instead that a Monitor component interface is created and default adapters are
+   provided to a number of the logging frameworks are provided.
+
+Overview
+
+IoC Types - Family Tree
+
+In recent years different approaches have emerged to deliver an IoC vision. Latter types, as part of a 'LightWeight'
+   agenda have concentrated on simplicity and transparency.
+
+Devised in London at the ThoughtWorks office in December of 2003; Present at the "Dependency Injection"
+   meeting were Paul Hammant, Aslak Hellesoy, Jon Tirsen, Rod Johnson (Lead Developer of the Spring Framework), Mike
+   Royle, Stacy Curl, Marcos Tarruela and Martin Fowler (electronically).
+
+Inversion of Control
+
+    Dependency Injection
+        
+            Constructor Dependency Injection (CDI) 

+                

+                Examples: Apache Composer, Spring Framework, (not in EJB 3.x sadly), Guice with Annotations
+            
+            Setter Dependency Injection

+                

+                Examples: Spring Framework, Apache Composer, EJB 3.0 & Guice with Annotations
+            
+            Interface Driven Setter Dependency Injection

+                

+                Examples: XWork, WebWork 2
+            
+            Field Dependency Injection

+                

+                Examples: Plexus, Apache Composer & Guice with Annotations.
+            
+        
+    
+    Dependency Lookup
+        
+            Pull approach (registry concept)

+                

+                Examples: EJB 2.x that leverages JNDI, Servlets that leverage JNDI
+            
+            Contextualized Dependency Lookup - AKA Push approach 

+                

+                Examples: Servlets that leverage ServletContext, Apache's Avalon, OSGi, Keel, Loom (they use Avalon)
+            
+        
+    
+
+See also Constructor Injection, Setter Injection for more information.
+
+Note Field Injection was categorised but there was was really no interest it until the EJB3.0 specification rolled out. Getter
+   Injection flourished for a while, but did not take and was never supported by the Apache Composer team.
+
+Examples of Common Types
+
+Constructor Dependency Injection
+
+This is where a dependency is handed into a component via its constructor :
+
+
+              public interface Orange {
+  // methods
+}
+
+public class AppleImpl implements Apple {
+  private Orange orange;
+  public AppleImpl(Orange orange) {
+    this.orange = orange;
+  }
+  // other methods
+}
+
+Setter Dependency Injection
+
+
+This is where dependencies are injected into a component via setters :
+
+
+    
+              public interface Orange {
+  // methods
+}
+
+public class AppleImpl implements Apple {
+  private Orange orange;
+  public void setOrange(Orange orange) {
+    this.orange = orange;
+  }
+  // other methods
+}
+    
+
+
+Contextualized Dependency Lookup (Push Approach)
+
+This is where dependencies are looked up from a container that is managing the component :
+
+
+              public interface Orange {
+  // methods
+}
+
+public class AppleImpl implements Apple, DependencyProvision {
+  private Orange orange;
+  public void doDependencyLookup(DependencyProvider dp) throws DependencyLookupExcpetion{
+    this.orange = (Orange) dp.lookup("Orange");
+  }
+  // other methods
+}
+
+
+Terms: Service, Component & Class
+
+Component is the correct name for things managed in an IoC sense. However very small ordinary classes are manageable
+   using IoC tricks, though this is for the very brave or extremists 
+
+A component many have dependencies on others. Thus dependency is the term we prefer to describe the needs of a
+   component.
+
+Service as a term is very popular presently. We think 'Service' dictates marshaling and remoteness. Think of Web
+   Service, Database service, Mail service. All of these have a concept of adaptation and transport. Typically a
+   language neutral form for a request is passed over the wire. In the case of the Web Service method requests are
+   marshaled to SOAP XML and forward to a suitable HTTP server for processing. Most of the time an application coder is
+   hidden from the client/server and marshaling ugliness by a toolkit or API.
+
+Dependency Injection versus Contextualized Lookup
+
+Dependency Injection is non-invasive. Typically this means that components can be used without a container or a
+   framework. If you ignore life cycle, there is no import requirements from an applicable framework.
+
+Contextualized Dependency Lookup is invasive. Typically this means components must be used inside a container or with
+   a framework, and requires the component coder to import classes from the applicable framework jar.
+
+Note that Apache's Avalon OSGi are not Dependency Injection types of IoC, they are Contextualized Dependency
+   Lookup.
+
+Ultimately, the contextualized lookup designs are not recommended at all. 
+
+What's wrong with JNDI ?
+
+With plain JNDI, lookup can be done in a classes' static initialiser, in the constuctor or any method including the
+   finaliser. Thus there is no control (refer C of IoC). With JNDI used under EJB control, and concerning only
+   components looked up from that bean's sisters (implicitly under the same container's control), the specification
+   indicates that the JNDI lookup should only happen at a certain moment in the startup of an EJB application, and only
+   from a set of beans declared in ejb-jar.xml. Hence, for EJB containers, the control element should be back. Should,
+   of course, means that many bean containers have no clue as to when lookups are actually being done, and apps work by
+   accident of deployment. Allowing it for static is truly evil. It means that a container could merely be looking at
+   classes with reflection in some early setup state, and the bean could be going off and availing of remote and local
+   services and components. Thus depending whether JNDI is being used in an Enterprise Java Bean or in a POJO, it is
+   either an example of IoC or not.
+
+Related Pages 
+
+    Contextualized Lookup
+        
+            Avalon
+                                                                                                            Framework
+            
+        
+    
+    IoC History
+    
+        
+            Dependency Injection
+                
+                    Constructor Injection
+                    
+                    Setter Injection
+                
+            
+        
+    
+
+
+

Added: incubator/composer/trunk/composer-site/src/site/content/javadoc.html
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/javadoc.html?rev=618174&view=auto
==============================================================================
--- incubator/composer/trunk/composer-site/src/site/content/javadoc.html (added)
+++ incubator/composer/trunk/composer-site/src/site/content/javadoc.html Sun Feb  3 22:33:20 2008
@@ -0,0 +1,16 @@
+
+
+
+
+Javadoc
+
+
+
+Core
+Gems
+TCK
+
+
+
+
+

Added: incubator/composer/trunk/composer-site/src/site/content/lifecycle.html
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/lifecycle.html?rev=618174&view=auto
==============================================================================
--- incubator/composer/trunk/composer-site/src/site/content/lifecycle.html (added)
+++ incubator/composer/trunk/composer-site/src/site/content/lifecycle.html Sun Feb  3 22:33:20 2008
@@ -0,0 +1,94 @@
+
+
+
+
+Lifecycle
+
+
+Lifecycle with configuration and depenedency injection makes
+Inversion of Control (IoC).
+After instantiation, if the component warrants it, a 'start'
+stage may be required. More specifically, if a container has injected
+and instantiated all components in a set, one or more of them may
+require starting in the same order they were instantiated. Later, in
+reverse order, the same component(s) may require stoping. In fact start
+and stop may happen more than one for the life of an application.
+Disposal may happen once only, before the component is eligible for
+garbage collection.
+Lifecycle is really only going to work for Apache Composers that are also caching component instances. Caching was a default in Apache Composer 1.x, but is not for 2.x - be warned!
+Thus lifecycle implies three methods:
+
+  start
+  stop
+  dispose
+
+In Apache Composer we think allow a pluggable LifecycleStrategy.
+Startable
+Our own interface for startable. We wish it were in the JDK,
+because we're big into making components unecumbered by the trappings of
+containment. In English: we'd rather not make components
+implement/extend/throw anything from our framework. Its a 'transparency'
+thing.
+Here's an example of components fitting that ideal
++public class Apple implements Startable{
+  public void start() {
+    // listen on socket, start thread etc.
+  }
+  public void stop() {
+    // stop listening on socket, kill thread etc.
+  }
+}
+
+
+...
+
+
+pico = new DefaultApache Composer(new StartableLifecycleStrategy());
+pico.addComponent(Apple.class);
+pico.start();
+// start gets called
+
+Apple a = pico.getComponent(Apple.class);
+
+The StartableLifecycleStrategy can be extended if you prefer your
+own interface for Startable. Just override
+Reflection based start/stop/dispose
+This works without an interface. Instead it works via reflection,
+and appropriate method names.
+
++public class Apple {
+  public void start() {
+    // listen on socket, start thread etc.
+  }
+  public void stop() {
+    // stop listening on socket, kill thread etc.
+  }
+}
+
+
+...
+
+
+pico = new DefaultApache Composer(new ReflectionLifecycleStrategy());
+pico.addComponent(Apple.class);
+pico.start();
+// start gets called
+
+Apple a = pico.getComponent(Apple.class);
+
+
+If you have other synonyms for start/stop/dispose, just extend
+the ReflectionLifecycleStrategy class and provide them.
+No Lifecycle
+DefaultApache Composer does sets StartableLifecycleStrategy by
+default. You can specify NullLifecycleStrategy instead if you are sure
+that no components honor any lifecycle concept..
+Custom Lifecycles
+Write a class that implements LifecycleStragegy, there are just
+four methods to implement. See LifecycleStrategy.
+
+
+
+

Added: incubator/composer/trunk/composer-site/src/site/content/mock-objects.html
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/mock-objects.html?rev=618174&view=auto
==============================================================================
--- incubator/composer/trunk/composer-site/src/site/content/mock-objects.html (added)
+++ incubator/composer/trunk/composer-site/src/site/content/mock-objects.html Sun Feb  3 22:33:20 2008
@@ -0,0 +1,73 @@
+
+
+
+
+Mock Objects
+
+
+If you have had it with codebases that drag along everything and the kitchen sink, (possibly using the Singleton) you must read this page. Classes that look up or instantiate heavyweight classes themselves are such beasts. As you might have experienced, they are a pain to test. (And ample proof that the authors didn't follow TDD ). Dependency Injection with Apache Composer and Mock Objects to the rescue!
+Mock Objects are special objects used during testing. Mock Objects and classes that honour Constructor Injection are a perfect match, since such classes can be handed mocks during testing and "the real thing" when the application is run.
+This illustration shows how:
+
+  
+    
+    
+  
+  
+    
+    
+  
+Unit-Test Time Deployment Time 

+The class
+  
+  Here is what NeedsStuff might look like:
++public class NeedsStuff {
+  // These are both interfaces.
+  private final BlueStuff bs;
+  private final GreenStuff gs;
+  public NeedsStuff(BlueStuff bs, GreenStuff gs) {
+    this.bs = bs;
+    this.gs = gs;
+  }
+ public String doIt() {
+  return bs.jump() + gs.beatIt();
+  }
+}
+  During test time we'll give NeedsStuff some mocks.
+During prime time (when the final application is running), the NeedsStuff class will be instantiated with a SuperHeavyBlueStuff and a NuclearGreenStuff instance. These require some really heavy infrastructure such as database connections and network access. We don't want to drag along that when we test NeedsStuff! (It can wait till the integration test).
+Test Time
+
+Our test becomes like this:
++public class NeedsStuffTestCase extends junit.framework.TestCase {
+  public void testNeedsStuffDoesStuff() {
+    BlueStuff bs = createBlueStuffMockThatReturnsBlahOnJump();
+    GreenStuff gs = createGreanStuffMockThatReturnsHuhOnBeatIt();
+
+    NeedsStuff ns = new NeedsStuff(bs, gs);
+    assertEquals("BlahHuh", ns.doIt());
+
+    // verify mocks.
+  }
+}
+We are testing the doIt() method without having to drag along any heavy dependencies 
+  We won't go into further technical details about mocks, as there are many libraries to choose from. Check out JMock and EasyMock, or read about the ideas at MockObjects 
+Prime Time
+
+It is left to Apache Composer to instantiate NeedsStuff. In order for it to succeed, we must also configure the container with some real BlueStuff and GreanStuff:
++public class AppBootstrapper {
+  public void runapp() {
+    pico = new DefaultApache Composer();
+    pico.addComponent(NeedsStuff.class);
+    pico.addComponent(SuperHeavyBlueStuff.class);
+    pico.addComponent(NuclearGreenStuff.class);
+  }
+}
+
+ It is even possible to do this component wiring using a soft scripting language. See NanoContainer
+
+
+
+

Added: incubator/composer/trunk/composer-site/src/site/content/monitors.html
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/monitors.html?rev=618174&view=auto
==============================================================================
--- incubator/composer/trunk/composer-site/src/site/content/monitors.html (added)
+++ incubator/composer/trunk/composer-site/src/site/content/monitors.html Sun Feb  3 22:33:20 2008
@@ -0,0 +1,45 @@
+
+
+
+
+Component Monitors
+
+A ComponentMonitor if injected into DefultApache Composer allows for certain events to me monitored at a container level. We are idealogically opposed to a forced choice of loging framework. If you're hell bent on logging, chose from a  ComponentMonitor imlementation below. For now though consider what events are monitored:
+
+  instantiating - refering to a component 
+  instantiated - refering to a component
+  instantiationFailed - refering to a component
+  invoking - refering to a method on a component 
+  invoked - refering to a method on a component 
+  invocationFailed - refering to a method on a component 
+  lifecycleInvocationFailed - referring to start/stop/dispose methods on a component 
+  noComponentFound - referring to getComponent(..) on a Apache Composer instance. 
+
+Return Values 
+Instantiating returns a Constructor. An implementor of ComponentMonitor can choose to return a different Constructor reference. This is one way that implementations can be replaced or decorated (AOP style) with additional/changed functionality. 
+noComponentFound returns an Object (default of null in most cases). An implementor can choose to return an instance instead. That instance should be of a type that makes sense to the component that was being sought. The getComponent(..) would have otherwise failed, but this hypothetical ComponentMonitor intercepted that failure and provided something that makes sense. 
+General rules
+
+  ComponentMonitor can generally be chained together. Meaning you can use them in combination. 
+  Most have NullComponentMonitor (see below) as their end stop. 
+  Any method on ComponentMonitor is open for interpretation. That means they can throw exceptions as well as return different values, making them modify Apache Composer's behavior. 
+
+Logging or text-centric varieties of ComponentMonitor 
+Hopefully self explanatory:
+
+  CommonsLoggingComponentMonitor (Gems) 
+  Log4JComponentMonitor (Gems) 
+  ConsoleComponentMonitor  
+  WriterComponentMonitor
+
+NullComponentMonitor
+This is Apache Composer's default ComponentMonitor. It generally fits the NullObject pattern, but it does add behavior. Specifically if it encounters a lifecycleInvocationFailed(..) method invocation, it throws a LifecycleException in response. If you use something other than NullComponentMonitor (bear in mind the default 'end stop' for most others is also NullComponentMonitor) then you could change the way Apache Composer responds to components it cannot start, stop of dispose of. 
+LifecycleComponentMonitor
+This  ComponentMonitor stores lifecycle failures and rethrows them later if rethrowLifecycleFailuresException() is called. 
+Future work
+Implementations that:
+
+  Record component injections and play them back later (optimised web frameworks) 
+
+
+

Added: incubator/composer/trunk/composer-site/src/site/content/news.html
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/news.html?rev=618174&view=auto
==============================================================================
--- incubator/composer/trunk/composer-site/src/site/content/news.html (added)
+++ incubator/composer/trunk/composer-site/src/site/content/news.html Sun Feb  3 22:33:20 2008
@@ -0,0 +1,70 @@
+
+
+
+
+    News
+
+
+Jan 19, 2008
+Apache Composer 2.0 released (190K jar) 
+New (versus beta 2):
+
+  Binding Annotations support (disambiguation)
+  Newer and rewritten properties backed containers
+  Parameter names can be leveraged for all relevant types of injection
+
+Changed (versus beta 2):
+
+  Yet More Java5 generics
+  Build moved to JUnit 4.x and JMock 2.x (does not affect users of Apache Composer)
+  Built-in parameter name access, as opposed jar dependency
+
+August 26, 2007
+Apache Composer 2.0 beta 2 released (152K jar) 
+New (versus beta 1):
+
+  Rudimentary AOP capability for components built in
+  Method Injection (one method post-construction with multiple arguments)
+  Automatic JNDI exposure
+  Multi Injection (Setter and after Constructor injection)
+  Store behavior (can extract/replace component store per thread)
+  Automatic components (instantiate irrespective of need)
+  Reentrant-Lock version of Synchronizing behavior
+
+Changed (versus beta 1):
+
+  Better Java5 generics
+  Renames of behaviors and injectors to more verb-like style
+  Startable interface more easily overridden to own choice
+
+July 15, 2007
+Apache Composer 2.0 BETA-1 released (128K jar) 
+New:
+
+  Properties for components as they are added to containers makes for increased flexibility
+  Field and Method annotation types of injection in addition to traditional Constructor (recommended) and Setter types 
+  Parameters names for constructors can now drive otherwise ambiguous injections, as well as configuration
+  Large sets of configuration can be taken from properties files and command line arguments
+  ContainerBuilder to make a container with desired behavior. 
+
+Changed:
+
+  Java 5 style (use of generics, varargs, among others)
+  Large scale Refactoring of packages and class names
+  Fluent interface for adding of components to a container
+
+Mar 18, 2007
+Apache Composer 1.3 released (113K jar) 
+January 19, 2006
+Apache Composer 1.2 released (112K jar) 
+November 4, 2004
+Apache Composer 1.1 released (75K jar) 
+June 5,  2004
+Apache Composer 1.0 released (49K jar) 
+June 29,  2003
+Apache Composer 1.0 alpha (25K jar) 
+
+  
+ 
+
+

Added: incubator/composer/trunk/composer-site/src/site/content/patterns.html
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/patterns.html?rev=618174&view=auto
==============================================================================
--- incubator/composer/trunk/composer-site/src/site/content/patterns.html (added)
+++ incubator/composer/trunk/composer-site/src/site/content/patterns.html Sun Feb  3 22:33:20 2008
@@ -0,0 +1,50 @@
+
+
+
+
+Design Patterns
+
+
+Key Patterns 
+Inversion of Control (IoC). 
+The idea that an application is controlled from the top down
+Separation of Concerns (SoC) 
+The idea that a class (aspect) should do one job and do it well
+Separation of API (or Interface) from Implementation
+The idea that you define and code to work interfaces
+Aspect Oriented Programming (AOP) 
+Mostly lightweight nowadays where you add a chain of interceptors around a method call that can handle orthogonal concerns
+Component Oriented Programming (COP) 
+The idea that you decompose your software into components
+Declarative Programming
+Where you use a declarative-style language (usually xml) to determine things like component wiring (i.e. your average tomcat config file, generalized)
+Event Based Programming (EBP) 
+Basically making the inter-object method call asynchronous and encapsulating such a call into some kind of event object that can be queued, modified, etc
+More Thinking 
+Good Citizen: Least surprise, least paranoia
+Authors: Dan North, Aslak Hellesoy
+Imagine a software system where there is no need for you to spend your time programming defensively; your objects will be used responsibly, and your methods will always be passed sensible arguments.
+This low-friction utopia can be approached by establishing some simple programming rules so that every class acts as a 'good citizen' in the society of classes collaborating at runtime.
+This page outlines some rules that we, and others, believe lead to good citizenship. All are aimed at improving clarity, reducing surprise, and promoting basic consistency.
+As a good citizen, I...
+
+    Keep a consistent state at all times - init() or populate() is a code smell.
+  Have no static fields or methods
+  Never expect or return null.
+  FailFast - even when constructing.
+  Am Easy to test- all dependent object I use can be passed to me, often in my constructor (typically as Mock Objects).
+  Accept dependent object that can easily be substituted with Mock Objects (I don't use Concrete Class Dependency).
+  Chain multiple constructors to a common place (using this(...)).
+  Always define hashCode() alongside equals()
+  Prefer immutable value objects that I can easily throw away.
+  Have a special value for 'nothing' - e.g. Collections.EMPTY_SET.
+  Raise checked exceptions when the caller asked for something unreasonable - e.g. open a non-existant file.
+  Raise unchecked exceptions when I can't do something reasonable that the caller asked of me - e.g. disk error when reading from an opened file.
+  Only catch exceptions that can be handled fully.
+  Only log information that someone needs to see.
+
+Classes that are designed for Constructor Injection are better citizens than those that are not.
+
+
+
+

Added: incubator/composer/trunk/composer-site/src/site/content/project.html
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/project.html?rev=618174&view=auto
==============================================================================
--- incubator/composer/trunk/composer-site/src/site/content/project.html (added)
+++ incubator/composer/trunk/composer-site/src/site/content/project.html Sun Feb  3 22:33:20 2008
@@ -0,0 +1,27 @@
+
+
+
+
+    Project
+
+
+Apache Composer is hosted at The Apache Software Foundation, presently in its incubator. 
+
+Project links
+
+Source control root for Apache Composer (you will need Maven2 installed to build):
+
+https://svn.apache.org/repos/asf/incubator/composer/trunk
+
+
+Maven repositories for artifact download : 
+
+TBA
+
+License
+
+Apache Composer is Apache licensed.
+
+
+

Added: incubator/composer/trunk/composer-site/src/site/content/properties.html
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/properties.html?rev=618174&view=auto
==============================================================================
--- incubator/composer/trunk/composer-site/src/site/content/properties.html (added)
+++ incubator/composer/trunk/composer-site/src/site/content/properties.html Sun Feb  3 22:33:20 2008
@@ -0,0 +1,86 @@
+
+
+
+
+    Component Properties
+
+
+
DefaultApache Composer allows for some properties to be set
+   per component at the time each is added. A convenience class called Characteristics lists the supplied properties. 
+
+Properties can be set for a component in a method 'as' on
+   MutableApache Composer. If that is the case then the properties will
+   affect the next component added only.
+
+They can also be set in a more persistent manner for the
+   MutableApache Composer in question, using the 'change' method. If so, they will affect all subsequent
+   additions of component.
+
+Some examples :
+
++import static org.picocontainer.Characteristics.SDI;
+import static org.picocontainer.Characteristics.CACHE;
+...
+pico = new DefaultApache Composer();
+pico.as(CACHE).addComponent(Apple.class);
+pico.as(CACHE, SDI).addComponent(Pear.class);
+
+
+import static org.picocontainer.Characteristics.SDI;
+import static org.picocontainer.Characteristics.CACHE;
+...
+pico = new DefaultApache Composer();
+pico.change(CACHE).addComponent(Apple.class);
+pico.change(SDI).addComponent(Pear.class);
+
++pico = new DefaultApache Composer();
+pico.as(Characteristics.CACHE).addComponent(Apple.class);
+pico.as(Characteristics.CACHE,
+    Characteristics.SDI).addComponent(Pear.class);
+
+
+pico = new DefaultApache Composer();
+pico.change(Characteristics.CACHE).addComponent(Apple.class);
+pico.change(Characteristics.SDI).addComponent(Pear.class);
+
+
+Some characteristics are mutually exclusive. For example CDI,
+   SDI. Meaning the last one set via 'as' or 'change' rules. Others are
+   additive like CACHE and HIDE_IMPL. The order of these is not important. 
+
+Appropriate Behavior and Injection Factories.
+
+Every characteristics set for a component must be handled by a
+   BehaviorFactory or InjectionFactory that recognises it. They are
+   typically chained together. DefaultApache Composer's default
+   BehaviorFactory and InjectionFactory are AdaptiveBehaviorFactory and
+   AdaptiveInjectionFactory. These can handle CDI and SDI as well as CACHE
+   and HIDE_IMPL.
+
+If you setup DefaultApache Composer with a
+   BehaviorFactory/InjectionFactory combination that is unaware of the
+   characteristics you subsequently use, Apache Composer will object by way of an
+   exception as you add the component to the container. See Unprocessed Properties. 
+Supplied properties (from org.picocontainer.Characteristics) -
+
+  CDI - added components will be Constructor Dependency Injection.
+  SDI  - added components will be Setter Dependency Injection.
+  METHOD_INJECTION - added components will be Method Injection (a method called inject will list the dependencies).
+  NO_CACHE - no caching for the component to be added (in the case of Caching being the container's default).
+  CACHE - cache the component to be added.
+  NO_JMX - JMX is not to be published for the component.
+  SYNCHRONIZE - ensure that the component to be added will be created only once, even if multiple threads are seeking the component simultaneously.
+  LOCK - an alternate to SYNCHRONIZE that leverages java.lang.concurrent.Lock for the same purpose.
+  SINGLE - synonym for CACHE.
+  HIDE_IMPL - hide the implementation of the component to be added.
+  NO_HIDE_IMPL - don't hide the implementation of the component to be added (in the case of ImplementationHiding being the container's default).
+  PROPERTY_APPLYING - allow for the application of properties for the component in question.
+  AUTOMATIC - instantiate the component when start() is called on the container even if component is not Startable nor depended on.
+  USE_NAMES - use the parameter names of the component's constructor (or injection method) for the binding of configuration or components.
+
+Custom Properties
+You can make your own properties quite easily - check out the source to Characteristics.java and the classes that refer to it in Apache Composer (various implementations of ComponentFactory and ComponentAdapter). 
+
+

Added: incubator/composer/trunk/composer-site/src/site/content/scopes.html
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/scopes.html?rev=618174&view=auto
==============================================================================
--- incubator/composer/trunk/composer-site/src/site/content/scopes.html (added)
+++ incubator/composer/trunk/composer-site/src/site/content/scopes.html Sun Feb  3 22:33:20 2008
@@ -0,0 +1,73 @@
+
+
+
+
+Scoped Containers
+
+
+Apache Composer's scope hinges on parent/child container
+relationships. From a Apache Composer instance you can make a child
+container via makeChildContainer() or addChildContainer(..).
+These hierarchies of container can be set up with parents and
+children refering to each other, or children referring to parents only,
+or parents referring to children only. This changes the way that things
+work considerably. If a child has its parent registered, then it can
+lean on it for component resolution (but not without). If a parent has
+its child registered asa child, then it can manage it (start, stop,
+dispose cascade into children).
+Web frameworks that leverage Apache Composer typically construct a tree of containers.  For example an application level container maintains components that can be shared across the application. The application container will have child containers to maintain session level components.  These session level containers can resolve dependencies through their parent containers, but the application container will have no visibility into its children.  Additionally these child container do not have visibility into their sibling containers.  With this design, containers can easily be garbage collected at the end of their scope. 
+Simple Examples
+Here are examples of parent/child setup:
+    
+      +parent = new DefaultApache Composer();
+parent.addComponent(Apple.class);
+parent.addComponent(Orange.class);
+parent.addComponent(Pear.class);
+child = parent.makeChildContainer();
+child.addComponent(DependsOnApple.class);
+// this is OK
+parent.start();
+// cascades to child just fine
+
+
+
+  +parent = new DefaultApache Composer();
+parent.addComponent(Apple.class);
+parent.addComponent(Orange.class);
+parent.addComponent(Pear.class);
+child = parent.addChildContainer(new DefaultApache Composer());
+child.addComponent(DependsOnApple.class);
+// this is NOT OK. child can't see parent
+parent.start();
+// cascades to child just fine
+
+
+
+  +parent = new DefaultApache Composer();
+parent.addComponent(Apple.class).addComponent(Orange.class).addComponent(Pear.class);
+child = parent.addChildContainer(new DefaultApache Composer(parent));
+child.addComponent(DependsOnApple.class);
+// this is OK
+parent.start();
+// cascades to child just fine
+
+
+parent = new DefaultApache Composer();
+parent.addComponent(Apple.class).addComponent(Orange.class).addComponent(Pear.class);
+child = new DefaultApache Composer(parent);
+child.addComponent(DependsOnApple.class);
+// this is  OK
+parent.start();
+// does NOT cascades to child 
+
+
+There is no limit to the extent of the chained containers, for example -
+great grandparent, grandparent, parent, child, is OK.
+Garbage collection is the standard way of disposing of scoped containers. If the children refer to the parents, then assign child to null just works. If the parents refer to the children too, then you'll have to do a removeChildContainer(..) first before it will be eligible for garbage collection.
+See  web frameworks
+also.
+
+

Added: incubator/composer/trunk/composer-site/src/site/content/setter-injection.html
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/setter-injection.html?rev=618174&view=auto
==============================================================================
--- incubator/composer/trunk/composer-site/src/site/content/setter-injection.html (added)
+++ incubator/composer/trunk/composer-site/src/site/content/setter-injection.html Sun Feb  3 22:33:20 2008
@@ -0,0 +1,83 @@
+
+
+
+
+    
+    Setter Injection
+
+
+Overview
+
+Setter Dependency Injection (SDI) is where the container or embedder hands dependencies to a component via setter
+   methods after instantiation.
+
+Example
+
+Joe Walnes whist working on Java Open Source Programming with other luminaries, started with a Setter Injection
+   IoC design for WebWork2. This is marked up with doclet tags (though that was not hard and fast) :
+
+
+            public class Shop {
+   StockManager stockManager;
+   String shopZipCode;
+   /**
+    * @service name="StockManager"
+    */
+   public void setStockManager(StockManager stockManager) {
+       this.stockManager = stockManager;
+   }
+   /**
+    * @config name="shopZipCode"
+    */
+   public void setStockManager(String shopZipCode) {
+       this.shopZipCode= shopZipCode;
+   }
+   // TODO - Joe - how does setter injector do config ? Same way?
+   public void initialize() {
+       // all setXXXs are now done :-)
+   }
+}
+
+The container use the meta-information to resolve all the dependencies. Components need not be interface/impl
+   separated. Developer's choice.
+
+Using Setter Injector Components
+                                                                                Without a Container.
+
+Setter Injection components can be used directly, without any container. The component-using class will
+   continue to compile, but at run time it will be apparent that there are missing dependencies. The downside of
+   this is that a developer may miss a setXXX(..) method invocation if they are using the component directly.
+   That is fairly small as a risk as it would clearly be caught in the development cycle. Caught in the
+   development cycle, but maybe obscurely so with a NullPointerException.
+
+
+              Shop shop = new Shop();
+shop.setStockManager(myStockManager);
+
+Container support
+
+The Spring Framework project is the best example of a container that favors setter injection. Apache Composer does
+   too, but we really believe that constructor injector is superior.
+
+Refs + Comparison
+
+Setter Injection is a
+    Dependency Injection variant where an object gets all
+                                                                                   dependencies via setter methods.
+                                                                                   Apache Composer support this with
+    SetterInjectionComponentAdapter,
+                                                                                                                                                                                         but
+                                                                                                                                                                                         the
+                                                                                                                                                                                         Apache Composer
+                                                                                                                                                                                         team
+                                                                                                                                                                                         recommends
+    Constructor Injection.
+
+The advantage of Constructor Injection is
+   that the setting is atomic in a sense that either all or none of the dependencies are set and that it can occur
+   once and only once. With Setter Injection there is the possibility to forget to set some of the dependencies
+
+

Added: incubator/composer/trunk/composer-site/src/site/content/sitemap.xml
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/sitemap.xml?rev=618174&view=auto
==============================================================================
--- incubator/composer/trunk/composer-site/src/site/content/sitemap.xml (added)
+++ incubator/composer/trunk/composer-site/src/site/content/sitemap.xml Sun Feb  3 22:33:20 2008
@@ -0,0 +1,72 @@
+
+    
+        About
+        index.html
+        introduction.html
+        javadoc.html
+        downloads.html
+        news.html
+        faq.html
+        goals.html
+    
+    
+        Core Concepts
+        injection.html
+        behaviors.html
+        fluent-style.html
+        lifecycle.html
+        monitors.html
+        scopes.html
+        builder.html
+        interception.html
+        properties.html
+        disambiguation.html
+       component-configuration.html
+    
+    
+        Architecture
+        patterns.html
+        inversion-of-control.html
+        adapters.html
+        mock-objects.html
+        terminology.html
+        constructor-injection.html
+        setter-injection.html
+        comparisons.html
+        transparency.html
+    
+    
+        Containers
+        DefaultApache Composer.html
+	    CommandLineArgumentsApache Composer.html
+		PropertiesApache Composer.html
+		SystemPropertiesApache Composer.html
+		TransientApache Composer.html
+    
+    
+         Applications
+         web-frameworks.html
+    
+    
+         Anti-patterns
+         antipatterns/propagating-dependency-antipattern.html
+         antipatterns/long-constructor-argument-list-antipattern.html
+         antipatterns/container-dependency-antipattern.html
+         antipatterns/tests-use-container-antipattern.html
+         antipatterns/singleton-antipattern.html
+    
+    
+         Help Pages
+         help/ambiguous-injectable-help.html
+         help/unprocessed-properties-help.html
+         
+    
+         History
+         inversion-of-control-history.html
+    
+    
+         Project Info
+         project.html
+         team.html
+     
+
\ No newline at end of file

Added: incubator/composer/trunk/composer-site/src/site/content/team.html
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/team.html?rev=618174&view=auto
==============================================================================
--- incubator/composer/trunk/composer-site/src/site/content/team.html (added)
+++ incubator/composer/trunk/composer-site/src/site/content/team.html Sun Feb  3 22:33:20 2008
@@ -0,0 +1,92 @@
+
+
+
+
+Team
+
+
+A project like Apache Composer is always made possible by the effort of a lot of people. Read about the developers and the contributers' names below. All of them have worked together to make Apache Composer the most respected IoC framework.
+Committers
+Apache Composer committers introduce themselves in their own words and are listed in alphabetical order.

+Paul Hammant
+Paul is 39, has worked for ThoughtWorks  since 2002 and is co-founder of the PicoContainer project (precursor to Apache Composer). He used to freelance but is now very happy at TW. Paul practices XP on client sites and loves open source on which he is chief zealot for TW. He formerly worked at Apache on the Avalon project and remains there working on AltRMI. He loves the simplest thing as a design metaphor, hates too much XML. He loves the lowest common denominator (LCD) as a mechanism for facilitating divergent designs. To that end, he encourages multiple implementations of LCD ideas and APIs. Paul hopes to see Milli, Kilo and Mega implementations of the Pico idea. He hopes to see a myriad of interchangeable Apache Composer Components. He hopes to see standard APIs for components emerge from those implementations, but never be forced when teams cannot agree. It would be fairly easy to guess that Paul does not like big up-front design. That not withstanding the fact that 
 he used to do bucket-loads of it Paul with Aslak, wrote the first lines. Paired, under the influence of a couple of beers, and based on Joe's story of Rachel Davies' comments to his setter injector IoC work at the start of June 2003.
+Paul is also well known for Enterprise Object Broker and Jesktop, the original driven side of Selenium and other stupid ideas like Thicky and related early Web 3.0 references
+Konstantin Pribluda
+I'm 32 and live in Wiesbaden. I started programming at the age of 12 and had access to really cool systems ranging from WANG 3200 through PDP 8/11 to System-360 ( actually sovjet clones of them, but who cares? ). My first "paid for" work was in 1988, and from that point I financed my study freelance software development. I developed fiscal management systems, medical video archiving, internet applications for telcos and java applet games ( later was for personal fun )...
+After study I continued to freelance ( this time for better paying, but also fast failing ) companies and started to work on open source software ( xdoclet ). Now I'm permanently hired project leader, and I'am in position to use ( and develop ) whatever technologies I see fit - of course xdoclet, pico, nano and a lot of other stuff.
+My biggest private interest ( besides open source programming ) is mountainbike racing.
+Jörg Schaible
+I was invited by Paul and Aslak early in 2004 to participate on the development of this project. I am currently 36 and write code for nearly 20 years in several languages and lately also Java. I have experience in AI software, did system programming and developed and maintained a plattform-independent GUI and database framework, and had to deal with CMS programming in JavaScript and J2EE. I was always involved in automated builds and tests for all these projects and one artifact left is JsUnit.
+Pico got my interest after some first steps with IoC using the Avalon framework. I felt in love with Pico from the first moment, because of its simplicity and natural way of programming. Yet, there is a lot of space for further development on top of it and I am happy to be part of it.
+My interests besides programming are my wife (who always gets too less time), reading books (a lot of fantasy and SF stuff), hearing celtic-rooted music (although I like others also lot), and - when in mood - cooking
+Last, but not least, beeing a Christian is a part of my life, where I have my roots.
+Mauro Talevi
+I first came across Paul at an XTC (eXtreme Tuesdays Club) on Agile development at the Ol' Bank of England Pub in London. Back then Apache Composer had yet to be born. We were both working with Avalon IoC and in particular the Phoenix microkernel. Ever since discussing all the limitations of the Avalon framework - in particular the dependency on an API - I knew that the way forward was the Pico way.
+I've worked in Java and enterprise systems for several years in various business domains - ranging from space data search portal for ESA to real-time messaging at the BBC - and I've come to appreciate the beauty, elegance and power of CDI.
+Michael Ward
+I live in Chicago, or at least that is where all my bills are sent. As it seems to be the lingo, I was assimilated into ThoughtWorks back in 2003. I have been developing professionally since 1997 and have had the great opportunity to work and live in many great locations with some exceptionally talented individuals. I was immediately drawn to Apache Composer because of its simplicity. The API is small and does not force you to define all your configurations in XML. The projects I have worked on are easier to test, refactor, debug and extend because a natural side effect of utilizing CDI is a small and easy to comprehend code base. Mike leads the Waffle web framework project (the easiest for Java we think). 
+Have worked/contributed to MicroContainer, the JMX module for NanoContainer, Apache Composer.NET and NanoContainer.NET.
+Michael Rimov
+Michael came to the Java world after programming for about eight years in the Windows API.  He dove head first into Java J2EE frameworks by initially working with the popular heavyweight Expresso framework where he introduced unit testing to those developers. During his stint as Lead Developer, the framework's usage numbers exploded.  After about nine years working with J2EE, Michael found the joys of light weight components and Apache Composer and has been reaping the performance benefits of both ever since.  His goal is to see it NanoContainer/NanoWAR grow in the J2EE arena, while keeping Pico perfect for embedding in all applications.
+Michael works for Centerline Computers, Inc in Corvallis Oregon.
+Jose Peleteiro
+I live in Rio de Janeiro, Brazil.
+http://www.peleteiro.net
+Jose Peleteiro works for Neoris do Brasil.
+Emeritus Committers
+Emeritus committers are those committers who have contributed significantly to the development of the project, but have been inactive for a period amount of time.
+ * Thomas Heller
+Aslak Hellesøy
+Aslak is very accomplished in the Open Source space and co-founder of Apache Composer. He leads XDoclet, and has taken over QDox from Joe. He wrote most of the impressive MiddleGen, and has refactored Generama out of both. From an observers point of view Aslak is prolific. Aslak was assimilated into ThoughtWorks in 2003. [ Words by Paul ]
+ * Mike Hogan
+ * Stephen L. Molitor
+Dan North
+Dan is a passionate Agile Coach and Developer. He's adept at a huge range of languages, with Ruby being his current favorite. This is his first foray into Open Source. Dan was assimilated into ThoughtWorks in 2002. [ Words by Paul ]
+ * Leo Simons
+ * Chris Stevenson
+James Strachan
+James used to dislike IoC, when the type that forced you to implement interfaces was the only choice. He championed the whole 'beans' effort at Apache, particularly in Jakarta-Commons. Most recently he's one of the the technical figurehead of LogicBlaze and a key in the  Apache Geronimo project. Most exciting of all of James' activities has been as initial lead of the Groovy language (thank god James got off his XML horse - Ed). James refuses to join ThoughtWorks. [ Words by Paul ]
+Jon Tirsén
+Jon is a passionate fellow who's invidually accomplished in the Open Source space. Nanning is one of his babies, and he's a committer to Prevayler. With Aslak, DamageControl is is latest project. Jon was assimilated into ThoughtWorks in 2003. Latterly in Australia, he leads some of the ThoughtWorks Studios developments. [ Words by Paul ]
+Joe Walnes
+Joe Walnes is one of those high accomplished people, with a trail of "I must work with him" fans and quality Open Source projects behind him. He wrote SiteMesh, and large chunks of OpenSymphony. He started QDox, and XStream. One of the unsung heroes of Java/.Net development. Joe was assimilated into ThoughtWorks in 2002, then Google in 2006. [ Words by Paul ]
+ 
+
+ 
+ 
+Contributers
+A lot of people have contributed ideas and code to the Apache Composer's code base. See the names in the list below in alphabetical order.
+ * Nicolas Averseng

+  * Mathias Bogaert

+  * Rao Chejarla

+  * Jeppe Cramon

+  * Stacy Curl

+  * Laurent Etiemble

+  * Scott Farquhar

+  * Obie Fernandez

+  * Jay Fields

+  * Steve Freeman

+  * Mario Gutierrez

+  * Matt Ho

+  * Jacob Kjome

+  * Rafal Krzewski

+  * Aapo Laakkonen

+  * Graham Lea

+  * Philipp Meier

+  * Zohar Melamed

+  * Kouhei Mori

+  * Mirco Novakovic

+  * Rickard Öberg

+  * Kevin O'Neill

+  * Miguel A. Paraz

+  * Gilles Philippart

+  * Michael Rettig

+  * Adam Rosien

+  * Pedro Santos

+  * Jens Schumann

+  * Nick Sieger

+  * Paulo Silvera

+  * Vincent Tence

+  * Calvin Yu
+
+

Added: incubator/composer/trunk/composer-site/src/site/content/terminology.html
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/terminology.html?rev=618174&view=auto
==============================================================================
--- incubator/composer/trunk/composer-site/src/site/content/terminology.html (added)
+++ incubator/composer/trunk/composer-site/src/site/content/terminology.html Sun Feb  3 22:33:20 2008
@@ -0,0 +1,145 @@
+
+
+
+
+    
+    Terminology
+
+
+
+Overview
+
+These can be arrived at from the definitions.
+
+    Everything is an object
+    Everything which is not a Contextualized Lookup component nor a domain-specific object is a POJO
+    A Setter Dependency Injection (SDI) component is a JavaBean, and a JavaBean is an SDI component
+    A Contructor Dependency Injection (CDI) Component is not a JavaBean, but is a POJO
+    A JavaBean can be any of the three types of IoC and domain-specific all at the same time
+    Spring, Apache Composer, XWork and other frameworks all support both Components and Data Objects to some
+        extend. Avalon tries real hard to not support Data Objects, but that is nearly impossible.
+    
+
+Terms
+
+Object or Instance
+
+An "object" as per the Java Language Specification.
+
+Class
+
+A "class" as per the Java Language Specification.
+
+POJO
+                                                                                                               (Plain
+                                                                                                               Old
+                                                                                                               Java
+                                                                                                               Object)
+
+
+An object that does not use nor support any other kind of component/bean specification. It does not implement
+   any lifecycle or marker interfaces, it does not provide any kind of metadata. Will usually follow the minimum
+   requirements for classifying it as a JavaBean though.
+
+Javabean / Bean
+
+An object that is a "valid java bean" according to the JavaBean Specification. That is, an object
+   that has a public default constructor, and that supports setting and/or retrieving all or a part of its state
+   using so-called setter and getter methods, which are named getXXX(), setXXX() or isXXX(), where XXX
+   identifies part of its state. The JavaBean specification defines a metadata framework, an event framework,
+   and some other things which are less relevant in this context. A JavaBean may represent both data and
+   functionality.
+
+Data Object / Entity Bean / Data Bean / PODO
+
+An object that only represents data, but contains no 'logic' or any kind of other functionality (except for
+   perhaps some utility methods that transform the data into some other form, like getXXXasString(). Will often
+   override equals() and hashCode(); will often be serializable. Does not create threads, does not keep
+   references to non-data objects.
+
+Component
+
+An object that only represents functionality. It is a "unit of logic", that can "do work".
+   In a well-designed application, the work that a component can do is specified in a work interface. Will
+   usually not override equals() or hashCode(). It typically coexists with other components of the same language in the same application or server process.
+Service
+One or more components that communicate with others over the wire. Services, laced together for some large stack, may be from different technologies or languages, and share only the specification of the wire protocol. Service implies remoteness and potential unavailability or outage.
+Passive Component
+
+A component that does not use threads (not even indirectly).
+
+Active Component
+
+A component that uses threads (possibly indirectly through the use of a Thread Pool or Executor
+   component).
+
+Contextualized Dependancy Lookup
+                                                                       Component
+
+A component that has a public default constructor and that usually has its state set up and/or modified
+   through the use of some kind of framework-specific mechanism.
+
+Setter
+                                                                                                       Injection
+                                                                                                       Component
+
+
+A component that has a public default constructor and that has its state set up through the use of setter
+   methods.
+
+Constructor Injection Component
+
+A component that has one or more public constructors and that has its state set up through the arguments
+   provided in one of these constructors.
+
+Constructor/ Setter Dependency
+                                                                                Injection Component
+
+A component that has a public constructor and that has its state set up through the arguments provided in
+   that constructor and through the use of setter methods.
+
+IoC Component
+
+A component that does not implement any kind of logic to set up its own state, but completely depends on
+   other parties to provide that state to it.
+
+Non-IoC Component
+
+A component that implements some kind of logic to set up its own state. Examples: a component that reads an
+   XML file; a component that looks up dependencies in JNDI; a component that queries system properties.
+
+Domain-Specific
+                                                                                               Object
+
+An object that implements a specification that is less generic than Java itself in its applicability.
+   Example: EJB, Servlets.
+
+Spring-supported
+                                                                                                 Object
+
+An object that can be 'natively' used in the Spring Framework. Any JavaBean (with some extensions to that
+   specification like "initialization completion" support), any object with a public default
+   constructor that does not require any method calls to set up its state.
+
+Apache Composer-supported
+                                                                                                               Object
+
+
+An object that can be 'natively' used in Apache Composer. Any Type-3 component.
+
+XWork-supported
+                                                                                               Object
+
+An object that can be 'natively' used in the XWork Framework. Any object with a public default constructor
+   that has its state set up through XXXAware interfaces.
+
+Fail Fast
+
+An object that fails fast is an object that indicates as early as possible if it is in an inconsistent or
+   unusable state (by throwing a fatal exception). The fastest possible way to FailFast is to do so during
+   instantiation. This can be handled in an elegant way if the class is a GoodCitizen.
+
+
+

Added: incubator/composer/trunk/composer-site/src/site/content/transparency.html
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/transparency.html?rev=618174&view=auto
==============================================================================
--- incubator/composer/trunk/composer-site/src/site/content/transparency.html (added)
+++ incubator/composer/trunk/composer-site/src/site/content/transparency.html Sun Feb  3 22:33:20 2008
@@ -0,0 +1,25 @@
+
+
+
+
+Transparency
+
+
+Transparency, for Apache Composer, means that components do not have to implement any interface or abstraction in order to be components. Moreover, components do not have to adhere to any naming conventions or bundle any meta-data in order to qualify as components.  
+Constructor Injection is what we recommend, so the minimum definition of a component is a simple class that takes its dependencies in its constructor. For Setter Injection, it is a class with dependencies delivered via simple setters. Your components may be interface / impl separated, but we are not forcing that for interop with Apache Composer.
+If you live with this ideal, you may be able to use the components you design for Apache Composer with other frameworks or containers. I.e. you are not locked in. We suggest you choose other technologies that are similarly light on API and framework, and could be characterised as transparent. Good examples are XStream, Sitemesh and anything that deals with POJOs.
+There are some exceptions, to this goal of ours.
+Lifecycle
+Java does not have a Startable interface, nor does it have a Disposable (.Net has IDisposable), so we made our own. You can use ours or your own in a similar design. If you use your own, you may want to extend StartableLifecycleStrategy and override a couple of methods. That's if you need lifecycle at all.
+If a Startable inerface goes into J2SE, then it will probably be supported.
+Annotations
+We also support @Inject as an annotation for methods and fields. This is a variation of Setter Injection. The annotations are part of our codebase. Again, you can use your own, or others if you override one of the two classes from Apache Composer's codebase AnnotatedFieldInjection and AnnotatedMethodInjection.
+Annotations are a break with transparency, so we don't recomend them - stick to vanilla Constructor Injection if you can.
+If a simple @Inject annotation goes into J2SE, then it will probably be supported. 
+
+ 
+
+
+
+
+

composer-commits@incubator.apache.org Archives

svn commit: r655913 - in /incubator/composer/trunk: BUILD.txt LICENSE.txt composer-core/ composer-site/ composer-tck/ pom.xml

svn commit: r618315 - /incubator/composer/trunk/pom.xml

svn commit: r618279 - in /incubator/composer/trunk/composer-site/src: resources/ site/content/ site/content/containers/ site/resources/images/ site/templates/

JNDI (Java API)

Origin

What is Container?

What is Apache Composer?

Getting Started

Basics

Write some simple classes - and interfaces with - dependencies

Write some simple classes and interfaces with dependencies

Lifecycle

Custom Properties

Hosted by

Tools

svn commit: r618262 - in /incubator/composer/trunk/composer-core/src/test/java: ./ org/apache/composer/core/monitors/

svn commit: r618244 - in /incubator/composer/trunk/composer-site: ./ src/site/content/ src/site/content/containers/

svn commit: r618243 [2/2] - in /incubator/composer/trunk/composer-site/src/site: content/ content/antipatterns/ content/help/ templates/

Prime Time

Logging or text-centric varieties of ComponentMonitor

NullComponentMonitor

LifecycleComponentMonitor

Future work

Project links

License

Custom Properties

Simple Examples

Container support

Refs + Comparison

Committers

Paul Hammant

Konstantin Pribluda

Mauro Talevi

Michael Ward

Michael Rimov

Jose Peleteiro

Aslak Hellesøy

Dan North

Apache Composer-supported +

Container-supported Object

XWork-supported Object

Lifecycle

Annotations

Apache Composer and web frameworks - the old way.

Container and web frameworks - the old way.

Apache Composer and web frameworks - the new way.

Container and web frameworks - the new way.

svn commit: r618243 [1/2] - in /incubator/composer/trunk/composer-site/src/site: content/ content/antipatterns/ content/help/ templates/

Using ComponentAdapter directly.

Causes

What to do

Symptoms

Causes

General use

Hot Swapping

Overview

IoC Containers

Spring Framework

Apache Avalon and its containers

Enterprise Java Beans

Servlets

Applets

Mainable (Not actually a container)

Choices

Configuration Object

Taking configuration from the elsewhere

Origin

Container support

Overview

Disambiguation using parameter names

@@ -49,36 +49,36 @@ - + How does Apache Composer decide what constructor to use?How does Container decide what constructor to use?

- + How does Apache Composer compare to EJB containers?How does Container compare to EJB containers?

- + How does Apache Composer decide what constructor to use?How does Container decide what constructor to use?

@@ -88,7 +88,7 @@

- + When should I use Apache Composer?When should I use Container?

What is Apache Composer?

What is Container?

Getting Started

Annotated Method Dependency Injection

@@ -49,36 +49,36 @@

- +

How does Apache Composer decide what constructor to use? How does Container decide what constructor to use?

- +

How does Apache Composer compare to EJB containers? How does Container compare to EJB containers?

- +

How does Apache Composer decide what constructor to use? How does Container decide what constructor to use?

- +

When should I use Apache Composer? When should I use Container?