onami-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From randg...@apache.org
Subject svn commit: r1454749 [2/2] - in /incubator/onami/trunk: lifecycle/ lifecycle/core/ lifecycle/core/main/ lifecycle/core/main/java/ lifecycle/core/main/java/org/ lifecycle/core/main/java/org/apache/ lifecycle/core/main/java/org/apache/onami/ lifecycle/co...
Date Sat, 09 Mar 2013 18:17:25 GMT
Copied: incubator/onami/trunk/lifecycle/core/test/java/org/apache/onami/lifecycle/core/TestAnnotationC.java (from r1452593, incubator/onami/trunk/lifecycle/src/main/java/org/apache/onami/lifecycle/Dispose.java)
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/lifecycle/core/test/java/org/apache/onami/lifecycle/core/TestAnnotationC.java?p2=incubator/onami/trunk/lifecycle/core/test/java/org/apache/onami/lifecycle/core/TestAnnotationC.java&p1=incubator/onami/trunk/lifecycle/src/main/java/org/apache/onami/lifecycle/Dispose.java&r1=1452593&r2=1454749&rev=1454749&view=diff
==============================================================================
--- incubator/onami/trunk/lifecycle/src/main/java/org/apache/onami/lifecycle/Dispose.java (original)
+++ incubator/onami/trunk/lifecycle/core/test/java/org/apache/onami/lifecycle/core/TestAnnotationC.java Sat Mar  9 18:17:23 2013
@@ -1,4 +1,4 @@
-package org.apache.onami.lifecycle;
+package org.apache.onami.lifecycle.core;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -19,20 +19,15 @@ package org.apache.onami.lifecycle;
  * under the License.
  */
 
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-/**
- * The method annotated with {@code Dispose} is typically used to release resources that it has been holding.
- */
-@Documented
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
 @Retention( RUNTIME )
 @Target( METHOD )
-public @interface Dispose
+public @interface TestAnnotationC
 {
 
 }

Modified: incubator/onami/trunk/lifecycle/pom.xml
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/lifecycle/pom.xml?rev=1454749&r1=1454748&r2=1454749&view=diff
==============================================================================
--- incubator/onami/trunk/lifecycle/pom.xml (original)
+++ incubator/onami/trunk/lifecycle/pom.xml Sat Mar  9 18:17:23 2013
@@ -28,12 +28,18 @@
 
   <artifactId>org.apache.onami.lifecycle</artifactId>
   <version>0.2.0-incubating-SNAPSHOT</version>
+  <packaging>pom</packaging>
 
   <name>Apache Onami-Lifecycle</name>
   <description>Apache Onami-Lifecycle allows objects lifecycle management made easy with Google Guice</description>
   <url>http://onami.incubator.apache.org/lifecycle/</url>
   <inceptionYear>2012</inceptionYear>
 
+  <modules>
+    <module>core</module>
+    <module>standard</module>
+  </modules>
+
   <scm>
     <url>https://svn.apache.org/viewvc/incubator/onami/trunk/lifecycle</url>
     <connection>scm:svn:https://svn.apache.org/repos/asf/incubator/onami/trunk/lifecycle</connection>

Copied: incubator/onami/trunk/lifecycle/standard/main/java/org/apache/onami/lifecycle/standard/AfterInjection.java (from r1452593, incubator/onami/trunk/lifecycle/src/main/java/org/apache/onami/lifecycle/AfterInjection.java)
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/lifecycle/standard/main/java/org/apache/onami/lifecycle/standard/AfterInjection.java?p2=incubator/onami/trunk/lifecycle/standard/main/java/org/apache/onami/lifecycle/standard/AfterInjection.java&p1=incubator/onami/trunk/lifecycle/src/main/java/org/apache/onami/lifecycle/AfterInjection.java&r1=1452593&r2=1454749&rev=1454749&view=diff
==============================================================================
--- incubator/onami/trunk/lifecycle/src/main/java/org/apache/onami/lifecycle/AfterInjection.java (original)
+++ incubator/onami/trunk/lifecycle/standard/main/java/org/apache/onami/lifecycle/standard/AfterInjection.java Sat Mar  9 18:17:23 2013
@@ -1,4 +1,4 @@
-package org.apache.onami.lifecycle;
+package org.apache.onami.lifecycle.standard;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -19,20 +19,20 @@ package org.apache.onami.lifecycle;
  * under the License.
  */
 
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
 /**
  * The {@code AfterInjection} annotation is used on a method that needs to be executed after dependency injection is
  * done to perform any initialization.
  */
 @Documented
-@Retention( RUNTIME )
-@Target( METHOD )
+@Retention(RUNTIME)
+@Target(METHOD)
 public @interface AfterInjection
 {
 

Propchange: incubator/onami/trunk/lifecycle/standard/main/java/org/apache/onami/lifecycle/standard/AfterInjection.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/onami/trunk/lifecycle/standard/main/java/org/apache/onami/lifecycle/standard/AfterInjection.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: incubator/onami/trunk/lifecycle/standard/main/java/org/apache/onami/lifecycle/standard/AfterInjection.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: incubator/onami/trunk/lifecycle/standard/main/java/org/apache/onami/lifecycle/standard/AfterInjectionModule.java (from r1452593, incubator/onami/trunk/lifecycle/src/test/java/org/apache/onami/lifecycle/DisposableObject.java)
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/lifecycle/standard/main/java/org/apache/onami/lifecycle/standard/AfterInjectionModule.java?p2=incubator/onami/trunk/lifecycle/standard/main/java/org/apache/onami/lifecycle/standard/AfterInjectionModule.java&p1=incubator/onami/trunk/lifecycle/src/test/java/org/apache/onami/lifecycle/DisposableObject.java&r1=1452593&r2=1454749&rev=1454749&view=diff
==============================================================================
--- incubator/onami/trunk/lifecycle/src/test/java/org/apache/onami/lifecycle/DisposableObject.java (original)
+++ incubator/onami/trunk/lifecycle/standard/main/java/org/apache/onami/lifecycle/standard/AfterInjectionModule.java Sat Mar  9 18:17:23 2013
@@ -1,4 +1,4 @@
-package org.apache.onami.lifecycle;
+package org.apache.onami.lifecycle.standard;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -19,15 +19,18 @@ package org.apache.onami.lifecycle;
  * under the License.
  */
 
-public final class DisposableObject
-{
-
-    boolean disposed = false;
+import com.google.inject.AbstractModule;
+import org.apache.onami.lifecycle.core.LifeCycleModule;
 
-    @Dispose
-    public void dispose()
+/**
+ * Guice module to register methods to be invoked after injection is complete.
+ */
+public class AfterInjectionModule
+    extends AbstractModule
+{
+    @Override
+    protected void configure()
     {
-        disposed  = true;
+        binder().install( new LifeCycleModule( AfterInjection.class ) );
     }
-
 }

Added: incubator/onami/trunk/lifecycle/standard/main/java/org/apache/onami/lifecycle/standard/DefaultDisposer.java
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/lifecycle/standard/main/java/org/apache/onami/lifecycle/standard/DefaultDisposer.java?rev=1454749&view=auto
==============================================================================
--- incubator/onami/trunk/lifecycle/standard/main/java/org/apache/onami/lifecycle/standard/DefaultDisposer.java (added)
+++ incubator/onami/trunk/lifecycle/standard/main/java/org/apache/onami/lifecycle/standard/DefaultDisposer.java Sat Mar  9 18:17:23 2013
@@ -0,0 +1,85 @@
+package org.apache.onami.lifecycle.standard;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.apache.onami.lifecycle.core.DefaultStager;
+import org.apache.onami.lifecycle.core.StageHandler;
+import org.apache.onami.lifecycle.core.Stageable;
+
+/**
+ * Default {@link Disposer} implementation.
+ *
+ * @since 0.2.0
+ */
+public class DefaultDisposer
+    extends DefaultStager<Dispose>
+    implements Disposer
+{
+    public DefaultDisposer()
+    {
+        super( Dispose.class, Order.FIRST_IN_LAST_OUT );
+    }
+
+    public void register( final Disposable disposable )
+    {
+        Stageable stageable = new Stageable()
+        {
+            public void stage( final StageHandler stageHandler )
+            {
+                DisposeHandler disposeHandler = new DisposeHandler()
+                {
+                    public <I> void onSuccess( I injectee )
+                    {
+                        stageHandler.onSuccess( injectee );
+                    }
+
+                    public <I, E extends Throwable> void onError( I injectee, E error )
+                    {
+                        stageHandler.onError( injectee, error );
+                    }
+                };
+                disposable.dispose( disposeHandler );
+            }
+        };
+        register( stageable );
+    }
+
+    public void dispose()
+    {
+        super.stage();
+    }
+
+    public void dispose( final DisposeHandler disposeHandler )
+    {
+        StageHandler stageHandler = new StageHandler()
+        {
+            public <I> void onSuccess( I injectee )
+            {
+                disposeHandler.onSuccess( injectee );
+            }
+
+            public <I, E extends Throwable> void onError( I injectee, E error )
+            {
+                disposeHandler.onError( injectee, error );
+            }
+        };
+        super.stage( stageHandler );
+    }
+}
\ No newline at end of file

Propchange: incubator/onami/trunk/lifecycle/standard/main/java/org/apache/onami/lifecycle/standard/DefaultDisposer.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/onami/trunk/lifecycle/standard/main/java/org/apache/onami/lifecycle/standard/DefaultDisposer.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: incubator/onami/trunk/lifecycle/standard/main/java/org/apache/onami/lifecycle/standard/DefaultDisposer.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: incubator/onami/trunk/lifecycle/standard/main/java/org/apache/onami/lifecycle/standard/Disposable.java (from r1452593, incubator/onami/trunk/lifecycle/src/main/java/org/apache/onami/lifecycle/Disposable.java)
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/lifecycle/standard/main/java/org/apache/onami/lifecycle/standard/Disposable.java?p2=incubator/onami/trunk/lifecycle/standard/main/java/org/apache/onami/lifecycle/standard/Disposable.java&p1=incubator/onami/trunk/lifecycle/src/main/java/org/apache/onami/lifecycle/Disposable.java&r1=1452593&r2=1454749&rev=1454749&view=diff
==============================================================================
--- incubator/onami/trunk/lifecycle/src/main/java/org/apache/onami/lifecycle/Disposable.java (original)
+++ incubator/onami/trunk/lifecycle/standard/main/java/org/apache/onami/lifecycle/standard/Disposable.java Sat Mar  9 18:17:23 2013
@@ -1,4 +1,4 @@
-package org.apache.onami.lifecycle;
+package org.apache.onami.lifecycle.standard;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -36,4 +36,4 @@ public interface Disposable
      */
     void dispose( DisposeHandler disposeHandler );
 
-}
+}
\ No newline at end of file

Propchange: incubator/onami/trunk/lifecycle/standard/main/java/org/apache/onami/lifecycle/standard/Disposable.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/onami/trunk/lifecycle/standard/main/java/org/apache/onami/lifecycle/standard/Disposable.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: incubator/onami/trunk/lifecycle/standard/main/java/org/apache/onami/lifecycle/standard/Disposable.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: incubator/onami/trunk/lifecycle/standard/main/java/org/apache/onami/lifecycle/standard/Dispose.java (from r1452593, incubator/onami/trunk/lifecycle/src/main/java/org/apache/onami/lifecycle/Dispose.java)
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/lifecycle/standard/main/java/org/apache/onami/lifecycle/standard/Dispose.java?p2=incubator/onami/trunk/lifecycle/standard/main/java/org/apache/onami/lifecycle/standard/Dispose.java&p1=incubator/onami/trunk/lifecycle/src/main/java/org/apache/onami/lifecycle/Dispose.java&r1=1452593&r2=1454749&rev=1454749&view=diff
==============================================================================
--- incubator/onami/trunk/lifecycle/src/main/java/org/apache/onami/lifecycle/Dispose.java (original)
+++ incubator/onami/trunk/lifecycle/standard/main/java/org/apache/onami/lifecycle/standard/Dispose.java Sat Mar  9 18:17:23 2013
@@ -1,4 +1,4 @@
-package org.apache.onami.lifecycle;
+package org.apache.onami.lifecycle.standard;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -19,19 +19,19 @@ package org.apache.onami.lifecycle;
  * under the License.
  */
 
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
 /**
  * The method annotated with {@code Dispose} is typically used to release resources that it has been holding.
  */
 @Documented
-@Retention( RUNTIME )
-@Target( METHOD )
+@Retention(RUNTIME)
+@Target(METHOD)
 public @interface Dispose
 {
 

Propchange: incubator/onami/trunk/lifecycle/standard/main/java/org/apache/onami/lifecycle/standard/Dispose.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/onami/trunk/lifecycle/standard/main/java/org/apache/onami/lifecycle/standard/Dispose.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: incubator/onami/trunk/lifecycle/standard/main/java/org/apache/onami/lifecycle/standard/Dispose.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: incubator/onami/trunk/lifecycle/standard/main/java/org/apache/onami/lifecycle/standard/DisposeHandler.java (from r1452593, incubator/onami/trunk/lifecycle/src/main/java/org/apache/onami/lifecycle/DisposeHandler.java)
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/lifecycle/standard/main/java/org/apache/onami/lifecycle/standard/DisposeHandler.java?p2=incubator/onami/trunk/lifecycle/standard/main/java/org/apache/onami/lifecycle/standard/DisposeHandler.java&p1=incubator/onami/trunk/lifecycle/src/main/java/org/apache/onami/lifecycle/DisposeHandler.java&r1=1452593&r2=1454749&rev=1454749&view=diff
==============================================================================
--- incubator/onami/trunk/lifecycle/src/main/java/org/apache/onami/lifecycle/DisposeHandler.java (original)
+++ incubator/onami/trunk/lifecycle/standard/main/java/org/apache/onami/lifecycle/standard/DisposeHandler.java Sat Mar  9 18:17:23 2013
@@ -1,4 +1,4 @@
-package org.apache.onami.lifecycle;
+package org.apache.onami.lifecycle.standard;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -20,7 +20,7 @@ package org.apache.onami.lifecycle;
  */
 
 /**
- * A {@link DisposeHandler} instance is used to track dispose progresses.
+ * A {@link org.apache.onami.lifecycle.standard.DisposeHandler} instance is used to track dispose progresses.
  */
 public interface DisposeHandler
 {
@@ -40,4 +40,4 @@ public interface DisposeHandler
      */
     <I, E extends Throwable> void onError( I injectee, E error );
 
-}
+}
\ No newline at end of file

Propchange: incubator/onami/trunk/lifecycle/standard/main/java/org/apache/onami/lifecycle/standard/DisposeHandler.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/onami/trunk/lifecycle/standard/main/java/org/apache/onami/lifecycle/standard/DisposeHandler.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: incubator/onami/trunk/lifecycle/standard/main/java/org/apache/onami/lifecycle/standard/DisposeHandler.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: incubator/onami/trunk/lifecycle/standard/main/java/org/apache/onami/lifecycle/standard/DisposeModule.java (from r1452593, incubator/onami/trunk/lifecycle/src/main/java/org/apache/onami/lifecycle/DisposeModule.java)
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/lifecycle/standard/main/java/org/apache/onami/lifecycle/standard/DisposeModule.java?p2=incubator/onami/trunk/lifecycle/standard/main/java/org/apache/onami/lifecycle/standard/DisposeModule.java&p1=incubator/onami/trunk/lifecycle/src/main/java/org/apache/onami/lifecycle/DisposeModule.java&r1=1452593&r2=1454749&rev=1454749&view=diff
==============================================================================
--- incubator/onami/trunk/lifecycle/src/main/java/org/apache/onami/lifecycle/DisposeModule.java (original)
+++ incubator/onami/trunk/lifecycle/standard/main/java/org/apache/onami/lifecycle/standard/DisposeModule.java Sat Mar  9 18:17:23 2013
@@ -1,4 +1,4 @@
-package org.apache.onami.lifecycle;
+package org.apache.onami.lifecycle.standard;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -19,34 +19,31 @@ package org.apache.onami.lifecycle;
  * under the License.
  */
 
-import static com.google.inject.matcher.Matchers.any;
+import com.google.inject.AbstractModule;
+import com.google.inject.TypeLiteral;
+import com.google.inject.matcher.Matcher;
+import org.apache.onami.lifecycle.core.LifeCycleStageModule;
 
 import java.lang.annotation.Annotation;
-import java.lang.reflect.Method;
 
-import com.google.inject.Injector;
-import com.google.inject.TypeLiteral;
-import com.google.inject.matcher.Matcher;
-import com.google.inject.spi.InjectionListener;
-import com.google.inject.spi.TypeEncounter;
+import static com.google.inject.matcher.Matchers.any;
 
 /**
- * Guice module to register methods to be invoked when {@link Disposer#dispose()} is invoked.
- * <p>
- * Module instance have state so it must not be used to construct more than one {@link Injector}. 
+ * Guice module to register methods to be invoked when {@link org.apache.onami.lifecycle.core.Stager#stage()} is invoked.
+ * <p/>
+ * Module instance have state so it must not be used to construct more than one {@link com.google.inject.Injector}.
  */
-public final class DisposeModule
-    extends AbstractLifeCycleModule
+public class DisposeModule
+    extends AbstractModule
 {
+    private final LifeCycleStageModule<?> lifeCycleStageModule;
 
     private final Disposer disposer;
 
-    /**
-     * Creates a new module which register methods annotated with {@link Dispose} on methods in any type.
-     */
     public DisposeModule()
     {
-        this( Dispose.class, any() );
+        disposer = new DefaultDisposer();
+        lifeCycleStageModule = new LifeCycleStageModule<Dispose>( new StagerWrapper<Dispose>( disposer, Dispose.class ) );
     }
 
     /**
@@ -54,64 +51,39 @@ public final class DisposeModule
      * in types filtered by the input matcher.
      *
      * @param disposeAnnotationType the <i>Dispose</i> annotation to be searched.
-     * @param typeMatcher the filter for injectee types.
+     * @param typeMatcher           the filter for injectee types.
      */
     public <A extends Annotation> DisposeModule( Class<A> disposeAnnotationType,
                                                  Matcher<? super TypeLiteral<?>> typeMatcher )
     {
-        super( disposeAnnotationType, typeMatcher );
         disposer = new DefaultDisposer();
+        lifeCycleStageModule =
+            LifeCycleStageModule.builder( disposeAnnotationType )
+                .withTypeMatcher( typeMatcher )
+                .withStager( new StagerWrapper<A>( disposer, disposeAnnotationType ) )
+                .build();
     }
 
-    /**
-     * Creates a new module from the supplied {@link Builder}.
-     *
-     * @param builder settings container.
-     * @since 0.2.0
-     */
-    DisposeModule( Builder builder )
-    {
-        super( builder.disposeAnnotationType, builder.typeMatcher );
-        this.disposer = builder.disposer;
+    @SuppressWarnings( "unchecked" )
+    protected DisposeModule( Builder builder )
+    {
+        disposer = builder.disposer;
+        StagerWrapper wrapper = new StagerWrapper( builder.disposer, builder.disposeAnnotationType );
+        lifeCycleStageModule =
+            LifeCycleStageModule.builder( builder.disposeAnnotationType ).withStager( wrapper ).withTypeMatcher(
+                builder.typeMatcher ).build();
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    protected void configure()
+    public static Builder builder()
     {
-        bind( Disposer.class ).toInstance( disposer );
-
-        bindListener( getTypeMatcher(), new AbstractMethodTypeListener( getAnnotationType() )
-        {
-
-            @Override
-            protected <I> void hear( final Method disposeMethod, TypeEncounter<I> encounter )
-            {
-                encounter.register( new InjectionListener<I>()
-                {
-
-                    public void afterInjection( I injectee )
-                    {
-                        disposer.register( new MethodDisposable( disposeMethod, injectee ) );
-                    }
-
-                } );
-            }
-
-        } );
+        return new Builder();
     }
 
-    /**
-     * Allows to create {@link DisposeModule} with builder pattern.
-     *
-     * @return builder for {@link DisposeModule}.
-     * @since 0.2.0
-     */
-    public static Builder builder()
+    @Override
+    protected void configure()
     {
-        return new Builder();
+        binder().bind(Disposer.class).toInstance( disposer );
+        binder().install( lifeCycleStageModule );
     }
 
     /**
@@ -122,11 +94,11 @@ public final class DisposeModule
     public static final class Builder
     {
 
-        Class<? extends Annotation> disposeAnnotationType = Dispose.class;
+        private Class<? extends Annotation> disposeAnnotationType = Dispose.class;
 
-        Matcher<? super TypeLiteral<?>> typeMatcher = any();
+        private Matcher<? super TypeLiteral<?>> typeMatcher = any();
 
-        Disposer disposer = new DefaultDisposer();
+        private Disposer disposer = new DefaultDisposer();
 
         /**
          * Hidden constructor.
@@ -135,10 +107,19 @@ public final class DisposeModule
         {
         }
 
+        private static <T> T checkNotNull( T object, String message )
+        {
+            if ( object == null )
+            {
+                throw new IllegalArgumentException( message );
+            }
+            return object;
+        }
+
         /**
-         * Builds {@link DisposeModule} with given settings.
+         * Builds {@link org.apache.onami.lifecycle.standard.DisposeModule} with given settings.
          *
-         * @return {@link DisposeModule} with given settings.
+         * @return {@link org.apache.onami.lifecycle.standard.DisposeModule} with given settings.
          * @since 0.2.0
          */
         public DisposeModule build()
@@ -155,8 +136,8 @@ public final class DisposeModule
          */
         public Builder withDisposeAnnotationType( Class<? extends Annotation> disposeAnnotationType )
         {
-            this.disposeAnnotationType = checkNotNull( disposeAnnotationType,
-                                                       "Argument 'disposeAnnotationType' must be not null." );
+            this.disposeAnnotationType =
+                checkNotNull( disposeAnnotationType, "Argument 'disposeAnnotationType' must be not null." );
             return this;
         }
 
@@ -185,16 +166,5 @@ public final class DisposeModule
             this.disposer = checkNotNull( disposer, "Argument 'disposer' must be not null." );
             return this;
         }
-
-        private static <T> T checkNotNull( T object, String message )
-        {
-            if ( object == null )
-            {
-                throw new IllegalArgumentException( message );
-            }
-            return object;
-        }
-
     }
-
 }

Propchange: incubator/onami/trunk/lifecycle/standard/main/java/org/apache/onami/lifecycle/standard/DisposeModule.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/onami/trunk/lifecycle/standard/main/java/org/apache/onami/lifecycle/standard/DisposeModule.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: incubator/onami/trunk/lifecycle/standard/main/java/org/apache/onami/lifecycle/standard/DisposeModule.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: incubator/onami/trunk/lifecycle/standard/main/java/org/apache/onami/lifecycle/standard/Disposer.java (from r1452593, incubator/onami/trunk/lifecycle/src/main/java/org/apache/onami/lifecycle/Disposer.java)
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/lifecycle/standard/main/java/org/apache/onami/lifecycle/standard/Disposer.java?p2=incubator/onami/trunk/lifecycle/standard/main/java/org/apache/onami/lifecycle/standard/Disposer.java&p1=incubator/onami/trunk/lifecycle/src/main/java/org/apache/onami/lifecycle/Disposer.java&r1=1452593&r2=1454749&rev=1454749&view=diff
==============================================================================
--- incubator/onami/trunk/lifecycle/src/main/java/org/apache/onami/lifecycle/Disposer.java (original)
+++ incubator/onami/trunk/lifecycle/standard/main/java/org/apache/onami/lifecycle/standard/Disposer.java Sat Mar  9 18:17:23 2013
@@ -1,4 +1,4 @@
-package org.apache.onami.lifecycle;
+package org.apache.onami.lifecycle.standard;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -57,4 +57,4 @@ public interface Disposer
      */
     void dispose( DisposeHandler disposeHandler );
 
-}
+}
\ No newline at end of file

Propchange: incubator/onami/trunk/lifecycle/standard/main/java/org/apache/onami/lifecycle/standard/Disposer.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/onami/trunk/lifecycle/standard/main/java/org/apache/onami/lifecycle/standard/Disposer.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: incubator/onami/trunk/lifecycle/standard/main/java/org/apache/onami/lifecycle/standard/Disposer.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: incubator/onami/trunk/lifecycle/standard/main/java/org/apache/onami/lifecycle/standard/StagerWrapper.java
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/lifecycle/standard/main/java/org/apache/onami/lifecycle/standard/StagerWrapper.java?rev=1454749&view=auto
==============================================================================
--- incubator/onami/trunk/lifecycle/standard/main/java/org/apache/onami/lifecycle/standard/StagerWrapper.java (added)
+++ incubator/onami/trunk/lifecycle/standard/main/java/org/apache/onami/lifecycle/standard/StagerWrapper.java Sat Mar  9 18:17:23 2013
@@ -0,0 +1,71 @@
+package org.apache.onami.lifecycle.standard;
+
+import org.apache.onami.lifecycle.core.StageHandler;
+import org.apache.onami.lifecycle.core.Stageable;
+import org.apache.onami.lifecycle.core.Stager;
+
+import java.lang.annotation.Annotation;
+
+class StagerWrapper<A extends Annotation> implements Stager<A>
+{
+    private final Disposer disposer;
+
+    private final Class<A> stage;
+
+    StagerWrapper(Disposer disposer, Class<A> stage)
+    {
+        this.disposer = disposer;
+        this.stage = stage;
+    }
+
+    public void register( final Stageable stageable )
+    {
+        Disposable disposable = new Disposable()
+        {
+            public void dispose( final DisposeHandler disposeHandler )
+            {
+                StageHandler stageHandler = new StageHandler()
+                {
+                    public <I> void onSuccess( I injectee )
+                    {
+                        disposeHandler.onSuccess( injectee );
+                    }
+
+                    public <I, E extends Throwable> void onError( I injectee, E error )
+                    {
+                        disposeHandler.onError( injectee, error );
+                    }
+                };
+                stageable.stage( stageHandler );
+            }
+        };
+        disposer.register( disposable );
+    }
+
+    public void stage()
+    {
+        disposer.dispose();
+    }
+
+    public void stage( final StageHandler stageHandler )
+    {
+        DisposeHandler disposeHandler = new DisposeHandler()
+        {
+            public <I> void onSuccess( I injectee )
+            {
+                stageHandler.onSuccess( injectee );
+            }
+
+            public <I, E extends Throwable> void onError( I injectee, E error )
+            {
+                stageHandler.onError( injectee, error );
+            }
+        };
+        disposer.dispose( disposeHandler );
+    }
+
+    public Class<A> getStage()
+    {
+        return stage;
+    }
+}

Propchange: incubator/onami/trunk/lifecycle/standard/main/java/org/apache/onami/lifecycle/standard/StagerWrapper.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/onami/trunk/lifecycle/standard/main/java/org/apache/onami/lifecycle/standard/StagerWrapper.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: incubator/onami/trunk/lifecycle/standard/main/java/org/apache/onami/lifecycle/standard/StagerWrapper.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: incubator/onami/trunk/lifecycle/standard/pom.xml
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/lifecycle/standard/pom.xml?rev=1454749&view=auto
==============================================================================
--- incubator/onami/trunk/lifecycle/standard/pom.xml (added)
+++ incubator/onami/trunk/lifecycle/standard/pom.xml Sat Mar  9 18:17:23 2013
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.onami</groupId>
+        <artifactId>org.apache.onami.lifecycle</artifactId>
+        <version>0.2.0-incubating-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>org.apache.onami.lifecycle.standard</artifactId>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.onami</groupId>
+      <artifactId>org.apache.onami.lifecycle.core</artifactId>
+      <version>0.2.0-incubating-SNAPSHOT</version>
+    </dependency>
+  </dependencies>
+</project>
\ No newline at end of file

Propchange: incubator/onami/trunk/lifecycle/standard/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/onami/trunk/lifecycle/standard/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: incubator/onami/trunk/lifecycle/standard/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Copied: incubator/onami/trunk/lifecycle/standard/test/java/org/apache/onami/lifecycle/standard/AfterInjectionTestCase.java (from r1452593, incubator/onami/trunk/lifecycle/src/test/java/org/apache/onami/lifecycle/AfterInjectionTestCase.java)
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/lifecycle/standard/test/java/org/apache/onami/lifecycle/standard/AfterInjectionTestCase.java?p2=incubator/onami/trunk/lifecycle/standard/test/java/org/apache/onami/lifecycle/standard/AfterInjectionTestCase.java&p1=incubator/onami/trunk/lifecycle/src/test/java/org/apache/onami/lifecycle/AfterInjectionTestCase.java&r1=1452593&r2=1454749&rev=1454749&view=diff
==============================================================================
--- incubator/onami/trunk/lifecycle/src/test/java/org/apache/onami/lifecycle/AfterInjectionTestCase.java (original)
+++ incubator/onami/trunk/lifecycle/standard/test/java/org/apache/onami/lifecycle/standard/AfterInjectionTestCase.java Sat Mar  9 18:17:23 2013
@@ -1,4 +1,4 @@
-package org.apache.onami.lifecycle;
+package org.apache.onami.lifecycle.standard;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -19,15 +19,12 @@ package org.apache.onami.lifecycle;
  * under the License.
  */
 
-import static com.google.inject.Guice.createInjector;
-import static junit.framework.Assert.assertTrue;
-
-import org.apache.onami.lifecycle.AfterInjection;
-import org.apache.onami.lifecycle.AfterInjectionModule;
-import org.junit.Test;
-
 import com.google.inject.ConfigurationException;
 import com.google.inject.ProvisionException;
+import org.junit.Test;
+
+import static com.google.inject.Guice.createInjector;
+import static junit.framework.Assert.assertTrue;
 
 public final class AfterInjectionTestCase
 {

Propchange: incubator/onami/trunk/lifecycle/standard/test/java/org/apache/onami/lifecycle/standard/AfterInjectionTestCase.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/onami/trunk/lifecycle/standard/test/java/org/apache/onami/lifecycle/standard/AfterInjectionTestCase.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: incubator/onami/trunk/lifecycle/standard/test/java/org/apache/onami/lifecycle/standard/AfterInjectionTestCase.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: incubator/onami/trunk/lifecycle/standard/test/java/org/apache/onami/lifecycle/standard/DisposableObject.java (from r1452593, incubator/onami/trunk/lifecycle/src/test/java/org/apache/onami/lifecycle/DisposableObject.java)
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/lifecycle/standard/test/java/org/apache/onami/lifecycle/standard/DisposableObject.java?p2=incubator/onami/trunk/lifecycle/standard/test/java/org/apache/onami/lifecycle/standard/DisposableObject.java&p1=incubator/onami/trunk/lifecycle/src/test/java/org/apache/onami/lifecycle/DisposableObject.java&r1=1452593&r2=1454749&rev=1454749&view=diff
==============================================================================
--- incubator/onami/trunk/lifecycle/src/test/java/org/apache/onami/lifecycle/DisposableObject.java (original)
+++ incubator/onami/trunk/lifecycle/standard/test/java/org/apache/onami/lifecycle/standard/DisposableObject.java Sat Mar  9 18:17:23 2013
@@ -1,4 +1,4 @@
-package org.apache.onami.lifecycle;
+package org.apache.onami.lifecycle.standard;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Propchange: incubator/onami/trunk/lifecycle/standard/test/java/org/apache/onami/lifecycle/standard/DisposableObject.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/onami/trunk/lifecycle/standard/test/java/org/apache/onami/lifecycle/standard/DisposableObject.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: incubator/onami/trunk/lifecycle/standard/test/java/org/apache/onami/lifecycle/standard/DisposableObject.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: incubator/onami/trunk/lifecycle/standard/test/java/org/apache/onami/lifecycle/standard/DisposeModuleTestCase.java (from r1452593, incubator/onami/trunk/lifecycle/src/test/java/org/apache/onami/lifecycle/DisposeModuleTestCase.java)
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/lifecycle/standard/test/java/org/apache/onami/lifecycle/standard/DisposeModuleTestCase.java?p2=incubator/onami/trunk/lifecycle/standard/test/java/org/apache/onami/lifecycle/standard/DisposeModuleTestCase.java&p1=incubator/onami/trunk/lifecycle/src/test/java/org/apache/onami/lifecycle/DisposeModuleTestCase.java&r1=1452593&r2=1454749&rev=1454749&view=diff
==============================================================================
--- incubator/onami/trunk/lifecycle/src/test/java/org/apache/onami/lifecycle/DisposeModuleTestCase.java (original)
+++ incubator/onami/trunk/lifecycle/standard/test/java/org/apache/onami/lifecycle/standard/DisposeModuleTestCase.java Sat Mar  9 18:17:23 2013
@@ -1,4 +1,4 @@
-package org.apache.onami.lifecycle;
+package org.apache.onami.lifecycle.standard;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -19,20 +19,17 @@ package org.apache.onami.lifecycle;
  * under the License.
  */
 
-import static com.google.inject.Guice.createInjector;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertTrue;
-import static junit.framework.Assert.fail;
+import com.google.inject.AbstractModule;
+import com.google.inject.CreationException;
+import com.google.inject.Provides;
+import org.junit.Test;
 
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 
-import org.junit.Test;
-
-import com.google.inject.AbstractModule;
-import com.google.inject.CreationException;
-import com.google.inject.Provides;
+import static com.google.inject.Guice.createInjector;
+import static junit.framework.Assert.*;
 
 public final class DisposeModuleTestCase
 {
@@ -69,7 +66,7 @@ public final class DisposeModuleTestCase
                 public <I> void onSuccess( I injectee )
                 {
                     assertTrue( injectee instanceof DisposableObject );
-                    assertTrue( ((DisposableObject) injectee).disposed );
+                    assertTrue( ( (DisposableObject) injectee ).disposed );
                 }
 
                 public <I, E extends Throwable> void onError( I injectee, E error )
@@ -77,7 +74,7 @@ public final class DisposeModuleTestCase
                     fail( error.toString() );
                 }
 
-            });
+            } );
         }
     }
 
@@ -138,7 +135,7 @@ public final class DisposeModuleTestCase
                 public <I> void onSuccess( I injectee )
                 {
                     assertTrue( injectee instanceof ExecutorService );
-                    assertTrue( ((ExecutorService) injectee).isShutdown() );
+                    assertTrue( ( (ExecutorService) injectee ).isShutdown() );
                 }
 
                 public <I, E extends Throwable> void onError( I injectee, E error )
@@ -146,7 +143,7 @@ public final class DisposeModuleTestCase
                     fail( error.toString() );
                 }
 
-            });
+            } );
         }
     }
 

Propchange: incubator/onami/trunk/lifecycle/standard/test/java/org/apache/onami/lifecycle/standard/DisposeModuleTestCase.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/onami/trunk/lifecycle/standard/test/java/org/apache/onami/lifecycle/standard/DisposeModuleTestCase.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: incubator/onami/trunk/lifecycle/standard/test/java/org/apache/onami/lifecycle/standard/DisposeModuleTestCase.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: incubator/onami/trunk/lifecycle/standard/test/java/org/apache/onami/lifecycle/standard/DisposeTestCase.java (from r1452593, incubator/onami/trunk/lifecycle/src/test/java/org/apache/onami/lifecycle/DisposeTestCase.java)
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/lifecycle/standard/test/java/org/apache/onami/lifecycle/standard/DisposeTestCase.java?p2=incubator/onami/trunk/lifecycle/standard/test/java/org/apache/onami/lifecycle/standard/DisposeTestCase.java&p1=incubator/onami/trunk/lifecycle/src/test/java/org/apache/onami/lifecycle/DisposeTestCase.java&r1=1452593&r2=1454749&rev=1454749&view=diff
==============================================================================
--- incubator/onami/trunk/lifecycle/src/test/java/org/apache/onami/lifecycle/DisposeTestCase.java (original)
+++ incubator/onami/trunk/lifecycle/standard/test/java/org/apache/onami/lifecycle/standard/DisposeTestCase.java Sat Mar  9 18:17:23 2013
@@ -1,15 +1,14 @@
-package org.apache.onami.lifecycle;
-
-import static com.google.inject.Guice.createInjector;
-import static junit.framework.Assert.assertTrue;
-import static junit.framework.Assert.fail;
-
-import org.junit.Before;
-import org.junit.Test;
+package org.apache.onami.lifecycle.standard;
 
 import com.google.inject.AbstractModule;
 import com.google.inject.ConfigurationException;
 import com.google.inject.Inject;
+import org.junit.Before;
+import org.junit.Test;
+
+import static com.google.inject.Guice.createInjector;
+import static junit.framework.Assert.assertTrue;
+import static junit.framework.Assert.fail;
 
 public final class DisposeTestCase
 {

Propchange: incubator/onami/trunk/lifecycle/standard/test/java/org/apache/onami/lifecycle/standard/DisposeTestCase.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/onami/trunk/lifecycle/standard/test/java/org/apache/onami/lifecycle/standard/DisposeTestCase.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: incubator/onami/trunk/lifecycle/standard/test/java/org/apache/onami/lifecycle/standard/DisposeTestCase.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: incubator/onami/trunk/lifecycle/standard/test/java/org/apache/onami/lifecycle/standard/ThrowingExceptionAfterInjectionMethod.java (from r1452593, incubator/onami/trunk/lifecycle/src/test/java/org/apache/onami/lifecycle/ThrowingExceptionAfterInjectionMethod.java)
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/lifecycle/standard/test/java/org/apache/onami/lifecycle/standard/ThrowingExceptionAfterInjectionMethod.java?p2=incubator/onami/trunk/lifecycle/standard/test/java/org/apache/onami/lifecycle/standard/ThrowingExceptionAfterInjectionMethod.java&p1=incubator/onami/trunk/lifecycle/src/test/java/org/apache/onami/lifecycle/ThrowingExceptionAfterInjectionMethod.java&r1=1452593&r2=1454749&rev=1454749&view=diff
==============================================================================
--- incubator/onami/trunk/lifecycle/src/test/java/org/apache/onami/lifecycle/ThrowingExceptionAfterInjectionMethod.java (original)
+++ incubator/onami/trunk/lifecycle/standard/test/java/org/apache/onami/lifecycle/standard/ThrowingExceptionAfterInjectionMethod.java Sat Mar  9 18:17:23 2013
@@ -1,6 +1,4 @@
-package org.apache.onami.lifecycle;
-
-import org.apache.onami.lifecycle.AfterInjection;
+package org.apache.onami.lifecycle.standard;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Propchange: incubator/onami/trunk/lifecycle/standard/test/java/org/apache/onami/lifecycle/standard/ThrowingExceptionAfterInjectionMethod.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/onami/trunk/lifecycle/standard/test/java/org/apache/onami/lifecycle/standard/ThrowingExceptionAfterInjectionMethod.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: incubator/onami/trunk/lifecycle/standard/test/java/org/apache/onami/lifecycle/standard/ThrowingExceptionAfterInjectionMethod.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: incubator/onami/trunk/lifecycle/standard/test/java/org/apache/onami/lifecycle/standard/ThrowingExceptionConstructor.java (from r1452593, incubator/onami/trunk/lifecycle/src/test/java/org/apache/onami/lifecycle/ThrowingExceptionConstructor.java)
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/lifecycle/standard/test/java/org/apache/onami/lifecycle/standard/ThrowingExceptionConstructor.java?p2=incubator/onami/trunk/lifecycle/standard/test/java/org/apache/onami/lifecycle/standard/ThrowingExceptionConstructor.java&p1=incubator/onami/trunk/lifecycle/src/test/java/org/apache/onami/lifecycle/ThrowingExceptionConstructor.java&r1=1452593&r2=1454749&rev=1454749&view=diff
==============================================================================
--- incubator/onami/trunk/lifecycle/src/test/java/org/apache/onami/lifecycle/ThrowingExceptionConstructor.java (original)
+++ incubator/onami/trunk/lifecycle/standard/test/java/org/apache/onami/lifecycle/standard/ThrowingExceptionConstructor.java Sat Mar  9 18:17:23 2013
@@ -1,4 +1,4 @@
-package org.apache.onami.lifecycle;
+package org.apache.onami.lifecycle.standard;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Propchange: incubator/onami/trunk/lifecycle/standard/test/java/org/apache/onami/lifecycle/standard/ThrowingExceptionConstructor.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/onami/trunk/lifecycle/standard/test/java/org/apache/onami/lifecycle/standard/ThrowingExceptionConstructor.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: incubator/onami/trunk/lifecycle/standard/test/java/org/apache/onami/lifecycle/standard/ThrowingExceptionConstructor.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: incubator/onami/trunk/lifecycle/standard/test/java/org/apache/onami/lifecycle/standard/ThrowingExceptionConstructor2.java (from r1452593, incubator/onami/trunk/lifecycle/src/test/java/org/apache/onami/lifecycle/ThrowingExceptionConstructor2.java)
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/lifecycle/standard/test/java/org/apache/onami/lifecycle/standard/ThrowingExceptionConstructor2.java?p2=incubator/onami/trunk/lifecycle/standard/test/java/org/apache/onami/lifecycle/standard/ThrowingExceptionConstructor2.java&p1=incubator/onami/trunk/lifecycle/src/test/java/org/apache/onami/lifecycle/ThrowingExceptionConstructor2.java&r1=1452593&r2=1454749&rev=1454749&view=diff
==============================================================================
--- incubator/onami/trunk/lifecycle/src/test/java/org/apache/onami/lifecycle/ThrowingExceptionConstructor2.java (original)
+++ incubator/onami/trunk/lifecycle/standard/test/java/org/apache/onami/lifecycle/standard/ThrowingExceptionConstructor2.java Sat Mar  9 18:17:23 2013
@@ -1,4 +1,4 @@
-package org.apache.onami.lifecycle;
+package org.apache.onami.lifecycle.standard;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -19,9 +19,8 @@ package org.apache.onami.lifecycle;
  * under the License.
  */
 
-import java.util.concurrent.ExecutorService;
-
 import javax.inject.Inject;
+import java.util.concurrent.ExecutorService;
 
 public final class ThrowingExceptionConstructor2
 {

Propchange: incubator/onami/trunk/lifecycle/standard/test/java/org/apache/onami/lifecycle/standard/ThrowingExceptionConstructor2.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/onami/trunk/lifecycle/standard/test/java/org/apache/onami/lifecycle/standard/ThrowingExceptionConstructor2.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: incubator/onami/trunk/lifecycle/standard/test/java/org/apache/onami/lifecycle/standard/ThrowingExceptionConstructor2.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: incubator/onami/trunk/lifecycle/standard/test/java/org/apache/onami/lifecycle/standard/ThrowingExceptionDisposeMethod.java (from r1452593, incubator/onami/trunk/lifecycle/src/test/java/org/apache/onami/lifecycle/ThrowingExceptionDisposeMethod.java)
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/lifecycle/standard/test/java/org/apache/onami/lifecycle/standard/ThrowingExceptionDisposeMethod.java?p2=incubator/onami/trunk/lifecycle/standard/test/java/org/apache/onami/lifecycle/standard/ThrowingExceptionDisposeMethod.java&p1=incubator/onami/trunk/lifecycle/src/test/java/org/apache/onami/lifecycle/ThrowingExceptionDisposeMethod.java&r1=1452593&r2=1454749&rev=1454749&view=diff
==============================================================================
--- incubator/onami/trunk/lifecycle/src/test/java/org/apache/onami/lifecycle/ThrowingExceptionDisposeMethod.java (original)
+++ incubator/onami/trunk/lifecycle/standard/test/java/org/apache/onami/lifecycle/standard/ThrowingExceptionDisposeMethod.java Sat Mar  9 18:17:23 2013
@@ -1,6 +1,4 @@
-package org.apache.onami.lifecycle;
-
-import org.apache.onami.lifecycle.Dispose;
+package org.apache.onami.lifecycle.standard;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Propchange: incubator/onami/trunk/lifecycle/standard/test/java/org/apache/onami/lifecycle/standard/ThrowingExceptionDisposeMethod.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/onami/trunk/lifecycle/standard/test/java/org/apache/onami/lifecycle/standard/ThrowingExceptionDisposeMethod.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: incubator/onami/trunk/lifecycle/standard/test/java/org/apache/onami/lifecycle/standard/ThrowingExceptionDisposeMethod.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: incubator/onami/trunk/lifecycle/standard/test/java/org/apache/onami/lifecycle/standard/WrongAfterInjectionMethod.java (from r1452593, incubator/onami/trunk/lifecycle/src/test/java/org/apache/onami/lifecycle/WrongAfterInjectionMethod.java)
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/lifecycle/standard/test/java/org/apache/onami/lifecycle/standard/WrongAfterInjectionMethod.java?p2=incubator/onami/trunk/lifecycle/standard/test/java/org/apache/onami/lifecycle/standard/WrongAfterInjectionMethod.java&p1=incubator/onami/trunk/lifecycle/src/test/java/org/apache/onami/lifecycle/WrongAfterInjectionMethod.java&r1=1452593&r2=1454749&rev=1454749&view=diff
==============================================================================
--- incubator/onami/trunk/lifecycle/src/test/java/org/apache/onami/lifecycle/WrongAfterInjectionMethod.java (original)
+++ incubator/onami/trunk/lifecycle/standard/test/java/org/apache/onami/lifecycle/standard/WrongAfterInjectionMethod.java Sat Mar  9 18:17:23 2013
@@ -1,6 +1,4 @@
-package org.apache.onami.lifecycle;
-
-import org.apache.onami.lifecycle.AfterInjection;
+package org.apache.onami.lifecycle.standard;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Propchange: incubator/onami/trunk/lifecycle/standard/test/java/org/apache/onami/lifecycle/standard/WrongAfterInjectionMethod.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/onami/trunk/lifecycle/standard/test/java/org/apache/onami/lifecycle/standard/WrongAfterInjectionMethod.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: incubator/onami/trunk/lifecycle/standard/test/java/org/apache/onami/lifecycle/standard/WrongAfterInjectionMethod.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: incubator/onami/trunk/lifecycle/standard/test/java/org/apache/onami/lifecycle/standard/WrongDisposeMethod.java (from r1452593, incubator/onami/trunk/lifecycle/src/test/java/org/apache/onami/lifecycle/WrongDisposeMethod.java)
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/lifecycle/standard/test/java/org/apache/onami/lifecycle/standard/WrongDisposeMethod.java?p2=incubator/onami/trunk/lifecycle/standard/test/java/org/apache/onami/lifecycle/standard/WrongDisposeMethod.java&p1=incubator/onami/trunk/lifecycle/src/test/java/org/apache/onami/lifecycle/WrongDisposeMethod.java&r1=1452593&r2=1454749&rev=1454749&view=diff
==============================================================================
--- incubator/onami/trunk/lifecycle/src/test/java/org/apache/onami/lifecycle/WrongDisposeMethod.java (original)
+++ incubator/onami/trunk/lifecycle/standard/test/java/org/apache/onami/lifecycle/standard/WrongDisposeMethod.java Sat Mar  9 18:17:23 2013
@@ -1,6 +1,4 @@
-package org.apache.onami.lifecycle;
-
-import org.apache.onami.lifecycle.Dispose;
+package org.apache.onami.lifecycle.standard;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Propchange: incubator/onami/trunk/lifecycle/standard/test/java/org/apache/onami/lifecycle/standard/WrongDisposeMethod.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/onami/trunk/lifecycle/standard/test/java/org/apache/onami/lifecycle/standard/WrongDisposeMethod.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: incubator/onami/trunk/lifecycle/standard/test/java/org/apache/onami/lifecycle/standard/WrongDisposeMethod.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: incubator/onami/trunk/scopes/pom.xml
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/scopes/pom.xml?rev=1454749&r1=1454748&r2=1454749&view=diff
==============================================================================
--- incubator/onami/trunk/scopes/pom.xml (original)
+++ incubator/onami/trunk/scopes/pom.xml Sat Mar  9 18:17:23 2013
@@ -81,7 +81,7 @@
 
     <dependency>
       <groupId>org.apache.onami</groupId>
-      <artifactId>org.apache.onami.lifecycle</artifactId>
+      <artifactId>org.apache.onami.lifecycle.standard</artifactId>
       <version>0.2.0-incubating-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>

Modified: incubator/onami/trunk/scopes/src/test/java/org/apache/onami/scopes/AnnotatedConcurrentLazySingletonObject.java
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/scopes/src/test/java/org/apache/onami/scopes/AnnotatedConcurrentLazySingletonObject.java?rev=1454749&r1=1454748&r2=1454749&view=diff
==============================================================================
--- incubator/onami/trunk/scopes/src/test/java/org/apache/onami/scopes/AnnotatedConcurrentLazySingletonObject.java (original)
+++ incubator/onami/trunk/scopes/src/test/java/org/apache/onami/scopes/AnnotatedConcurrentLazySingletonObject.java Sat Mar  9 18:17:23 2013
@@ -19,7 +19,7 @@ package org.apache.onami.scopes;
  * under the License.
  */
 
-import org.apache.onami.lifecycle.AfterInjection;
+import org.apache.onami.lifecycle.standard.AfterInjection;
 
 import java.util.concurrent.atomic.AtomicInteger;
 

Modified: incubator/onami/trunk/scopes/src/test/java/org/apache/onami/scopes/AnnotatedLazySingletonObject.java
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/scopes/src/test/java/org/apache/onami/scopes/AnnotatedLazySingletonObject.java?rev=1454749&r1=1454748&r2=1454749&view=diff
==============================================================================
--- incubator/onami/trunk/scopes/src/test/java/org/apache/onami/scopes/AnnotatedLazySingletonObject.java (original)
+++ incubator/onami/trunk/scopes/src/test/java/org/apache/onami/scopes/AnnotatedLazySingletonObject.java Sat Mar  9 18:17:23 2013
@@ -19,7 +19,7 @@ package org.apache.onami.scopes;
  * under the License.
  */
 
-import org.apache.onami.lifecycle.AfterInjection;
+import org.apache.onami.lifecycle.standard.AfterInjection;
 
 import java.util.concurrent.atomic.AtomicInteger;
 

Modified: incubator/onami/trunk/scopes/src/test/java/org/apache/onami/scopes/LazySingletonObject.java
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/scopes/src/test/java/org/apache/onami/scopes/LazySingletonObject.java?rev=1454749&r1=1454748&r2=1454749&view=diff
==============================================================================
--- incubator/onami/trunk/scopes/src/test/java/org/apache/onami/scopes/LazySingletonObject.java (original)
+++ incubator/onami/trunk/scopes/src/test/java/org/apache/onami/scopes/LazySingletonObject.java Sat Mar  9 18:17:23 2013
@@ -19,7 +19,7 @@ package org.apache.onami.scopes;
  * under the License.
  */
 
-import org.apache.onami.lifecycle.AfterInjection;
+import org.apache.onami.lifecycle.standard.AfterInjection;
 
 import java.util.concurrent.atomic.AtomicInteger;
 

Modified: incubator/onami/trunk/scopes/src/test/java/org/apache/onami/scopes/TestConcurrentLazySingleton.java
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/scopes/src/test/java/org/apache/onami/scopes/TestConcurrentLazySingleton.java?rev=1454749&r1=1454748&r2=1454749&view=diff
==============================================================================
--- incubator/onami/trunk/scopes/src/test/java/org/apache/onami/scopes/TestConcurrentLazySingleton.java (original)
+++ incubator/onami/trunk/scopes/src/test/java/org/apache/onami/scopes/TestConcurrentLazySingleton.java Sat Mar  9 18:17:23 2013
@@ -27,7 +27,7 @@ import java.util.concurrent.CountDownLat
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
-import org.apache.onami.lifecycle.AfterInjectionModule;
+import org.apache.onami.lifecycle.standard.AfterInjectionModule;
 import org.apache.onami.test.OnamiRunner;
 import org.junit.Before;
 import org.junit.Test;

Modified: incubator/onami/trunk/scopes/src/test/java/org/apache/onami/scopes/TestLazySingleton.java
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/scopes/src/test/java/org/apache/onami/scopes/TestLazySingleton.java?rev=1454749&r1=1454748&r2=1454749&view=diff
==============================================================================
--- incubator/onami/trunk/scopes/src/test/java/org/apache/onami/scopes/TestLazySingleton.java (original)
+++ incubator/onami/trunk/scopes/src/test/java/org/apache/onami/scopes/TestLazySingleton.java Sat Mar  9 18:17:23 2013
@@ -22,7 +22,7 @@ package org.apache.onami.scopes;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertSame;
 
-import org.apache.onami.lifecycle.AfterInjectionModule;
+import org.apache.onami.lifecycle.standard.AfterInjectionModule;
 import org.apache.onami.test.OnamiRunner;
 import org.junit.Before;
 import org.junit.Test;



Mime
View raw message