Missing beans.xml was causing a lot of problems...

forge · Oct 26, 2012 · cffe248 · cffe248
1 parent 9c01781
commit cffe248
Show file tree

Hide file tree

Showing 79 changed files with 353 additions and 298 deletions.
diff --git a/...an-forge/classpath/src/main/java/org/jboss/forge/arquillian/ForgeDeployableContainer.java b/...an-forge/classpath/src/main/java/org/jboss/forge/arquillian/ForgeDeployableContainer.java
@@ -15,14 +15,14 @@
 import org.jboss.forge.arquillian.protocol.ServletProtocolDescription;
 import org.jboss.forge.arquillian.util.ShrinkWrapUtil;
 import org.jboss.forge.container.Addon;
+import org.jboss.forge.container.AddonEntry;
+import org.jboss.forge.container.AddonRegistry;
+import org.jboss.forge.container.AddonUtil;
+import org.jboss.forge.container.Bootstrap;
+import org.jboss.forge.container.Forge;
 import org.jboss.forge.container.Status;
-import org.jboss.forge.container.impl.AddonEntry;
-import org.jboss.forge.container.impl.AddonRegistry;
-import org.jboss.forge.container.impl.AddonUtil;
-import org.jboss.forge.container.impl.Bootstrap;
-import org.jboss.forge.container.impl.Forge;
-import org.jboss.forge.container.impl.util.Files;
-import org.jboss.forge.container.impl.util.Streams;
+import org.jboss.forge.container.util.Files;
+import org.jboss.forge.container.util.Streams;
 import org.jboss.shrinkwrap.api.Archive;
 import org.jboss.shrinkwrap.api.Node;
 import org.jboss.shrinkwrap.api.asset.Asset;

diff --git a/arquillian-forge/core/src/main/java/org/jboss/forge/arquillian/runner/ServletTestRunner.java b/arquillian-forge/core/src/main/java/org/jboss/forge/arquillian/runner/ServletTestRunner.java
@@ -33,7 +33,7 @@
 import org.jboss.arquillian.container.test.spi.util.TestRunners;
 import org.jboss.arquillian.test.spi.TestResult;
 import org.jboss.arquillian.test.spi.TestResult.Status;
-import org.jboss.forge.container.impl.util.SecurityActions;
+import org.jboss.forge.container.util.SecurityActions;
 
 /**
  * ServletTestRunner

diff --git a/arquillian-forge/core/src/main/java/org/jboss/forge/arquillian/util/ShrinkWrapUtil.java b/arquillian-forge/core/src/main/java/org/jboss/forge/arquillian/util/ShrinkWrapUtil.java
@@ -6,7 +6,7 @@
 import java.util.Map;
 import java.util.Map.Entry;
 
-import org.jboss.forge.container.impl.util.Streams;
+import org.jboss.forge.container.util.Streams;
 import org.jboss.shrinkwrap.api.Archive;
 import org.jboss.shrinkwrap.api.ArchivePath;
 import org.jboss.shrinkwrap.api.Filter;

diff --git a/...lian-forge/managed/src/main/java/org/jboss/forge/arquillian/ForgeDeployableContainer.java b/...lian-forge/managed/src/main/java/org/jboss/forge/arquillian/ForgeDeployableContainer.java
@@ -15,10 +15,10 @@
 import org.jboss.forge.arquillian.protocol.ServletProtocolDescription;
 import org.jboss.forge.arquillian.util.NativeSystemCall;
 import org.jboss.forge.arquillian.util.ShrinkWrapUtil;
-import org.jboss.forge.container.impl.AddonEntry;
-import org.jboss.forge.container.impl.AddonUtil;
-import org.jboss.forge.container.impl.util.Files;
-import org.jboss.forge.container.impl.util.Streams;
+import org.jboss.forge.container.AddonEntry;
+import org.jboss.forge.container.AddonUtil;
+import org.jboss.forge.container.util.Files;
+import org.jboss.forge.container.util.Streams;
 import org.jboss.shrinkwrap.api.Archive;
 import org.jboss.shrinkwrap.api.Node;
 import org.jboss.shrinkwrap.api.asset.Asset;
@@ -47,7 +47,7 @@ public void start() throws LifecycleException
       try
       {
          this.process = NativeSystemCall.exec("java", "-Dforge.logging=false -Dforge.home=" + FORGE_HOME,
-                  "-cp", FORGE_HOME + "/lib/*", "org.jboss.forge.container.impl.Bootstrap");
+                  "-cp", FORGE_HOME + "/lib/*", "org.jboss.forge.container.Bootstrap");
       }
       catch (Exception e)
       {

diff --git a/...llian-forge/remote/src/main/java/org/jboss/forge/arquillian/ForgeDeployableContainer.java b/...llian-forge/remote/src/main/java/org/jboss/forge/arquillian/ForgeDeployableContainer.java
@@ -15,10 +15,10 @@
 import org.jboss.forge.arquillian.protocol.ServletProtocolDescription;
 import org.jboss.forge.arquillian.util.NativeSystemCall;
 import org.jboss.forge.arquillian.util.ShrinkWrapUtil;
-import org.jboss.forge.container.impl.AddonEntry;
-import org.jboss.forge.container.impl.AddonUtil;
-import org.jboss.forge.container.impl.util.Files;
-import org.jboss.forge.container.impl.util.Streams;
+import org.jboss.forge.container.AddonEntry;
+import org.jboss.forge.container.AddonUtil;
+import org.jboss.forge.container.util.Files;
+import org.jboss.forge.container.util.Streams;
 import org.jboss.shrinkwrap.api.Archive;
 import org.jboss.shrinkwrap.api.Node;
 import org.jboss.shrinkwrap.api.asset.Asset;
@@ -47,7 +47,7 @@ public void start() throws LifecycleException
       try
       {
          this.process = NativeSystemCall.exec("java", "-Dforge.logging=false -Dforge.home=" + FORGE_HOME,
-                  "-cp", FORGE_HOME + "/lib/*", "org.jboss.forge.container.impl.Bootstrap");
+                  "-cp", FORGE_HOME + "/lib/*", "org.jboss.forge.container.Bootstrap");
       }
       catch (Exception e)
       {

diff --git a/...in/java/org/example/ConsumingService.java → ...g/example/consuming/ConsumingService.java b/...in/java/org/example/ConsumingService.java → ...g/example/consuming/ConsumingService.java
@@ -1,8 +1,9 @@
-package org.example;
+package org.example.consuming;
 
 import javax.enterprise.event.Observes;
 import javax.inject.Inject;
 
+import org.example.published.PublishedService;
 import org.jboss.forge.container.event.PostStartup;
 import org.jboss.forge.container.services.Remote;
 import org.jboss.forge.container.services.Service;

diff --git a/.../main/java/org/example/TestExtension.java → .../org/example/extension/TestExtension.java b/.../main/java/org/example/TestExtension.java → .../org/example/extension/TestExtension.java
@@ -4,7 +4,7 @@
  * Licensed under the Eclipse Public License version 1.0, available at
  * http://www.eclipse.org/legal/epl-v10.html
  */
-package org.example;
+package org.example.extension;
 
 import javax.enterprise.event.Observes;
 import javax.enterprise.inject.spi.Extension;

diff --git a/...in/java/org/example/PublishedService.java → ...g/example/published/PublishedService.java b/...in/java/org/example/PublishedService.java → ...g/example/published/PublishedService.java
@@ -1,4 +1,4 @@
-package org.example;
+package org.example.published;
 
 import javax.enterprise.event.Observes;
 import javax.inject.Singleton;

diff --git a/.../main/java/org/example/SimpleService.java → ...ava/org/example/simple/SimpleService.java b/.../main/java/org/example/SimpleService.java → ...ava/org/example/simple/SimpleService.java
@@ -1,4 +1,4 @@
-package org.example;
+package org.example.simple;
 
 import java.io.IOException;
 

diff --git a/forge-example-plugin/src/test/java/org/example/AddonDependencyTest.java b/forge-example-plugin/src/test/java/org/example/AddonDependencyTest.java
@@ -3,6 +3,10 @@
 import javax.enterprise.inject.spi.Extension;
 import javax.inject.Inject;
 
+import org.example.consuming.ConsumingService;
+import org.example.extension.TestExtension;
+import org.example.published.PublishedService;
+import org.example.simple.SimpleService;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.forge.arquillian.archive.ForgeArchive;

diff --git a/forge-example-plugin/src/test/java/org/example/CDIExtensionTest.java b/forge-example-plugin/src/test/java/org/example/CDIExtensionTest.java
@@ -3,6 +3,7 @@
 import javax.enterprise.inject.spi.Extension;
 import javax.inject.Inject;
 
+import org.example.extension.TestExtension;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.forge.arquillian.archive.ForgeArchive;

diff --git a/forge-example-plugin/src/test/java/org/example/SingleAddonTest.java b/forge-example-plugin/src/test/java/org/example/SingleAddonTest.java
@@ -2,6 +2,7 @@
 
 import javax.inject.Inject;
 
+import org.example.simple.SimpleService;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.forge.arquillian.archive.ForgeArchive;

diff --git a/forge-example-plugin/src/test/java/org/example/SinglePublishedAddonTest.java b/forge-example-plugin/src/test/java/org/example/SinglePublishedAddonTest.java
@@ -2,6 +2,7 @@
 
 import javax.inject.Inject;
 
+import org.example.published.PublishedService;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.forge.arquillian.archive.ForgeArchive;

diff --git a/plugin-container-api/src/main/java/org/jboss/forge/container/ContainerControl.java b/plugin-container-api/src/main/java/org/jboss/forge/container/ContainerControl.java
@@ -21,4 +21,11 @@ public interface ContainerControl
     * Restart the container.
     */
    void restart();
+
+   /**
+    * Get the {@link Status} of the container.
+    * 
+    * @return
+    */
+   Status getStatus();
 }
diff --git a/...boss/forge/container/impl/AddonEntry.java → ...org/jboss/forge/container/AddonEntry.java b/...boss/forge/container/impl/AddonEntry.java → ...org/jboss/forge/container/AddonEntry.java
@@ -1,9 +1,9 @@
-package org.jboss.forge.container.impl;
+package org.jboss.forge.container;
 
 import java.util.Arrays;
 import java.util.List;
 
-import org.jboss.forge.container.impl.util.Strings;
+import org.jboss.forge.container.util.Strings;
 
 public class AddonEntry
 {

diff --git a/...jboss/forge/container/impl/AddonImpl.java → .../org/jboss/forge/container/AddonImpl.java b/...jboss/forge/container/impl/AddonImpl.java → .../org/jboss/forge/container/AddonImpl.java
@@ -1,4 +1,4 @@
-package org.jboss.forge.container.impl;
+package org.jboss.forge.container;
 
 import org.jboss.forge.container.Addon;
 import org.jboss.forge.container.Status;

diff --git a/...s/forge/container/impl/AddonRegistry.java → .../jboss/forge/container/AddonRegistry.java b/...s/forge/container/impl/AddonRegistry.java → .../jboss/forge/container/AddonRegistry.java
@@ -1,5 +1,6 @@
-package org.jboss.forge.container.impl;
+package org.jboss.forge.container;
 
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
@@ -9,8 +10,8 @@
 import javax.inject.Singleton;
 
 import org.jboss.forge.container.Addon;
-import org.jboss.forge.container.impl.util.Sets;
 import org.jboss.forge.container.services.ServiceRegistry;
+import org.jboss.forge.container.util.Sets;
 
 @Typed()
 public class AddonRegistry
@@ -74,6 +75,6 @@ public String toString()
 
    public Set<Addon> getRegisteredAddons()
    {
-      return addons;
+      return Collections.unmodifiableSet(addons);
    }
 }
diff --git a/...s/forge/container/impl/AddonRunnable.java → .../jboss/forge/container/AddonRunnable.java b/...s/forge/container/impl/AddonRunnable.java → .../jboss/forge/container/AddonRunnable.java
@@ -1,18 +1,20 @@
-package org.jboss.forge.container.impl;
+package org.jboss.forge.container;
 
 import java.util.concurrent.Callable;
 
 import javax.enterprise.inject.spi.BeanManager;
 
+import org.jboss.forge.container.ContainerControl;
 import org.jboss.forge.container.Status;
-import org.jboss.forge.container.impl.event.ContainerShutdown;
-import org.jboss.forge.container.impl.event.ContainerStartup;
-import org.jboss.forge.container.impl.modules.ModularWeld;
-import org.jboss.forge.container.impl.modules.SilentTCCLSingletonProvider;
-import org.jboss.forge.container.impl.util.Assert;
-import org.jboss.forge.container.impl.util.BeanManagerUtils;
-import org.jboss.forge.container.impl.util.ClassLoaders;
+import org.jboss.forge.container.event.ContainerShutdown;
+import org.jboss.forge.container.event.ContainerStartup;
+import org.jboss.forge.container.exception.ContainerException;
+import org.jboss.forge.container.modules.ModularWeld;
+import org.jboss.forge.container.modules.SilentTCCLSingletonProvider;
 import org.jboss.forge.container.services.ServiceRegistry;
+import org.jboss.forge.container.util.Assert;
+import org.jboss.forge.container.util.BeanManagerUtils;
+import org.jboss.forge.container.util.ClassLoaders;
 import org.jboss.modules.Module;
 import org.jboss.weld.bootstrap.api.SingletonProvider;
 import org.jboss.weld.environment.se.Weld;
@@ -21,13 +23,13 @@
 public final class AddonRunnable implements Runnable
 {
    private AddonImpl addon;
-   private AddonRegistry globalRegistry;
+   private AddonRegistry addonRegistry;
    private boolean shutdown = false;
 
    public AddonRunnable(AddonImpl addon, AddonRegistry registry)
    {
       this.addon = addon;
-      this.globalRegistry = registry;
+      this.addonRegistry = registry;
    }
 
    public void shutdown()
@@ -56,10 +58,18 @@ public Object call() throws Exception
                BeanManager manager = container.getBeanManager();
                Assert.notNull(manager, "BeanManager was null");
 
-               globalRegistry.register(addon);
+               addonRegistry.register(addon);
                addon.setStatus(Status.STARTING);
 
                manager.fireEvent(new ContainerStartup());
+
+               ContainerControl control = BeanManagerUtils.getContextualInstance(manager, ContainerControl.class);
+               Assert.notNull(control, "Container control was null.");
+
+               if (!Status.STARTED.equals(control.getStatus()))
+               {
+                  throw new ContainerException("Container failed to start.");
+               }
 
                ServiceRegistry registry = BeanManagerUtils.getContextualInstance(manager, ServiceRegistry.class);
                Assert.notNull(registry, "Service registry was null.");
@@ -77,7 +87,7 @@ public Object call() throws Exception
 
                addon.setStatus(Status.STOPPING);
 
-               globalRegistry.remove(addon);
+               addonRegistry.remove(addon);
                manager.fireEvent(new ContainerShutdown());
                weld.shutdown();
 

diff --git a/...oss/forge/container/impl/AddonThread.java → ...rg/jboss/forge/container/AddonThread.java b/...oss/forge/container/impl/AddonThread.java → ...rg/jboss/forge/container/AddonThread.java
@@ -1,4 +1,4 @@
-package org.jboss.forge.container.impl;
+package org.jboss.forge.container;
 
 
 /**

diff --git a/...jboss/forge/container/impl/AddonUtil.java → .../org/jboss/forge/container/AddonUtil.java b/...jboss/forge/container/impl/AddonUtil.java → .../org/jboss/forge/container/AddonUtil.java
@@ -4,7 +4,7 @@
  * Licensed under the Eclipse Public License version 1.0, available at
  * http://www.eclipse.org/legal/epl-v10.html
  */
-package org.jboss.forge.container.impl;
+package org.jboss.forge.container;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -17,10 +17,10 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.jboss.forge.container.impl.util.Assert;
-import org.jboss.forge.container.impl.util.OSUtils;
-import org.jboss.forge.container.impl.util.Streams;
-import org.jboss.forge.container.impl.util.Strings;
+import org.jboss.forge.container.util.Assert;
+import org.jboss.forge.container.util.OSUtils;
+import org.jboss.forge.container.util.Streams;
+import org.jboss.forge.container.util.Strings;
 import org.jboss.forge.parser.xml.Node;
 import org.jboss.forge.parser.xml.XMLParser;
 import org.jboss.forge.parser.xml.XMLParserException;

diff --git a/.../forge/container/impl/BeanRegistrant.java → ...jboss/forge/container/BeanRegistrant.java b/.../forge/container/impl/BeanRegistrant.java → ...jboss/forge/container/BeanRegistrant.java
@@ -1,4 +1,4 @@
-package org.jboss.forge.container.impl;
+package org.jboss.forge.container;
 
 import javax.enterprise.event.Observes;
 import javax.enterprise.inject.spi.BeanManager;

diff --git a/...jboss/forge/container/impl/Bootstrap.java → .../org/jboss/forge/container/Bootstrap.java b/...jboss/forge/container/impl/Bootstrap.java → .../org/jboss/forge/container/Bootstrap.java
@@ -4,7 +4,7 @@
  * Licensed under the Eclipse Public License version 1.0, available at
  * http://www.eclipse.org/legal/epl-v10.html
  */
-package org.jboss.forge.container.impl;
+package org.jboss.forge.container;
 
 /**
  * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a>

diff --git a/.../container/impl/ContainerControlImpl.java → ...forge/container/ContainerControlImpl.java b/.../container/impl/ContainerControlImpl.java → ...forge/container/ContainerControlImpl.java
@@ -4,7 +4,7 @@
  * Licensed under the Eclipse Public License version 1.0, available at
  * http://www.eclipse.org/legal/epl-v10.html
  */
-package org.jboss.forge.container.impl;
+package org.jboss.forge.container;
 
 import javax.enterprise.event.Observes;
 import javax.enterprise.inject.spi.BeanManager;
@@ -13,13 +13,13 @@
 
 import org.jboss.forge.container.ContainerControl;
 import org.jboss.forge.container.Status;
+import org.jboss.forge.container.event.ContainerRestart;
+import org.jboss.forge.container.event.ContainerShutdown;
+import org.jboss.forge.container.event.ContainerStartup;
 import org.jboss.forge.container.event.PostStartup;
 import org.jboss.forge.container.event.PreShutdown;
 import org.jboss.forge.container.event.Shutdown;
 import org.jboss.forge.container.event.Startup;
-import org.jboss.forge.container.impl.event.ContainerRestart;
-import org.jboss.forge.container.impl.event.ContainerShutdown;
-import org.jboss.forge.container.impl.event.ContainerStartup;
 
 /**
  * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a>

diff --git a/...org/jboss/forge/container/impl/Forge.java → ...java/org/jboss/forge/container/Forge.java b/...org/jboss/forge/container/impl/Forge.java → ...java/org/jboss/forge/container/Forge.java
@@ -1,5 +1,6 @@
-package org.jboss.forge.container.impl;
+package org.jboss.forge.container;
 
+import java.lang.reflect.Method;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -8,13 +9,14 @@
 import java.util.logging.Logger;
 
 import org.jboss.forge.container.Addon;
-import org.jboss.forge.container.impl.exception.ContainerException;
-import org.jboss.forge.container.impl.modules.AddonModuleLoader;
-import org.jboss.forge.container.impl.util.Sets;
+import org.jboss.forge.container.exception.ContainerException;
+import org.jboss.forge.container.modules.AddonModuleLoader;
+import org.jboss.forge.container.util.Sets;
 import org.jboss.modules.Module;
 import org.jboss.modules.ModuleIdentifier;
 import org.jboss.modules.ModuleLoadException;
 import org.jboss.modules.ModuleLoader;
+import org.jboss.modules.log.StreamModuleLogger;
 
 public final class Forge
 {
@@ -36,6 +38,17 @@ public final class Forge
 
       // Module.setModuleLogger(new StreamModuleLogger(System.err));
 
+      try
+      {
+         Method method = ModuleLoader.class.getDeclaredMethod("installMBeanServer");
+         method.setAccessible(true);
+         method.invoke(null);
+      }
+      catch (Exception e)
+      {
+         throw new ContainerException("Could not install Modules MBean server", e);
+      }
+
       // if (LOGGING_ENABLED)
       // initLogging();
    }