[jboss-svn-commits] JBoss Common SVN: r4607 - in arquillian/trunk/containers/weld-embedded: src/main/java/org/jboss/arquillian and 12 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Jun 29 11:05:53 EDT 2010
Author: aslak
Date: 2010-06-29 11:05:52 -0400 (Tue, 29 Jun 2010)
New Revision: 4607
Added:
arquillian/trunk/containers/weld-embedded/src/main/java/org/jboss/arquillian/container/
arquillian/trunk/containers/weld-embedded/src/main/java/org/jboss/arquillian/container/weld/
arquillian/trunk/containers/weld-embedded/src/main/java/org/jboss/arquillian/container/weld/se/
arquillian/trunk/containers/weld-embedded/src/main/java/org/jboss/arquillian/container/weld/se/embedded_1/
arquillian/trunk/containers/weld-embedded/src/main/java/org/jboss/arquillian/container/weld/se/embedded_1/RequestLifeCycleController.java
arquillian/trunk/containers/weld-embedded/src/main/java/org/jboss/arquillian/container/weld/se/embedded_1/SessionLifeCycleController.java
arquillian/trunk/containers/weld-embedded/src/main/java/org/jboss/arquillian/container/weld/se/embedded_1/WeldSEConfiguration.java
arquillian/trunk/containers/weld-embedded/src/main/java/org/jboss/arquillian/container/weld/se/embedded_1/WeldSEContainer.java
arquillian/trunk/containers/weld-embedded/src/main/java/org/jboss/arquillian/container/weld/se/embedded_1/WeldSETestEnricher.java
arquillian/trunk/containers/weld-embedded/src/main/java/org/jboss/arquillian/container/weld/se/embedded_1/shrinkwrap/
arquillian/trunk/containers/weld-embedded/src/test/java/org/jboss/arquillian/container/
arquillian/trunk/containers/weld-embedded/src/test/java/org/jboss/arquillian/container/weld/
arquillian/trunk/containers/weld-embedded/src/test/java/org/jboss/arquillian/container/weld/se/
arquillian/trunk/containers/weld-embedded/src/test/java/org/jboss/arquillian/container/weld/se/embedded_1/
arquillian/trunk/containers/weld-embedded/src/test/java/org/jboss/arquillian/container/weld/se/embedded_1/WeldEmbeddedIntegrationTestCase.java
arquillian/trunk/containers/weld-embedded/src/test/java/org/jboss/arquillian/container/weld/se/embedded_1/beans/
Removed:
arquillian/trunk/containers/weld-embedded/src/main/java/org/jboss/arquillian/weld/
arquillian/trunk/containers/weld-embedded/src/test/java/org/jboss/arquillian/weld/
Modified:
arquillian/trunk/containers/weld-embedded/pom.xml
arquillian/trunk/containers/weld-embedded/src/main/java/org/jboss/arquillian/container/weld/se/embedded_1/shrinkwrap/ShrinkWrapClassLoader.java
arquillian/trunk/containers/weld-embedded/src/main/java/org/jboss/arquillian/container/weld/se/embedded_1/shrinkwrap/ShrinkwrapBeanDeploymentArchive.java
arquillian/trunk/containers/weld-embedded/src/main/java/org/jboss/arquillian/container/weld/se/embedded_1/shrinkwrap/ShrinkwrapBeanDeploymentArchiveImpl.java
arquillian/trunk/containers/weld-embedded/src/main/resources/META-INF/services/org.jboss.arquillian.spi.ContainerConfiguration
arquillian/trunk/containers/weld-embedded/src/main/resources/META-INF/services/org.jboss.arquillian.spi.DeployableContainer
arquillian/trunk/containers/weld-embedded/src/main/resources/META-INF/services/org.jboss.arquillian.spi.TestEnricher
arquillian/trunk/containers/weld-embedded/src/main/resources/META-INF/services/org.jboss.arquillian.weld.shrinkwrap.ShrinkwrapBeanDeploymentArchive
arquillian/trunk/containers/weld-embedded/src/test/java/org/jboss/arquillian/container/weld/se/embedded_1/beans/MyBean.java
Log:
ARQ-200 ARQ-202 Renamed Weld SE 1 Embedded Container package
Modified: arquillian/trunk/containers/weld-embedded/pom.xml
===================================================================
--- arquillian/trunk/containers/weld-embedded/pom.xml 2010-06-29 13:52:08 UTC (rev 4606)
+++ arquillian/trunk/containers/weld-embedded/pom.xml 2010-06-29 15:05:52 UTC (rev 4607)
@@ -15,9 +15,9 @@
<!-- Artifact Configuration -->
<groupId>org.jboss.arquillian.container</groupId>
- <artifactId>arquillian-weld-embedded</artifactId>
- <name>Arquillian Container Weld Embedded</name>
- <description>Weld Embedded Container integration for the Arquillian Project</description>
+ <artifactId>arquillian-weld-se-embedded-1</artifactId>
+ <name>Arquillian Container Weld SE Embedded 1.x</name>
+ <description>Weld SE 1.x Embedded Container integration for the Arquillian Project</description>
<!-- Properties -->
Copied: arquillian/trunk/containers/weld-embedded/src/main/java/org/jboss/arquillian/container/weld/se/embedded_1/RequestLifeCycleController.java (from rev 4586, arquillian/trunk/containers/weld-embedded/src/main/java/org/jboss/arquillian/weld/RequestLifeCycleController.java)
===================================================================
--- arquillian/trunk/containers/weld-embedded/src/main/java/org/jboss/arquillian/container/weld/se/embedded_1/RequestLifeCycleController.java (rev 0)
+++ arquillian/trunk/containers/weld-embedded/src/main/java/org/jboss/arquillian/container/weld/se/embedded_1/RequestLifeCycleController.java 2010-06-29 15:05:52 UTC (rev 4607)
@@ -0,0 +1,94 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jboss.arquillian.container.weld.se.embedded_1;
+
+import java.util.UUID;
+
+import org.jboss.arquillian.spi.Context;
+import org.jboss.arquillian.spi.event.Event;
+import org.jboss.arquillian.spi.event.suite.EventHandler;
+import org.jboss.weld.context.ContextLifecycle;
+import org.jboss.weld.context.api.BeanStore;
+import org.jboss.weld.context.api.helpers.ConcurrentHashMapBeanStore;
+import org.jboss.weld.manager.api.WeldManager;
+
+/**
+ * SessionLifeCycleController
+ *
+ * @author <a href="mailto:aknutsen at redhat.com">Aslak Knutsen</a>
+ * @version $Revision: $
+ */
+public class RequestLifeCycleController implements EventHandler<Event>
+{
+ private Class<? extends Event> endRequestEvent;
+
+ public RequestLifeCycleController(Class<? extends Event> endRequestEvent)
+ {
+ if(endRequestEvent == null)
+ {
+ throw new IllegalArgumentException("EndSessionEvent must be specified");
+ }
+ this.endRequestEvent = endRequestEvent;
+ }
+
+ /* (non-Javadoc)
+ * @see org.jboss.arquillian.spi.EventHandler#callback(org.jboss.arquillian.spi.Context, java.lang.Object)
+ */
+ public void callback(Context context, Event event) throws Exception
+ {
+ WeldManager manager = context.get(WeldManager.class);
+ if(manager == null)
+ {
+ throw new IllegalStateException("No " + WeldManager.class.getName() + " found in context");
+ }
+ ContextLifecycle lifeCycle = manager.getServices().get(ContextLifecycle.class);
+
+ String requestId = UUID.randomUUID().toString();
+ BeanStore beanStore = new ConcurrentHashMapBeanStore();
+
+ lifeCycle.beginRequest(requestId, beanStore);
+
+ context.register(endRequestEvent, new DestoryRequest(requestId, beanStore));
+ }
+
+ /**
+ * DestorySession
+ *
+ * @author <a href="mailto:aknutsen at redhat.org">Aslak Knutsen</a>
+ * @version $Revision: $
+ */
+ private static class DestoryRequest implements EventHandler<Event> {
+
+ private String requestId;
+ private BeanStore beanStore;
+
+ public DestoryRequest(String requestId, BeanStore beanStore)
+ {
+ this.requestId = requestId;
+ this.beanStore = beanStore;
+ }
+
+ /* (non-Javadoc)
+ * @see org.jboss.arquillian.spi.event.EventHandler#callback(org.jboss.arquillian.spi.Context, java.lang.Object)
+ */
+ public void callback(Context context, Event event) throws Exception
+ {
+ WeldManager manager = context.get(WeldManager.class);
+ manager.getServices().get(ContextLifecycle.class).endRequest(requestId, beanStore);
+ }
+ }
+}
Copied: arquillian/trunk/containers/weld-embedded/src/main/java/org/jboss/arquillian/container/weld/se/embedded_1/SessionLifeCycleController.java (from rev 4586, arquillian/trunk/containers/weld-embedded/src/main/java/org/jboss/arquillian/weld/SessionLifeCycleController.java)
===================================================================
--- arquillian/trunk/containers/weld-embedded/src/main/java/org/jboss/arquillian/container/weld/se/embedded_1/SessionLifeCycleController.java (rev 0)
+++ arquillian/trunk/containers/weld-embedded/src/main/java/org/jboss/arquillian/container/weld/se/embedded_1/SessionLifeCycleController.java 2010-06-29 15:05:52 UTC (rev 4607)
@@ -0,0 +1,93 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jboss.arquillian.container.weld.se.embedded_1;
+
+import java.util.UUID;
+
+import org.jboss.arquillian.spi.Context;
+import org.jboss.arquillian.spi.event.Event;
+import org.jboss.arquillian.spi.event.suite.EventHandler;
+import org.jboss.weld.context.ContextLifecycle;
+import org.jboss.weld.context.api.BeanStore;
+import org.jboss.weld.context.api.helpers.ConcurrentHashMapBeanStore;
+import org.jboss.weld.manager.api.WeldManager;
+
+/**
+ * SessionLifeCycleController
+ *
+ * @author <a href="mailto:aknutsen at redhat.com">Aslak Knutsen</a>
+ * @version $Revision: $
+ */
+public class SessionLifeCycleController implements EventHandler<Event>
+{
+ private Class<? extends Event> endSessionEvent;
+
+ public SessionLifeCycleController(Class<? extends Event> endSessionEvent)
+ {
+ if(endSessionEvent == null)
+ {
+ throw new IllegalArgumentException("EndSessionEvent must be specified");
+ }
+ this.endSessionEvent = endSessionEvent;
+ }
+
+ /* (non-Javadoc)
+ * @see org.jboss.arquillian.spi.EventHandler#callback(org.jboss.arquillian.spi.Context, java.lang.Object)
+ */
+ public void callback(Context context, Event event) throws Exception
+ {
+ WeldManager manager = context.get(WeldManager.class);
+ if(manager == null)
+ {
+ throw new IllegalStateException("No " + WeldManager.class.getName() + " found in context");
+ }
+ ContextLifecycle lifeCycle = manager.getServices().get(ContextLifecycle.class);
+
+ String sessionId = UUID.randomUUID().toString();
+ BeanStore beanStore = new ConcurrentHashMapBeanStore();
+
+ lifeCycle.restoreSession(sessionId, beanStore);
+ context.register(endSessionEvent, new DestorySession(sessionId, beanStore));
+ }
+
+ /**
+ * DestorySession
+ *
+ * @author <a href="mailto:aknutsen at redhat.org">Aslak Knutsen</a>
+ * @version $Revision: $
+ */
+ private static class DestorySession implements EventHandler<Event> {
+
+ private String sessionId;
+ private BeanStore beanStore;
+
+ public DestorySession(String sessionId, BeanStore beanStore)
+ {
+ this.sessionId = sessionId;
+ this.beanStore = beanStore;
+ }
+
+ /* (non-Javadoc)
+ * @see org.jboss.arquillian.spi.event.EventHandler#callback(org.jboss.arquillian.spi.Context, java.lang.Object)
+ */
+ public void callback(Context context, Event event) throws Exception
+ {
+ WeldManager manager = context.get(WeldManager.class);
+ manager.getServices().get(ContextLifecycle.class).endSession(sessionId, beanStore);
+ }
+ }
+}
Copied: arquillian/trunk/containers/weld-embedded/src/main/java/org/jboss/arquillian/container/weld/se/embedded_1/WeldSEConfiguration.java (from rev 4586, arquillian/trunk/containers/weld-embedded/src/main/java/org/jboss/arquillian/weld/WeldSEConfiguration.java)
===================================================================
--- arquillian/trunk/containers/weld-embedded/src/main/java/org/jboss/arquillian/container/weld/se/embedded_1/WeldSEConfiguration.java (rev 0)
+++ arquillian/trunk/containers/weld-embedded/src/main/java/org/jboss/arquillian/container/weld/se/embedded_1/WeldSEConfiguration.java 2010-06-29 15:05:52 UTC (rev 4607)
@@ -0,0 +1,36 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jboss.arquillian.container.weld.se.embedded_1;
+
+import org.jboss.arquillian.spi.ContainerConfiguration;
+import org.jboss.arquillian.spi.ContainerProfile;
+
+/**
+ * WeldSEConfiguration
+ *
+ * @author <a href="mailto:aknutsen at redhat.com">Aslak Knutsen</a>
+ * @version $Revision: $
+ */
+public class WeldSEConfiguration implements ContainerConfiguration
+{
+
+ public ContainerProfile getContainerProfile()
+ {
+ return ContainerProfile.STANDALONE;
+ }
+
+}
Copied: arquillian/trunk/containers/weld-embedded/src/main/java/org/jboss/arquillian/container/weld/se/embedded_1/WeldSEContainer.java (from rev 4586, arquillian/trunk/containers/weld-embedded/src/main/java/org/jboss/arquillian/weld/WeldSEContainer.java)
===================================================================
--- arquillian/trunk/containers/weld-embedded/src/main/java/org/jboss/arquillian/container/weld/se/embedded_1/WeldSEContainer.java (rev 0)
+++ arquillian/trunk/containers/weld-embedded/src/main/java/org/jboss/arquillian/container/weld/se/embedded_1/WeldSEContainer.java 2010-06-29 15:05:52 UTC (rev 4607)
@@ -0,0 +1,142 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jboss.arquillian.container.weld.se.embedded_1;
+
+import java.util.Arrays;
+import java.util.Collection;
+
+import org.jboss.arquillian.container.weld.se.embedded_1.shrinkwrap.ShrinkWrapClassLoader;
+import org.jboss.arquillian.container.weld.se.embedded_1.shrinkwrap.ShrinkwrapBeanDeploymentArchive;
+import org.jboss.arquillian.protocol.local.LocalMethodExecutor;
+import org.jboss.arquillian.spi.Configuration;
+import org.jboss.arquillian.spi.ContainerMethodExecutor;
+import org.jboss.arquillian.spi.Context;
+import org.jboss.arquillian.spi.DeployableContainer;
+import org.jboss.arquillian.spi.DeploymentException;
+import org.jboss.arquillian.spi.LifecycleException;
+import org.jboss.arquillian.spi.event.container.BeforeUnDeploy;
+import org.jboss.arquillian.spi.event.suite.After;
+import org.jboss.arquillian.spi.event.suite.Before;
+import org.jboss.arquillian.spi.event.suite.BeforeClass;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.weld.bootstrap.WeldBootstrap;
+import org.jboss.weld.bootstrap.api.Environments;
+import org.jboss.weld.bootstrap.api.ServiceRegistry;
+import org.jboss.weld.bootstrap.spi.BeanDeploymentArchive;
+import org.jboss.weld.bootstrap.spi.Deployment;
+import org.jboss.weld.context.api.helpers.ConcurrentHashMapBeanStore;
+import org.jboss.weld.manager.api.WeldManager;
+
+/**
+ * WeldSEContainer
+ *
+ * @author <a href="mailto:aslak at conduct.no">Aslak Knutsen</a>
+ * @version $Revision: $
+ */
+public class WeldSEContainer implements DeployableContainer
+{
+ /* (non-Javadoc)
+ * @see org.jboss.arquillian.spi.DeployableContainer#setup(org.jboss.arquillian.spi.Context, org.jboss.arquillian.spi.Configuration)
+ */
+ public void setup(Context context, Configuration configuration)
+ {
+ //configuration.getContainerConfig(WeldSEConfiguration.class);
+
+ /*
+ * TODO: make this work ? these handlers will be fired.
+ * Not with the needed ClassContext but with the SuiteContext the event was fired from..
+ */
+// context.register(AfterDeploy.class, new SessionLifeCycleController(BeforeUnDeploy.class));
+// context.register(Before.class, new RequestLifeCycleController(After.class));
+ }
+
+ /* (non-Javadoc)
+ * @see org.jboss.arquillian.spi.DeployableContainer#start(org.jboss.arquillian.spi.Context)
+ */
+ public void start(Context context) throws LifecycleException
+ {
+ }
+
+ /* (non-Javadoc)
+ * @see org.jboss.arquillian.spi.DeployableContainer#stop(org.jboss.arquillian.spi.Context)
+ */
+ public void stop(Context context) throws LifecycleException
+ {
+ }
+
+ /* (non-Javadoc)
+ * @see org.jboss.arquillian.spi.DeployableContainer#deploy(org.jboss.arquillian.spi.Context, org.jboss.shrinkwrap.api.Archive)
+ */
+ public ContainerMethodExecutor deploy(Context context, final Archive<?> archive)
+ throws DeploymentException
+ {
+ final BeanDeploymentArchive beanArchive = archive.as(ShrinkwrapBeanDeploymentArchive.class);
+
+ ClassLoader cl = new ShrinkWrapClassLoader(archive);
+
+ Thread.currentThread().setContextClassLoader(cl);
+
+ Deployment deployment = new Deployment()
+ {
+ public Collection<BeanDeploymentArchive> getBeanDeploymentArchives()
+ {
+ return Arrays.asList(beanArchive);
+ }
+
+ public ServiceRegistry getServices()
+ {
+ return beanArchive.getServices();
+ }
+
+ public BeanDeploymentArchive loadBeanDeploymentArchive(
+ Class<?> beanClass)
+ {
+ return beanArchive;
+ }
+ };
+
+ WeldBootstrap bootstrap = new WeldBootstrap();
+ bootstrap.startContainer(Environments.SE, deployment, new ConcurrentHashMapBeanStore())
+ .startInitialization()
+ .deployBeans()
+ .validateBeans()
+ .endInitialization();
+
+ WeldManager manager = bootstrap.getManager(beanArchive);
+
+ context.add(WeldBootstrap.class, bootstrap);
+ context.add(WeldManager.class, manager);
+ context.register(BeforeClass.class, new SessionLifeCycleController(BeforeUnDeploy.class));
+ context.register(Before.class, new RequestLifeCycleController(After.class));
+
+ return new LocalMethodExecutor();
+ }
+
+ /* (non-Javadoc)
+ * @see org.jboss.arquillian.spi.DeployableContainer#undeploy(org.jboss.arquillian.spi.Context, org.jboss.shrinkwrap.api.Archive)
+ */
+ public void undeploy(Context context, Archive<?> archive) throws DeploymentException
+ {
+ WeldBootstrap bootstrap = context.get(WeldBootstrap.class);
+ if(bootstrap != null)
+ {
+ bootstrap.shutdown();
+ }
+ Thread.currentThread().setContextClassLoader(
+ Thread.currentThread().getContextClassLoader().getParent());
+ }
+}
\ No newline at end of file
Copied: arquillian/trunk/containers/weld-embedded/src/main/java/org/jboss/arquillian/container/weld/se/embedded_1/WeldSETestEnricher.java (from rev 4586, arquillian/trunk/containers/weld-embedded/src/main/java/org/jboss/arquillian/weld/WeldSETestEnricher.java)
===================================================================
--- arquillian/trunk/containers/weld-embedded/src/main/java/org/jboss/arquillian/container/weld/se/embedded_1/WeldSETestEnricher.java (rev 0)
+++ arquillian/trunk/containers/weld-embedded/src/main/java/org/jboss/arquillian/container/weld/se/embedded_1/WeldSETestEnricher.java 2010-06-29 15:05:52 UTC (rev 4607)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jboss.arquillian.container.weld.se.embedded_1;
+
+import javax.enterprise.inject.spi.BeanManager;
+
+import org.jboss.arquillian.spi.Context;
+import org.jboss.arquillian.testenricher.cdi.CDIInjectionEnricher;
+import org.jboss.weld.manager.api.WeldManager;
+
+/**
+ * WeldSETestEnricher
+ *
+ * @author <a href="mailto:aslak at conduct.no">Aslak Knutsen</a>
+ * @version $Revision: $
+ */
+public class WeldSETestEnricher extends CDIInjectionEnricher
+{
+ @Override
+ protected BeanManager lookupBeanManager(Context context)
+ {
+ return context.get(WeldManager.class);
+ }
+}
Copied: arquillian/trunk/containers/weld-embedded/src/main/java/org/jboss/arquillian/container/weld/se/embedded_1/shrinkwrap (from rev 4586, arquillian/trunk/containers/weld-embedded/src/main/java/org/jboss/arquillian/weld/shrinkwrap)
Modified: arquillian/trunk/containers/weld-embedded/src/main/java/org/jboss/arquillian/container/weld/se/embedded_1/shrinkwrap/ShrinkWrapClassLoader.java
===================================================================
--- arquillian/trunk/containers/weld-embedded/src/main/java/org/jboss/arquillian/weld/shrinkwrap/ShrinkWrapClassLoader.java 2010-06-29 10:58:12 UTC (rev 4586)
+++ arquillian/trunk/containers/weld-embedded/src/main/java/org/jboss/arquillian/container/weld/se/embedded_1/shrinkwrap/ShrinkWrapClassLoader.java 2010-06-29 15:05:52 UTC (rev 4607)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jboss.arquillian.weld.shrinkwrap;
+package org.jboss.arquillian.container.weld.se.embedded_1.shrinkwrap;
import java.io.IOException;
import java.io.InputStream;
Modified: arquillian/trunk/containers/weld-embedded/src/main/java/org/jboss/arquillian/container/weld/se/embedded_1/shrinkwrap/ShrinkwrapBeanDeploymentArchive.java
===================================================================
--- arquillian/trunk/containers/weld-embedded/src/main/java/org/jboss/arquillian/weld/shrinkwrap/ShrinkwrapBeanDeploymentArchive.java 2010-06-29 10:58:12 UTC (rev 4586)
+++ arquillian/trunk/containers/weld-embedded/src/main/java/org/jboss/arquillian/container/weld/se/embedded_1/shrinkwrap/ShrinkwrapBeanDeploymentArchive.java 2010-06-29 15:05:52 UTC (rev 4607)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jboss.arquillian.weld.shrinkwrap;
+package org.jboss.arquillian.container.weld.se.embedded_1.shrinkwrap;
import org.jboss.shrinkwrap.api.Assignable;
import org.jboss.weld.bootstrap.spi.BeanDeploymentArchive;
Modified: arquillian/trunk/containers/weld-embedded/src/main/java/org/jboss/arquillian/container/weld/se/embedded_1/shrinkwrap/ShrinkwrapBeanDeploymentArchiveImpl.java
===================================================================
--- arquillian/trunk/containers/weld-embedded/src/main/java/org/jboss/arquillian/weld/shrinkwrap/ShrinkwrapBeanDeploymentArchiveImpl.java 2010-06-29 10:58:12 UTC (rev 4586)
+++ arquillian/trunk/containers/weld-embedded/src/main/java/org/jboss/arquillian/container/weld/se/embedded_1/shrinkwrap/ShrinkwrapBeanDeploymentArchiveImpl.java 2010-06-29 15:05:52 UTC (rev 4607)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jboss.arquillian.weld.shrinkwrap;
+package org.jboss.arquillian.container.weld.se.embedded_1.shrinkwrap;
import java.io.IOException;
import java.io.InputStream;
Modified: arquillian/trunk/containers/weld-embedded/src/main/resources/META-INF/services/org.jboss.arquillian.spi.ContainerConfiguration
===================================================================
--- arquillian/trunk/containers/weld-embedded/src/main/resources/META-INF/services/org.jboss.arquillian.spi.ContainerConfiguration 2010-06-29 13:52:08 UTC (rev 4606)
+++ arquillian/trunk/containers/weld-embedded/src/main/resources/META-INF/services/org.jboss.arquillian.spi.ContainerConfiguration 2010-06-29 15:05:52 UTC (rev 4607)
@@ -1 +1 @@
-org.jboss.arquillian.weld.WeldSEConfiguration
\ No newline at end of file
+org.jboss.arquillian.container.weld.se.embedded_1.WeldSEConfiguration
\ No newline at end of file
Modified: arquillian/trunk/containers/weld-embedded/src/main/resources/META-INF/services/org.jboss.arquillian.spi.DeployableContainer
===================================================================
--- arquillian/trunk/containers/weld-embedded/src/main/resources/META-INF/services/org.jboss.arquillian.spi.DeployableContainer 2010-06-29 13:52:08 UTC (rev 4606)
+++ arquillian/trunk/containers/weld-embedded/src/main/resources/META-INF/services/org.jboss.arquillian.spi.DeployableContainer 2010-06-29 15:05:52 UTC (rev 4607)
@@ -1 +1 @@
-org.jboss.arquillian.weld.WeldSEContainer
\ No newline at end of file
+org.jboss.arquillian.container.weld.se.embedded_1.WeldSEContainer
\ No newline at end of file
Modified: arquillian/trunk/containers/weld-embedded/src/main/resources/META-INF/services/org.jboss.arquillian.spi.TestEnricher
===================================================================
--- arquillian/trunk/containers/weld-embedded/src/main/resources/META-INF/services/org.jboss.arquillian.spi.TestEnricher 2010-06-29 13:52:08 UTC (rev 4606)
+++ arquillian/trunk/containers/weld-embedded/src/main/resources/META-INF/services/org.jboss.arquillian.spi.TestEnricher 2010-06-29 15:05:52 UTC (rev 4607)
@@ -1 +1 @@
-org.jboss.arquillian.weld.WeldSETestEnricher
\ No newline at end of file
+org.jboss.arquillian.container.weld.se.embedded_1.WeldSETestEnricher
\ No newline at end of file
Modified: arquillian/trunk/containers/weld-embedded/src/main/resources/META-INF/services/org.jboss.arquillian.weld.shrinkwrap.ShrinkwrapBeanDeploymentArchive
===================================================================
--- arquillian/trunk/containers/weld-embedded/src/main/resources/META-INF/services/org.jboss.arquillian.weld.shrinkwrap.ShrinkwrapBeanDeploymentArchive 2010-06-29 13:52:08 UTC (rev 4606)
+++ arquillian/trunk/containers/weld-embedded/src/main/resources/META-INF/services/org.jboss.arquillian.weld.shrinkwrap.ShrinkwrapBeanDeploymentArchive 2010-06-29 15:05:52 UTC (rev 4607)
@@ -1 +1 @@
-org.jboss.arquillian.weld.shrinkwrap.ShrinkwrapBeanDeploymentArchiveImpl
\ No newline at end of file
+org.jboss.arquillian.container.weld.se.embedded_1.shrinkwrap.ShrinkwrapBeanDeploymentArchiveImpl
\ No newline at end of file
Copied: arquillian/trunk/containers/weld-embedded/src/test/java/org/jboss/arquillian/container/weld/se/embedded_1/WeldEmbeddedIntegrationTestCase.java (from rev 4586, arquillian/trunk/containers/weld-embedded/src/test/java/org/jboss/arquillian/weld/WeldEmbeddedIntegrationTestCase.java)
===================================================================
--- arquillian/trunk/containers/weld-embedded/src/test/java/org/jboss/arquillian/container/weld/se/embedded_1/WeldEmbeddedIntegrationTestCase.java (rev 0)
+++ arquillian/trunk/containers/weld-embedded/src/test/java/org/jboss/arquillian/container/weld/se/embedded_1/WeldEmbeddedIntegrationTestCase.java 2010-06-29 15:05:52 UTC (rev 4607)
@@ -0,0 +1,75 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jboss.arquillian.container.weld.se.embedded_1;
+
+import javax.inject.Inject;
+
+import junit.framework.Assert;
+
+import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.container.weld.se.embedded_1.beans.MyBean;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.shrinkwrap.api.ArchivePaths;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.impl.base.asset.ByteArrayAsset;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * WeldEmbeddedIntegrationTestCase
+ *
+ * @author <a href="mailto:aslak at redhat.com">Aslak Knutsen</a>
+ * @version $Revision: $
+ */
+ at RunWith(Arquillian.class)
+public class WeldEmbeddedIntegrationTestCase
+{
+ @Deployment
+ public static JavaArchive createdeployment()
+ {
+ return ShrinkWrap.create("test.jar", JavaArchive.class)
+ .addClasses(
+ WeldEmbeddedIntegrationTestCase.class,
+ MyBean.class)
+ .addManifestResource(
+ new ByteArrayAsset("<beans/>".getBytes()), ArchivePaths.create("beans.xml"));
+ }
+
+ @Inject
+ private MyBean instanceVariable;
+
+ @Test
+ public void shouldBeAbleToInjectBeanAsInstanceVariable() throws Exception
+ {
+ Assert.assertNotNull(
+ "Verify that the Bean has been injected",
+ instanceVariable);
+
+ Assert.assertEquals("aslak", instanceVariable.getName());
+ }
+
+ @Test
+ public void shouldBeAbleToInjectBeanAsArgumentVariable(MyBean argumentVariable) throws Exception
+ {
+ Assert.assertNotNull(
+ "Verify that the Bean has been injected",
+ argumentVariable);
+
+ Assert.assertEquals("aslak", argumentVariable.getName());
+ }
+}
Copied: arquillian/trunk/containers/weld-embedded/src/test/java/org/jboss/arquillian/container/weld/se/embedded_1/beans (from rev 4586, arquillian/trunk/containers/weld-embedded/src/test/java/org/jboss/arquillian/weld/beans)
Modified: arquillian/trunk/containers/weld-embedded/src/test/java/org/jboss/arquillian/container/weld/se/embedded_1/beans/MyBean.java
===================================================================
--- arquillian/trunk/containers/weld-embedded/src/test/java/org/jboss/arquillian/weld/beans/MyBean.java 2010-06-29 10:58:12 UTC (rev 4586)
+++ arquillian/trunk/containers/weld-embedded/src/test/java/org/jboss/arquillian/container/weld/se/embedded_1/beans/MyBean.java 2010-06-29 15:05:52 UTC (rev 4607)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jboss.arquillian.weld.beans;
+package org.jboss.arquillian.container.weld.se.embedded_1.beans;
import javax.enterprise.context.ApplicationScoped;
More information about the jboss-svn-commits
mailing list