You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@composer.apache.org by ma...@apache.org on 2008/02/04 13:38:44 UTC

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

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 @@
           </div>
           
 
-          <p>Familiar? Hopefully not <img class="emoticon" src="http://docs.codehaus.org/images/icons/emoticons/smile.gif" height="20" width="20" align="absmiddle" alt="" border="0" />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.</p>
+          <p>Familiar? Hopefully not <img class="emoticon" src="images/smile.gif" height="20" width="20" align="absmiddle" alt="" border="0" />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.</p>
         </div>
         <div>
           <h3>JNDI (Java API)</h3>

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 @@
     </li>
     <li>A dependency may be made immutable by making the dependency reference <em>final</em></li>
 </ul>
-<p><img class="emoticon" src="http://docs.codehaus.org/images/icons/emoticons/information.gif" alt="" align="middle" border="0" height="16" width="16" /> Martin Fowler explains <a href="http://www.martinfowler.com/articles/injection.html#ConstructorInjectionWithPicocontainer">Constructor
+<p><img class="emoticon" src="images/information.gif" alt="" align="middle" border="0" height="16" width="16" /> Martin Fowler explains <a href="http://www.martinfowler.com/articles/injection.html#ConstructorInjectionWithPicocontainer">Constructor
                                                                                                      Injection</a>
                                                           in more detail.<br />
     <br />
-    <img class="emoticon" src="http://docs.codehaus.org/images/icons/emoticons/information.gif" alt="" align="middle" border="0" height="16" width="16" /> Container also supports <a href="setter-injection.html" title="Setter Injection">Setter Injection</a>.</p>
+    <img class="emoticon" src="images/information.gif" alt="" align="middle" border="0" height="16" width="16" /> Container also supports <a href="setter-injection.html" title="Setter Injection">Setter Injection</a>.</p>
 
 <h2>Origin</h2>
 

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</pre>
+java -jar myAppJar.jar -cp composer-core.jar timeout=100 spellingWebServiceURL=http://ws.com/someService.wsdl</pre>
 </div>
 <p>Here is another manual use forcing an association between a item in the properties file, and the relative position of a parameter in the constructor:</p>
 <div class="source">
 <pre>mpc.addComponent(BigFatComponent.class, ConfigParameter(&quot;config1&quot;), ConfigParameter(&quot;moreConfig&quot;));
 ...
 
-java -jar myAppJar.jar -cp containercontainer-2.0.jar config1=http://ws.com/someService.wsd moreConfig=100 </pre>
+java -jar myAppJar.jar -cp composer-core.jar config1=http://ws.com/someService.wsd moreConfig=100 </pre>
 </div>
 <p>Type conversion is automatic in many cases. Properties in a properties file are clearly strings. Parameters can be any of:</p>
         <ul>

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

Modified: incubator/composer/trunk/composer-site/src/site/content/faq.html
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/src/site/content/faq.html?rev=618279&r1=618278&r2=618279&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 05:38:42 2008
@@ -217,7 +217,7 @@
 0>hellos
 1> 1
 2> @Foo$Bar()
-Exception in thread "main" java.lang.NoClassDefFoundError: org/containercontainer/annotations/Inject
+Exception in thread "main" java.lang.NoClassDefFoundError: org/apache/composer/core/annotations/Inject
         at Foo.main(Foo.java:32)</pre>
 </div>
   <p>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:</p>

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=618279&r1=618278&r2=618279&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 05:38:42 2008
@@ -7,9 +7,9 @@
 
 <body>
 
-<h2>What is Container?</h2>
+<h2>What is Apache Composer?</h2>
 
-<p>Container is a  highly embeddable full service Inversion of Control (IoC) container
+<p>Apache Composer is a  highly embeddable full service Inversion of Control (IoC) container
 for components honour the Dependency Injection pattern.</p>
 <p>You could use it as a lightweight alternative to Sun's J2EE patterns for web applications or general solutions. </p>
 <p>What is Dependency Injection? Martin Fowler has a good <a href="http://www.martinfowler.com/articles/injection.html">article</a> from 2003, but here is another view: It is a good design pattern that, for large enterprise applications, facilitates: </p>
@@ -31,10 +31,8 @@
   <li>has made development staff looking after it miserable</li>
   <li>suffers repeated allegations of being unable to be developed without complete rewrite </li>
 </ul>
-<p>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.</p>
-<p>Container has originally been implemented in Java but is also
-available for other platforms and languages. These are detailed <a href="http://docs.codehaus.org/display/PICO/Ports">here</a>.</p>
+<p>Despite it being very compact in size (the core is ~128K and it has no <b>mandatory</b> dependencies outside the JDK), 
+Apache Composer supports different dependency injection types (Constructor, Setter, Annotated Field and Method) and offers multiple lifecycle and monitoring strategies.</p>
 <div class="section">
 <h3>Getting Started</h3>
 <p>Take a look at the <a href="introduction.html">introduction</a>. </p>

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 @@
 </head>
 <body>
 
-<p>Authors: Aslak Hellesoy, Jon Tirsen</p>
-
 <h2>Basics</h2>
 
-<p>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. </p>
+<p>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. </p>
 
-<p>Container's most important feature is its ability to instantiate arbitrary objects. This is done through its API,
+<p>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.</p>
 
 <p>Example:</p>
@@ -26,8 +24,8 @@
 </div>
 
 <p>(i)<a
-    href="http://www.containercontainer.org/containercontainer/latest/containercontainer/apidocs/org/containercontainer/MutableContainer.html">MutableContainer
-                                                                                                                               API<sup><img
+    href="javadoc/core/org/apache/composer/core/MutableContainer.html">
+    MutableContainer API<sup><img
     class="rendericon" src="/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt=""
     border="0" /></sup></a></p>
 
@@ -39,8 +37,8 @@
     </div>
 </div>
 
-<p>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
+<p>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:</p>
 <table>
     <tbody>
@@ -63,9 +61,7 @@
         can be configured dynamically. Container is able to
         instantiate a complex graph of several interdependent objects.</p>
 
-        <h2>Write some simple classes
-                                                                                             and interfaces with
-                                                                                             dependencies</h2>
+        <h2>Write some simple classes and interfaces with dependencies</h2>
 
 <p>The "Juicer Example" diagram above could translate to the following code (we added a concrete Peelable):</p>
 
@@ -149,8 +145,7 @@
 </div>
 
 <p>(i)<a
-    href="http://www.containercontainer.org/containercontainer/latest/containercontainer/apidocs/org/containercontainer/MutableContainer.html">MutableContainer
-                                                                                                                               API<sup><img
+    href="javadoc/core/org/apache/composer/core/MutableContainer.html">MutableContainer API<sup><img
     class="rendericon" src="/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt=""
     border="0" /></sup></a></p>
 
@@ -246,7 +241,7 @@
         <h2>Lifecycle</h2>
 
 <p>Container has support for <a href="lifecycle.html" title="Lifecycle">Lifecycle</a>. If your classes implement <a
-    href="http://www.containercontainer.org/containercontainer/latest/containercontainer/apidocs/org/containercontainer/Startable.html">Startable<sup><img
+    href="javadoc/core/org/apache/composer/core//Startable.html">Startable<sup><img
     class="rendericon" src="/images/icons/linkext7.gif" height="7" width="7" align="absmiddle" alt=""
     border="0" /></sup></a>, 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 @@
 
 <p>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 <img class="emoticon"
-                                                                          src="http://docs.codehaus.org/images/icons/emoticons/smile.gif"
+                                                                          src="images/smile.gif"
                                                                           height="20" width="20" align="absmiddle"
                                                                           alt="" border="0" /></p>
 

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=618279&r1=618278&r2=618279&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 05:38:42 2008
@@ -81,6 +81,6 @@
   <li>USE_NAMES - use the parameter names of the component's constructor (or injection method) for the binding of configuration or components.</li>
 </ul>
 <h3>Custom Properties</h3>
-<p>You can make your own properties quite easily - check out the source to <a href="http://svn.codehaus.org/containercontainer/java/2.x/trunk/container/container/src/java/org/containercontainer/Characteristics.java">Characteristics.java</a> and the classes that refer to it in Container (various implementations of ComponentFactory and ComponentAdapter). </p>
+<p>You can make your own properties quite easily - check out the source to <a href="https://svn.apache.org/repos/asf/incubator/composer/trunk/composer-core/src/main/java/org/apache/composer/core/Characteristics.java">Characteristics.java</a> and the classes that refer to it in Container (various implementations of ComponentFactory and ComponentAdapter). </p>
 </body>
 </html>

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=618279&r1=618278&r2=618279&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 05:38:42 2008
@@ -68,7 +68,7 @@
     <a href="injection.html" title="Dependency Injection">Dependency Injection</a> variant where an object gets all
                                                                                    dependencies via setter methods.
                                                                                    Container support this with
-    <a href="http://www.containercontainer.org/containercontainer/latest/containercontainer/apidocs/org/containercontainer/defaults/SetterInjectionComponentAdapter.html">SetterInjectionComponentAdapter</a>,
+    <a href="javadoc/core/org/apache/composer/core/injectors/SetterInjection.html">SetterInjection</a>,
                                                                                                                                                                                          but
                                                                                                                                                                                          the
                                                                                                                                                                                          Container

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=618279&r1=618278&r2=618279&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 05:38:42 2008
@@ -30,7 +30,7 @@
 
 <body class="composite">
 
-<div id="banner"><img src=""
+<div id="banner"><img src="http://www.apache.org/images/asf-logo.gif"
   alt="Apache Composer" />
 <div class="clear">
 </div>
@@ -54,9 +54,6 @@
   </#if> </#list>
 </ul>
 </#list>
-<h1>Hosted by</h1>
-<img alt="Hosted at Codehaus"
-  src="http://ci.codehaus.org/codehaus-small.png" /><br />
 <h1>Tools</h1>
 <img alt="Build with Maven 2"
   src="http://maven.apache.org/images/logos/maven-feather.png" /> <br />