Arquillian - Seam3 - Drools - TestRun - Patch

Index: impl/src/test/java/org/jboss/seam/drools/test/cep/CEPTest.java
===================================================================
--- impl/src/test/java/org/jboss/seam/drools/test/cep/CEPTest.java  (revision 12771)
+++ impl/src/test/java/org/jboss/seam/drools/test/cep/CEPTest.java  (working copy)
@@ -52,17 +52,17 @@
    @Deployment
    public static JavaArchive createTestArchive()
    {
-      String pkgPath = CEPTest.class.getPackage().getName().replaceAll("\\.", "/");
+      Package pkgPath = CEPTest.class.getPackage();
       JavaArchive archive = ShrinkWrap.create("test.jar", JavaArchive.class)
       .addPackages(true, new DroolsModuleFilter("cep"), KnowledgeBaseProducer.class.getPackage())
       .addPackages(true, ResourceProvider.class.getPackage())
       .addClass(FireAlarm.class)
       .addClass(FireDetected.class)
       .addClass(SprinklerActivated.class)
-      .addResource(pkgPath + "/ceptest.drl", ArchivePaths.create("ceptest.drl"))
+      .addResource(pkgPath, "ceptest.drl", ArchivePaths.create("ceptest.drl"))
       //.addResource(pkgPath + "/kbuilderconfig.properties", ArchivePaths.create("kbuilderconfig.properties"))
       //.addResource(pkgPath + "/kbaseconfig.properties", ArchivePaths.create("kbaseconfig.properties"))
-      .addManifestResource(pkgPath + "/CEPTest-beans.xml", ArchivePaths.create("beans.xml"));
+      .addManifestResource(pkgPath, "CEPTest-beans.xml", ArchivePaths.create("beans.xml"));
       //System.out.println(archive.toString(Formatters.VERBOSE));
       return archive;
    }
Index: impl/src/test/java/org/jboss/seam/drools/test/delegate/DelegateTest.java
===================================================================
--- impl/src/test/java/org/jboss/seam/drools/test/delegate/DelegateTest.java    (revision 12771)
+++ impl/src/test/java/org/jboss/seam/drools/test/delegate/DelegateTest.java    (working copy)
@@ -23,10 +23,9 @@

 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertNotSame;

 import javax.enterprise.inject.Default;
+import javax.inject.Inject;

 import org.drools.runtime.StatefulKnowledgeSession;
 import org.jboss.arquillian.api.Deployment;
@@ -60,8 +59,14 @@
       return archive;
    }

+   @Inject
+   DelegateBean delegateBean;
+
+   @Inject
+   @Default @DefaultConfig StatefulKnowledgeSession ksession;
+
    @Test
-   public void testDelegate(DelegateBean delegateBean, @Default @DefaultConfig StatefulKnowledgeSession ksession) {
+   public void testDelegate() {
       assertNotNull(ksession);
       assertNotNull(delegateBean);
       ksession.fireAllRules();
Index: impl/src/main/java/org/jboss/seam/drools/KnowledgeBaseProducer.java
===================================================================
--- impl/src/main/java/org/jboss/seam/drools/KnowledgeBaseProducer.java (revision 12771)
+++ impl/src/main/java/org/jboss/seam/drools/KnowledgeBaseProducer.java (working copy)
@@ -30,6 +30,7 @@
 import javax.enterprise.context.ApplicationScoped;
 import javax.enterprise.inject.Produces;
 import javax.enterprise.inject.spi.BeanManager;
+import javax.enterprise.inject.Default;
 import javax.inject.Inject;

 import org.drools.KnowledgeBase;
@@ -70,6 +71,7 @@
    DroolsExtension droolsExtension;

    @Produces
+   @Default
    @ApplicationScoped
    public KnowledgeBase produceKnowledgeBase(DroolsConfig config) throws Exception
    {
Index: impl/src/main/java/org/jboss/seam/drools/ExecutionResultsProducer.java
===================================================================
--- impl/src/main/java/org/jboss/seam/drools/ExecutionResultsProducer.java  (revision 12771)
+++ impl/src/main/java/org/jboss/seam/drools/ExecutionResultsProducer.java  (working copy)
@@ -29,6 +29,7 @@

 import javax.enterprise.context.RequestScoped;
 import javax.enterprise.context.SessionScoped;
+import javax.enterprise.inject.Default;
 import javax.enterprise.inject.Produces;
 import javax.enterprise.inject.spi.BeanManager;
 import javax.inject.Inject;
@@ -73,6 +74,7 @@
    @SuppressWarnings("unchecked")
    @Produces
    @Stateless
+   @Default
    @RequestScoped
    public ExecutionResults produceStatelessExecutionResults(StatelessKnowledgeSession ksession) {
       return ksession.execute(CommandFactory.newBatchExecution(getCommandList()));
@@ -89,6 +91,7 @@

    @Produces
    @Stateful
+   @Default
    @RequestScoped
    public ExecutionResults produceStateFulExecutionResults(StatefulKnowledgeSession ksession) {
       ResultHandlerImpl resultsHandler = new ResultHandlerImpl();