[jboss-svn-commits] JBoss Common SVN: r4615 - in arquillian/trunk/containers/openejb: src/main/java/org/jboss/arquillian and 11 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Jun 29 15:19:26 EDT 2010
Author: aslak
Date: 2010-06-29 15:19:24 -0400 (Tue, 29 Jun 2010)
New Revision: 4615
Added:
arquillian/trunk/containers/openejb/src/main/java/org/jboss/arquillian/container/
arquillian/trunk/containers/openejb/src/main/java/org/jboss/arquillian/container/openejb/
arquillian/trunk/containers/openejb/src/main/java/org/jboss/arquillian/container/openejb/embedded_3_1/
arquillian/trunk/containers/openejb/src/test/java/org/jboss/arquillian/container/
arquillian/trunk/containers/openejb/src/test/java/org/jboss/arquillian/container/openejb/
arquillian/trunk/containers/openejb/src/test/java/org/jboss/arquillian/container/openejb/embedded_3_1/
arquillian/trunk/containers/openejb/src/test/java/org/jboss/arquillian/container/openejb/embedded_3_1/OpenEJBIntegrationTestCase.java
arquillian/trunk/containers/openejb/src/test/java/org/jboss/arquillian/container/openejb/embedded_3_1/ejb/
Removed:
arquillian/trunk/containers/openejb/src/main/java/org/jboss/arquillian/openejb/
arquillian/trunk/containers/openejb/src/test/java/org/jboss/arquillian/openejb/OpenEJBIntegrationTestCase.java
arquillian/trunk/containers/openejb/src/test/java/org/jboss/arquillian/openejb/ejb/
Modified:
arquillian/trunk/containers/openejb/pom.xml
arquillian/trunk/containers/openejb/src/main/java/org/jboss/arquillian/container/openejb/embedded_3_1/OpenEJBConfiguration.java
arquillian/trunk/containers/openejb/src/main/java/org/jboss/arquillian/container/openejb/embedded_3_1/OpenEJBContainer.java
arquillian/trunk/containers/openejb/src/main/java/org/jboss/arquillian/container/openejb/embedded_3_1/OpenEJBTestEnricher.java
arquillian/trunk/containers/openejb/src/main/resources/META-INF/services/org.jboss.arquillian.spi.ContainerConfiguration
arquillian/trunk/containers/openejb/src/main/resources/META-INF/services/org.jboss.arquillian.spi.DeployableContainer
arquillian/trunk/containers/openejb/src/main/resources/META-INF/services/org.jboss.arquillian.spi.TestEnricher
arquillian/trunk/containers/openejb/src/test/java/org/jboss/arquillian/container/openejb/embedded_3_1/ejb/EchoBean.java
arquillian/trunk/containers/openejb/src/test/java/org/jboss/arquillian/container/openejb/embedded_3_1/ejb/EchoLocalBusiness.java
arquillian/trunk/containers/openejb/src/test/java/org/jboss/arquillian/prototyping/context/OpenEJBArquillianContextTestCase.java
arquillian/trunk/containers/openejb/src/test/java/org/jboss/arquillian/prototyping/context/OpenEJBAuthenticatedJndiContextTestCase.java
Log:
ARQ-200 ARQ-202 Renamed OpenEJB 3.1 Embedded Container package
Modified: arquillian/trunk/containers/openejb/pom.xml
===================================================================
--- arquillian/trunk/containers/openejb/pom.xml 2010-06-29 18:47:40 UTC (rev 4614)
+++ arquillian/trunk/containers/openejb/pom.xml 2010-06-29 19:19:24 UTC (rev 4615)
@@ -15,9 +15,9 @@
<!-- Artifact Configuration -->
<groupId>org.jboss.arquillian.container</groupId>
- <artifactId>arquillian-openejb</artifactId>
- <name>Arquillian Container OpenEJB</name>
- <description>OpenEJB Integration for the Arquillian Project</description>
+ <artifactId>arquillian-openejb-embedded-3.1</artifactId>
+ <name>Arquillian Container OpenEJB Embedded 3.1.x</name>
+ <description>OpenEJB 3.1.x Embedded integration for the Arquillian Project</description>
<!-- Properties -->
Copied: arquillian/trunk/containers/openejb/src/main/java/org/jboss/arquillian/container/openejb/embedded_3_1 (from rev 4586, arquillian/trunk/containers/openejb/src/main/java/org/jboss/arquillian/openejb)
Modified: arquillian/trunk/containers/openejb/src/main/java/org/jboss/arquillian/container/openejb/embedded_3_1/OpenEJBConfiguration.java
===================================================================
--- arquillian/trunk/containers/openejb/src/main/java/org/jboss/arquillian/openejb/OpenEJBConfiguration.java 2010-06-29 10:58:12 UTC (rev 4586)
+++ arquillian/trunk/containers/openejb/src/main/java/org/jboss/arquillian/container/openejb/embedded_3_1/OpenEJBConfiguration.java 2010-06-29 19:19:24 UTC (rev 4615)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jboss.arquillian.openejb;
+package org.jboss.arquillian.container.openejb.embedded_3_1;
import org.jboss.arquillian.spi.ContainerConfiguration;
import org.jboss.arquillian.spi.ContainerProfile;
Modified: arquillian/trunk/containers/openejb/src/main/java/org/jboss/arquillian/container/openejb/embedded_3_1/OpenEJBContainer.java
===================================================================
--- arquillian/trunk/containers/openejb/src/main/java/org/jboss/arquillian/openejb/OpenEJBContainer.java 2010-06-29 10:58:12 UTC (rev 4586)
+++ arquillian/trunk/containers/openejb/src/main/java/org/jboss/arquillian/container/openejb/embedded_3_1/OpenEJBContainer.java 2010-06-29 19:19:24 UTC (rev 4615)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jboss.arquillian.openejb;
+package org.jboss.arquillian.container.openejb.embedded_3_1;
import java.util.logging.Logger;
Modified: arquillian/trunk/containers/openejb/src/main/java/org/jboss/arquillian/container/openejb/embedded_3_1/OpenEJBTestEnricher.java
===================================================================
--- arquillian/trunk/containers/openejb/src/main/java/org/jboss/arquillian/openejb/OpenEJBTestEnricher.java 2010-06-29 10:58:12 UTC (rev 4586)
+++ arquillian/trunk/containers/openejb/src/main/java/org/jboss/arquillian/container/openejb/embedded_3_1/OpenEJBTestEnricher.java 2010-06-29 19:19:24 UTC (rev 4615)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jboss.arquillian.openejb;
+package org.jboss.arquillian.container.openejb.embedded_3_1;
import java.lang.annotation.Annotation;
import java.lang.reflect.Field;
Modified: arquillian/trunk/containers/openejb/src/main/resources/META-INF/services/org.jboss.arquillian.spi.ContainerConfiguration
===================================================================
--- arquillian/trunk/containers/openejb/src/main/resources/META-INF/services/org.jboss.arquillian.spi.ContainerConfiguration 2010-06-29 18:47:40 UTC (rev 4614)
+++ arquillian/trunk/containers/openejb/src/main/resources/META-INF/services/org.jboss.arquillian.spi.ContainerConfiguration 2010-06-29 19:19:24 UTC (rev 4615)
@@ -1 +1 @@
-org.jboss.arquillian.openejb.OpenEJBConfiguration
\ No newline at end of file
+org.jboss.arquillian.container.openejb.embedded_3_1.OpenEJBConfiguration
\ No newline at end of file
Modified: arquillian/trunk/containers/openejb/src/main/resources/META-INF/services/org.jboss.arquillian.spi.DeployableContainer
===================================================================
--- arquillian/trunk/containers/openejb/src/main/resources/META-INF/services/org.jboss.arquillian.spi.DeployableContainer 2010-06-29 18:47:40 UTC (rev 4614)
+++ arquillian/trunk/containers/openejb/src/main/resources/META-INF/services/org.jboss.arquillian.spi.DeployableContainer 2010-06-29 19:19:24 UTC (rev 4615)
@@ -1 +1 @@
-org.jboss.arquillian.openejb.OpenEJBContainer
\ No newline at end of file
+org.jboss.arquillian.container.openejb.embedded_3_1.OpenEJBContainer
\ No newline at end of file
Modified: arquillian/trunk/containers/openejb/src/main/resources/META-INF/services/org.jboss.arquillian.spi.TestEnricher
===================================================================
--- arquillian/trunk/containers/openejb/src/main/resources/META-INF/services/org.jboss.arquillian.spi.TestEnricher 2010-06-29 18:47:40 UTC (rev 4614)
+++ arquillian/trunk/containers/openejb/src/main/resources/META-INF/services/org.jboss.arquillian.spi.TestEnricher 2010-06-29 19:19:24 UTC (rev 4615)
@@ -1 +1 @@
-org.jboss.arquillian.openejb.OpenEJBTestEnricher
\ No newline at end of file
+org.jboss.arquillian.container.openejb.embedded_3_1.OpenEJBTestEnricher
\ No newline at end of file
Copied: arquillian/trunk/containers/openejb/src/test/java/org/jboss/arquillian/container/openejb/embedded_3_1/OpenEJBIntegrationTestCase.java (from rev 4586, arquillian/trunk/containers/openejb/src/test/java/org/jboss/arquillian/openejb/OpenEJBIntegrationTestCase.java)
===================================================================
--- arquillian/trunk/containers/openejb/src/test/java/org/jboss/arquillian/container/openejb/embedded_3_1/OpenEJBIntegrationTestCase.java (rev 0)
+++ arquillian/trunk/containers/openejb/src/test/java/org/jboss/arquillian/container/openejb/embedded_3_1/OpenEJBIntegrationTestCase.java 2010-06-29 19:19:24 UTC (rev 4615)
@@ -0,0 +1,94 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, 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.openejb.embedded_3_1;
+
+import java.util.logging.Logger;
+
+import javax.ejb.EJB;
+
+import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.container.openejb.embedded_3_1.ejb.EchoBean;
+import org.jboss.arquillian.container.openejb.embedded_3_1.ejb.EchoLocalBusiness;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * Tests that EJB deployments into the OpenEJB server
+ * work through the Arquillian lifecycle
+ *
+ * @author <a href="mailto:andrew.rubinger at jboss.org">ALR</a>
+ * @version $Revision: $
+ */
+ at RunWith(Arquillian.class)
+public class OpenEJBIntegrationTestCase
+{
+
+ //-------------------------------------------------------------------------------------||
+ // Class Members ----------------------------------------------------------------------||
+ //-------------------------------------------------------------------------------------||
+
+ /**
+ * Logger
+ */
+ private static final Logger log = Logger.getLogger(OpenEJBIntegrationTestCase.class.getName());
+
+ //-------------------------------------------------------------------------------------||
+ // Instance Members -------------------------------------------------------------------||
+ //-------------------------------------------------------------------------------------||
+
+ /**
+ * Define the deployment
+ */
+ @Deployment
+ public static JavaArchive createDeployment()
+ {
+ return ShrinkWrap.create("slsb.jar", JavaArchive.class).addClasses(EchoLocalBusiness.class, EchoBean.class);
+ }
+
+ /**
+ * The EJB proxy used for invocations
+ */
+ @EJB
+ private EchoLocalBusiness bean;
+
+ //-------------------------------------------------------------------------------------||
+ // Tests ------------------------------------------------------------------------------||
+ //-------------------------------------------------------------------------------------||
+
+ /**
+ * Ensures the {@link EchoBean} returns the expected
+ * response via pass-by-reference semantics
+ */
+ @Test
+ public void testEchoBean()
+ {
+ // Define the input and expected outcome
+ final String expected = "Word up.";
+
+ // Invoke upon the proxy
+ final String received = bean.echo(expected);
+
+ // Test
+ Assert.assertEquals("Expected output was not equal by value", expected, received);
+ Assert.assertTrue("Expected output was not equal by reference", expected == received);
+ log.info("Got expected result from EJB: " + received);
+ }
+}
Copied: arquillian/trunk/containers/openejb/src/test/java/org/jboss/arquillian/container/openejb/embedded_3_1/ejb (from rev 4586, arquillian/trunk/containers/openejb/src/test/java/org/jboss/arquillian/openejb/ejb)
Modified: arquillian/trunk/containers/openejb/src/test/java/org/jboss/arquillian/container/openejb/embedded_3_1/ejb/EchoBean.java
===================================================================
--- arquillian/trunk/containers/openejb/src/test/java/org/jboss/arquillian/openejb/ejb/EchoBean.java 2010-06-29 10:58:12 UTC (rev 4586)
+++ arquillian/trunk/containers/openejb/src/test/java/org/jboss/arquillian/container/openejb/embedded_3_1/ejb/EchoBean.java 2010-06-29 19:19:24 UTC (rev 4615)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jboss.arquillian.openejb.ejb;
+package org.jboss.arquillian.container.openejb.embedded_3_1.ejb;
import javax.annotation.Resource;
import javax.annotation.security.DeclareRoles;
@@ -56,7 +56,7 @@
/**
* {@inheritDoc}
- * @see org.jboss.arquillian.openejb.ejb.EchoLocalBusiness#securedEcho(java.lang.String)
+ * @see org.jboss.arquillian.container.openejb.embedded_3_1.ejb.EchoLocalBusiness#securedEcho(java.lang.String)
*/
@RolesAllowed(
{ROLE_ADMIN})
@@ -69,7 +69,7 @@
/**
* {@inheritDoc}
- * @see org.jboss.arquillian.openejb.ejb.EchoLocalBusiness#echo(java.lang.String)
+ * @see org.jboss.arquillian.container.openejb.embedded_3_1.ejb.EchoLocalBusiness#echo(java.lang.String)
*/
@Override
@PermitAll
Modified: arquillian/trunk/containers/openejb/src/test/java/org/jboss/arquillian/container/openejb/embedded_3_1/ejb/EchoLocalBusiness.java
===================================================================
--- arquillian/trunk/containers/openejb/src/test/java/org/jboss/arquillian/openejb/ejb/EchoLocalBusiness.java 2010-06-29 10:58:12 UTC (rev 4586)
+++ arquillian/trunk/containers/openejb/src/test/java/org/jboss/arquillian/container/openejb/embedded_3_1/ejb/EchoLocalBusiness.java 2010-06-29 19:19:24 UTC (rev 4615)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jboss.arquillian.openejb.ejb;
+package org.jboss.arquillian.container.openejb.embedded_3_1.ejb;
/**
* Local business interface of an EJB which echos a sent message
Deleted: arquillian/trunk/containers/openejb/src/test/java/org/jboss/arquillian/openejb/OpenEJBIntegrationTestCase.java
===================================================================
--- arquillian/trunk/containers/openejb/src/test/java/org/jboss/arquillian/openejb/OpenEJBIntegrationTestCase.java 2010-06-29 18:47:40 UTC (rev 4614)
+++ arquillian/trunk/containers/openejb/src/test/java/org/jboss/arquillian/openejb/OpenEJBIntegrationTestCase.java 2010-06-29 19:19:24 UTC (rev 4615)
@@ -1,94 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, 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.openejb;
-
-import java.util.logging.Logger;
-
-import javax.ejb.EJB;
-
-import org.jboss.arquillian.api.Deployment;
-import org.jboss.arquillian.junit.Arquillian;
-import org.jboss.arquillian.openejb.ejb.EchoBean;
-import org.jboss.arquillian.openejb.ejb.EchoLocalBusiness;
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-/**
- * Tests that EJB deployments into the OpenEJB server
- * work through the Arquillian lifecycle
- *
- * @author <a href="mailto:andrew.rubinger at jboss.org">ALR</a>
- * @version $Revision: $
- */
- at RunWith(Arquillian.class)
-public class OpenEJBIntegrationTestCase
-{
-
- //-------------------------------------------------------------------------------------||
- // Class Members ----------------------------------------------------------------------||
- //-------------------------------------------------------------------------------------||
-
- /**
- * Logger
- */
- private static final Logger log = Logger.getLogger(OpenEJBIntegrationTestCase.class.getName());
-
- //-------------------------------------------------------------------------------------||
- // Instance Members -------------------------------------------------------------------||
- //-------------------------------------------------------------------------------------||
-
- /**
- * Define the deployment
- */
- @Deployment
- public static JavaArchive createDeployment()
- {
- return ShrinkWrap.create("slsb.jar", JavaArchive.class).addClasses(EchoLocalBusiness.class, EchoBean.class);
- }
-
- /**
- * The EJB proxy used for invocations
- */
- @EJB
- private EchoLocalBusiness bean;
-
- //-------------------------------------------------------------------------------------||
- // Tests ------------------------------------------------------------------------------||
- //-------------------------------------------------------------------------------------||
-
- /**
- * Ensures the {@link EchoBean} returns the expected
- * response via pass-by-reference semantics
- */
- @Test
- public void testEchoBean()
- {
- // Define the input and expected outcome
- final String expected = "Word up.";
-
- // Invoke upon the proxy
- final String received = bean.echo(expected);
-
- // Test
- Assert.assertEquals("Expected output was not equal by value", expected, received);
- Assert.assertTrue("Expected output was not equal by reference", expected == received);
- log.info("Got expected result from EJB: " + received);
- }
-}
Modified: arquillian/trunk/containers/openejb/src/test/java/org/jboss/arquillian/prototyping/context/OpenEJBArquillianContextTestCase.java
===================================================================
--- arquillian/trunk/containers/openejb/src/test/java/org/jboss/arquillian/prototyping/context/OpenEJBArquillianContextTestCase.java 2010-06-29 18:47:40 UTC (rev 4614)
+++ arquillian/trunk/containers/openejb/src/test/java/org/jboss/arquillian/prototyping/context/OpenEJBArquillianContextTestCase.java 2010-06-29 19:19:24 UTC (rev 4615)
@@ -27,9 +27,9 @@
import javax.naming.NamingException;
import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.container.openejb.embedded_3_1.ejb.EchoBean;
+import org.jboss.arquillian.container.openejb.embedded_3_1.ejb.EchoLocalBusiness;
import org.jboss.arquillian.junit.Arquillian;
-import org.jboss.arquillian.openejb.ejb.EchoBean;
-import org.jboss.arquillian.openejb.ejb.EchoLocalBusiness;
import org.jboss.arquillian.prototyping.context.api.ArquillianContext;
import org.jboss.arquillian.prototyping.context.api.openejb.OpenEJBArquillianContext;
import org.jboss.shrinkwrap.api.ShrinkWrap;
Modified: arquillian/trunk/containers/openejb/src/test/java/org/jboss/arquillian/prototyping/context/OpenEJBAuthenticatedJndiContextTestCase.java
===================================================================
--- arquillian/trunk/containers/openejb/src/test/java/org/jboss/arquillian/prototyping/context/OpenEJBAuthenticatedJndiContextTestCase.java 2010-06-29 18:47:40 UTC (rev 4614)
+++ arquillian/trunk/containers/openejb/src/test/java/org/jboss/arquillian/prototyping/context/OpenEJBAuthenticatedJndiContextTestCase.java 2010-06-29 19:19:24 UTC (rev 4615)
@@ -24,9 +24,9 @@
import javax.naming.NamingException;
import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.container.openejb.embedded_3_1.ejb.EchoBean;
+import org.jboss.arquillian.container.openejb.embedded_3_1.ejb.EchoLocalBusiness;
import org.jboss.arquillian.junit.Arquillian;
-import org.jboss.arquillian.openejb.ejb.EchoBean;
-import org.jboss.arquillian.openejb.ejb.EchoLocalBusiness;
import org.jboss.arquillian.prototyping.context.api.Properties;
import org.jboss.arquillian.prototyping.context.api.Property;
import org.jboss.arquillian.prototyping.context.api.openejb.OpenEJBArquillianContext;
More information about the jboss-svn-commits
mailing list