ARQ-196 Change to expose Deployment related state in DeploymentContext

arquillian · Feb 21, 2011 · b72401a · b72401a
1 parent 4580ef2
commit b72401a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/...ed-1/src/main/java/org/jboss/arquillian/container/weld/se/embedded_1/WeldSEContainer.java b/...ed-1/src/main/java/org/jboss/arquillian/container/weld/se/embedded_1/WeldSEContainer.java
@@ -26,7 +26,7 @@
 import org.jboss.arquillian.spi.client.protocol.ProtocolDescription;
 import org.jboss.arquillian.spi.client.protocol.metadata.ProtocolMetaData;
 import org.jboss.arquillian.spi.core.InstanceProducer;
-import org.jboss.arquillian.spi.core.annotation.ClassScoped;
+import org.jboss.arquillian.spi.core.annotation.DeploymentScoped;
 import org.jboss.arquillian.spi.core.annotation.Inject;
 import org.jboss.shrinkwrap.api.Archive;
 import org.jboss.shrinkwrap.descriptor.api.Descriptor;
@@ -45,14 +45,13 @@
  */
 public class WeldSEContainer implements DeployableContainer<WeldSEConfiguration>
 {
-   // TODO: these should be DeploymentScoped, but TestEnrich is currently happening outside a DeploymentScope.
+   @Inject @DeploymentScoped
-   @Inject @ClassScoped // @DeploymentScoped
    private InstanceProducer<ContextClassLoaderManager> classLoaderManagerProducer;
 
-   @Inject @ClassScoped // @DeploymentScoped
+   @Inject @DeploymentScoped
    private InstanceProducer<WeldManager> weldManagerProducer;
 
-   @Inject @ClassScoped // @DeploymentScoped
+   @Inject @DeploymentScoped
    private InstanceProducer<WeldBootstrap> weldBootstrapProducer;
 
    public ProtocolDescription getDefaultProtocol()

diff --git a/...va/org/jboss/arquillian/container/weld/se/embedded_1/WeldEmbeddedIntegrationTestCase.java b/...va/org/jboss/arquillian/container/weld/se/embedded_1/WeldEmbeddedIntegrationTestCase.java
@@ -26,6 +26,7 @@
 import org.jboss.shrinkwrap.api.ArchivePaths;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.asset.ByteArrayAsset;
+import org.jboss.shrinkwrap.api.asset.EmptyAsset;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -47,7 +48,7 @@ public static JavaArchive createdeployment()
                         WeldEmbeddedIntegrationTestCase.class,
                         MyBean.class)
                   .addManifestResource(
-                        new ByteArrayAsset("<beans/>".getBytes()), ArchivePaths.create("beans.xml"));
+                        EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml"));
    }
 
    @Inject