[jboss-cvs] JBossAS SVN: r106130 - in projects/jboss-jca/trunk: doc/userguide/en/modules and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Jun 17 13:41:57 EDT 2010
Author: jesper.pedersen
Date: 2010-06-17 13:41:56 -0400 (Thu, 17 Jun 2010)
New Revision: 106130
Modified:
projects/jboss-jca/trunk/doc/userguide/en/modules/about.xml
projects/jboss-jca/trunk/embedded/src/main/java/org/jboss/jca/embedded/arquillian/EmbeddedJCAContainer.java
projects/jboss-jca/trunk/embedded/src/main/java/org/jboss/jca/embedded/arquillian/EmbeddedJCATestEnricher.java
projects/jboss-jca/trunk/embedded/src/test/java/org/jboss/jca/embedded/unit/ArquillianTestCase.java
projects/jboss-jca/trunk/ivy.xml
Log:
[JBJCA-362] Support for @Resource injection of ConnectionFactory in Embedded JCA Arquillian. Patch by Aslak Knutsen
Modified: projects/jboss-jca/trunk/doc/userguide/en/modules/about.xml
===================================================================
--- projects/jboss-jca/trunk/doc/userguide/en/modules/about.xml 2010-06-17 17:27:04 UTC (rev 106129)
+++ projects/jboss-jca/trunk/doc/userguide/en/modules/about.xml 2010-06-17 17:41:56 UTC (rev 106130)
@@ -25,7 +25,7 @@
<para>
Dimitris Andreadis, Carlo de Wolf, Jason Green, Jonathan Halliday, Søren Hilmer, Vicky Kak,
- Sacha Labourey, Alexey Loubyansky, Patrick MacDonald, Andrig Miller,
+ Aslak Knutsen, Sacha Labourey, Alexey Loubyansky, Patrick MacDonald, Andrig Miller,
Andrew Lee Rubinger, Anil Saldhana and Scott Stark.
</para>
Modified: projects/jboss-jca/trunk/embedded/src/main/java/org/jboss/jca/embedded/arquillian/EmbeddedJCAContainer.java
===================================================================
--- projects/jboss-jca/trunk/embedded/src/main/java/org/jboss/jca/embedded/arquillian/EmbeddedJCAContainer.java 2010-06-17 17:27:04 UTC (rev 106129)
+++ projects/jboss-jca/trunk/embedded/src/main/java/org/jboss/jca/embedded/arquillian/EmbeddedJCAContainer.java 2010-06-17 17:41:56 UTC (rev 106130)
@@ -62,12 +62,12 @@
if (archive == null)
throw new DeploymentException("Could not deploy a null application");
- if (!(archive instanceof ResourceAdapterArchive))
+ if (!(ResourceAdapterArchive.class.isInstance(archive)))
throw new DeploymentException("Could not deploy a non resource adapter application");
try
{
- embedded.deploy((ResourceAdapterArchive)archive);
+ embedded.deploy(ResourceAdapterArchive.class.cast(archive));
}
catch (Exception e)
{
@@ -92,12 +92,12 @@
if (archive == null)
throw new DeploymentException("Could not undeploy a null application");
- if (!(archive instanceof ResourceAdapterArchive))
+ if (!(ResourceAdapterArchive.class.isInstance(archive)))
throw new DeploymentException("Could not undeploy a non resource adapter application");
try
{
- embedded.undeploy((ResourceAdapterArchive)archive);
+ embedded.undeploy(ResourceAdapterArchive.class.cast(archive));
}
catch (Exception e)
{
Modified: projects/jboss-jca/trunk/embedded/src/main/java/org/jboss/jca/embedded/arquillian/EmbeddedJCATestEnricher.java
===================================================================
--- projects/jboss-jca/trunk/embedded/src/main/java/org/jboss/jca/embedded/arquillian/EmbeddedJCATestEnricher.java 2010-06-17 17:27:04 UTC (rev 106129)
+++ projects/jboss-jca/trunk/embedded/src/main/java/org/jboss/jca/embedded/arquillian/EmbeddedJCATestEnricher.java 2010-06-17 17:41:56 UTC (rev 106130)
@@ -21,47 +21,28 @@
*/
package org.jboss.jca.embedded.arquillian;
-import java.lang.reflect.Method;
import java.util.Properties;
import javax.naming.InitialContext;
-import org.jboss.arquillian.spi.Context;
-import org.jboss.arquillian.spi.TestEnricher;
+import org.jboss.arquillian.testenricher.resource.ResourceInjectionEnricher;
/**
* {@link TestEnricher} implementation specific to the EmbeddedJCA container
*
* @author <a href="mailto:jesper.pedersen at jboss.org">Jesper Pedersen</a>
*/
-public class EmbeddedJCATestEnricher implements TestEnricher
+public class EmbeddedJCATestEnricher extends ResourceInjectionEnricher
{
- /**
- * Constructor
+ /* (non-Javadoc)
+ * @see org.jboss.arquillian.testenricher.resource.ResourceInjectionEnricher#lookup(java.lang.String)
*/
- public EmbeddedJCATestEnricher()
+ protected Object lookup(String jndiName) throws Exception
{
+ return createContext().lookup(jndiName);
}
/**
- * {@inheritDoc}
- */
- @Override
- public void enrich(final Context context, final Object testCase)
- {
- // Nothing for now
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public Object[] resolve(Context context, Method method)
- {
- return null;
- }
-
- /**
* Create a context
* @return The context
* @exception Exception Thrown if an error occurs
Modified: projects/jboss-jca/trunk/embedded/src/test/java/org/jboss/jca/embedded/unit/ArquillianTestCase.java
===================================================================
--- projects/jboss-jca/trunk/embedded/src/test/java/org/jboss/jca/embedded/unit/ArquillianTestCase.java 2010-06-17 17:27:04 UTC (rev 106129)
+++ projects/jboss-jca/trunk/embedded/src/test/java/org/jboss/jca/embedded/unit/ArquillianTestCase.java 2010-06-17 17:41:56 UTC (rev 106130)
@@ -34,6 +34,7 @@
import java.util.UUID;
+import javax.annotation.Resource;
import javax.naming.Context;
import javax.naming.InitialContext;
import javax.naming.NamingException;
@@ -63,8 +64,7 @@
private static Logger log = Logger.getLogger(ArquillianTestCase.class);
- private static final String JNDI_PREFIX = "java:/eis/";
- private static String deploymentName = null;
+ private static String deploymentName = "ArquillianTest";
/**
* Define the deployment
@@ -73,8 +73,6 @@
@Deployment
public static ResourceAdapterArchive createDeployment()
{
- deploymentName = UUID.randomUUID().toString();
-
ResourceAdapterArchive raa =
ShrinkWrap.create(ResourceAdapterArchive.class, deploymentName + ".rar");
@@ -94,6 +92,9 @@
// Tests ------------------------------------------------------------------------------||
//-------------------------------------------------------------------------------------||
+ @Resource(mappedName = "java:/eis/ArquillianTest")
+ private TestConnectionFactory connectionFactory;
+
/**
* Basic
* @exception Throwable Thrown if case of an error
@@ -101,32 +102,6 @@
@Test
public void testBasic() throws Throwable
{
- Context context = null;
-
- try
- {
- context = new InitialContext();
- Object o = context.lookup(JNDI_PREFIX + deploymentName);
- assertNotNull(o);
- }
- catch (Throwable t)
- {
- log.error(t.getMessage(), t);
- fail(t.getMessage());
- }
- finally
- {
- if (context != null)
- {
- try
- {
- context.close();
- }
- catch (NamingException ne)
- {
- // Ignore
- }
- }
- }
+ assertNotNull(connectionFactory);
}
}
Modified: projects/jboss-jca/trunk/ivy.xml
===================================================================
--- projects/jboss-jca/trunk/ivy.xml 2010-06-17 17:27:04 UTC (rev 106129)
+++ projects/jboss-jca/trunk/ivy.xml 2010-06-17 17:41:56 UTC (rev 106130)
@@ -72,6 +72,7 @@
<dependency org="org.jboss.arquillian" name="arquillian-impl-base" rev="${version.arquillian}" conf="standalone->default;sjc->*"/>
<dependency org="org.jboss.arquillian" name="arquillian-junit" rev="${version.arquillian}" conf="standalone->default;sjc->*"/>
<dependency org="org.jboss.arquillian" name="arquillian-spi" rev="${version.arquillian}" conf="standalone->default;sjc->*"/>
+ <dependency org="org.jboss.arquillian.testenricher" name="arquillian-testenricher-resource" rev="${version.arquillian}" conf="standalone->default;sjc->*"/>
<dependency org="org.jboss.arquillian.protocol" name="arquillian-protocol-local" rev="${version.arquillian}" conf="standalone->default;sjc->*"/>
<dependency org="org.jboss.bootstrap" name="jboss-bootstrap" rev="${version.jboss.bootstrap}" conf="standalone->default"/>
<dependency org="org.jboss.cl" name="jboss-classloader" rev="${version.jboss.classloading}" conf="standalone->default"/>
More information about the jboss-cvs-commits
mailing list