Removed unnecessary beans.xml files, re-organize tests a bit

api/src/main/java/org/jboss/forge/furnace/container/cdi/package-info.java

@@ -0,0 +1,7 @@
+/*
+ * Copyright 2013 Red Hat, Inc. and/or its affiliates.
+ *
+ * Licensed under the Eclipse Public License version 1.0, available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
+package org.jboss.forge.furnace.container.cdi;

impl/src/main/java/org/jboss/forge/furnace/container/cdi/weld/ModuleScanResult.java

@@ -2,6 +2,7 @@
 
 import java.net.URL;
 import java.util.Collection;
+import java.util.Iterator;
 import java.util.List;
 
 import org.jboss.weld.resources.spi.ResourceLoader;
@@ -33,4 +34,30 @@ public ResourceLoader getResourceLoader()
    {
       return loader;
    }
+
+   @Override
+   public String toString()
+   {
+      StringBuilder result = new StringBuilder();
+      if (resourceUrls != null)
+      {
+         Iterator<URL> iterator = resourceUrls.iterator();
+         while (iterator.hasNext())
+         {
+            String url = iterator.next().toString();
+            result.append(url).append("\n");
+         }
+      }
+      if (classes != null)
+      {
+         result.append("\n");
+         Iterator<String> iterator = classes.iterator();
+         while (iterator.hasNext())
+         {
+            String type = iterator.next();
+            result.append(type).append("\n");
+         }
+      }
+      return result.toString();
+   }
 }

pom.xml

@@ -41,7 +41,7 @@
       <forge.developer.connection>scm:git:git@github.com:forge/furnace-cdi.git</forge.developer.connection>
       <forge.scm.url>http://github.com/forge/furnace-cdi</forge.scm.url>
       <version.cdi>1.1</version.cdi>
-      <version.furnace>2.0.0.Alpha8</version.furnace>
+      <version.furnace>2.0.0-SNAPSHOT</version.furnace>
       <version.jboss.spec>3.0.2.Final</version.jboss.spec>
       <version.slf4j>1.6.1</version.slf4j>
       <version.weld>2.0.2.Final</version.weld>

tests/src/main/java/org/example/event/EventPayload1.java → tests/src/main/java/test/org/jboss/forge/furnace/mocks/event/EventPayload1.java

@@ -1,4 +1,4 @@
-package org.example.event;
+package test.org.jboss.forge.furnace.mocks.event;
 
 import org.jboss.forge.furnace.services.Exported;
 

tests/src/main/java/test/org/jboss/forge/furnace/mocks/event/EventPayload2.java

@@ -0,0 +1,7 @@
+package test.org.jboss.forge.furnace.mocks.event;
+
+
+public class EventPayload2
+{
+
+}

tests/src/main/java/org/example/event/EventPayload3.java → tests/src/main/java/test/org/jboss/forge/furnace/mocks/event/EventPayload3.java

@@ -1,4 +1,4 @@
-package org.example.event;
+package test.org.jboss.forge.furnace.mocks.event;
 
 import org.jboss.forge.furnace.services.Exported;
 

tests/src/main/java/org/example/event/EventResponseService.java → tests/src/main/java/test/org/jboss/forge/furnace/mocks/event/EventResponseService.java

@@ -1,4 +1,4 @@
-package org.example.event;
+package test.org.jboss.forge.furnace.mocks.event;
 
 import javax.enterprise.event.Event;
 import javax.enterprise.event.Observes;

tests/src/main/java/org/example/event/EventService.java → tests/src/main/java/test/org/jboss/forge/furnace/mocks/event/EventService.java

@@ -1,4 +1,4 @@
-package org.example.event;
+package test.org.jboss.forge.furnace.mocks.event;
 
 import javax.enterprise.event.Event;
 import javax.enterprise.event.Observes;

tests/src/main/java/org/example/extension/TestExtension.java → tests/src/main/java/test/org/jboss/forge/furnace/mocks/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.extension;
+package test.org.jboss.forge.furnace.mocks.extension;
 
 import javax.enterprise.event.Observes;
 import javax.enterprise.inject.spi.Extension;

tests/src/main/java/org/example/ConsumingService.java → tests/src/main/java/test/org/jboss/forge/furnace/mocks/services/ConsumingService.java

@@ -1,4 +1,4 @@
-package org.example;
+package test.org.jboss.forge.furnace.mocks.services;
 
 import javax.inject.Inject;
 

tests/src/main/java/org/example/LifecycleListenerService.java → tests/src/main/java/test/org/jboss/forge/furnace/mocks/services/LifecycleListenerService.java

@@ -1,4 +1,4 @@
-package org.example;
+package test.org.jboss.forge.furnace.mocks.services;
 
 import java.io.IOException;
 

tests/src/main/java/org/example/NonService.java → tests/src/main/java/test/org/jboss/forge/furnace/mocks/services/NonService.java

@@ -1,4 +1,4 @@
-package org.example;
+package test.org.jboss.forge.furnace.mocks.services;
 
 import java.io.IOException;
 

tests/src/main/java/org/example/PublishedService.java → tests/src/main/java/test/org/jboss/forge/furnace/mocks/services/PublishedService.java

@@ -1,4 +1,4 @@
-package org.example;
+package test.org.jboss.forge.furnace.mocks.services;
 
 import javax.inject.Singleton;
 

tests/src/test/java/test/org/jboss/forge/furnace/dependencies/AddonCDIExtensionTest.java

@@ -3,7 +3,6 @@
 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.AddonDependency;
@@ -15,6 +14,8 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import test.org.jboss.forge.furnace.mocks.extension.TestExtension;
+
 /**
  * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a>
  */

tests/src/test/java/test/org/jboss/forge/furnace/dependencies/AddonDependencyInjectionTest.java

@@ -3,9 +3,6 @@
 import javax.enterprise.inject.spi.Extension;
 import javax.inject.Inject;
 
-import org.example.ConsumingService;
-import org.example.PublishedService;
-import org.example.extension.TestExtension;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.forge.arquillian.AddonDependency;
@@ -17,6 +14,10 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import test.org.jboss.forge.furnace.mocks.extension.TestExtension;
+import test.org.jboss.forge.furnace.mocks.services.ConsumingService;
+import test.org.jboss.forge.furnace.mocks.services.PublishedService;
+
 /**
  * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a>
  */

tests/src/test/java/test/org/jboss/forge/furnace/dependencies/AddonSelfInjectionExposedServiceTest.java

@@ -2,7 +2,6 @@
 
 import javax.inject.Inject;
 
-import org.example.PublishedService;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.forge.arquillian.AddonDependency;
@@ -14,6 +13,8 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import test.org.jboss.forge.furnace.mocks.services.PublishedService;
+
 /**
  * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a>
  */

tests/src/test/java/test/org/jboss/forge/furnace/dependencies/AddonSelfInjectionTest.java

@@ -2,7 +2,6 @@
 
 import javax.inject.Inject;
 
-import org.example.NonService;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.forge.arquillian.AddonDependency;
@@ -14,6 +13,8 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import test.org.jboss.forge.furnace.mocks.services.NonService;
+
 /**
  * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a>
  */

tests/src/test/java/test/org/jboss/forge/furnace/dependencies/ClassLoadingOnlyAddonTest.java

@@ -1,7 +1,5 @@
 package test.org.jboss.forge.furnace.dependencies;
 
-import org.example.NonService;
-import org.example.PublishedService;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.forge.arquillian.AddonDependency;
@@ -13,6 +11,9 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import test.org.jboss.forge.furnace.mocks.services.NonService;
+import test.org.jboss.forge.furnace.mocks.services.PublishedService;
+
 /**
  * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a>
  */

tests/src/test/java/test/org/jboss/forge/furnace/deployment/AddonMissingDelayedRequiredDependencyTest.java

@@ -2,7 +2,6 @@
 
 import javax.inject.Inject;
 
-import org.example.PublishedService;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.forge.arquillian.AddonDependency;
@@ -14,6 +13,8 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import test.org.jboss.forge.furnace.mocks.services.PublishedService;
+
 /**
  * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a>
  */

tests/src/test/java/test/org/jboss/forge/furnace/deployment/AddonMultipleDependencyVersionTest.java

@@ -2,8 +2,6 @@
 
 import javax.inject.Inject;
 
-import org.example.LifecycleListenerService;
-import org.example.PublishedService;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.forge.arquillian.AddonDependency;
@@ -19,6 +17,9 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import test.org.jboss.forge.furnace.mocks.services.LifecycleListenerService;
+import test.org.jboss.forge.furnace.mocks.services.PublishedService;
+
 /**
  * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a>
  */

tests/src/test/java/test/org/jboss/forge/furnace/dependencies/AddonEventPropagationNonRemoteTest.java → tests/src/test/java/test/org/jboss/forge/furnace/events/AddonEventPropagationNonRemoteTest.java

@@ -1,10 +1,7 @@
-package test.org.jboss.forge.furnace.dependencies;
+package test.org.jboss.forge.furnace.events;
 
 import javax.inject.Inject;
 
-import org.example.event.EventPayload2;
-import org.example.event.EventResponseService;
-import org.example.event.EventService;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.forge.arquillian.AddonDependency;
@@ -16,6 +13,10 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import test.org.jboss.forge.furnace.mocks.event.EventPayload2;
+import test.org.jboss.forge.furnace.mocks.event.EventResponseService;
+import test.org.jboss.forge.furnace.mocks.event.EventService;
+
 /**
  * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a>
  */

tests/src/test/java/test/org/jboss/forge/furnace/dependencies/AddonEventPropagationRemoteTest.java → tests/src/test/java/test/org/jboss/forge/furnace/events/AddonEventPropagationRemoteTest.java

@@ -1,11 +1,7 @@
-package test.org.jboss.forge.furnace.dependencies;
+package test.org.jboss.forge.furnace.events;
 
 import javax.inject.Inject;
 
-import org.example.event.EventPayload1;
-import org.example.event.EventPayload3;
-import org.example.event.EventResponseService;
-import org.example.event.EventService;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.forge.arquillian.AddonDependency;
@@ -17,6 +13,11 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import test.org.jboss.forge.furnace.mocks.event.EventPayload1;
+import test.org.jboss.forge.furnace.mocks.event.EventPayload3;
+import test.org.jboss.forge.furnace.mocks.event.EventResponseService;
+import test.org.jboss.forge.furnace.mocks.event.EventService;
+
 /**
  * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a>
  */

tests/src/test/java/test/org/jboss/forge/furnace/ContainerLifecycleEventObserver.java → tests/src/test/java/test/org/jboss/forge/furnace/events/ContainerLifecycleEventObserver.java

@@ -1,4 +1,4 @@
-package test.org.jboss.forge.furnace;
+package test.org.jboss.forge.furnace.events;
 
 import javax.enterprise.event.Observes;
 import javax.inject.Singleton;

tests/src/test/java/test/org/jboss/forge/furnace/ContainerLifecycleEventsTest.java → tests/src/test/java/test/org/jboss/forge/furnace/events/ContainerLifecycleEventsTest.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 test.org.jboss.forge.furnace;
+package test.org.jboss.forge.furnace.events;
 
 import javax.inject.Inject;
 import javax.xml.xpath.XPathFactory;

tests/src/test/java/test/org/jboss/forge/furnace/services/NullServiceRegistryLookupTest.java

@@ -3,9 +3,6 @@
 import javax.enterprise.inject.spi.Extension;
 import javax.inject.Inject;
 
-import org.example.ConsumingService;
-import org.example.PublishedService;
-import org.example.extension.TestExtension;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.forge.arquillian.AddonDependency;
@@ -20,6 +17,10 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import test.org.jboss.forge.furnace.mocks.extension.TestExtension;
+import test.org.jboss.forge.furnace.mocks.services.ConsumingService;
+import test.org.jboss.forge.furnace.mocks.services.PublishedService;
+
 /**
  * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a>
  */