[jboss-svn-commits] JBoss Common SVN: r4613 - in arquillian/trunk/containers/openwebbeans-embedded: src/main/java/org/jboss/arquillian and 9 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Jun 29 14:46:20 EDT 2010
Author: aslak
Date: 2010-06-29 14:46:20 -0400 (Tue, 29 Jun 2010)
New Revision: 4613
Added:
arquillian/trunk/containers/openwebbeans-embedded/src/main/java/org/jboss/arquillian/container/
arquillian/trunk/containers/openwebbeans-embedded/src/main/java/org/jboss/arquillian/container/openwebbeans/
arquillian/trunk/containers/openwebbeans-embedded/src/main/java/org/jboss/arquillian/container/openwebbeans/embedded_1/
arquillian/trunk/containers/openwebbeans-embedded/src/test/java/org/jboss/arquillian/container/
arquillian/trunk/containers/openwebbeans-embedded/src/test/java/org/jboss/arquillian/container/openwebbeans/
arquillian/trunk/containers/openwebbeans-embedded/src/test/java/org/jboss/arquillian/container/openwebbeans/embedded_1/
arquillian/trunk/containers/openwebbeans-embedded/src/test/java/org/jboss/arquillian/container/openwebbeans/embedded_1/OpenWebBeansIntegrationTestCase.java
arquillian/trunk/containers/openwebbeans-embedded/src/test/java/org/jboss/arquillian/container/openwebbeans/embedded_1/beans/
Removed:
arquillian/trunk/containers/openwebbeans-embedded/src/main/java/org/jboss/arquillian/openwebbeans/
arquillian/trunk/containers/openwebbeans-embedded/src/test/java/org/jboss/arquillian/openwebbeans/
Modified:
arquillian/trunk/containers/openwebbeans-embedded/pom.xml
arquillian/trunk/containers/openwebbeans-embedded/src/main/java/org/jboss/arquillian/container/openwebbeans/embedded_1/OpenWebBeansConfiguration.java
arquillian/trunk/containers/openwebbeans-embedded/src/main/java/org/jboss/arquillian/container/openwebbeans/embedded_1/OpenWebBeansSEContainer.java
arquillian/trunk/containers/openwebbeans-embedded/src/main/java/org/jboss/arquillian/container/openwebbeans/embedded_1/OpenWebBeansSETestEnricher.java
arquillian/trunk/containers/openwebbeans-embedded/src/main/java/org/jboss/arquillian/container/openwebbeans/embedded_1/ShrinkWrapClassLoader.java
arquillian/trunk/containers/openwebbeans-embedded/src/main/java/org/jboss/arquillian/container/openwebbeans/embedded_1/ShrinkWrapMetaDataDiscovery.java
arquillian/trunk/containers/openwebbeans-embedded/src/main/resources/META-INF/services/org.jboss.arquillian.spi.ContainerConfiguration
arquillian/trunk/containers/openwebbeans-embedded/src/main/resources/META-INF/services/org.jboss.arquillian.spi.DeployableContainer
arquillian/trunk/containers/openwebbeans-embedded/src/main/resources/META-INF/services/org.jboss.arquillian.spi.TestEnricher
arquillian/trunk/containers/openwebbeans-embedded/src/test/java/org/jboss/arquillian/container/openwebbeans/embedded_1/beans/MyBean.java
Log:
ARQ-200 ARQ-202 Renamed OpenWebBeans 1 Embedded Container package
Modified: arquillian/trunk/containers/openwebbeans-embedded/pom.xml
===================================================================
--- arquillian/trunk/containers/openwebbeans-embedded/pom.xml 2010-06-29 18:43:28 UTC (rev 4612)
+++ arquillian/trunk/containers/openwebbeans-embedded/pom.xml 2010-06-29 18:46:20 UTC (rev 4613)
@@ -12,9 +12,9 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.arquillian.container</groupId>
- <artifactId>arquillian-openwebbeans-embedded</artifactId>
- <name>Arquillian Container OpenWebBeans Embedded</name>
- <description>OpenWebBeans Embedded Container integration for the Arquillian Project</description>
+ <artifactId>arquillian-openwebbeans-embedded-1</artifactId>
+ <name>Arquillian Container OpenWebBeans Embedded 1.x</name>
+ <description>OpenWebBeans 1.x Embedded Container integration for the Arquillian Project</description>
<properties>
<version.openwebbeans>1.0.0-M4</version.openwebbeans>
Copied: arquillian/trunk/containers/openwebbeans-embedded/src/main/java/org/jboss/arquillian/container/openwebbeans/embedded_1 (from rev 4586, arquillian/trunk/containers/openwebbeans-embedded/src/main/java/org/jboss/arquillian/openwebbeans)
Modified: arquillian/trunk/containers/openwebbeans-embedded/src/main/java/org/jboss/arquillian/container/openwebbeans/embedded_1/OpenWebBeansConfiguration.java
===================================================================
--- arquillian/trunk/containers/openwebbeans-embedded/src/main/java/org/jboss/arquillian/openwebbeans/OpenWebBeansConfiguration.java 2010-06-29 10:58:12 UTC (rev 4586)
+++ arquillian/trunk/containers/openwebbeans-embedded/src/main/java/org/jboss/arquillian/container/openwebbeans/embedded_1/OpenWebBeansConfiguration.java 2010-06-29 18:46:20 UTC (rev 4613)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jboss.arquillian.openwebbeans;
+package org.jboss.arquillian.container.openwebbeans.embedded_1;
import org.jboss.arquillian.spi.ContainerConfiguration;
import org.jboss.arquillian.spi.ContainerProfile;
Modified: arquillian/trunk/containers/openwebbeans-embedded/src/main/java/org/jboss/arquillian/container/openwebbeans/embedded_1/OpenWebBeansSEContainer.java
===================================================================
--- arquillian/trunk/containers/openwebbeans-embedded/src/main/java/org/jboss/arquillian/openwebbeans/OpenWebBeansSEContainer.java 2010-06-29 10:58:12 UTC (rev 4586)
+++ arquillian/trunk/containers/openwebbeans-embedded/src/main/java/org/jboss/arquillian/container/openwebbeans/embedded_1/OpenWebBeansSEContainer.java 2010-06-29 18:46:20 UTC (rev 4613)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jboss.arquillian.openwebbeans;
+package org.jboss.arquillian.container.openwebbeans.embedded_1;
import java.util.Enumeration;
import java.util.HashMap;
Modified: arquillian/trunk/containers/openwebbeans-embedded/src/main/java/org/jboss/arquillian/container/openwebbeans/embedded_1/OpenWebBeansSETestEnricher.java
===================================================================
--- arquillian/trunk/containers/openwebbeans-embedded/src/main/java/org/jboss/arquillian/openwebbeans/OpenWebBeansSETestEnricher.java 2010-06-29 10:58:12 UTC (rev 4586)
+++ arquillian/trunk/containers/openwebbeans-embedded/src/main/java/org/jboss/arquillian/container/openwebbeans/embedded_1/OpenWebBeansSETestEnricher.java 2010-06-29 18:46:20 UTC (rev 4613)
@@ -14,11 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jboss.arquillian.openwebbeans;
+package org.jboss.arquillian.container.openwebbeans.embedded_1;
import javax.enterprise.inject.spi.BeanManager;
-import org.jboss.arquillian.openwebbeans.OpenWebBeansSEContainer.ContainerInstanceHolder;
+import org.jboss.arquillian.container.openwebbeans.embedded_1.OpenWebBeansSEContainer.ContainerInstanceHolder;
+
import org.jboss.arquillian.spi.Context;
import org.jboss.arquillian.testenricher.cdi.CDIInjectionEnricher;
Modified: arquillian/trunk/containers/openwebbeans-embedded/src/main/java/org/jboss/arquillian/container/openwebbeans/embedded_1/ShrinkWrapClassLoader.java
===================================================================
--- arquillian/trunk/containers/openwebbeans-embedded/src/main/java/org/jboss/arquillian/openwebbeans/ShrinkWrapClassLoader.java 2010-06-29 10:58:12 UTC (rev 4586)
+++ arquillian/trunk/containers/openwebbeans-embedded/src/main/java/org/jboss/arquillian/container/openwebbeans/embedded_1/ShrinkWrapClassLoader.java 2010-06-29 18:46:20 UTC (rev 4613)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jboss.arquillian.openwebbeans;
+package org.jboss.arquillian.container.openwebbeans.embedded_1;
import java.io.IOException;
import java.io.InputStream;
Modified: arquillian/trunk/containers/openwebbeans-embedded/src/main/java/org/jboss/arquillian/container/openwebbeans/embedded_1/ShrinkWrapMetaDataDiscovery.java
===================================================================
--- arquillian/trunk/containers/openwebbeans-embedded/src/main/java/org/jboss/arquillian/openwebbeans/ShrinkWrapMetaDataDiscovery.java 2010-06-29 10:58:12 UTC (rev 4586)
+++ arquillian/trunk/containers/openwebbeans-embedded/src/main/java/org/jboss/arquillian/container/openwebbeans/embedded_1/ShrinkWrapMetaDataDiscovery.java 2010-06-29 18:46:20 UTC (rev 4613)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jboss.arquillian.openwebbeans;
+package org.jboss.arquillian.container.openwebbeans.embedded_1;
import java.io.IOException;
import java.io.InputStream;
Modified: arquillian/trunk/containers/openwebbeans-embedded/src/main/resources/META-INF/services/org.jboss.arquillian.spi.ContainerConfiguration
===================================================================
--- arquillian/trunk/containers/openwebbeans-embedded/src/main/resources/META-INF/services/org.jboss.arquillian.spi.ContainerConfiguration 2010-06-29 18:43:28 UTC (rev 4612)
+++ arquillian/trunk/containers/openwebbeans-embedded/src/main/resources/META-INF/services/org.jboss.arquillian.spi.ContainerConfiguration 2010-06-29 18:46:20 UTC (rev 4613)
@@ -1 +1 @@
-org.jboss.arquillian.openwebbeans.OpenWebBeansConfiguration
\ No newline at end of file
+org.jboss.arquillian.container.openwebbeans.embedded_1.OpenWebBeansConfiguration
\ No newline at end of file
Modified: arquillian/trunk/containers/openwebbeans-embedded/src/main/resources/META-INF/services/org.jboss.arquillian.spi.DeployableContainer
===================================================================
--- arquillian/trunk/containers/openwebbeans-embedded/src/main/resources/META-INF/services/org.jboss.arquillian.spi.DeployableContainer 2010-06-29 18:43:28 UTC (rev 4612)
+++ arquillian/trunk/containers/openwebbeans-embedded/src/main/resources/META-INF/services/org.jboss.arquillian.spi.DeployableContainer 2010-06-29 18:46:20 UTC (rev 4613)
@@ -1 +1 @@
-org.jboss.arquillian.openwebbeans.OpenWebBeansSEContainer
+org.jboss.arquillian.container.openwebbeans.embedded_1.OpenWebBeansSEContainer
Modified: arquillian/trunk/containers/openwebbeans-embedded/src/main/resources/META-INF/services/org.jboss.arquillian.spi.TestEnricher
===================================================================
--- arquillian/trunk/containers/openwebbeans-embedded/src/main/resources/META-INF/services/org.jboss.arquillian.spi.TestEnricher 2010-06-29 18:43:28 UTC (rev 4612)
+++ arquillian/trunk/containers/openwebbeans-embedded/src/main/resources/META-INF/services/org.jboss.arquillian.spi.TestEnricher 2010-06-29 18:46:20 UTC (rev 4613)
@@ -1 +1 @@
-org.jboss.arquillian.openwebbeans.OpenWebBeansSETestEnricher
+org.jboss.arquillian.container.openwebbeans.embedded_1.OpenWebBeansSETestEnricher
Copied: arquillian/trunk/containers/openwebbeans-embedded/src/test/java/org/jboss/arquillian/container/openwebbeans/embedded_1/OpenWebBeansIntegrationTestCase.java (from rev 4586, arquillian/trunk/containers/openwebbeans-embedded/src/test/java/org/jboss/arquillian/openwebbeans/OpenWebBeansIntegrationTestCase.java)
===================================================================
--- arquillian/trunk/containers/openwebbeans-embedded/src/test/java/org/jboss/arquillian/container/openwebbeans/embedded_1/OpenWebBeansIntegrationTestCase.java (rev 0)
+++ arquillian/trunk/containers/openwebbeans-embedded/src/test/java/org/jboss/arquillian/container/openwebbeans/embedded_1/OpenWebBeansIntegrationTestCase.java 2010-06-29 18:46:20 UTC (rev 4613)
@@ -0,0 +1,76 @@
+/*
+ * 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.openwebbeans.embedded_1;
+
+import javax.inject.Inject;
+
+import junit.framework.Assert;
+
+import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.container.openwebbeans.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;
+
+
+/**
+ * OpenWebBeansIntegrationTestCase
+ *
+ * @author <a href="mailto:aslak at redhat.com">Aslak Knutsen</a>
+ * @version $Revision: $
+ */
+ at RunWith(Arquillian.class)
+public class OpenWebBeansIntegrationTestCase
+{
+ @Deployment
+ public static JavaArchive createdeployment()
+ {
+ return ShrinkWrap.create("test.jar", JavaArchive.class)
+ .addClasses(
+ OpenWebBeansIntegrationTestCase.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/openwebbeans-embedded/src/test/java/org/jboss/arquillian/container/openwebbeans/embedded_1/beans (from rev 4586, arquillian/trunk/containers/openwebbeans-embedded/src/test/java/org/jboss/arquillian/openwebbeans/beans)
Modified: arquillian/trunk/containers/openwebbeans-embedded/src/test/java/org/jboss/arquillian/container/openwebbeans/embedded_1/beans/MyBean.java
===================================================================
--- arquillian/trunk/containers/openwebbeans-embedded/src/test/java/org/jboss/arquillian/openwebbeans/beans/MyBean.java 2010-06-29 10:58:12 UTC (rev 4586)
+++ arquillian/trunk/containers/openwebbeans-embedded/src/test/java/org/jboss/arquillian/container/openwebbeans/embedded_1/beans/MyBean.java 2010-06-29 18:46:20 UTC (rev 4613)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jboss.arquillian.openwebbeans.beans;
+package org.jboss.arquillian.container.openwebbeans.embedded_1.beans;
/**
More information about the jboss-svn-commits
mailing list