DELTASPIKE-21 ProjectStageProducer moved to the api module

deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/projectstage/ProjectStageProducer.java → deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/projectstage/ProjectStageProducer.java

@@ -16,10 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.deltaspike.core.impl.projectstage;
+package org.apache.deltaspike.core.api.projectstage;
 
 import org.apache.deltaspike.core.api.config.ConfigResolver;
-import org.apache.deltaspike.core.api.projectstage.ProjectStage;
 import org.apache.deltaspike.core.api.util.ClassUtils;
 
 import javax.enterprise.context.ApplicationScoped;
@@ -90,13 +89,6 @@ public ProjectStage getProjectStage()
         return projectStage;
     }
 
-    //just for testing
-    protected void reset()
-    {
-        projectStage = null;
-        projectStageProducer = null;
-    }
-
     /**
      * <p>This factory method should only get used if there is absolutly no way
      * to get the current {@link ProjectStage} via &#064;Inject.</p>
@@ -159,16 +151,6 @@ private static synchronized void lazyInit()
         projectStageProducer.initProjectStage();
     }
 
-    /**
-     * This function can be used to manually set the ProjectStage for the application.
-     * This is e.g. useful in unit tests.
-     * @param ps the ProjectStage to set
-     */
-    public static void setProjectStage(ProjectStage ps)
-    {
-        projectStage = ps;
-    }
-
     /**
      * Resolves the project-stage configured for DeltaSpike
      * @return the resolved {@link ProjectStage} or <code>null</code> if none defined.
@@ -203,4 +185,34 @@ protected void initProjectStage()
             }
         }
     }
+
+    /*
+     * Methods which might be needed for unti tests
+     */
+
+    /**
+     * Can be used esp. for internal tests.
+     * Usage:
+     * <pre>
+     * new ProjectStageProducer() {
+     *     @Override
+     *     protected void reset() { super.reset(); }
+     * }.reset();
+     * </pre>
+     */
+    protected void reset()
+    {
+        projectStage = null;
+        projectStageProducer = null;
+    }
+
+    /**
+     * This function can be used to manually set the ProjectStage for the application.
+     * This is e.g. useful in unit tests.
+     * @param ps the ProjectStage to set
+     */
+    public static void setProjectStage(ProjectStage ps)
+    {
+        projectStage = ps;
+    }
 }

deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exclude/ExcludeExtension.java

@@ -18,14 +18,14 @@
  */
 package org.apache.deltaspike.core.impl.exclude;
 
+import org.apache.deltaspike.core.api.projectstage.ProjectStageProducer;
 import org.apache.deltaspike.core.spi.activation.util.ClassDeactivation;
 import org.apache.deltaspike.core.spi.activation.Deactivatable;
 import org.apache.deltaspike.core.api.exclude.Exclude;
 import org.apache.deltaspike.core.api.interpreter.ExpressionInterpreter;
 import org.apache.deltaspike.core.api.projectstage.ProjectStage;
 import org.apache.deltaspike.core.api.util.ClassUtils;
 import org.apache.deltaspike.core.impl.interpreter.PropertyExpressionInterpreter;
-import org.apache.deltaspike.core.impl.projectstage.ProjectStageProducer;
 
 import javax.enterprise.event.Observes;
 import javax.enterprise.inject.spi.AfterDeploymentValidation;

deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/exclude/ExcludeTest.java

@@ -20,7 +20,7 @@
 
 
 import org.apache.deltaspike.core.api.provider.BeanProvider;
-import org.apache.deltaspike.core.impl.projectstage.ProjectStageProducer;
+import org.apache.deltaspike.core.api.projectstage.ProjectStageProducer;
 import org.apache.deltaspike.test.core.api.temptestutil.ShrinkWrapArchiveUtil;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;

deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/exclude/ExcludeTestProjectStageDevelopment.java

@@ -19,8 +19,8 @@
 package org.apache.deltaspike.test.core.api.exclude;
 
 
+import org.apache.deltaspike.core.api.projectstage.ProjectStageProducer;
 import org.apache.deltaspike.core.api.provider.BeanProvider;
-import org.apache.deltaspike.core.impl.projectstage.ProjectStageProducer;
 import org.apache.deltaspike.test.core.api.temptestutil.ShrinkWrapArchiveUtil;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;

deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/projectstage/ProjectStageProducerTest.java

@@ -19,7 +19,7 @@
 package org.apache.deltaspike.test.core.api.projectstage;
 
 import org.apache.deltaspike.core.api.projectstage.ProjectStage;
-import org.apache.deltaspike.core.impl.projectstage.ProjectStageProducer;
+import org.apache.deltaspike.core.api.projectstage.ProjectStageProducer;
 import org.junit.Assert;
 import org.junit.Test;
 

deltaspike/core/integration-test/src/test/java/org/apache/deltaspike/integration/core/api/exclude/ExcludeIntegrationTest.java

@@ -21,7 +21,7 @@
 
 import org.apache.deltaspike.core.api.projectstage.ProjectStage;
 import org.apache.deltaspike.core.api.provider.BeanProvider;
-import org.apache.deltaspike.core.impl.projectstage.ProjectStageProducer;
+import org.apache.deltaspike.core.api.projectstage.ProjectStageProducer;
 import org.apache.deltaspike.test.category.SeCategory;
 import org.apache.deltaspike.integration.core.api.projectstage.IntegrationTestProjectStageProducer;
 import org.apache.deltaspike.test.core.api.exclude.AlwaysActiveBean;

deltaspike/core/integration-test/src/test/java/org/apache/deltaspike/integration/core/api/projectstage/IntegrationTestProjectStageProducer.java

@@ -19,7 +19,7 @@
 package org.apache.deltaspike.integration.core.api.projectstage;
 
 import org.apache.deltaspike.core.api.projectstage.ProjectStage;
-import org.apache.deltaspike.core.impl.projectstage.ProjectStageProducer;
+import org.apache.deltaspike.core.api.projectstage.ProjectStageProducer;
 
 import javax.enterprise.inject.Typed;
 

deltaspike/core/integration-test/src/test/resources/META-INF/apache-deltaspike.properties

@@ -17,6 +17,6 @@
 
 deltaspike_ordinal=1001
 
-org.apache.deltaspike.core.impl.projectstage.ProjectStageProducer=org.apache.deltaspike.integration.core.api.projectstage.IntegrationTestProjectStageProducer
+org.apache.deltaspike.core.api.projectstage.ProjectStageProducer=org.apache.deltaspike.integration.core.api.projectstage.IntegrationTestProjectStageProducer
 db=itDb