[jboss-cvs] JBossAS SVN: r88742 - projects/microcontainer/trunk/docs/gettingstarted/en-US/src/main/docbook/modules.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Tue May 12 11:27:09 EDT 2009


Author: kabir.khan at jboss.com
Date: 2009-05-12 11:27:08 -0400 (Tue, 12 May 2009)
New Revision: 88742

Modified:
   projects/microcontainer/trunk/docs/gettingstarted/en-US/src/main/docbook/modules/annotations.xml
   projects/microcontainer/trunk/docs/gettingstarted/en-US/src/main/docbook/modules/aop.xml
   projects/microcontainer/trunk/docs/gettingstarted/en-US/src/main/docbook/modules/basics.xml
   projects/microcontainer/trunk/docs/gettingstarted/en-US/src/main/docbook/modules/classloader.xml
   projects/microcontainer/trunk/docs/gettingstarted/en-US/src/main/docbook/modules/deployers.xml
   projects/microcontainer/trunk/docs/gettingstarted/en-US/src/main/docbook/modules/examples.xml
   projects/microcontainer/trunk/docs/gettingstarted/en-US/src/main/docbook/modules/guice.xml
   projects/microcontainer/trunk/docs/gettingstarted/en-US/src/main/docbook/modules/introduction.xml
   projects/microcontainer/trunk/docs/gettingstarted/en-US/src/main/docbook/modules/javabeans.xml
   projects/microcontainer/trunk/docs/gettingstarted/en-US/src/main/docbook/modules/mbeans.xml
   projects/microcontainer/trunk/docs/gettingstarted/en-US/src/main/docbook/modules/osgi.xml
   projects/microcontainer/trunk/docs/gettingstarted/en-US/src/main/docbook/modules/packaging.xml
   projects/microcontainer/trunk/docs/gettingstarted/en-US/src/main/docbook/modules/reliance.xml
   projects/microcontainer/trunk/docs/gettingstarted/en-US/src/main/docbook/modules/reliance_identity.xml
   projects/microcontainer/trunk/docs/gettingstarted/en-US/src/main/docbook/modules/reliance_jbpm.xml
   projects/microcontainer/trunk/docs/gettingstarted/en-US/src/main/docbook/modules/reliance_rules.xml
   projects/microcontainer/trunk/docs/gettingstarted/en-US/src/main/docbook/modules/spring.xml
Log:
[JBMICROCONT-429] Fix spelling and grammatical mistakes, and get rid of some line overflows in code examples

Modified: projects/microcontainer/trunk/docs/gettingstarted/en-US/src/main/docbook/modules/annotations.xml
===================================================================
--- projects/microcontainer/trunk/docs/gettingstarted/en-US/src/main/docbook/modules/annotations.xml	2009-05-12 15:17:40 UTC (rev 88741)
+++ projects/microcontainer/trunk/docs/gettingstarted/en-US/src/main/docbook/modules/annotations.xml	2009-05-12 15:27:08 UTC (rev 88742)
@@ -7,17 +7,17 @@
 
    <para>We learned how to configure our POJOs with Microcontainer's XML elements.
       In today's development most of the configuration is done with annotations.
-      Microcontainer is no exception.
+      The Microcontainer is no exception.
    </para>
 
-   <para>Almost all of the features available in XML are also present in Microcontainer's
+   <para>Almost all of the features available in XML are also present in the Microcontainer's
       annotations support, except for the classloading configuration, which for obvious reasons
-      doesn't have its equivalent (class needs to be loaded before we can check for annotations, right).
+      doesn't have its equivalent (the class needs to be loaded before we can check for annotations, right). 
       Let's now look at the annotations supported and some of its caveats.
    </para>
 
    <para>Like in most other configurations XML and predetermined bean metadata override annotations.
-      This is current list of supported annotations and their XML equivalents. Later we will show how
+      This is the current list of supported annotations and their XML equivalents. Later we will show how
       you can extend support for your own annotations directly into Microcontainer's configuration.
    </para>
 
@@ -26,37 +26,37 @@
             <para>@Aliases - &lt;alias></para>
             <para>
                <programlisting>
-                  /**
-                   * The aliases.
-                   * Equivalent to deployment's alias element.
-                   *
-                   * @author &lt;a href="mailto:ales.justin at jboss.com">Ales Justin&lt;/a>
-                   */
-                  @Retention(RetentionPolicy.RUNTIME)
-                  @Target({ElementType.TYPE})
-                  public @interface Aliases
-                  {
-                     /**
-                      * Get aliases array.
-                      *
-                      * @return the aliases
-                      */
-                     String[] value();
+     /**
+      * The aliases.
+      * Equivalent to deployment's alias element.
+      *
+      * @author &lt;a href="mailto:ales.justin at jboss.com">Ales Justin&lt;/a>
+      */
+      @Retention(RetentionPolicy.RUNTIME)
+      @Target({ElementType.TYPE})
+      public @interface Aliases
+      {
+         /**
+          * Get aliases array.
+          *
+          * @return the aliases
+          */
+         String[] value();
 
-                     /**
-                      * Do system property replace.
-                      *
-                      * @return true to replace system property, false otherwise
-                      */
-                     boolean replace() default true;
-                  }
+         /**
+          * Do system property replace.
+          *
+          * @return true to replace system property, false otherwise
+          */
+         boolean replace() default true;
+      }
                </programlisting>
             </para>
             <para>
                Example:
                <programlisting>
-                  @Aliases({"MyAlias", "YetAnotherSimpleBean"})
-                  public class AliasSimpleBeanImpl extends SimpleBeanImpl
+      @Aliases({"MyAlias", "YetAnotherSimpleBean"})
+      public class AliasSimpleBeanImpl extends SimpleBeanImpl
                </programlisting>
             </para>
          </listitem>
@@ -68,70 +68,70 @@
             <para>@SetValue - &lt;set></para>
             <para>
                <programlisting>
-                  /**
-                   * Injecting array value.
-                   *
-                   * @author &lt;a href="mailto:ales.justin at jboss.com">Ales Justin&lt;/a>
-                   */
-                  @Retention(RetentionPolicy.RUNTIME)
-                  @Target({ElementType.METHOD, ElementType.PARAMETER})
-                  public @interface ArrayValue
-                  {
-                     /**
-                      * Set the array class.
-                      *
-                      * @return array class name
-                      */
-                     String clazz() default "";
+      /**
+       * Injecting array value.
+       *
+       * @author &lt;a href="mailto:ales.justin at jboss.com">Ales Justin&lt;/a>     
+       */
+      @Retention(RetentionPolicy.RUNTIME)
+      @Target({ElementType.METHOD, ElementType.PARAMETER})
+      public @interface ArrayValue
+      {
+         /**
+          * Set the array class.
+          *
+          * @return array class name
+          */
+         String clazz() default "";
 
-                     /**
-                      * Array's element class.
-                      *
-                      * @return element class name
-                      */
-                     String elementClass() default "";
+         /**
+          * Array's element class.
+          *
+          * @return element class name
+          */
+         String elementClass() default "";
 
-                     /**
-                      * Get the values.
-                      *
-                      * @return the values
-                      */
-                     Value[] value();
-                  }
+         /**
+          * Get the values.
+          *
+          * @return the values
+          */
+         Value[] value();
+      }
                </programlisting>
             </para>
             <para>
                Example:
                <programlisting>
-                  @ArrayValue(
-                        value = {
-                           @Value(string = @StringValue("string1")),
-                           @Value(string = @StringValue("string2")),
-                           @Value(string = @StringValue("string2")),
-                           @Value(string = @StringValue("string1"))
-                        },
-                        elementClass = "java.lang.String",
-                        clazz = "[Ljava.lang.Comparable;"
-                  )
-                  public void setArray(Object[] array)
-                  {
-                     super.setArray(array);
-                  }
+      @ArrayValue(
+         value = {
+            @Value(string = @StringValue("string1")),
+            @Value(string = @StringValue("string2")),
+            @Value(string = @StringValue("string2")),
+            @Value(string = @StringValue("string1"))
+         },
+         elementClass = "java.lang.String",
+         clazz = "[Ljava.lang.Comparable;"
+      )
+      public void setArray(Object[] array)
+      {
+         super.setArray(array);
+      }
 
-                  @CollectionValue(
-                        value = {
-                           @Value(string = @StringValue("string1")),
-                           @Value(string = @StringValue("string2")),
-                           @Value(string = @StringValue("string2")),
-                           @Value(string = @StringValue("string1"))
-                        },
-                        elementClass = "java.lang.String",
-                        clazz = "java.util.ArrayList"
-                  )
-                  public void setCollection(Collection collection)
-                  {
-                     super.setCollection(collection);
-                  }
+      @CollectionValue(
+         value = {
+            @Value(string = @StringValue("string1")),
+            @Value(string = @StringValue("string2")),
+            @Value(string = @StringValue("string2")),
+            @Value(string = @StringValue("string1"))
+         },
+         elementClass = "java.lang.String",
+         clazz = "java.util.ArrayList"
+      )
+      public void setCollection(Collection collection)
+      {
+         super.setCollection(collection);
+      }
                </programlisting>
             </para>
          </listitem>
@@ -140,28 +140,28 @@
             <para>@Constructor - &lt;constructor></para>
             <para>
                <programlisting>
-                  /**
-                   * Mark the constructor used to instantiate bean.
-                   *
-                   * @author &lt;a href="mailto:ales.justin at jboss.com">Ales Justin&lt;/a>
-                   */
-                  @Retention(RetentionPolicy.RUNTIME)
-                  @Target({ElementType.CONSTRUCTOR})
-                  public @interface Constructor
-                  {
-                  }
+      /**
+       * Mark the constructor used to instantiate bean.
+       *
+       * @author &lt;a href="mailto:ales.justin at jboss.com">Ales Justin&lt;/a>
+       */
+      @Retention(RetentionPolicy.RUNTIME)
+      @Target({ElementType.CONSTRUCTOR})
+      public @interface Constructor
+      {
+      }
+         </programlisting>
+      </para>
+      <para>
+         Example:
+         <programlisting>
+      @Constructor
+      public TestConstructorBean(@Inject(bean = "testBean") TestBean test)
+      {
+         ...
+      }
                </programlisting>
             </para>
-            <para>
-               Example:
-               <programlisting>
-                  @Constructor
-                  public TestConstructorBean(@Inject(bean = "testBean") TestBean test)
-                  {
-                     ...
-                  }
-               </programlisting>
-            </para>
          </listitem>
 
          <listitem>
@@ -171,50 +171,52 @@
             <para>@Destroy - &lt;destroy></para>
             <para>
                <programlisting>
-                  /**
-                   * Mark lifecycle create method.
-                   *
-                   * @author &lt;a href="mailto:ales.justin at jboss.com">Ales Justin&lt;/a>
-                   */
-                  @Retention(RetentionPolicy.RUNTIME)
-                  @Target({ElementType.METHOD})
-                  public @interface Create
-                  {
-                     /**
-                      * Is this lifecycle callback ignored.
-                      *
-                      * @return ignored
-                      */
-                     boolean ignored() default false;
-                  }
+      /**
+       * Mark lifecycle create method.
+       *
+       * @author &lt;a href="mailto:ales.justin at jboss.com">Ales Justin&lt;/a>
+       */
+      @Retention(RetentionPolicy.RUNTIME)
+      @Target({ElementType.METHOD})
+      public @interface Create
+      {
+         /**
+          * Is this lifecycle callback ignored.
+          *
+          * @return ignored
+          */
+         boolean ignored() default false;
+      }
                </programlisting>
             </para>
             <para>
                Example:
                <programlisting>
-                  @Create
-                  public void notCreate(@Inject(bean = "Name1") SimpleBeanWithLifecycle bean)
-                  {
-                     super.notCreate(bean);
-                  }
+      @Create
+      public void notCreate(
+                 @Inject(bean = "Name1") SimpleBeanWithLifecycle bean)
+      {
+         super.notCreate(bean);
+      }
 
-                  @Start
-                  public void notStart(@Inject(bean = "Name2")SimpleBeanWithLifecycle bean)
-                  {
-                     super.notStart(bean);
-                  }
+      @Start
+      public void notStart(@Inject(bean = "Name2")SimpleBeanWithLifecycle bean)
+      {
+         super.notStart(bean);
+      }
 
-                  @Stop
-                  public void notStop(@Inject(bean = "Name3")SimpleBeanWithLifecycle bean)
-                  {
-                     super.notStop(bean);
-                  }
+      @Stop
+      public void notStop(@Inject(bean = "Name3")SimpleBeanWithLifecycle bean)
+      {
+         super.notStop(bean);
+      }
 
-                  @Destroy
-                  public void notDestroy(@Inject(bean = "Name4")SimpleBeanWithLifecycle bean)
-                  {
-                     super.notDestroy(bean);
-                  }
+      @Destroy
+      public void notDestroy(
+                 @Inject(bean = "Name4")SimpleBeanWithLifecycle bean)
+      {
+         super.notDestroy(bean);
+      }
                </programlisting>
             </para>
          </listitem>
@@ -223,29 +225,29 @@
             <para>@Demands - &lt;demands></para>
             <para>
                <programlisting>
-                  /**
-                   * The demands.
-                   *
-                   * @author &lt;a href="mailto:ales.justin at jboss.com">Ales Justin&lt;/a>
-                   */
-                  @Retention(RetentionPolicy.RUNTIME)
-                  @Target({ElementType.TYPE})
-                  public @interface Demands
-                  {
-                     /**
-                      * Get demands.
-                      *
-                      * @return the demands
-                      */
-                     Demand[] value();
-                  }
+      /**
+       * The demands.
+       *
+       * @author &lt;a href="mailto:ales.justin at jboss.com">Ales Justin&lt;/a>
+       */
+      @Retention(RetentionPolicy.RUNTIME)
+      @Target({ElementType.TYPE})
+      public @interface Demands
+      {
+         /**
+          * Get demands.
+          *
+          * @return the demands
+          */
+         Demand[] value();
+      }
                </programlisting>
             </para>
             <para>
                Example:
                <programlisting>
-                  @Demands({@Demand("WhatIWant")})
-                  public class DemandSimpleBeanImpl extends SimpleBeanImpl
+      @Demands({@Demand("WhatIWant")})
+      public class DemandSimpleBeanImpl extends SimpleBeanImpl
                </programlisting>
             </para>
          </listitem>
@@ -254,29 +256,29 @@
             <para>@Depends - &lt;depends></para>
             <para>
                <programlisting>
-                  /**
-                   * The depends values.
-                   *
-                   * @author &lt;a href="mailto:ales.justin at jboss.com">Ales Justin&lt;/a>
-                   */
-                  @Retention(RetentionPolicy.RUNTIME)
-                  @Target({ElementType.TYPE})
-                  public @interface Depends
-                  {
-                     /**
-                      * Get the depends values.
-                      *
-                      * @return the depends
-                      */
-                     String[] value();
-                  }
+      /**
+       * The depends values.
+       *
+       * @author &lt;a href="mailto:ales.justin at jboss.com">Ales Justin&lt;/a>
+       */
+      @Retention(RetentionPolicy.RUNTIME)
+      @Target({ElementType.TYPE})
+      public @interface Depends
+      {
+         /**
+          * Get the depends values.
+          *
+          * @return the depends
+          */
+         String[] value();
+      }
                </programlisting>
             </para>
             <para>
                Example:
                <programlisting>
-                  @Depends({"Name1"})
-                  public class DependSimpleBeanWithLifecycle extends SimpleBeanWithLifecycle
+      @Depends({"Name1"})
+      public class DependSimpleBeanWithLifecycle extends SimpleBeanWithLifecycle
                </programlisting>
             </para>
          </listitem>
@@ -286,30 +288,34 @@
             <para>@ExternalUninstalls - &lt;uninstall bean="..." method="..."/></para>
             <para>
                <programlisting>
-                  /**
-                   * Array of external installs.
-                   *
-                   * @author &lt;a href="mailto:ales.justin at jboss.com">Ales Justin&lt;/a>
-                   */
-                  @Retention(RetentionPolicy.RUNTIME)
-                  @Target({ElementType.TYPE})
-                  public @interface ExternalUninstalls
-                  {
-                     /**
-                      * Get external installs.
-                      *
-                      * @return the external installs
-                      */
-                     ExternalInstall[] value();
-                  }
+      /**
+       * Array of external installs.
+       *
+       * @author &lt;a href="mailto:ales.justin at jboss.com">Ales Justin&lt;/a>
+       */
+      @Retention(RetentionPolicy.RUNTIME)
+      @Target({ElementType.TYPE})
+      public @interface ExternalUninstalls
+      {
+         /**
+          * Get external installs.
+          *
+          * @return the external installs
+          */
+         ExternalInstall[] value();
+      }
                </programlisting>
             </para>
             <para>
                Example:
                <programlisting>
-                  @ExternalInstalls({@ExternalInstall(bean = "Name1", method = "addSimpleBean", parameters = {@Value(thisValue = @ThisValue)})})
-                  @ExternalUninstalls({@ExternalInstall(bean = "Name1", method = "removeSimpleBean", parameters = {@Value(thisValue = @ThisValue)})})
-                  public class ExternalInstallSimpleBeanImpl implements Serializable, SimpleBean
+      @ExternalInstalls({
+         @ExternalInstall(bean = "Name1", method = "addSimpleBean", 
+            parameters = {@Value(thisValue = @ThisValue)})})
+      @ExternalUninstalls({
+         @ExternalInstall(bean = "Name1", method = "removeSimpleBean", 
+            parameters = {@Value(thisValue = @ThisValue)})})
+      public class ExternalInstallSimpleBeanImpl implements Serializable, SimpleBean
                </programlisting>
             </para>
          </listitem>
@@ -318,54 +324,55 @@
             <para>@Factory - &lt;constructor>&lt;factory ...></para>
             <para>
                <programlisting>
-                  /**
-                   * Define constructor factory.
-                   *
-                   * @author &lt;a href="mailto:ales.justin at jboss.com">Ales Justin&lt;/a>
-                   */
-                  @Retention(RetentionPolicy.RUNTIME)
-                  @Target({ElementType.TYPE})
-                  public @interface Factory
-                  {
-                     /**
-                      * Get the factory.
-                      *
-                      * @return the factory value
-                      */
-                     Value factory() default @Value();
-
-                     /**
-                      * Get the factory class.
-                      *
-                      * @return the factory class
-                      */
-                     String factoryClass() default "";
-
-                     /**
-                      * Get the factory method.
-                      *
-                      * @return the factory method
-                      */
-                     String factoryMethod();
-
-                     /**
-                      * Get parameters.
-                      *
-                      * @return the parameters
-                      */
-                     Value[] parameters() default {};
-                  }
+      /**
+       * Define constructor factory.
+       *
+       * @author &lt;a href="mailto:ales.justin at jboss.com">Ales Justin&lt;/a>
+       */
+      @Retention(RetentionPolicy.RUNTIME)
+      @Target({ElementType.TYPE})
+      public @interface Factory
+      {
+         /**
+          * Get the factory.
+          *
+          * @return the factory value
+          */
+         Value factory() default @Value();
+
+         /**
+          * Get the factory class.
+          *
+          * @return the factory class
+          */
+         String factoryClass() default "";
+
+         /**
+          * Get the factory method.
+          *
+          * @return the factory method
+          */
+         String factoryMethod();
+
+         /**
+          * Get parameters.
+          *
+          * @return the parameters
+          */
+         Value[] parameters() default {};
+      }
                </programlisting>
             </para>
             <para>
                Example:
                <programlisting>
-                  @Factory(
-                        factory = @Value(javabean = @JavaBeanValue("org.jboss.test.kernel.config.support.SimpleBeanFactory")),
-                        factoryMethod = "createSimpleBean",
-                        parameters = {@Value(string = @StringValue("Factory Value"))}
-                  )
-                  public class FromFactoryWithParamSimpleBean extends SimpleBean
+      @Factory(
+            factory = @Value(javabean = @JavaBeanValue(
+              "org.jboss.test.kernel.config.support.SimpleBeanFactory")),
+            factoryMethod = "createSimpleBean",
+            parameters = {@Value(string = @StringValue("Factory Value"))}
+      )
+      public class FromFactoryWithParamSimpleBean extends SimpleBean
                </programlisting>
             </para>
          </listitem>
@@ -374,26 +381,26 @@
             <para>@FactoryMethod - &lt;constructor>&lt;factory factoryMethod="..." ...></para>
             <para>
                <programlisting>
-                  /**
-                   * Mark static method as factory method.
-                   *
-                   * @author &lt;a href="mailto:ales.justin at jboss.com">Ales Justin&lt;/a>
-                   */
-                  @Retention(RetentionPolicy.RUNTIME)
-                  @Target({ElementType.METHOD})
-                  public @interface FactoryMethod
-                  {
-                  }
+      /**
+       * Mark static method as factory method.
+       *
+       * @author &lt;a href="mailto:ales.justin at jboss.com">Ales Justin&lt;/a>
+       */
+      @Retention(RetentionPolicy.RUNTIME)
+      @Target({ElementType.METHOD})
+      public @interface FactoryMethod
+      {
+      }
                </programlisting>
             </para>
             <para>
                Example:
                <programlisting>
-                  @FactoryMethod
-                  public static SimpleInject getInstance(@NullValue Object someNull)
-                  {
-                     return new SimpleInject();
-                  }
+      @FactoryMethod
+      public static SimpleInject getInstance(@NullValue Object someNull)
+      {
+         return new SimpleInject();
+      }
                </programlisting>
             </para>
          </listitem>
@@ -402,96 +409,101 @@
             <para>@Inject - &lt;inject></para>
             <para>
                <programlisting>
-                  /**
-                   * Beans when injected by class type are by default changed to configured
-                   * state - if not yet configured.
-                   * You can change this behavior by setting state.
-                   *
-                   * @author &lt;a href="mailto:ales.justin at jboss.com">Ales Justin&lt;/a>
-                   */
-                  @Retention(RetentionPolicy.RUNTIME)
-                  @Target({ElementType.METHOD, ElementType.PARAMETER})
-                  public @interface Inject
-                  {
-                     /**
-                      * Get bean.
-                      * Default is no bean.
-                      *
-                      * @return bean name
-                      */
-                     String bean() default "";
+      /**
+       * Beans when injected by class type are by default changed to configured
+       * state - if not yet configured.
+       * You can change this behavior by setting state.
+       *
+       * @author &lt;a href="mailto:ales.justin at jboss.com">Ales Justin&lt;/a>
+       */
+      @Retention(RetentionPolicy.RUNTIME)
+      @Target({ElementType.METHOD, ElementType.PARAMETER})
+      public @interface Inject
+      {
+         /**
+          * Get bean.
+          * Default is no bean.
+          *
+          * @return bean name
+          */
+         String bean() default "";
 
-                     /**
-                      * Get property.
-                      * Default is no property.
-                      *
-                      * @return property name
-                      */
-                     String property() default "";
+         /**
+          * Get property.
+          * Default is no property.
+          *
+          * @return property name
+          */
+         String property() default "";
 
-                     /**
-                      * Get when required.
-                      *
-                      * @return when required.
-                      */
-                     String whenRequired() default "";
+         /**
+          * Get when required.
+          *
+          * @return when required.
+          */
+         String whenRequired() default "";
 
-                     /**
-                      * Get dependent state.
-                      * Default is Installed.
-                      *
-                      * @return dependent state.
-                      */
-                     String dependentState() default "Installed";
+         /**
+          * Get dependent state.
+          * Default is Installed.
+          *
+          * @return dependent state.
+          */
+         String dependentState() default "Installed";
 
-                     /**
-                      * Get injection type.
-                      * Default is by class.
-                      *
-                      * @return injection type
-                      */
-                     InjectType type() default InjectType.BY_CLASS;
+         /**
+          * Get injection type.
+          * Default is by class.
+          *
+          * @return injection type
+          */
+         InjectType type() default InjectType.BY_CLASS;
 
-                     /**
-                      * Get injection option.
-                      * Default is Strict.
-                      *
-                      * @return injection option
-                      */
-                     InjectOption option() default InjectOption.STRICT;
+         /**
+          * Get injection option.
+          * Default is Strict.
+          *
+          * @return injection option
+          */
+         InjectOption option() default InjectOption.STRICT;
 
-                     /**
-                      * Get from context injection.
-                      *
-                      * @return from context type
-                      */
-                     FromContext fromContext() default FromContext.NONE;
+         /**
+          * Get from context injection.
+          *
+          * @return from context type
+          */
+         FromContext fromContext() default FromContext.NONE;
 
-                     /**
-                      * Is this @Inject valid.
-                      * Used with @Value.
-                      *
-                      * @return is this instance valid
-                      */
-                     boolean valid() default true;
-                  }
+         /**
+          * Is this @Inject valid.
+          * Used with @Value.
+          *
+          * @return is this instance valid
+          */
+         boolean valid() default true;
+      }
                </programlisting>
             </para>
             <para>
                Example:
                <programlisting>
-                  @Inject(bean = "Name1")
-                  public void setSimpleBean(SimpleBean bean)
-                  {
-                     super.setSimpleBean(bean);
-                  }
+      @Inject(bean = "Name1")
+      public void setSimpleBean(SimpleBean bean)
+      {
+         super.setSimpleBean(bean);
+      }
 
-                  @Start
-                  public void startMeUp(@Inject(bean = "lifecycleBean") TestBean bean, @ValueFactory(bean="valueBean", method = "getValue", parameter = "123") int value)
-                  {
-                     test = bean;
-                     intVF =- value;
-                  }
+      @Start
+      public void startMeUp(
+        @Inject(bean = "lifecycleBean") TestBean bean, 
+          @ValueFactory(bean="valueBean", 
+          method = "getValue", 
+          parameter = "123") 
+        int value)
+      {
+         test = bean;
+         intVF =- value;
+      }
                </programlisting>
             </para>
          </listitem>
@@ -501,98 +513,98 @@
             <para>@Uninstall - &lt;uncallback></para>
             <para>
                <programlisting>
-                  /**
-                   * Install callback.
-                   *
-                   * @author &lt;a href="mailto:ales.justin at jboss.com">Ales Justin&lt;/a>
-                   */
-                  @Retention(RetentionPolicy.RUNTIME)
-                  @Target({ElementType.METHOD})
-                  public @interface Install
-                  {
-                     /**
-                      * Get the cardinality.
-                      * Default is no cardinality.
-                      *
-                      * @return cardinality
-                      */
-                     String cardinality() default "";
+      /**
+       * Install callback.
+       *
+       * @author &lt;a href="mailto:ales.justin at jboss.com">Ales Justin&lt;/a>
+       */
+      @Retention(RetentionPolicy.RUNTIME)
+      @Target({ElementType.METHOD})
+      public @interface Install
+      {
+         /**
+          * Get the cardinality.
+          * Default is no cardinality.
+          *
+          * @return cardinality
+          */
+         String cardinality() default "";
 
-                     /**
-                      * Get when required.
-                      * Default is Configured.
-                      *
-                      * @return when required.
-                      */
-                     String whenRequired() default "Configured";
+         /**
+          * Get when required.
+          * Default is Configured.
+          *
+          * @return when required.
+          */
+         String whenRequired() default "Configured";
 
-                     /**
-                      * Get dependent state.
-                      * Default is Installed.
-                      *
-                      * @return dependent state.
-                      */
-                     String dependentState() default "Installed";
-                  }
+         /**
+          * Get dependent state.
+          * Default is Installed.
+          *
+          * @return dependent state.
+          */
+         String dependentState() default "Installed";
+      }
                </programlisting>
             </para>
             <para>
                Example:
                <programlisting>
-                  @Install
-                  public void addDeployer(MyDeployer deployer)
-                  {
-                     if (deployers == null)
-                        deployers = new HashSet&lt;MyDeployer>();
-                     deployers.add(deployer);
-                  }
+      @Install
+      public void addDeployer(MyDeployer deployer)
+      {
+         if (deployers == null)
+            deployers = new HashSet&lt;MyDeployer>();
+         deployers.add(deployer);
+      }
 
-                  @Uninstall
-                  public void removeDeployer(MyDeployer deployer)
-                  {
-                     deployers.remove(deployer);
-                  }
+      @Uninstall
+      public void removeDeployer(MyDeployer deployer)
+      {
+         deployers.remove(deployer);
+      }
                </programlisting>
             </para>
          </listitem>
 
          <listitem>
             <para>@InstallMethod - &lt;install></para>
-            <para>@UninstallMethod - &lt;uninstall></para>
+            <para>Sethod - &lt;uninstall></para>
             <para>
                <programlisting>
-                  /**
-                   * Internal installation method.
-                   *
-                   * @author &lt;a href="mailto:ales.justin at jboss.com">Ales Justin&lt;/a>
-                   */
-                  @Retention(RetentionPolicy.RUNTIME)
-                  @Target({ElementType.METHOD})
-                  public @interface InstallMethod
-                  {
-                     /**
-                      * Get dependant state.
-                      *
-                      * @return the dependant state
-                      */
-                     String dependantState() default "";
-                  }
+      /**
+       * Internal installation method.
+       *
+       * @author &lt;a href="mailto:ales.justin at jboss.com">Ales Justin&lt;/a>
+       */
+      @Retention(RetentionPolicy.RUNTIME)
+      @Target({ElementType.METHOD})
+      public @interface InstallMethod
+      {
+         /**
+          * Get dependant state.
+          *
+          * @return the dependant state
+          */
+         String dependantState() default "";
+      }
                </programlisting>
             </para>
             <para>
                Example:
                <programlisting>
-                  @InstallMethod
-                  public void install()
-                  {
-                     installed = true;
-                  }
+      @InstallMethod
+      public void install()
+      {
+         installed = true;
+      }
 
-                  @UninstallMethod
-                  public void uninstall()
-                  {
-                     installed = false;
-                  }
+      @UninstallMethod
+      public void uninstall()
+      {
+         installed = false;
+      }
                </programlisting>
             </para>
          </listitem>
@@ -601,32 +613,33 @@
             <para>@JavaBeanValue - &lt;javabean></para>
             <para>
                <programlisting>
-                  /**
-                   * Java bean value.
-                   *
-                   * @author &lt;a href="mailto:ales.justin at jboss.com">Ales Justin&lt;/a>
-                   */
-                  @Retention(RetentionPolicy.RUNTIME)
-                  @Target({ElementType.METHOD, ElementType.PARAMETER})
-                  public @interface JavaBeanValue
-                  {
-                     /**
-                      * Get java bean class name.
-                      * Must have default constructor.
-                      *
-                      * @return the class name
-                      */
-                     String value() default "";
-                  }
+      /**
+       * Java bean value.
+       *
+       * @author &lt;a href="mailto:ales.justin at jboss.com">Ales Justin&lt;/a>
+       */
+      @Retention(RetentionPolicy.RUNTIME)
+      @Target({ElementType.METHOD, ElementType.PARAMETER})
+      public @interface JavaBeanValue
+      {
+         /**
+          * Get java bean class name.
+          * Must have default constructor.
+          *
+          * @return the class name
+          */
+         String value() default "";
+      }
                </programlisting>
             </para>
             <para>
                Example:
                <programlisting>
-                  @Factory(
-                        factory = @Value(javabean = @JavaBeanValue("org.jboss.test.kernel.config.support.SimpleBeanFactory")),
-                        factoryMethod = "createSimpleBean"
-                  )
+      @Factory(
+            factory = @Value(javabean = @JavaBeanValue(
+               "org.jboss.test.kernel.config.support.SimpleBeanFactory")),
+            factoryMethod = "createSimpleBean"
+      )
                </programlisting>
             </para>
          </listitem>
@@ -635,69 +648,69 @@
             <para>@MapValue - &lt;map></para>
             <para>
                <programlisting>
-                  /**
-                   * Map value injection.
-                   *
-                   * @author &lt;a href="mailto:ales.justin at jboss.com">Ales Justin&lt;/a>
-                   */
-                  @Retention(RetentionPolicy.RUNTIME)
-                  @Target({ElementType.METHOD, ElementType.PARAMETER})
-                  public @interface MapValue
-                  {
-                     /**
-                      * Get the map class name.
-                      *
-                      * @return the map class name
-                      */
-                     String clazz() default "";
+      /**
+       * Map value injection.
+       *
+       * @author &lt;a href="mailto:ales.justin at jboss.com">Ales Justin&lt;/a>
+       */
+      @Retention(RetentionPolicy.RUNTIME)
+      @Target({ElementType.METHOD, ElementType.PARAMETER})
+      public @interface MapValue
+      {
+         /**
+          * Get the map class name.
+          *
+          * @return the map class name
+          */
+         String clazz() default "";
 
-                     /**
-                      * Get the key class name.
-                      *
-                      * @return the key class name
-                      */
-                     String keyClass() default "";
+         /**
+          * Get the key class name.
+          *
+          * @return the key class name
+          */
+         String keyClass() default "";
 
-                     /**
-                      * Get the value class name.
-                      *
-                      * @return the value class name
-                      */
-                     String valueClass() default "";
+         /**
+          * Get the value class name.
+          *
+          * @return the value class name
+          */
+         String valueClass() default "";
 
-                     /**
-                      * Get the entries.
-                      *
-                      * @return the entries
-                      */
-                     EntryValue[] value();
-                  }
+         /**
+          * Get the entries.
+          *
+          * @return the entries
+          */
+         EntryValue[] value();
+      }
                </programlisting>
             </para>
             <para>
                Example:
                <programlisting>
-                  @Constructor
-                  public AnnotatedLDAPFactory(
-                        @MapValue(
-                              keyClass = "java.lang.String",
-                              valueClass = "java.lang.String",
-                              value = {
-                                 @EntryValue(
-                                    key = @Value(string = @StringValue("foo.bar.key")),
-                                    value = @Value(string = @StringValue("QWERT"))
-                                 ),
-                                 @EntryValue(
-                                    key = @Value(string = @StringValue("xyz.key")),
-                                    value = @Value(string = @StringValue(" QWERT "))
-                                 )
-                              }
-                        )
-                        Map&lt;String, String> map
-                  )
-                  {
-                     super(map);
+      @Constructor
+      public AnnotatedLDAPFactory(
+            @MapValue(
+                  keyClass = "java.lang.String",
+                  valueClass = "java.lang.String",
+                  value = {
+                     @EntryValue(
+                        key = @Value(string = @StringValue("foo.bar.key")),
+                        value = @Value(string = @StringValue("QWERT"))
+                     ),
+                     @EntryValue(
+                        key = @Value(string = @StringValue("xyz.key")),
+                        value = @Value(string = @StringValue(" QWERT "))
+                     )
                   }
+            )
+            Map&lt;String, String> map
+      )
+      {
+         super(map);
+      }
                </programlisting>
             </para>
          </listitem>
@@ -706,35 +719,37 @@
             <para>@NullValue - &lt;null></para>
             <para>
                <programlisting>
-                  /**
-                   * Null value.
-                   *
-                   * @author &lt;a href="mailto:ales.justin at jboss.com">Ales Justin&lt;/a>
-                   */
-                  @Retention(RetentionPolicy.RUNTIME)
-                  @Target({ElementType.METHOD, ElementType.PARAMETER})
-                  public @interface NullValue
-                  {
-                     /**
-                      * Is valid.
-                      * Used in @Parameter and @value to define
-                      * unused value.
-                      *
-                      * @return is value valid
-                      */
-                     boolean valid() default true;
-                  }
+      /**
+       * Null value.
+       *
+       * @author &lt;a href="mailto:ales.justin at jboss.com">Ales Justin&lt;/a>
+       */
+      @Retention(RetentionPolicy.RUNTIME)
+      @Target({ElementType.METHOD, ElementType.PARAMETER})
+      public @interface NullValue
+      {
+         /**
+          * Is valid.
+          * Used in @Parameter and @value to define
+          * unused value.
+          *
+          * @return is value valid
+          */
+         boolean valid() default true;
+      }
                </programlisting>
             </para>
             <para>
                Example:
                <programlisting>
-                  @UninstallMethod
-                  public void withUninstall(@ThisValue SimpleInject me, @NullValue Object plainNull)
-                  {
-                     System.out.println(me == this);
-                     System.out.println("plainNull = " + plainNull);
-                  }
+      @UninstallMethod
+      public void withUninstall(
+         @ThisValue SimpleInject me, 
+         @NullValue Object plainNull)
+      {
+         System.out.println(me == this);
+         System.out.println("plainNull = " + plainNull);
+      }
                </programlisting>
             </para>
          </listitem>
@@ -743,46 +758,46 @@
             <para>@StringValue - &lt;value>somestring&lt;/value></para>
             <para>
                <programlisting>
-                  /**
-                   * String value.
-                   *
-                   * @author &lt;a href="mailto:ales.justin at jboss.com">Ales Justin&lt;/a>
-                   */
-                  @Retention(RetentionPolicy.RUNTIME)
-                  @Target({ElementType.METHOD, ElementType.PARAMETER})
-                  public @interface StringValue
-                  {
-                     /**
-                      * Get the value.
-                      *
-                      * @return the value
-                      */
-                     String value();
+      /**
+       * String value.
+       *
+       * @author &lt;a href="mailto:ales.justin at jboss.com">Ales Justin&lt;/a>
+       */
+      @Retention(RetentionPolicy.RUNTIME)
+      @Target({ElementType.METHOD, ElementType.PARAMETER})
+      public @interface StringValue
+      {
+         /**
+          * Get the value.
+          *
+          * @return the value
+          */
+         String value();
 
-                     /**
-                      * Get type.
-                      *
-                      * @return the type
-                      */
-                     String type() default "";
+         /**
+          * Get type.
+          *
+          * @return the type
+          */
+         String type() default "";
 
-                     /**
-                      * Do replace with system properties.
-                      *
-                      * @return true for replace with system properties, false otherwise
-                      */
-                     boolean replace() default true;
-                  }
+         /**
+          * Do replace with system properties.
+          *
+          * @return true for replace with system properties, false otherwise
+          */
+         boolean replace() default true;
+      }
                </programlisting>
             </para>
             <para>
                Example:
                <programlisting>
-                  @Constructor
-                  public ParamIntConstructorAnnBean(@StringValue("7") Integer string)
-                  {
-                     super(string);
-                  }
+      @Constructor
+      public ParamIntConstructorAnnBean(@StringValue("7") Integer string)
+      {
+         super(string);
+      }
                </programlisting>
             </para>
          </listitem>
@@ -791,29 +806,30 @@
             <para>@Supplys - &lt;supply></para>
             <para>
                <programlisting>
-                  /**
-                   * The supplys.
-                   *
-                   * @author &lt;a href="mailto:ales.justin at jboss.com">Ales Justin&lt;/a>
-                   */
-                  @Retention(RetentionPolicy.RUNTIME)
-                  @Target({ElementType.TYPE})
-                  public @interface Supplys
-                  {
-                     /**
-                      * Get supply values.
-                      *
-                      * @return the supplys
-                      */
-                     String[] value();
-                  }
+      /**
+       * The supplys.
+       *
+       * @author &lt;a href="mailto:ales.justin at jboss.com">Ales Justin&lt;/a>
+       */
+      @Retention(RetentionPolicy.RUNTIME)
+      @Target({ElementType.TYPE})
+      public @interface Supplys
+      {
+         /**
+          * Get supply values.
+          *
+          * @return the supplys
+          */
+         String[] value();
+      }
                </programlisting>
             </para>
             <para>
                Example:
                <programlisting>
-                  @Supplys({"WhatIWant"})
-                  public class SupplyPlainDependecySimpleBeanImpl extends PlainDependecySimpleBeanImpl
+      @Supplys({"WhatIWant"})
+      public class SupplyPlainDependecySimpleBeanImpl 
+         extends PlainDependecySimpleBeanImpl
                </programlisting>
             </para>
          </listitem>
@@ -822,36 +838,38 @@
             <para>@ThisValue - &lt;this/></para>
             <para>
                <programlisting>
-                  /**
-                   * This value.
-                   * Get the underlying target.
-                   *
-                   * @author &lt;a href="mailto:ales.justin at jboss.com">Ales Justin&lt;/a>
-                   */
-                  @Retention(RetentionPolicy.RUNTIME)
-                  @Target({ElementType.METHOD, ElementType.PARAMETER})
-                  public @interface ThisValue
-                  {
-                     /**
-                      * Is instance valid.
-                      *
-                      * @see @org.jboss.beans.metadata.api.annotations.Value
-                  * @see @org.jboss.beans.metadata.api.annotations.Parameter
-                  * @return true for valid
-                      */
-                     boolean valid() default true;
-                  }
+      /**
+       * This value.
+       * Get the underlying target.
+       *
+       * @author &lt;a href="mailto:ales.justin at jboss.com">Ales Justin&lt;/a>
+       */
+      @Retention(RetentionPolicy.RUNTIME)
+      @Target({ElementType.METHOD, ElementType.PARAMETER})
+      public @interface ThisValue
+      {
+         /**
+          * Is instance valid.
+          *
+          * @see @org.jboss.beans.metadata.api.annotations.Value
+      * @see @org.jboss.beans.metadata.api.annotations.Parameter
+      * @return true for valid
+          */
+         boolean valid() default true;
+      }
                </programlisting>
             </para>
             <para>
                Example:
                <programlisting>
-                  @InstallMethod
-                  public void whenInstalled(@ThisValue SimpleInject me, @NullValue Object plainNull)
-                  {
-                     System.out.println(me == this);
-                     System.out.println("plainNull = " + plainNull);
-                  }
+      @InstallMethod
+      public void whenInstalled(
+         @ThisValue SimpleInject me, 
+		 @NullValue Object plainNull)
+      {
+         System.out.println(me == this);
+         System.out.println("plainNull = " + plainNull);
+      }
                </programlisting>
             </para>
          </listitem>
@@ -860,74 +878,75 @@
             <para>@ValueFactory - &lt;value-factory></para>
             <para>
                <programlisting>
-                  /**
-                   * The value factory.
-                   *
-                   * @author &lt;a href="mailto:ales.justin at jboss.com">Ales Justin&lt;/a>
-                   */
-                  @Retention(RetentionPolicy.RUNTIME)
-                  @Target({ElementType.METHOD, ElementType.PARAMETER})
-                  public @interface ValueFactory
-                  {
-                     /**
-                      * Get the bean.
-                      *
-                      * @return the bean
-                      */
-                     String bean();
+      /**
+       * The value factory.
+       *
+       * @author &lt;a href="mailto:ales.justin at jboss.com">Ales Justin&lt;/a>
+       */
+      @Retention(RetentionPolicy.RUNTIME)
+      @Target({ElementType.METHOD, ElementType.PARAMETER})
+      public @interface ValueFactory
+      {
+         /**
+          * Get the bean.
+          *
+          * @return the bean
+          */
+         String bean();
 
-                     /**
-                      * Get the method.
-                      *
-                      * @return the method
-                      */
-                     String method();
+         /**
+          * Get the method.
+          *
+          * @return the method
+          */
+         String method();
 
-                     /**
-                      * Get single parameter.
-                      *
-                      * @return the single parameter
-                      */
-                     String parameter() default "";
+         /**
+          * Get single parameter.
+          *
+          * @return the single parameter
+          */
+         String parameter() default "";
 
-                     /**
-                      * Get parameters.
-                      *
-                      * @return the parameters
-                      */
-                     Parameter[] parameters() default {};
+         /**
+          * Get parameters.
+          *
+          * @return the parameters
+          */
+         Parameter[] parameters() default {};
 
-                     /**
-                      * Get default value.
-                      *
-                      * @return the default value
-                      */
-                     String defaultValue() default "";
+         /**
+          * Get default value.
+          *
+          * @return the default value
+          */
+         String defaultValue() default "";
 
-                     /**
-                      * Get dependant state.
-                      *
-                      * @return the dependant state
-                      */
-                     String dependantState() default "Installed";
+         /**
+          * Get dependant state.
+          *
+          * @return the dependant state
+          */
+         String dependantState() default "Installed";
 
-                     /**
-                      * Get when required state.
-                      *
-                      * @return the when required state
-                      */
-                     String whenRequiredState() default "Configured";
-                  }
+         /**
+          * Get when required state.
+          *
+          * @return the when required state
+          */
+         String whenRequiredState() default "Configured";
+      }
                </programlisting>
             </para>
             <para>
                Example:
                <programlisting>
-                  @ValueFactory(bean = "ldap", method = "getValue", parameter = "foo.bar.key")
-                  public void setValue(String value)
-                  {
-                     super.setValue(value);
-                  }
+      @ValueFactory(bean = "ldap", 
+         method = "getValue", parameter = "foo.bar.key")
+      public void setValue(String value)
+      {
+         super.setValue(value);
+      }
                </programlisting>
             </para>
          </listitem>

Modified: projects/microcontainer/trunk/docs/gettingstarted/en-US/src/main/docbook/modules/aop.xml
===================================================================
--- projects/microcontainer/trunk/docs/gettingstarted/en-US/src/main/docbook/modules/aop.xml	2009-05-12 15:17:40 UTC (rev 88741)
+++ projects/microcontainer/trunk/docs/gettingstarted/en-US/src/main/docbook/modules/aop.xml	2009-05-12 15:27:08 UTC (rev 88742)
@@ -5,15 +5,15 @@
 <section>
    <title>AOP Configuration and Usage</title>
 
-   <para>When writting new version of Kernel, there was always a need for
+   <para>When writing a new version of the Kernel, there was always a need for
       simple usage of advanced AOP features in the Kernel itself.
-      With the version 2.0.0 of Microcontainer there is an elegant way of
+      With version 2.0.0 of the Microcontainer there is an elegant way of
       binding your aspect to wired POJOs, using all the advantages of full
-      dependency state machine. Meaning that even aspect behave as installed
+      dependency state machine. Meaning that even aspects behave as installed
       services, having full lifecycle and dependency support in the Microcontainer.
-      And it's all a matter of configuration if you want to use aspectized Microcontainer
+      And it's all a matter of configuration if you want to use an aspectized Microcontainer
       or just plain POJO behaviour. To find out more about JBoss AOP, please see the JBoss
-      AOP documentation
+      AOP documentation.
    </para>
 
    <sect2>
@@ -62,11 +62,14 @@
 
    <aop:aspect xmlns:aop="urn:jboss:aop-beans:1.0"
                name="FooAdvice"
-               class="org.jboss.test.microcontainer.support.TestAspect"
-               method="foo"
-               pointcut="execution(* *.SimpleBeanImpl->someMethod(..))">
-   </aop:aspect>
-
+               class="org.jboss.test.microcontainer.support.TestAspect">
+   </aop:aspect>
+   
+   <aop:bind xmlns:aop="urn:jboss:aop-beans:1.0"
+               pointcut="execution(* *.SimpleBeanImpl->someMethod(..))">
+      <advice aspect="FooAdvice" advice="foo"/>	  
+   </aop:bind>
+
    <bean
       name="Intercepted"
       class="org.jboss.test.microcontainer.support.SimpleBeanImpl"/>
@@ -90,12 +93,15 @@
 }
       ]]></programlisting>
 
-      <para>In the above example, whenever we call the method <literal>someMethod()</literal>
+      <para>In the above example, the elements in the <literal>aop</literal>
+         namespace follow the same format as in a <literal>-aop.xml</literal>. 
+         Please see the JBoss AOP documentation for more details.
+      </para>
+      <para>
+         Whenever we call the method <literal>someMethod()</literal>
          in the <literal>Intercepted</literal> bean, we will get intercepted by the
          <literal>FooAdvice</literal> bean's <literal>foo()</literal> method. The aspect
-         methods must have the signature shown. If the <literal>method</literal> attribute
-         is left out for the <literal>aop:aspect</literal> advice, it will look for an advice
-         method called <literal>invoke()</literal>. Please see the JBoss AOP documentation for
+         methods must have the signature shown. The JBoss AOP documentation contains
          more information about advice methods, and the pointcut expressions used to pick out
          methods/constructors/fields that should have aspects applied.
       </para>
@@ -195,19 +201,23 @@
    </bean>
 
    <aop:lifecycle-configure xmlns:aop="urn:jboss:aop-beans:1.0"
-               name="JMXAdvice"
-               class="org.jboss.aop.microcontainer.aspects.jmx.JMXLifecycleCallback"
-               classes="@org.jboss.aop.microcontainer.aspects.jmx.JMX">
+            name="JMXAdvice"
+            class="org.jboss.aop.microcontainer.aspects.jmx.JMXLifecycleCallback"
+            classes="@org.jboss.aop.microcontainer.aspects.jmx.JMX">
       <property name="mbeanServer"><inject bean="MBeanServer"/></property>
    </aop:lifecycle-configure>
 
-   <aop:aspect xmlns:aop="urn:jboss:aop-beans:1.0"
-               name="TxAdvice"
-               class="org.acme.aspects.TxAspect"
-               pointcut="execution(* *->@org.acme.Tx(..))">
-      <property name="txManager"><inject bean="TxManager"/></property>
-   </aop:aspect>
-
+   <aop:aspect xmlns:aop="urn:jboss:aop-beans:1.0"
+            name="TxAdvice"
+            class="org.acme.aspects.TxAspect"
+      <property name="txManager"><inject bean="TxManager"/></property>
+   </aop:aspect>
+
+   <aop:bind xmlns:aop="urn:jboss:aop-beans:1.0"
+            pointcut="execution(* *->@org.acme.Tx(..))">
+      <advice aspect="TxAdvice" name="invoke"/>
+   </aop:bind>
+
    <bean name="BeanWithAspects"
       class="org.jboss.test.microcontainer.support.SimpleBeanImpl">
       <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX</annotation>

Modified: projects/microcontainer/trunk/docs/gettingstarted/en-US/src/main/docbook/modules/basics.xml
===================================================================
--- projects/microcontainer/trunk/docs/gettingstarted/en-US/src/main/docbook/modules/basics.xml	2009-05-12 15:17:40 UTC (rev 88741)
+++ projects/microcontainer/trunk/docs/gettingstarted/en-US/src/main/docbook/modules/basics.xml	2009-05-12 15:27:08 UTC (rev 88742)
@@ -41,7 +41,7 @@
          <!-- bean part of the deployment -->
          <bean .../>
 
-         </deployment&gt;
+         </deployment>
 
 ]]>
    </programlisting>
@@ -91,7 +91,7 @@
    <sect2>
       <title>Construction</title>
 
-      <para>The example above uses the default constructor. What if you don't want to use some other constructor. The
+      <para>The example above uses the default constructor. What if you want to use some other constructor? The
          simplest mechanism just matches the number of parameters in the constructor. The example below is from the
          <varname>constructor</varname>
          example.
@@ -353,7 +353,7 @@
 
       <para>The configuration creates the
          <varname>PropertiesBean</varname>
-         instance and then use the setter methods to set its properties.
+         instance and then uses the setter methods to set its properties.
       </para>
 
       <programlisting>
@@ -518,9 +518,9 @@
 ]]>
       </programlisting>
 
-      <para>Sometimes it is still usefull to be able to set or inject a value which can be morphed / progressed into
-         needed type althogh existing type is not compatible (normally getting <varname>ClassCastException</varname>). This is mostly true
-         for <varname>java.lang.Number</varname> subclasses. Let's see how <varname>progression</varname> is used on the following example
+      <para>Sometimes it is still useful to be able to set or inject a value which can be morphed / progressed into
+         the needed type although the existing type is not compatible (normally getting <varname>ClassCastException</varname>). This is mostly true
+         for <varname>java.lang.Number</varname> subclasses. Let's see how <varname>progression</varname> is used in the following example
          (here we use <varname><![CDATA[<inject />]]></varname>, which is actually explained in the next chapter).
       </para>
 
@@ -554,10 +554,10 @@
          property name means that a field is of type double. A<varname>Float</varname> corresponds to Float type. Etc.
       </para>
 
-      <para>You can change the progression behavior by setting System property
+      <para>You can change the progression behavior by setting the System property
          <varname>org.jboss.reflect.plugins.progressionConvertor</varname>,
          putting the ProgressionConvertor's implementation fully qualified class name as value.
-         By default SimpleProgressionConvertor implementation is used. Another existing implementation is
+         By default the SimpleProgressionConvertor implementation is used. Another existing implementation is
          NullProgressionConvertor, which doesn't do any actual progression.
       </para>
 
@@ -567,7 +567,7 @@
       <title>Injections</title>
 
       <para>Objects by themself are not very useful. They need to be linked together to form more complicated data
-         structures. We have already seen one form of an injection when using factory instances above. Injections can be
+         structures. We have already seen one form of injection when using factory instances above. Injections can be
          used anywhere a string value is used. All the examples that we have previously seen with strings could also be
          done with injections.
       </para>
@@ -721,13 +721,15 @@
       <programlisting>
 <![CDATA[
 
-   <bean name="PropHolder" class="org.jboss.test.kernel.config.support.PropHolder">
+   <bean name="PropHolder" 
+     class="org.jboss.test.kernel.config.support.PropHolder">
       <property name="value">
          <value-factory bean="ldap" method="getValue">
             <parameter>xyz.key</parameter>
             <parameter>xyz</parameter>
             <parameter>
-               <bean name="t" class="org.jboss.test.kernel.config.support.TrimTransformer"/>
+               <bean name="t" 
+                 class="org.jboss.test.kernel.config.support.TrimTransformer"/>
             </parameter>
          </value-factory>
       </property>
@@ -764,7 +766,8 @@
       <programlisting>
 <![CDATA[
 
-   <bean name="PropHolder" class="org.jboss.test.kernel.config.support.PropHolder">
+   <bean name="PropHolder" 
+     class="org.jboss.test.kernel.config.support.PropHolder">
       <constructor>
          <parameter>
             <value-factory bean="ldap" method="getValue" parameter="foo.bar.key"/>
@@ -781,7 +784,8 @@
       <programlisting>
 <![CDATA[
 
-   <bean name="PropHolder" class="org.jboss.test.kernel.config.support.PropHolder">
+   <bean name="PropHolder" 
+     class="org.jboss.test.kernel.config.support.PropHolder">
       <property name="list">
          <list elementClass="java.lang.String">
             <value-factory bean="ldap" method="getValue" default="QWERT">
@@ -830,11 +834,10 @@
          <varname>list</varname>
          is shown here in those examples. You just need to nest
          <varname>value</varname>
-         elements inside the collection element to specify the contents of the collection. Please note that a
+         elements inside the collection element to specify the contents of the collection. Please note that an
          <varname>"elementClass"</varname>
          attribute is required on the collection element, unless you specify explicit types on all the
-         <varname>value</varname>
-         s.
+         <varname>value</varname>s.
       </para>
 
       <para>Below is a sample configuration from the
@@ -883,13 +886,17 @@
       <property name="list">
          <list class="java.util.LinkedList" elementClass="java.lang.String">
 
-            <value>A string</value> <!-- uses elementClass -->
+            <!-- uses elementClass -->
+            <value>A string</value> 
 
-            <value class="java.lang.URL">http://acme.com/index.html</value> <!-- a URL -->
+            <!-- a URL -->
+            <value class="java.lang.URL">http://acme.com/index.html</value> 
 
-            <value><inject bean="SomeBean"/></value> <!-- inject some other bean -->
+            <!-- inject some other bean -->
+            <value><inject bean="SomeBean"/></value> 
 
-            <value> <!-- a list inside a list -->
+            <!-- a list inside a list -->
+            <value> 
                <list elementClass="java.lang.String">
                   <value>Another string</value>
                </list>
@@ -971,15 +978,15 @@
 ]]>
       </programlisting>
 
-      <para>When using collections in your bean configuration, this is the order Microcontainer will use for new
-         instantiation or using already existing collection instance.
+      <para>When using collections in your bean configuration, this is the order the Microcontainer will use for new
+         instantiation or using an already existing collection instance.
          <itemizedlist mark="bullet">
             <listitem>
-               <para>if collection's class attribute is defined, a new instance of that class will be instantiated</para>
+               <para>if the collection's class attribute is defined, a new instance of that class will be instantiated</para>
             </listitem>
             <listitem>
-               <para>if already instantiated collection exists and is available via getter, this instance will be used -
-                  unless you define preinstantiate attribute on the property to false
+               <para>if an already instantiated collection exists and is available via getter, this instance will be used -
+                  unless you define the preinstantiate attribute on the property to false
                </para>
             </listitem>
             <listitem>
@@ -998,7 +1005,8 @@
       <programlisting>
 <![CDATA[
 
-   <bean name="SimpleBean" class="org.jboss.test.kernel.config.support.UnmodifiableGetterBean">
+   <bean name="SimpleBean" 
+     class="org.jboss.test.kernel.config.support.UnmodifiableGetterBean">
       <property name="list" preinstantiate="false">
          <list elementClass="java.lang.String">
             <value>string1</value>
@@ -1030,7 +1038,7 @@
             <para>Described: The POJO's bean description has been examined and dependencies determined.</para>
          </listitem>
          <listitem>
-            <para>Instantiated: All the dependencies have been resolved to construct the bean, these include, the class
+            <para>Instantiated: All the dependencies have been resolved to construct the bean. These include: the class
                exists, the constructor parameter injections can be resolved, any factory can be resolved.
             </para>
          </listitem>
@@ -1197,7 +1205,7 @@
 
       <para>They can also be ignored. See the
          <varname>jboss-beans.xml</varname>
-         with ignore attribute set to true on the start element.
+         with the <varname>ignore</varname> attribute set to true on the start element.
       </para>
 
       <programlisting>
@@ -1215,8 +1223,8 @@
 ]]>
       </programlisting>
 
-      <para>In this case Microcontainer would not
-         invoke start method when passing over Start state.
+      <para>In this case the Microcontainer would not
+         invoke the start method when passing over Start state.
       </para>
    </sect2>
 
@@ -1249,7 +1257,7 @@
    // Install
    name1 = new Timer();
    name2 = ...;
-   name1.schedule(Name2, 100, 10000);
+   name1.schedule(name2, 100, 10000);
 
    // Uninstall
    name2.cancel();
@@ -1278,12 +1286,12 @@
       </bean>
 
       <!-- bean level will use any deployment level classloader -->
-      <bean name="Name2" ...>
+      <bean name="Name3" ...>
       </bean>
 
       <!-- bean level as null to not use any deployment level classloader -->
-      <bean name="Name2" ...>
-         <classloader&gt;<null/></classloader>
+      <bean name="Name4" ...>
+         <classloader><null/></classloader>
       </bean>
 
    </deployment>
@@ -1296,7 +1304,8 @@
       <title>Annotations via XML</title>
 
       <para>With the new Microcontainer 2.0 we've added support for annotations via XML. Meaning you can have annotation
-         support even in Java 1.4 and before, depending on the retrowoven Microcontainer project.
+<!--         support even in Java 1.4 and before, depending on the retrowoven Microcontainer project. -->
+         support where the annotation is not part of the bean class's bytecode.
          Each annotation is set per bean instance and you can set annotations on the following types:
          <itemizedlist>
             <listitem><simpara>deployment (all beans inherit this annotations)</simpara></listitem>
@@ -1355,7 +1364,7 @@
 
       <para>The only issue with having annotations defined via XML is that they are per instance basis - 
          as already mentioned, not added at compile time. In this case you need an external mechanism in
-         order to do the annotation inspection. In Microcontainer this is its metadata repository.
+         order to do the annotation inspection. In the Microcontainer this is its metadata repository.
          See how this is done in Reference Manual, TODO.
       </para>
 
@@ -1379,8 +1388,8 @@
       </programlisting>
 
       <para>As with all String values you can have System property replacement as part of actual alias value.
-         Additionally you can specify if this replacement is ignored. Or you can even convert final alias String value
-         into any other class supported by PropertyEditors by setting class attribute on alias element. Lets see this
+         Additionally you can specify if this replacement is ignored. Or you can even convert a final alias String value
+         into any other class supported by PropertyEditors by setting the class attribute on an alias element. Lets see this
          configuration on the examples below.
       </para>
 
@@ -1434,11 +1443,11 @@
       </programlisting>
 
       <para>
-         Newly added alias defined as a element on the deployment acts as a full dependency item. Meaning
-         it won't get registered (installed) until the original bean is installed. What this means that you can have
+         A newly added alias defined as a element on the deployment acts as a full dependency item. Meaning
+         it won't get registered (installed) until the original bean is installed. What this means is that you can have
          original beans defined in one deployment and aliases in another, and the order of deployment doesn't matter.
          When the original bean is uninstalled, the alias gets unregistered (uninstalled) as well.
-         When the alias gets unregistered, all beans that depend on the alias get undeployed as well, regardless if
+         When the alias gets unregistered, all beans that depend on the alias get undeployed as well, regardless of if
          the original bean is still present.
       </para>
 
@@ -1492,7 +1501,7 @@
       <para>
          On the other hand each bean can also provide additional information
          what it supplies, apart from it self. The actual supply doesn't need to be
-         binded to Microcontainer in any way.
+         bound to the Microcontainer in any way.
          More about this feature with the actual example.
       </para>
 
@@ -1530,7 +1539,7 @@
    </sect2>
 
    <sect2>
-      <title>Contextual awareness</title>
+      <title>Contextual Awareness</title>
 
       <para>
          With existing annoyance of using huge amounts of xml to sometimes wire up
@@ -1538,7 +1547,7 @@
          Beans, specially singletons, can often be wired with a simple class type knowledge.
          But with huge systems you should use this feature with care, since it can easly get broken
          with addition of another bean that would satisfy contextual dependency.
-         Existing 2.0.0 version supports three ways of autowiring:
+         The existing 2.0.0 version supports three ways of autowiring:
          <itemizedlist spacing="compact">
             <listitem>
                <para>full bean autowiring</para>
@@ -1552,8 +1561,8 @@
          </itemizedlist>
       </para>
 
-      <para>On the other hand, if you don't want for a particular bean to be involved as a candidate for
-         autowiring, you can set bean element's attribute <varname>autowire-candidate</varname> to false.
+      <para>On the other hand, if you don't want a particular bean to be involved as a candidate for
+         autowiring, you can set the bean element's attribute <varname>autowire-candidate</varname> to false.
       </para>
 
       <programlisting>
@@ -1577,9 +1586,9 @@
       </programlisting>
 
       <para>
-         When doing a propery / parameter injection of some existing bean, you can omit the bean attibute, meaning that
+         When doing a propery / parameter injection of some existing bean, you can omit the bean attibute, meaning that the
          Microcontainer will do the injection based on the information from the property / parameter class type.
-         If no such information is available, exception will be thrown. If no such bean is eventually available, you can define
+         If no such information is available, an exception will be thrown. If no such bean is eventually available, you can define
          the behavior after validation. For Strict option the deployment will fail, for Callback see the callback injection below.
          There is also a way of doing contextual injection based on property name. Property name will be matched against
          newly wired bean's name.
@@ -1588,7 +1597,7 @@
       <programlisting>
 <![CDATA[
 
-   <bean name="propInj" class="com.acme.ThreadPoolImpl"/>
+   <bean name="pool" class="com.acme.ThreadPoolImpl"/>
 
    <bean name="propInj" class="com.acme.Example">
       <property name="threadPool"><inject/></property>
@@ -1623,10 +1632,10 @@
 
       <para>
          Sometimes it is useful to be notified of certain beans being installed / uninstalled by
-         inspecting their class type. In Microcontainer we call this callbacks.
-         You can define which methods should be used for callback resolution on a particular bean. Usually method
-         name is sufficient, in the case of having multiple methods with the same name, you can narrow down the
-         exact method by specifying class type to use for contextual lookup.
+         inspecting their class type. In the Microcontainer we call this callbacks.
+         You can define which methods should be used for callback resolution on a particular bean. Usually the method
+         name is sufficient. In the case of having multiple methods with the same name, you can narrow down the
+         exact method by specifying the class type to use for contextual lookup.
       </para>
 
       <programlisting>
@@ -1661,7 +1670,7 @@
 
       <para>
          We can do the same callback injection on a property.
-         And there is also an interesting feature available, though it will be probabaly rarely used.
+         And there is also an interesting feature available, though it will probably rarely be used.
          You can define a Cardinality as a condition when that actual dependency is satisfied and injection
          can take place.
          The following examples shows how we need at least 2 Editor instances to satisfy callback dependency.
@@ -1697,24 +1706,24 @@
       <para>While using callbacks on the Collection subclasses, currently only basic Collection subinterfaces
          are supported: List, Set and Queue. See BasicCollectionCallbackItemFactory for more details.
          But you can change the Collection callback behaviour by providing your own CollectionCallbackItemFactory.
-         You do this by setting System property <varname>org.jboss.dependency.collectionCallbackItemFactory</varname>
-         and putting CollectionCallbackItemFactory implementation fully qualified class name as a value.
+         You do this by setting the System Property <varname>org.jboss.dependency.collectionCallbackItemFactory</varname>
+         and putting the CollectionCallbackItemFactory implementation fully qualified class name as a value.
       </para>
 
    </sect2>
 
    <sect2>
-      <title>Injection from context</title>
+      <title>Injection from Context</title>
 
-      <para>Even though Microcontainer is aimed at POJOs, it doesn't mean you are not able to easily get into
+      <para>Even though the Microcontainer is aimed at POJOs, it doesn't mean you are not able to easily get into
          the underlying architecture of its state machine.
-         Each bean is represented in Microcontainer's state machine (Controller) as a ControllerContext.
-         ControllerContext holds various information in order to consistently move between lifecycle states,
+         Each bean is represented in the Microcontainer's state machine (Controller) as a ControllerContext.
+         The ControllerContext holds various information in order to consistently move between lifecycle states,
          resolve dependencies, apply instance aspects, annotations, metadata ...
       </para>
 
       <para>
-         With already known injection concept (<varname><![CDATA[<inject />]]></varname>), now you can also inject some information from the context.
+         With the already known injection concept (<varname><![CDATA[<inject />]]></varname>), you can also inject some information from the context.
          This is what you can currently get a hold on from the underlying context:
          <itemizedlist>
             <listitem>
@@ -1741,17 +1750,20 @@
          </itemizedlist>
       </para>
 
-      <para>All this information is wrapped into unmodifiable objects, preventing user to add or set additional
-         information outside Microcontainer's Controller.
-         As we already know, <varname><![CDATA[<inject/>]]></varname> element can take bean attribute. In this case, if bean attribute is set,
-         we are not targeting bean's underlying context, but context that coresponds to set bean attribute.
+      <para>All this information is wrapped into unmodifiable objects, preventing the user to add or set additional
+         information outside the Microcontainer's Controller.
+         As we already know, the <varname><![CDATA[<inject/>]]></varname> element can take a 
+		 <varname>bean</varname> attribute. In this case, if the bean attribute is set,
+         we are not obtaining the target bean's underlying context, but the context that coresponds to the bean being injected.
       </para>
 
       <programlisting>
 <![CDATA[
 
-   <bean name="sndBean" class="org.jboss.test.kernel.deployment.support.NameAwareBean">
-      <property name="beaninfo"><inject bean="otherBean" fromContext="beaninfo"/></property>
+   <bean name="sndBean" 
+     class="org.jboss.test.kernel.deployment.support.NameAwareBean">
+      <property 
+	    name="beaninfo"><inject bean="otherBean" fromContext="beaninfo"/></property>
    </bean>
 
 ]]>

Modified: projects/microcontainer/trunk/docs/gettingstarted/en-US/src/main/docbook/modules/classloader.xml
===================================================================
--- projects/microcontainer/trunk/docs/gettingstarted/en-US/src/main/docbook/modules/classloader.xml	2009-05-12 15:17:40 UTC (rev 88741)
+++ projects/microcontainer/trunk/docs/gettingstarted/en-US/src/main/docbook/modules/classloader.xml	2009-05-12 15:27:08 UTC (rev 88742)
@@ -9,15 +9,15 @@
       Introducing fine grained classloading in Micorcontainer's IoC, better aspect integration, new
       <xref linkend="vfs"/> and <xref linkend="deployers"/> projects, it was all set to also redo the whole
       classloding layer for the new Kernel and transitively JBoss5 application server.
-      Whole new Classloder module was created to somehow fix the old API mistakes and to allow clean and plugable way
-      for existing extensions of default classloading. This extensions range from old concepts of Servlet classloading,
+      A whole new Classloder module was created to somehow fix the old API mistakes and to allow a clean and plugable way
+      for existing extensions of default classloading. These extensions range from old concepts of Servlet classloading,
       runtime AOP weaving, and all the way to new <xref linkend="osgi"/>.
    </para>
 
    <para>
       When designing new API for Classloading, we wanted to expose as little as possible.
       The concept there was to hide all the "nitty gritty" details and reduce the amount of API users need to
-      apply in order to get required behaviour.
+      apply in order to get the required behaviour.
       When you were normally dealing with concrete ClassLoader classes, we reduced the implementation detail to
       only needing to implement your own ClassLoaderPolicy. This includes things like what packages you export,
       what you import, how to get resources and other things related to defining classes.
@@ -43,7 +43,7 @@
    </programlisting>
 
    <para>
-      This is a simple example of what it falls down to, to create your own Classloader instance that will
+      This is a simple example of what it comes down to, to create your own Classloader instance that will
       behave accordingly to the classloader policy.
    </para>
 

Modified: projects/microcontainer/trunk/docs/gettingstarted/en-US/src/main/docbook/modules/deployers.xml
===================================================================
--- projects/microcontainer/trunk/docs/gettingstarted/en-US/src/main/docbook/modules/deployers.xml	2009-05-12 15:17:40 UTC (rev 88741)
+++ projects/microcontainer/trunk/docs/gettingstarted/en-US/src/main/docbook/modules/deployers.xml	2009-05-12 15:27:08 UTC (rev 88742)
@@ -15,11 +15,11 @@
       <title>StructureDeployers</title>
 
       <para>
-         Combined with previously mentioned new VFS implementation we introduced a new kind of Deployers, the
+         Combined with the previously mentioned new VFS implementation we introduced a new kind of Deployer, the
          Structure Deployer. The purpose of Structure Deployer is to recognise the deployment type and prepare this
          information for the actual Deployers. There are already default implementations for standard types such as
          JAR, WAR, EAR and specific files. You can simply implement your own StructureDeployer or extend the
-         AbstractStructureDeployer. Or you can use the declarative approach by defining your structure with XML
+         AbstractStructureDeployer. Or you can use the declarative approach by defining your structure with an XML
          file - META-INF/jboss-structure.xml. This file will be automatically picked up by DeclarativeStructureDeployer.
          Let's now look at how to use one of the existing StructureDeployer implementations, write our own or use the
          declarative one.
@@ -36,7 +36,7 @@
 
       <para>
          This is a simple implementation for our own deployment structure which holds metadata information in mydata
-         direcotry and has Java classes in myclasses directory.
+         directory and has Java classes in myclasses directory.
       </para>
 
       <programlisting></programlisting>
@@ -57,13 +57,13 @@
          that each deployer implementation does just one thing. This way it is easier to control how much it gets done
          and even easier to swap out the behaviour. But what is that one thing? We are all familiar with parsing,
          creating
-         ClassLoaders, installing services, etc. So, basically any part of previous deployment process, we can see as a
+         ClassLoaders, installing services, etc. So, basically any part of the previous deployment process, can be seen as a
          separate process, parsing the jboss-service.xml file, creating ServiceMetaData, setting up RepositoryCL
          and finally registring MBeans into the MBeanServer instance.
       </para>
 
       <para>
-         Let's see this aspectization on the listing below. This is a real example from the current Microcontainer
+         Let's see this aspectization in the listing below. This is a real example from the current Microcontainer
          beans deployment.
          <itemizedlist>
             <listitem>Parsing Deployers
@@ -100,208 +100,209 @@
 
       <para>
          Before we start coding the new Deployers there is another concept that we still need to have a look at.
-         What is the way to store the information between different deployers? We keep this information in so called
+         What is the way to store the information between different deployers? We keep this information in so-called
          Attachments. There are two types of attachments, predetermined and transient. e.g. predetermined can be
-         set by ProfileService, where we would get the transient one's from parsing the XML file. You must be aware that
-         a predetermined overriddes transient. This is a simple API to get a hold of the Attachments reference from
+         set by the ProfileService, while we would get the transient one's from parsing the XML file. You must be aware that
+         a predetermined attachment overriddes a transient attachment. This is a simple API to get a hold of the Attachments reference from
          the underlying DeploymentUnit instance.
       </para>
 
       <programlisting>
-         public interface DeploymentUnit extends MutableAttachments
-         {
-         /**
-         * Get all the metadata for the expected type
-         *
-         * @param &lt;T> the type to get
-         * @param type the type
-         * @return a set of metadata matching the type
-         * @throws IllegalArgumentException if the type is null
-         */
-         &lt;T> Set&lt;? extends T> getAllMetaData(Class&lt;T> type);
+ public interface DeploymentUnit extends MutableAttachments
+ {
+ /**
+ * Get all the metadata for the expected type
+ *
+ * @param &lt;T> the type to get
+ * @param type the type
+ * @return a set of metadata matching the type
+ * @throws IllegalArgumentException if the type is null
+ */
+ &lt;T> Set&lt;? extends T> getAllMetaData(Class&lt;T> type);
 
-         /**
-         * Get the transient managed objects
-         *
-         * @return the managed objects
-         */
-         MutableAttachments getTransientManagedObjects();
+ /**
+ * Get the transient managed objects
+ *
+ * @return the managed objects
+ */
+ MutableAttachments getTransientManagedObjects();
 
-         ...
-         }
+ ...
+ }
 
-         public interface MutableAttachments extends Attachments
-         {
-         /**
-         * Add attachment
-         *
-         * @param name the name of the attachment
-         * @param attachment the attachment
-         * @return any previous attachment
-         * @throws IllegalArgumentException for a null name or attachment
-         * @throws UnsupportedOperationException when not supported by the implementation
-         */
-         Object addAttachment(String name, Object attachment);
+ public interface MutableAttachments extends Attachments
+ {
+ /**
+ * Add attachment
+ *
+ * @param name the name of the attachment
+ * @param attachment the attachment
+ * @return any previous attachment
+ * @throws IllegalArgumentException for a null name or attachment
+ * @throws UnsupportedOperationException when not supported by the implementation
+ */
+ Object addAttachment(String name, Object attachment);
 
-         /**
-         * Add attachment
-         *
-         * @param &lt;T> the expected type
-         * @param name the name of the attachment
-         * @param attachment the attachment
-         * @param expectedType the expected type
-         * @return any previous attachment
-         * @throws IllegalArgumentException for a null name, attachment or expectedType
-         * @throws UnsupportedOperationException when not supported by the implementation
-         */
-         &lt;T> T addAttachment(String name, T attachment, Class&lt;T> expectedType);
+ /**
+ * Add attachment
+ *
+ * @param &lt;T> the expected type
+ * @param name the name of the attachment
+ * @param attachment the attachment
+ * @param expectedType the expected type
+ * @return any previous attachment
+ * @throws IllegalArgumentException for a null name, attachment or expectedType
+ * @throws UnsupportedOperationException when not supported by the implementation
+ */
+ &lt;T> T addAttachment(String name, T attachment, Class&lt;T> expectedType);
 
-         /**
-         * Add attachment
-         *
-         * @param &lt;T> the expected type
-         * @param attachment the attachment
-         * @param type the type
-         * @return any previous attachment
-         * @throws IllegalArgumentException for a null name, attachment or type
-         * @throws UnsupportedOperationException when not supported by the implementation
-         */
-         &lt;T> T addAttachment(Class&lt;T> type, T attachment);
+ /**
+ * Add attachment
+ *
+ * @param &lt;T> the expected type
+ * @param attachment the attachment
+ * @param type the type
+ * @return any previous attachment
+ * @throws IllegalArgumentException for a null name, attachment or type
+ * @throws UnsupportedOperationException when not supported by the implementation
+ */
+ &lt;T> T addAttachment(Class&lt;T> type, T attachment);
 
-         /**
-         * Remove attachment
-         *
-         * @param name the name of the attachment
-         * @return the attachment or null if not present
-         * @throws IllegalArgumentException for a null name
-         * @throws UnsupportedOperationException when not supported by the implementation
-         */
-         Object removeAttachment(String name);
+ /**
+ * Remove attachment
+ *
+ * @param name the name of the attachment
+ * @return the attachment or null if not present
+ * @throws IllegalArgumentException for a null name
+ * @throws UnsupportedOperationException when not supported by the implementation
+ */
+ Object removeAttachment(String name);
 
-         /**
-         * Remove attachment
-         *
-         * @param &lt;T> the expected type
-         * @param name the name of the attachment
-         * @return the attachment or null if not present
-         * @param expectedType the expected type
-         * @throws IllegalArgumentException for a null name or expectedType
-         * @throws UnsupportedOperationException when not supported by the implementation
-         */
-         &lt;T> T removeAttachment(String name, Class&lt;T> expectedType);
+ /**
+ * Remove attachment
+ *
+ * @param &lt;T> the expected type
+ * @param name the name of the attachment
+ * @return the attachment or null if not present
+ * @param expectedType the expected type
+ * @throws IllegalArgumentException for a null name or expectedType
+ * @throws UnsupportedOperationException when not supported by the implementation
+ */
+ &lt;T> T removeAttachment(String name, Class&lt;T> expectedType);
 
-         /**
-         * Remove attachment
-         *
-         * @param &lt;T> the expected type
-         * @return the attachment or null if not present
-         * @param type the type
-         * @throws IllegalArgumentException for a null name or type
-         */
-         &lt;T> T removeAttachment(Class&lt;T> type);
+ /**
+ * Remove attachment
+ *
+ * @param &lt;T> the expected type
+ * @return the attachment or null if not present
+ * @param type the type
+ * @throws IllegalArgumentException for a null name or type
+ */
+ &lt;T> T removeAttachment(Class&lt;T> type);
 
-         /**
-         * Set the attachments
-         *
-         * @param map the new attachments a map of names to attachments
-         * @throws IllegalArgumentException for a null map
-         */
-         void setAttachments(Map&lt;String, Object> map);
+ /**
+ * Set the attachments
+ *
+ * @param map the new attachments a map of names to attachments
+ * @throws IllegalArgumentException for a null map
+ */
+ void setAttachments(Map&lt;String, Object> map);
 
-         /**
-         * Clear the attachments
-         *
-         * @throws UnsupportedOperationException when not supported by the implementation
-         */
-         void clear();
+ /**
+ * Clear the attachments
+ *
+ * @throws UnsupportedOperationException when not supported by the implementation
+ */
+ void clear();
 
-         /**
-         * Get the number of changes that have happened.
-         *
-         * @return number of adds/removes that have happened since creation or clearChangeCount.
-         */
-         int getChangeCount();
+ /**
+ * Get the number of changes that have happened.
+ *
+ * @return number of adds/removes that have happened since creation or 
+ * clearChangeCount.
+ */
+ int getChangeCount();
 
-         /**
-         * Reset the change count to zero.
-         */
-         void clearChangeCount();
-         }
+ /**
+ * Reset the change count to zero.
+ */
+ void clearChangeCount();
+ }
 
-         public interface Attachments extends Serializable
-         {
-         /**
-         * Get all the attachments
-         *
-         * @return the unmodifiable attachments
-         */
-         Map&lt;String, Object> getAttachments();
+ public interface Attachments extends Serializable
+ {
+ /**
+ * Get all the attachments
+ *
+ * @return the unmodifiable attachments
+ */
+ Map&lt;String, Object> getAttachments();
 
-         /**
-         * Get attachment
-         *
-         * @param name the name of the attachment
-         * @return the attachment or null if not present
-         * @throws IllegalArgumentException for a null name
-         */
-         Object getAttachment(String name);
+ /**
+ * Get attachment
+ *
+ * @param name the name of the attachment
+ * @return the attachment or null if not present
+ * @throws IllegalArgumentException for a null name
+ */
+ Object getAttachment(String name);
 
-         /**
-         * Get attachment
-         *
-         * @param &lt;T> the expected type
-         * @param name the name of the attachment
-         * @param expectedType the expected type
-         * @return the attachment or null if not present
-         * @throws IllegalArgumentException for a null name or expectedType
-         */
-         &lt;T> T getAttachment(String name, Class&lt;T> expectedType);
+ /**
+ * Get attachment
+ *
+ * @param &lt;T> the expected type
+ * @param name the name of the attachment
+ * @param expectedType the expected type
+ * @return the attachment or null if not present
+ * @throws IllegalArgumentException for a null name or expectedType
+ */
+ &lt;T> T getAttachment(String name, Class&lt;T> expectedType);
 
-         /**
-         * Get attachment
-         *
-         * @param &lt;T> the expected type
-         * @param type the type
-         * @return the attachment or null if not present
-         * @throws IllegalArgumentException for a null name or type
-         */
-         &lt;T> T getAttachment(Class&lt;T> type);
+ /**
+ * Get attachment
+ *
+ * @param &lt;T> the expected type
+ * @param type the type
+ * @return the attachment or null if not present
+ * @throws IllegalArgumentException for a null name or type
+ */
+ &lt;T> T getAttachment(Class&lt;T> type);
 
-         /**
-         * Is the attachment present
-         *
-         * @param name the name of the attachment
-         * @return true when the attachment is present
-         * @throws IllegalArgumentException for a null name
-         */
-         boolean isAttachmentPresent(String name);
+ /**
+ * Is the attachment present
+ *
+ * @param name the name of the attachment
+ * @return true when the attachment is present
+ * @throws IllegalArgumentException for a null name
+ */
+ boolean isAttachmentPresent(String name);
 
-         /**
-         * Is the attachment present
-         *
-         * @param name the name of the attachment
-         * @param expectedType the expected type
-         * @return true when the attachment is present
-         * @throws IllegalArgumentException for a null name or expectedType
-         */
-         boolean isAttachmentPresent(String name, Class&lt;?> expectedType);
+ /**
+ * Is the attachment present
+ *
+ * @param name the name of the attachment
+ * @param expectedType the expected type
+ * @return true when the attachment is present
+ * @throws IllegalArgumentException for a null name or expectedType
+ */
+ boolean isAttachmentPresent(String name, Class&lt;?> expectedType);
 
-         /**
-         * Is the attachment present
-         *
-         * @param type the type
-         * @return true when the attachment is present
-         * @throws IllegalArgumentException for a null name or type
-         */
-         boolean isAttachmentPresent(Class&lt;?> type);
+ /**
+ * Is the attachment present
+ *
+ * @param type the type
+ * @return true when the attachment is present
+ * @throws IllegalArgumentException for a null name or type
+ */
+ boolean isAttachmentPresent(Class&lt;?> type);
 
-         /**
-         * Are there any attachments
-         *
-         * @return true if there are any attachments, false otherwise.
-         */
-         boolean hasAttachments();
-         }
+ /**
+ * Are there any attachments
+ *
+ * @return true if there are any attachments, false otherwise.
+ */
+ boolean hasAttachments();
+ }
       </programlisting>
 
    </sect1>
@@ -329,7 +330,7 @@
       <para>
          Here we can see that our MyDeployer depends on SomeMetaData1 and SomeMetaData2 instance attachments, and
          provides
-         further MyOutput instance attachment for next deployers to use. So any deployer that provides
+         a further MyOutput instance attachment for next deployers to use. So any deployer that provides
          SomeMetaData1 and SomeMetaData2 instance attachments should be before our MyDeployer and any one that uses
          MyOutput instance attachment should be after.
       </para>

Modified: projects/microcontainer/trunk/docs/gettingstarted/en-US/src/main/docbook/modules/examples.xml
===================================================================
--- projects/microcontainer/trunk/docs/gettingstarted/en-US/src/main/docbook/modules/examples.xml	2009-05-12 15:17:40 UTC (rev 88741)
+++ projects/microcontainer/trunk/docs/gettingstarted/en-US/src/main/docbook/modules/examples.xml	2009-05-12 15:27:08 UTC (rev 88742)
@@ -6,7 +6,7 @@
    <title>Starting Examples</title>
 
    <section>
-      <title>A Simple IoC Examples</title>
+      <title>A Simple IoC Example</title>
 
       <para>The best way to learn the Microcontainer is through examples. The Microcontainer distribution is bundled
          with several examples, which we will discuss in later this guide. In this section, let us first have a look at

Modified: projects/microcontainer/trunk/docs/gettingstarted/en-US/src/main/docbook/modules/guice.xml
===================================================================
--- projects/microcontainer/trunk/docs/gettingstarted/en-US/src/main/docbook/modules/guice.xml	2009-05-12 15:17:40 UTC (rev 88741)
+++ projects/microcontainer/trunk/docs/gettingstarted/en-US/src/main/docbook/modules/guice.xml	2009-05-12 15:27:08 UTC (rev 88742)
@@ -10,17 +10,20 @@
    </para>
 
    <para>We've written a piece of integration code that bridges the two IoC frameworks together.
-      You can inject Guice defined beans into Microcontainer and/or the other way around.
-      See examples for more details.
+      You can inject Guice defined beans into the Microcontainer and/or the other way around.
+      See the examples for more details.
    </para>
 
-   <para>In this example we will define Guice module, binding simple Singleton class to one of it's
-      instances. We will then do a contextual lookup for the Singleton instance in SingletonHolder class.
+   <para>In this example we will define a Guice module, binding a simple Singleton class to one of its
+      instances. We will then do a contextual lookup for the Singleton instance in the SingletonHolder class.
    </para>
 
    <programlisting>
-      AbstractBeanMetaData guicePlugin = new AbstractBeanMetaData("GuicePlugin", GuiceKernelRegistryEntryPlugin.class.getName());
-      AbstractConstructorMetaData constructor = new AbstractConstructorMetaData();
+      AbstractBeanMetaData guicePlugin = 
+            new AbstractBeanMetaData(
+                "GuicePlugin", GuiceKernelRegistryEntryPlugin.class.getName());
+      AbstractConstructorMetaData constructor = 
+        new AbstractConstructorMetaData();
       AbstractArrayMetaData arrayMetaData = new AbstractArrayMetaData();
       final Singleton singleton = new Singleton();
       Module module = new AbstractModule()
@@ -31,7 +34,9 @@
          }
       };
       arrayMetaData.add(new AbstractValueMetaData(module));
-      constructor.setParameters(Collections.singletonList((ParameterMetaData)new AbstractParameterMetaData(arrayMetaData)));
+      constructor.setParameters(
+         Collections.singletonList(
+             (ParameterMetaData)new AbstractParameterMetaData(arrayMetaData)));
       guicePlugin.setConstructor(constructor);
 
       public class SingletonHolder
@@ -58,53 +63,66 @@
    </programlisting>
 
    <para>The detail that is hidden is in GuiceKernelRegistryEntryPlugin, which acts as a intermediate between
-      Microcontainer's registry and Guice Injector. But all you need to do is register GuiceKernelRegistryEntryPlugin
+      the Microcontainer's registry and the Guice Injector. But all you need to do is register GuiceKernelRegistryEntryPlugin
       as a POJO into Microcontainer, providing Guice Modules with its constructor.
    </para>
 
-   <para>We can also go the other way around. Injecting named beans into Guice Injector. There are a couple of ways
+   <para>We can also go the other way around. Injecting named beans into the Guice Injector. There are a couple of ways
       to achieve that. Lets look at them.
    </para>
 
    <programlisting>
-         Injector injector = Guice.createInjector(new AbstractModule()
+      Injector injector = Guice.createInjector(new AbstractModule()
+      {
+         protected void configure()
          {
-            protected void configure()
-            {
-               bind(Controller.class).toInstance(controller);
-               bind(Singleton.class).toProvider(GuiceIntegration.fromMicrocontainer(Singleton.class, "singleton"));
-               bind(Prototype.class).toProvider(GuiceIntegration.fromMicrocontainer(Prototype.class, "prototype"));
-            }
-         });
+            bind(Controller.class).toInstance(controller);
+            bind(Singleton.class).toProvider(
+               GuiceIntegration.fromMicrocontainer(
+                  Singleton.class, "singleton"));
+            bind(Prototype.class).toProvider(
+               GuiceIntegration.fromMicrocontainer(
+                  Prototype.class, "prototype"));
+         }
+      });
    </programlisting>
 
    <programlisting>
-         AbstractBeanMetaData injectorBean = new AbstractBeanMetaData("injector", GuiceInjectorFactory.class.getName());
-         AbstractConstructorMetaData constructor = new AbstractConstructorMetaData();
-         constructor.setFactoryClass(GuiceInjectorFactory.class.getName());
-         constructor.setFactoryMethod("createInjector");
-         List&lt;ParameterMetaData> parameters = new ArrayList&lt;ParameterMetaData>();
-         parameters.add(new AbstractParameterMetaData(new AbstractDependencyValueMetaData(KernelConstants.KERNEL_NAME)));
-         AbstractArrayMetaData array = new AbstractArrayMetaData();
-         array.add(new AbstractValueMetaData(GuiceObject.ALL));
-         parameters.add(new AbstractParameterMetaData(array));
-         constructor.setParameters(parameters);
-         injectorBean.setConstructor(constructor);
-         controller.install(injectorBean);
+     AbstractBeanMetaData injectorBean = 
+        new AbstractBeanMetaData(
+            "injector", GuiceInjectorFactory.class.getName());
+     AbstractConstructorMetaData constructor = new AbstractConstructorMetaData();
+     constructor.setFactoryClass(GuiceInjectorFactory.class.getName());
+     constructor.setFactoryMethod("createInjector");
+     List&lt;ParameterMetaData> parameters = new ArrayList&lt;ParameterMetaData>();
+     parameters.add(new AbstractParameterMetaData(
+            new AbstractDependencyValueMetaData(KernelConstants.KERNEL_NAME)));
+     AbstractArrayMetaData array = new AbstractArrayMetaData();
+     array.add(new AbstractValueMetaData(GuiceObject.ALL));
+     parameters.add(new AbstractParameterMetaData(array));
+     constructor.setParameters(parameters);
+     injectorBean.setConstructor(constructor);
+     controller.install(injectorBean);
 
-         ControllerContext injectorContext = controller.getInstalledContext("injector");
-         assertNotNull(injectorContext);
-         Injector injector = (Injector)injectorContext.getTarget();
+     ControllerContext injectorContext = 
+        controller.getInstalledContext("injector");
+     assertNotNull(injectorContext);
+     Injector injector = (Injector)injectorContext.getTarget();
    </programlisting>
 
    <programlisting>
       &lt;bean name="injector" class="org.jboss.guice.plugins.GuiceInjectorFactory">
-         &lt;constructor factoryClass="org.jboss.guice.plugins.GuiceInjectorFactory" factoryMethod="createInjector">
+         &lt;constructor 
+                factoryClass="org.jboss.guice.plugins.GuiceInjectorFactory" 
+                factoryMethod="createInjector">
             &lt;parameter>jboss.kernel:service=Kernel&lt;/parameter>
             &lt;parameter>
                &lt;array>
-                  &lt;bean name="BindAll" class="org.jboss.guice.plugins.AllGuiceObject">
-                     &lt;constructor factoryClass="org.jboss.guice.plugins.AllGuiceObject" factoryMethod="getInstance"/>
+                  &lt;bean name="BindAll" 
+                        class="org.jboss.guice.plugins.AllGuiceObject">
+                     &lt;constructor 
+                            factoryClass="org.jboss.guice.plugins.AllGuiceObject" 
+                            factoryMethod="getInstance"/>
                   &lt;/bean>
                &lt;/array>
             &lt;/parameter>
@@ -112,10 +130,10 @@
       &lt;/bean>
    </programlisting>
 
-   <para>Here we see three way of usgin Microcontainer beans to do wiring in Guice. The first and second examples are
+   <para>Here we saw three ways of using Microcontainer beans to do wiring in Guice. The first and second examples are
       purely programmatic and you need to provide a Controller instance. The third one is how you would bind all
-      existing installed beans into Guice Injector via -beans.xml. Or you can provide a ControllerContextBindFilter
-      instance to the binding methods to filter those beans you want to bind. See API docs for more details.
+      existing installed beans into the Guice Injector via a -beans.xml. Or you can provide a ControllerContextBindFilter
+      instance to the binding methods to filter the beans you want to bind. See the API docs for more details.
    </para>
 
 </chapter>

Modified: projects/microcontainer/trunk/docs/gettingstarted/en-US/src/main/docbook/modules/introduction.xml
===================================================================
--- projects/microcontainer/trunk/docs/gettingstarted/en-US/src/main/docbook/modules/introduction.xml	2009-05-12 15:17:40 UTC (rev 88741)
+++ projects/microcontainer/trunk/docs/gettingstarted/en-US/src/main/docbook/modules/introduction.xml	2009-05-12 15:27:08 UTC (rev 88742)
@@ -12,9 +12,9 @@
    <para>As we mention JBoss Application Server, while rewriting its Microkernel to a POJO environment, there were other
       aspects that also needed to be considered while changing the core functionality. New modules or subprojects were
       introduced to the Microcontainer project to tightly integrate those aspects with the new POJO approach and to
-      eventually solve some of the basic problems that arose over the years with the changes application server went
+      eventually solve some of the basic problems that arose over the years with the changes the application server went
       through.
-      We will discuss these modules and subproject later on.
+      We will discuss these modules and subprojects later on.
    </para>
 
    <para>At its core, the JBoss Microcontainer is a generic "dependency injection" framework. Its primary function is
@@ -52,7 +52,7 @@
       <listitem>
          <para>JBoss Microcontainer is used as a replacement for the JMX-based Microkernel in JBoss AS 5.x and above.
             All
-            the existing features of MBeans are thightly integrated into new Microcontainer based ServiceController.
+            the existing features of MBeans are tightly integrated into new Microcontainer based ServiceController.
          </para>
       </listitem>
       <listitem>
@@ -89,7 +89,7 @@
       </listitem>
    </itemizedlist>
 
-   <para>A typical JBoss Microcontainer application or service include a set of POJOs that complete business tasks,
+   <para>A typical JBoss Microcontainer application or service includes a set of POJOs that complete business tasks,
       as
       well as an XML configuration file called
       <varname>META-INF/jboss-beans.xml</varname>

Modified: projects/microcontainer/trunk/docs/gettingstarted/en-US/src/main/docbook/modules/javabeans.xml
===================================================================
--- projects/microcontainer/trunk/docs/gettingstarted/en-US/src/main/docbook/modules/javabeans.xml	2009-05-12 15:17:40 UTC (rev 88741)
+++ projects/microcontainer/trunk/docs/gettingstarted/en-US/src/main/docbook/modules/javabeans.xml	2009-05-12 15:27:08 UTC (rev 88742)
@@ -5,7 +5,7 @@
 <section>
    <title>Java Beans</title>
 
-   <para>In Container module there is a simple support for
+   <para>In the Container module there is a simple support for
       <ulink url="http://java.sun.com/products/javabeans/">JavaBeans</ulink> configuration. When we have some existing
       JavaBeans XML, we can easily port that bean configuration into Microcontainer beans configuration. Or if all we
       really need is simple configuration, no dependency, JavaBeans configuration is enough. Let see this
@@ -13,7 +13,8 @@
    </para>
 
    <programlisting>
-      &lt;javabean xmlns="urn:jboss:javabean:1.0" class="org.jboss.test.javabean.support.SimpleBean">
+      &lt;javabean xmlns="urn:jboss:javabean:1.0" 
+            class="org.jboss.test.javabean.support.SimpleBean">
          &lt;property name="AString">StringValue&lt;/property>
          &lt;property name="AByte">12&lt;/property>
          &lt;property name="ABoolean">true&lt;/property>
@@ -43,10 +44,12 @@
 
    <programlisting>      
       &lt;javabean xmlns="urn:jboss:javabean:2.0"
-          class="org.jboss.test.javabean.support.SimpleBean">
-          &lt;constructor factoryClass="org.jboss.test.javabean.support.SimpleBeanFactory"
+            class="org.jboss.test.javabean.support.SimpleBean">
+          &lt;constructor 
+            factoryClass="org.jboss.test.javabean.support.SimpleBeanFactory"
               factoryMethod="newInstance">
-              &lt;property name="anObject" class="java.lang.Object">anObjectValue&lt;/property>
+              &lt;property name="anObject" 
+                  class="java.lang.Object">anObjectValue&lt;/property>
               &lt;property name="AString">StringValue&lt;/property>
               &lt;property name="AByte">12&lt;/property>
               &lt;property name="ABoolean">true&lt;/property>
@@ -80,7 +83,8 @@
    <programlisting>      
       &lt;bean xmlns="urn:jboss:bean-deployer:2.0" class="org.jboss.acme.Example">
          &lt;property name="PropertyName">
-            &lt;javabean xmlns="urn:jboss:javabean:1.0" class="org.jboss.test.kernel.deployment.xml.support.SerializableObject"/>
+            &lt;javabean xmlns="urn:jboss:javabean:1.0" 
+               class="org.jboss.test.kernel.deployment.xml.support.SerializableObject"/>
          &lt;/property>
       &lt;/bean>
    </programlisting>

Modified: projects/microcontainer/trunk/docs/gettingstarted/en-US/src/main/docbook/modules/mbeans.xml
===================================================================
--- projects/microcontainer/trunk/docs/gettingstarted/en-US/src/main/docbook/modules/mbeans.xml	2009-05-12 15:17:40 UTC (rev 88741)
+++ projects/microcontainer/trunk/docs/gettingstarted/en-US/src/main/docbook/modules/mbeans.xml	2009-05-12 15:27:08 UTC (rev 88742)
@@ -5,11 +5,11 @@
 <chapter id="mbeans">
    <title>MBeans extensions</title>
 
-   <para>In previous versions (pre 5.x) of JBoss Application Server core services were implemented as MBeans.
+   <para>In previous versions (pre 5.x) of JBoss Application Server, core services were implemented as MBeans.
       To make things a bit easier, not forcing the requrement for a direct implementation of the
       DynamicMBean interface, we introduced
       <ulink url="http://docs.jboss.org/jbossas/jboss4guide/r1/html/ch2.chapter.html#d0e3460">XMBeans</ulink>.
-      But with the change of underlying Kernel, moving away from JMX MBeanServer to plain POJO Controller, we also
+      But with the change of the underlying Kernel, moving away from an JMX MBeanServer to a plain POJO Controller, we also
       let the handling of the existing MBeans to the new Controller.
       Apart from supporting all of the existing XMBean features, we also ported some of the rich features from the new
       Microcontainer IoC model to the XBeans.
@@ -19,7 +19,8 @@
    <programlisting>
       &lt;mbean name="jboss.test:type=BasicMBeanName" code="BasicMBeanCode">
          &lt;attribute name="Attribute">
-            &lt;inject bean="TestName" property="getSomething" state="Instantiated"/>
+            &lt;inject bean="TestName" property="getSomething" 
+               state="Instantiated"/>
          &lt;/attribute>
       &lt;/mbean>
    </programlisting>

Modified: projects/microcontainer/trunk/docs/gettingstarted/en-US/src/main/docbook/modules/osgi.xml
===================================================================
--- projects/microcontainer/trunk/docs/gettingstarted/en-US/src/main/docbook/modules/osgi.xml	2009-05-12 15:17:40 UTC (rev 88741)
+++ projects/microcontainer/trunk/docs/gettingstarted/en-US/src/main/docbook/modules/osgi.xml	2009-05-12 15:27:08 UTC (rev 88742)
@@ -6,15 +6,15 @@
    <title>OSGi module</title>
 
    <para>We can see an increased demand for <ulink url="http://www.osgi.org">OSGi</ulink> technology these days.
-      Developers and users specially like OSGi kind of Classloader wiring. Being able to have Class dependency defined
+      Developers and users especially like the OSGi kind of Classloader wiring. Being able to have a Class dependency defined
       as a versioned package dependency is something we've been lacking for while now. There are new JSRs in the making,
       that will eventually solve this problem, but OSGi is here and now.
    </para>
 
-   <para>Looking at the OSGi framework we saw a lot similarity with what we already have with Microcontainer. Another
-      aspect of OSGi that is cruical part of the core Framework is Service Registry. A simple lookup pattern that
-      takes Classloading wiring into the consideration when doing Service lookup. While we already have contextual
-      awareness in Microcontainer implementing this was a matter of simple <varname>OSGi Facade</varname> over the
+   <para>Looking at the OSGi framework we saw a lot similarity with what we already have with the Microcontainer. Another
+      aspect of OSGi that is a cruical part of the core Framework is the Service Registry. A simple lookup pattern that
+      takes Classloading wiring into consideration when doing Service lookup. While we already have contextual
+      awareness in tje Microcontainer, implementing this was a matter of a simple <varname>OSGi Facade</varname> over the
       existing Microcontainer registry. Together with new <xref linkend="classloader"/> there is a fully
       OSGi r4.1 compatible solution available with the 2.0.0 Microcontainer.
    </para>
@@ -33,7 +33,7 @@
 
    <para>
       For the existing OSGi declarative services or programmatic usage via BundleActivator, there is a full support
-      of the OSGi core API. But for new service declaration, we encourage people to use much richer Microcontainer
+      of the OSGi core API. But for new service declaration, we encourage people to use the much richer Microcontainer
       IoC features. The Classloading behavior and Service Registry will take new Microcontainer services into
       consideration.
    </para>

Modified: projects/microcontainer/trunk/docs/gettingstarted/en-US/src/main/docbook/modules/packaging.xml
===================================================================
--- projects/microcontainer/trunk/docs/gettingstarted/en-US/src/main/docbook/modules/packaging.xml	2009-05-12 15:17:40 UTC (rev 88741)
+++ projects/microcontainer/trunk/docs/gettingstarted/en-US/src/main/docbook/modules/packaging.xml	2009-05-12 15:27:08 UTC (rev 88742)
@@ -9,8 +9,8 @@
       <varname>jboss-beans.xml</varname>
       file in
       <xref
-            linkend="examples"/>
-      . In this chapter, we will go into more depth on the packaging topic. As
+            linkend="examples"/>.
+      In this chapter, we will go into more depth on the packaging topic. As
       we will see later in
       <xref linkend="standalone"/>
       , the packaging is more of a convention rather
@@ -37,7 +37,7 @@
 
    <para>If you want to include a .jar file in an
       <varname>.ear</varname>
-      deployment, you will need to reference in
+      deployment, you will need to reference it in
       <varname>META-INF/jboss-app.xml</varname>
       .
    </para>

Modified: projects/microcontainer/trunk/docs/gettingstarted/en-US/src/main/docbook/modules/reliance.xml
===================================================================
--- projects/microcontainer/trunk/docs/gettingstarted/en-US/src/main/docbook/modules/reliance.xml	2009-05-12 15:17:40 UTC (rev 88741)
+++ projects/microcontainer/trunk/docs/gettingstarted/en-US/src/main/docbook/modules/reliance.xml	2009-05-12 15:27:08 UTC (rev 88742)
@@ -5,10 +5,10 @@
 <chapter id="reliance">
    <title>Reliance modules</title>
 
-   <para>In Microcontainer it's all about dependecies. One of the features we promissed it ability to write your own
-      dependency. As a dependency we mean some condition that must be satisfied in order that a state machine let's
-      a node pass to next state. In our case nodes are our beans, which we eventually want to install into
-      Microcontainer's registry.
+   <para>In Microcontainer it's all about dependecies. One of the features we promised is the ability to write your own
+      dependency. As a dependency we mean some condition that must be satisfied in order that a state machine lets
+      a node pass to next state. In our case the nodes are our beans, which we eventually want to install into
+      the Microcontainer's registry.
    </para>
 
    <para>Almost all component models impose some sort of authentification or authorization. We've added a simple
@@ -20,7 +20,7 @@
 
    <para>We've also added a jBPM integration to support long lasting state flow definitions. This integration provides
       a plugable way of notifying state machine nodes that they can move forward to the next state. We'll show a simple
-      human interaction of accepting state change request to move bean into next state.
+      human interaction of accepting state change requests to move beans into the next state.
    </para>
 
    <xi:include href="reliance_identity.xml"

Modified: projects/microcontainer/trunk/docs/gettingstarted/en-US/src/main/docbook/modules/reliance_identity.xml
===================================================================
--- projects/microcontainer/trunk/docs/gettingstarted/en-US/src/main/docbook/modules/reliance_identity.xml	2009-05-12 15:17:40 UTC (rev 88741)
+++ projects/microcontainer/trunk/docs/gettingstarted/en-US/src/main/docbook/modules/reliance_identity.xml	2009-05-12 15:27:08 UTC (rev 88742)
@@ -32,7 +32,7 @@
          <!-- bean part of the deployment -->
          <bean .../>
 
-         </deployment&gt;
+         </deployment>
 
 ]]>
    </programlisting>

Modified: projects/microcontainer/trunk/docs/gettingstarted/en-US/src/main/docbook/modules/reliance_jbpm.xml
===================================================================
--- projects/microcontainer/trunk/docs/gettingstarted/en-US/src/main/docbook/modules/reliance_jbpm.xml	2009-05-12 15:17:40 UTC (rev 88741)
+++ projects/microcontainer/trunk/docs/gettingstarted/en-US/src/main/docbook/modules/reliance_jbpm.xml	2009-05-12 15:27:08 UTC (rev 88742)
@@ -32,7 +32,7 @@
          <!-- bean part of the deployment -->
          <bean .../>
 
-         </deployment&gt;
+         </deployment>
 
 ]]>
    </programlisting>

Modified: projects/microcontainer/trunk/docs/gettingstarted/en-US/src/main/docbook/modules/reliance_rules.xml
===================================================================
--- projects/microcontainer/trunk/docs/gettingstarted/en-US/src/main/docbook/modules/reliance_rules.xml	2009-05-12 15:17:40 UTC (rev 88741)
+++ projects/microcontainer/trunk/docs/gettingstarted/en-US/src/main/docbook/modules/reliance_rules.xml	2009-05-12 15:27:08 UTC (rev 88742)
@@ -32,7 +32,7 @@
          <!-- bean part of the deployment -->
          <bean .../>
 
-         </deployment&gt;
+         </deployment>
 
 ]]>
    </programlisting>

Modified: projects/microcontainer/trunk/docs/gettingstarted/en-US/src/main/docbook/modules/spring.xml
===================================================================
--- projects/microcontainer/trunk/docs/gettingstarted/en-US/src/main/docbook/modules/spring.xml	2009-05-12 15:17:40 UTC (rev 88741)
+++ projects/microcontainer/trunk/docs/gettingstarted/en-US/src/main/docbook/modules/spring.xml	2009-05-12 15:27:08 UTC (rev 88742)
@@ -56,7 +56,7 @@
    <para>But things would be too easy if we just let get away with plain Spring XML.
       So what you can do is mix and match Microcontainer beans with Spring beans. It doesn't matter which
       starting element you choose, as long as your beans have the right namespace.
-      Let see this on the next two examples.
+      Let see this in the next two examples.
    </para>
 
    <programlisting>
@@ -68,7 +68,8 @@
             &lt;/property>
          &lt;/bean>
 
-         &lt;bean xmlns="urn:jboss:spring-beans:2.0" id="testBean" class="org.jboss.test.spring.support.SimpleBean">
+         &lt;bean xmlns="urn:jboss:spring-beans:2.0" id="testBean" 
+                 class="org.jboss.test.spring.support.SimpleBean">
             &lt;property name="mylist">
                &lt;list value-type="java.lang.String">
                   &lt;value>onel&lt;/value>
@@ -94,7 +95,8 @@
             &lt;/property>
          &lt;/bean>
 
-         &lt;bean xmlns="urn:jboss:bean-deployer:2.0" name="oldBean" class="org.jboss.test.spring.support.OldBean">
+         &lt;bean xmlns="urn:jboss:bean-deployer:2.0" name="oldBean" 
+                      class="org.jboss.test.spring.support.OldBean">
             &lt;property name="javaBeanString">JavaBean&lt;/property>
          &lt;/bean>
 




More information about the jboss-cvs-commits mailing list