Revert "CDI-626 How should CDI.current() and CDI.getBeanManager() behave for non-CDI apps?"

Author: antoinesd

api/src/main/java/javax/enterprise/inject/spi/CDI.java

@@ -44,7 +44,7 @@ public abstract class CDI<T> implements Instance<T> {
      * access the container is used.
      * </p>
      * 
-     * @throws IllegalStateException if no {@link CDIProvider} is available
+     * @throws IllegalStateException if no CDI provider is available
      * 
      */
     public static CDI<Object> current() {
@@ -55,7 +55,7 @@ public static CDI<Object> current() {
      *
      * @return the {@link CDIProvider} retrieved by serviceloader or setted by user
      */
-    private static CDIProvider getCDIProvider() {
+    public static CDIProvider getCDIProvider() {
         if (configuredProvider != null) {
             return configuredProvider;
         } else {

api/src/main/java/javax/enterprise/inject/spi/CDIProvider.java

@@ -29,7 +29,6 @@ public interface CDIProvider {
      * Provides access to the current container
      * 
      * @return the CDI instance for the current container
-     * @throws IllegalStateException if no CDI container is available
      */
     CDI<Object> getCDI();
 

spec/src/main/asciidoc/core/spi.asciidoc

@@ -235,8 +235,7 @@ public abstract class CDI<T> implements Instance<T> {
 }
 ----
 
-A portable extension or other object may obtain a reference to the current container by calling `CDI.current()`.
-`CDI.getBeanManager()` may be called at any time after the container fires the `BeforeBeanDiscovery` container lifecycle event until the container fires the `BeforeShutdown` container lifecycle event.
+A portable extension or other object may obtain a reference to the current container by calling `CDI.current()`. `CDI.getBeanManager()` may be called at any time after the container fires the `BeforeBeanDiscovery` container lifecycle event until the container fires the `BeforeShutdown` container lifecycle event.
 Other methods on `CDI` may be called after the application initialization is completed until the application shutdown starts.
 If methods on `CDI` are called at any other time, non-portable behavior results.