[jboss-cvs] JBossAS SVN: r109813 - in projects/jboss-jca/trunk: api and 10 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Thu Dec 9 18:12:08 EST 2010


Author: maeste
Date: 2010-12-09 18:12:07 -0500 (Thu, 09 Dec 2010)
New Revision: 109813

Removed:
   projects/jboss-jca/trunk/embedded/src/main/resources/services/
Modified:
   projects/jboss-jca/trunk/.gitignore
   projects/jboss-jca/trunk/api/.classpath
   projects/jboss-jca/trunk/api/.project
   projects/jboss-jca/trunk/codegenerator/.classpath
   projects/jboss-jca/trunk/codegenerator/.project
   projects/jboss-jca/trunk/common/.classpath
   projects/jboss-jca/trunk/common/.project
   projects/jboss-jca/trunk/core/.classpath
   projects/jboss-jca/trunk/core/.project
   projects/jboss-jca/trunk/deployers/.classpath
   projects/jboss-jca/trunk/deployers/.project
   projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/IronJacamarTestCase.java
   projects/jboss-jca/trunk/embedded/.classpath
   projects/jboss-jca/trunk/embedded/.project
   projects/jboss-jca/trunk/embedded/build.xml
   projects/jboss-jca/trunk/embedded/src/test/java/org/jboss/jca/embedded/unit/ArquillianTestCase.java
   projects/jboss-jca/trunk/sjc/.classpath
   projects/jboss-jca/trunk/sjc/.project
   projects/jboss-jca/trunk/validator/.classpath
   projects/jboss-jca/trunk/validator/.project
Log:
set up for eclipse projects to support arquillian tests. Refactoring to some tests to be arquillian's infected and run inside eclipse for debug goals

Modified: projects/jboss-jca/trunk/.gitignore
===================================================================
--- projects/jboss-jca/trunk/.gitignore	2010-12-09 22:28:49 UTC (rev 109812)
+++ projects/jboss-jca/trunk/.gitignore	2010-12-09 23:12:07 UTC (rev 109813)
@@ -1,9 +1,11 @@
-.project
+#.project
 .settings
-.classpath
+#.classpath
 standalone/**
 build.debug.xml
 # /
+**/bin
+**/eclipse-target
 /build
 /target
 /reports

Modified: projects/jboss-jca/trunk/api/.classpath
===================================================================
--- projects/jboss-jca/trunk/api/.classpath	2010-12-09 22:28:49 UTC (rev 109812)
+++ projects/jboss-jca/trunk/api/.classpath	2010-12-09 23:12:07 UTC (rev 109813)
@@ -2,6 +2,6 @@
 <classpath>
 	<classpathentry kind="src" path="src/main/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="var" path="JBJCA_LIB/common/jboss-transaction-api.jar"/>
+	<classpathentry kind="lib" path="/ironjacamar-parent/lib/common/jboss-transaction-api.jar"/>
 	<classpathentry kind="output" path="eclipse-target/classes"/>
 </classpath>

Modified: projects/jboss-jca/trunk/api/.project
===================================================================
--- projects/jboss-jca/trunk/api/.project	2010-12-09 22:28:49 UTC (rev 109812)
+++ projects/jboss-jca/trunk/api/.project	2010-12-09 23:12:07 UTC (rev 109813)
@@ -1,13 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-  <name>jboss-jca-api</name>
-  <comment>JCA 1.6 specification API</comment>
-  <projects/>
-  <buildSpec>
-    <buildCommand>
-      <name>org.eclipse.jdt.core.javabuilder</name>
-    </buildCommand>
-  </buildSpec>
-  <natures>
-    <nature>org.eclipse.jdt.core.javanature</nature>
-  </natures>
+	<name>ironjacamar-api</name>
+	<comment>JCA 1.6 specification API</comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
 </projectDescription>

Modified: projects/jboss-jca/trunk/codegenerator/.classpath
===================================================================
--- projects/jboss-jca/trunk/codegenerator/.classpath	2010-12-09 22:28:49 UTC (rev 109812)
+++ projects/jboss-jca/trunk/codegenerator/.classpath	2010-12-09 23:12:07 UTC (rev 109813)
@@ -5,11 +5,12 @@
 	<classpathentry kind="src" output="eclipse-target/tests-classes" path="src/test/java"/>
 	<classpathentry excluding="**/*.java" kind="src" output="eclipse-target/tests-classes" path="src/test/resources"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/jboss-jca-api"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/jboss-jca-common"/>
-	<classpathentry kind="var" path="JBJCA_LIB/common/jboss-metadata-rar.jar"/>
-	<classpathentry kind="var" path="JBJCA_LIB/common/ant.jar"/>
-	<classpathentry kind="var" path="JBJCA_LIB/common/jboss-logging-spi.jar"/>
-	<classpathentry kind="var" path="JBJCA_LIB/test/junit.jar"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/ironjacamar-api"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/ironjacamar-common"/>
+	<classpathentry kind="lib" path="/ironjacamar-parent/lib/common/jboss-logging.jar"/>
+	<classpathentry kind="lib" path="/ironjacamar-parent/lib/test/h2.jar"/>
+	<classpathentry kind="lib" path="/ironjacamar-parent/lib/test/junit.jar"/>
+	<classpathentry kind="lib" path="/ironjacamar-parent/lib/test/mockito-all.jar"/>
+	<classpathentry kind="lib" path="/ironjacamar-parent/lib/tools/ant.jar"/>
 	<classpathentry kind="output" path="eclipse-target/classes"/>
 </classpath>

Modified: projects/jboss-jca/trunk/codegenerator/.project
===================================================================
--- projects/jboss-jca/trunk/codegenerator/.project	2010-12-09 22:28:49 UTC (rev 109812)
+++ projects/jboss-jca/trunk/codegenerator/.project	2010-12-09 23:12:07 UTC (rev 109813)
@@ -1,13 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-  <name>jboss-jca-codegenerator</name>
-  <comment>JBoss JCA Codegenerator</comment>
-  <projects/>
-  <buildSpec>
-    <buildCommand>
-      <name>org.eclipse.jdt.core.javabuilder</name>
-    </buildCommand>
-  </buildSpec>
-  <natures>
-    <nature>org.eclipse.jdt.core.javanature</nature>
-  </natures>
+	<name>ironjacamar-codegenerator</name>
+	<comment>JBoss JCA Codegenerator</comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
 </projectDescription>

Modified: projects/jboss-jca/trunk/common/.classpath
===================================================================
--- projects/jboss-jca/trunk/common/.classpath	2010-12-09 22:28:49 UTC (rev 109812)
+++ projects/jboss-jca/trunk/common/.classpath	2010-12-09 23:12:07 UTC (rev 109813)
@@ -3,14 +3,10 @@
 	<classpathentry kind="src" path="src/main/java"/>
 	<classpathentry excluding="**/*.java" kind="src" path="src/main/resources"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="var" path="JBJCA_LIB/common/papaki-core.jar"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/jboss-jca-api"/>
-	<classpathentry kind="var" path="JBJCA_LIB/common/jboss-metadata-common.jar"/>
-	<classpathentry kind="var" path="JBJCA_LIB/common/jboss-metadata-rar.jar"/>
-	<classpathentry kind="var" path="JBJCA_LIB/common/jboss-logging-spi.jar"/>
-	<classpathentry kind="var" path="JBJCA_LIB/common/jbossxb.jar"/>
-	<classpathentry kind="var" path="JBJCA_LIB/common/jboss-mdr.jar"/>
-	<classpathentry kind="var" path="JBJCA_LIB/sjc/fungal.jar"/>
-	<classpathentry kind="var" path="JBJCA_LIB/common/jboss-common-core.jar"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/ironjacamar-api"/>
+	<classpathentry kind="lib" path="/ironjacamar-parent/lib/common/jboss-common-core.jar"/>
+	<classpathentry kind="lib" path="/ironjacamar-parent/lib/common/jboss-logging.jar"/>
+	<classpathentry kind="lib" path="/ironjacamar-parent/lib/common/papaki-core.jar"/>
+	<classpathentry kind="lib" path="/ironjacamar-parent/lib/sjc/fungal.jar"/>
 	<classpathentry kind="output" path="eclipse-target/classes"/>
 </classpath>

Modified: projects/jboss-jca/trunk/common/.project
===================================================================
--- projects/jboss-jca/trunk/common/.project	2010-12-09 22:28:49 UTC (rev 109812)
+++ projects/jboss-jca/trunk/common/.project	2010-12-09 23:12:07 UTC (rev 109813)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>jboss-jca-common</name>
+	<name>ironjacamar-common</name>
 	<comment>JBoss JCA Common</comment>
 	<projects>
 	</projects>

Modified: projects/jboss-jca/trunk/core/.classpath
===================================================================
--- projects/jboss-jca/trunk/core/.classpath	2010-12-09 22:28:49 UTC (rev 109812)
+++ projects/jboss-jca/trunk/core/.classpath	2010-12-09 23:12:07 UTC (rev 109813)
@@ -5,24 +5,23 @@
 	<classpathentry kind="src" output="eclipse-target/tests-classes" path="src/test/java"/>
 	<classpathentry excluding="**/*.java" kind="src" output="eclipse-target/tests-classes" path="src/test/resources"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/jboss-jca-api"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/jboss-jca-common"/>
-	<classpathentry kind="var" path="JBJCA_LIB/common/jboss-transaction-api.jar"/>
-	<classpathentry kind="var" path="JBJCA_LIB/common/jboss-threads.jar"/>
-	<classpathentry kind="var" path="JBJCA_LIB/common/jboss-integration.jar"/>
-	<classpathentry kind="var" path="JBJCA_LIB/common/jboss-logging-spi.jar"/>
-	<classpathentry kind="var" path="JBJCA_LIB/common/validation-api.jar"/>
-	<classpathentry kind="var" path="JBJCA_LIB/common/jboss-metadata-rar.jar"/>
-	<classpathentry kind="var" path="JBJCA_LIB/common/jboss-common-core.jar"/>
-	<classpathentry kind="var" path="JBJCA_LIB/common/jboss-jaspi-api.jar"/>
-	<classpathentry kind="var" path="JBJCA_LIB/common/jbosssx.jar"/>
-	<classpathentry kind="var" path="JBJCA_LIB/common/jboss-security-spi.jar"/>
-	<classpathentry kind="var" path="JBJCA_LIB/common/jboss-security-spi-bare.jar"/>
-	<classpathentry kind="var" path="JBJCA_LIB/common/jboss-mdr.jar"/>
-	<classpathentry kind="var" path="JBJCA_LIB/common/jnpserver.jar"/>
-	<classpathentry kind="var" path="JBJCA_LIB/test/junit.jar"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/jboss-jca-embedded"/>
-	<classpathentry kind="var" path="JBJCA_LIB/embedded/shrinkwrap-api.jar"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/ironjacamar-api"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/ironjacamar-common"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/ironjacamar-embedded"/>
+	<classpathentry kind="lib" path="/ironjacamar-parent/lib/common/jboss-common-core.jar"/>
+	<classpathentry kind="lib" path="/ironjacamar-parent/lib/common/jboss-integration.jar"/>
+	<classpathentry kind="lib" path="/ironjacamar-parent/lib/common/jboss-jaspi-api.jar"/>
+	<classpathentry kind="lib" path="/ironjacamar-parent/lib/common/jboss-security-spi-bare.jar"/>
+	<classpathentry kind="lib" path="/ironjacamar-parent/lib/common/jboss-security-spi.jar"/>
+	<classpathentry kind="lib" path="/ironjacamar-parent/lib/common/jboss-threads.jar"/>
+	<classpathentry kind="lib" path="/ironjacamar-parent/lib/common/jboss-transaction-api.jar"/>
+	<classpathentry kind="lib" path="/ironjacamar-parent/lib/common/jbosssx.jar"/>
+	<classpathentry kind="lib" path="/ironjacamar-parent/lib/common/jnpserver.jar"/>
+	<classpathentry kind="lib" path="/ironjacamar-parent/lib/common/validation-api.jar"/>
+	<classpathentry kind="lib" path="/ironjacamar-parent/lib/embedded/shrinkwrap-api.jar"/>
+	<classpathentry kind="lib" path="/ironjacamar-parent/lib/common/jboss-logging.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
+	<classpathentry kind="lib" path="/ironjacamar-parent/lib/test/mockito-all.jar"/>
+	<classpathentry kind="lib" path="/ironjacamar-parent/lib/test/h2.jar"/>
 	<classpathentry kind="output" path="eclipse-target/classes"/>
 </classpath>

Modified: projects/jboss-jca/trunk/core/.project
===================================================================
--- projects/jboss-jca/trunk/core/.project	2010-12-09 22:28:49 UTC (rev 109812)
+++ projects/jboss-jca/trunk/core/.project	2010-12-09 23:12:07 UTC (rev 109813)
@@ -1,13 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-  <name>jboss-jca-core</name>
-  <comment>JBoss JCA Core</comment>
-  <projects/>
-  <buildSpec>
-    <buildCommand>
-      <name>org.eclipse.jdt.core.javabuilder</name>
-    </buildCommand>
-  </buildSpec>
-  <natures>
-    <nature>org.eclipse.jdt.core.javanature</nature>
-  </natures>
+	<name>ironjacamar-core</name>
+	<comment>JBoss JCA Core</comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
 </projectDescription>

Modified: projects/jboss-jca/trunk/deployers/.classpath
===================================================================
--- projects/jboss-jca/trunk/deployers/.classpath	2010-12-09 22:28:49 UTC (rev 109812)
+++ projects/jboss-jca/trunk/deployers/.classpath	2010-12-09 23:12:07 UTC (rev 109813)
@@ -5,22 +5,33 @@
 	<classpathentry kind="src" output="eclipse-target/tests-classes" path="src/test/java"/>
 	<classpathentry excluding="**/*.java" kind="src" output="eclipse-target/tests-classes" path="src/test/resources"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/jboss-jca-api"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/jboss-jca-common"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/jboss-jca-validator"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/jboss-jca-core"/>
-	<classpathentry kind="var" path="JBJCA_LIB/sjc/fungal.jar"/>
-	<classpathentry kind="var" path="JBJCA_LIB/common/jboss-metadata-rar.jar"/>
-	<classpathentry kind="var" path="JBJCA_LIB/common/jboss-common-core.jar"/>
-	<classpathentry kind="var" path="JBJCA_LIB/common/jboss-logging-spi.jar"/>
-	<classpathentry kind="var" path="JBJCA_LIB/common/jboss-metadata-common.jar"/>
-	<classpathentry kind="var" path="JBJCA_LIB/common/jboss-transaction-api.jar"/>
-	<classpathentry kind="var" path="JBJCA_LIB/common/jboss-integration.jar"/>
-	<classpathentry kind="var" path="JBJCA_LIB/common/validation-api.jar"/>
-	<classpathentry kind="var" path="JBJCA_LIB/common/papaki-core.jar"/>
-	<classpathentry kind="var" path="JBJCA_LIB/test/junit.jar"/>
-	<classpathentry kind="var" path="JBJCA_LIB/test/mockito-all.jar"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/jboss-jca-embedded"/>
-	<classpathentry kind="var" path="JBJCA_LIB/embedded/shrinkwrap-api.jar"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/ironjacamar-api"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/ironjacamar-common"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/ironjacamar-core"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/ironjacamar-embedded"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/ironjacamar-validator"/>
+	<classpathentry kind="lib" path="/ironjacamar-parent/lib/common/jboss-common-core.jar"/>
+	<classpathentry kind="lib" path="/ironjacamar-parent/lib/common/jboss-integration.jar"/>
+	<classpathentry kind="lib" path="/ironjacamar-parent/lib/common/jboss-logging.jar"/>
+	<classpathentry kind="lib" path="/ironjacamar-parent/lib/common/jboss-transaction-api.jar"/>
+	<classpathentry kind="lib" path="/ironjacamar-parent/lib/common/papaki-core.jar"/>
+	<classpathentry kind="lib" path="/ironjacamar-parent/lib/common/validation-api.jar"/>
+	<classpathentry kind="lib" path="/ironjacamar-parent/lib/embedded/shrinkwrap-api.jar"/>
+	<classpathentry kind="lib" path="/ironjacamar-parent/lib/sjc/fungal.jar"/>
+	<classpathentry kind="lib" path="/ironjacamar-parent/lib/test/h2.jar"/>
+	<classpathentry kind="lib" path="/ironjacamar-parent/lib/test/junit.jar"/>
+	<classpathentry kind="lib" path="/ironjacamar-parent/lib/test/mockito-all.jar"/>
+	<classpathentry kind="lib" path="/ironjacamar-parent/lib/arquillian/arquillian-api.jar"/>
+	<classpathentry kind="lib" path="/ironjacamar-parent/lib/arquillian/arquillian-impl-base.jar"/>
+	<classpathentry kind="lib" path="/ironjacamar-parent/lib/arquillian/arquillian-junit.jar" sourcepath="/dati/project/RH/arquillian/impl-base/src/main/java"/>
+	<classpathentry kind="lib" path="/ironjacamar-parent/lib/arquillian/arquillian-protocol-local.jar"/>
+	<classpathentry kind="lib" path="/ironjacamar-parent/lib/arquillian/arquillian-spi.jar"/>
+	<classpathentry kind="lib" path="/ironjacamar-parent/lib/arquillian/arquillian-testenricher-resource.jar"/>
+	<classpathentry kind="lib" path="/ironjacamar-parent/lib/common/hibernate-validator.jar"/>
+	<classpathentry kind="lib" path="/ironjacamar-parent/lib/common/slf4j-jboss-logmanager.jar"/>
+	<classpathentry kind="lib" path="/ironjacamar-parent/lib/common/slf4j-api.jar"/>
+	<classpathentry kind="lib" path="/ironjacamar-parent/lib/common/jboss-logmanager.jar"/>
+	<classpathentry kind="lib" path="/ironjacamar-parent/lib/embedded/shrinkwrap-impl-base.jar"/>
+	<classpathentry kind="lib" path="/ironjacamar-parent/lib/embedded/shrinkwrap-spi.jar"/>
 	<classpathentry kind="output" path="eclipse-target/classes"/>
 </classpath>

Modified: projects/jboss-jca/trunk/deployers/.project
===================================================================
--- projects/jboss-jca/trunk/deployers/.project	2010-12-09 22:28:49 UTC (rev 109812)
+++ projects/jboss-jca/trunk/deployers/.project	2010-12-09 23:12:07 UTC (rev 109813)
@@ -1,13 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-  <name>jboss-jca-deployer</name>
-  <comment>JBoss JCA Deployer</comment>
-  <projects/>
-  <buildSpec>
-    <buildCommand>
-      <name>org.eclipse.jdt.core.javabuilder</name>
-    </buildCommand>
-  </buildSpec>
-  <natures>
-    <nature>org.eclipse.jdt.core.javanature</nature>
-  </natures>
+	<name>ironjacamar-deployer</name>
+	<comment>JBoss JCA Deployer</comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
 </projectDescription>

Modified: projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/IronJacamarTestCase.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/IronJacamarTestCase.java	2010-12-09 22:28:49 UTC (rev 109812)
+++ projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/IronJacamarTestCase.java	2010-12-09 23:12:07 UTC (rev 109813)
@@ -22,132 +22,68 @@
 
 package org.jboss.jca.test.deployers.spec;
 
-import org.jboss.jca.embedded.Embedded;
-import org.jboss.jca.embedded.EmbeddedFactory;
+import javax.annotation.Resource;
+import javax.resource.cci.ConnectionFactory;
 
-import java.io.File;
-import java.net.URL;
+import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.shrinkwrap.api.spec.ResourceAdapterArchive;
 
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-
-import org.jboss.logging.Logger;
-
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
 import org.junit.Test;
-import static org.junit.Assert.*;
+import org.junit.runner.RunWith;
 
+import static org.junit.Assert.assertNotNull;
+
 /**
  * Test cases for deploying resource adapter archives (.RAR) using ironjacamar.xml files
  * for activation
- * 
+ *
  * @author <a href="mailto:jesper.pedersen at jboss.org">Jesper Pedersen</a>
  * @version $Revision: $
  */
-public class IronJacamarTestCase
+ at RunWith(Arquillian.class)
+public class IronJacamarTestCase extends AbstractDeployerTest
 {
-
-   // --------------------------------------------------------------------------------||
-   // Class Members ------------------------------------------------------------------||
-   // --------------------------------------------------------------------------------||
-
-   private static Logger log = Logger.getLogger(IronJacamarTestCase.class);
-
-   private static final String JNDI_PREFIX = "java:/eis/";
-
-   /*
-    * Embedded
-    */
-   private static Embedded embedded;
-
-   // --------------------------------------------------------------------------------||
-   // Tests --------------------------------------------------------------------------||
-   // --------------------------------------------------------------------------------||
-
+   //-------------------------------------------------------------------------------------||
+   //---------------------- GIVEN --------------------------------------------------------||
+   //-------------------------------------------------------------------------------------||
    /**
-    * ra15outironjacamar.rar
-    * @throws Throwable throwable exception 
+    * Define the deployment
+    * @return The deployment archive
+    * @throws Exception in case of errors
     */
-   @Test
-   public void testRa15out() throws Throwable
+   @Deployment
+   public static ResourceAdapterArchive createDeployment() throws Exception
    {
-      URL archive = getURL("ra15outironjacamar.rar");
-      Context context = null;
- 
-      try
-      {
-         embedded.deploy(archive);
+      String archiveName = "ra15outironjacamar.rar";
+      String packageName = "org.jboss.jca.test.deployers.spec.rars.ra15out";
+      ResourceAdapterArchive raa = buidShrinkwrapRa(archiveName, packageName);
+      raa.addManifestResource(archiveName + "/META-INF/ra.xml", "ra.xml");
+      raa.addManifestResource(archiveName + "/META-INF/ironjacamar.xml", "ironjacamar.xml");
 
-         context = new InitialContext();
-         Object o = context.lookup(JNDI_PREFIX + "ra15outironjacamar-explicit");
-         assertNotNull(o);
-      }
-      catch (Throwable t)
-      {
-         log.error(t.getMessage(), t);
-         fail(t.getMessage());
-      }
-      finally
-      {
-         if (context != null)
-         {
-            try
-            {
-               context.close();
-            }
-            catch (NamingException ne)
-            {
-               // Ignore
-            }
-         }
-
-         embedded.undeploy(archive);
-      }
+      return raa;
    }
 
-   // --------------------------------------------------------------------------------||
-   // Lifecycle Methods --------------------------------------------------------------||
-   // --------------------------------------------------------------------------------||
+   //-------------------------------------------------------------------------------------||
+   //---------------------- WHEN  --------------------------------------------------------||
+   //-------------------------------------------------------------------------------------||
 
-   /**
-    * Lifecycle start, before the suite is executed
-    * @throws Throwable throwable exception 
-    */
-   @BeforeClass
-   public static void beforeClass() throws Throwable
-   {
-      // Create and set an embedded JCA instance
-      embedded = EmbeddedFactory.create();
+   @Resource(mappedName = "java:/eis/ra15outironjacamar-explicit")
+   private ConnectionFactory connectionFactory;
 
-      // Startup
-      embedded.startup();
-   }
+   //-------------------------------------------------------------------------------------||
+   //---------------------- THEN  --------------------------------------------------------||
+   //-------------------------------------------------------------------------------------||
 
    /**
-    * Lifecycle stop, after the suite is executed
-    * @throws Throwable throwable exception 
+    * Basic
+    * @exception Throwable Thrown if case of an error
     */
-   @AfterClass
-   public static void afterClass() throws Throwable
+   @Test
+   public void testBasic() throws Throwable
    {
-      // Shutdown embedded
-      embedded.shutdown();
-
-      // Set embedded to null
-      embedded = null;
+      assertNotNull(connectionFactory);
    }
 
-   /**
-    * Get the URL for a test archive
-    * @param archive The name of the test archive
-    * @return The URL to the archive
-    * @throws Throwable throwable exception
-    */
-   public URL getURL(String archive) throws Throwable
-   {
-      File f = new File(System.getProperty("archives.dir") + File.separator + archive);
-      return f.toURI().toURL();
-   }
+
 }

Modified: projects/jboss-jca/trunk/embedded/.classpath
===================================================================
--- projects/jboss-jca/trunk/embedded/.classpath	2010-12-09 22:28:49 UTC (rev 109812)
+++ projects/jboss-jca/trunk/embedded/.classpath	2010-12-09 23:12:07 UTC (rev 109813)
@@ -5,16 +5,24 @@
 	<classpathentry kind="src" output="eclipse-target/tests-classes" path="src/test/java"/>
 	<classpathentry excluding="**/*.java" kind="src" output="eclipse-target/tests-classes" path="src/test/resources"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/jboss-jca-api"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/jboss-jca-common"/>
-	<classpathentry kind="var" path="JBJCA_LIB/sjc/fungal.jar"/>
-	<classpathentry kind="var" path="JBJCA_LIB/embedded/shrinkwrap-api.jar"/>
-	<classpathentry kind="var" path="JBJCA_LIB/arquillian/arquillian-api.jar"/>
-	<classpathentry kind="var" path="JBJCA_LIB/arquillian/arquillian-junit.jar"/>
-	<classpathentry kind="var" path="JBJCA_LIB/arquillian/arquillian-spi.jar"/>
-	<classpathentry kind="var" path="JBJCA_LIB/arquillian/arquillian-protocol-local.jar"/>
-	<classpathentry kind="var" path="JBJCA_LIB/arquillian/arquillian-testenricher-resource.jar"/>
-	<classpathentry kind="var" path="JBJCA_LIB/common/jboss-logging-spi.jar"/>
-	<classpathentry kind="var" path="JBJCA_LIB/test/junit.jar"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/ironjacamar-api"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/ironjacamar-common"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
+	<classpathentry kind="lib" path="/ironjacamar-parent/lib/arquillian/arquillian-api.jar"/>
+	<classpathentry kind="lib" path="/ironjacamar-parent/lib/arquillian/arquillian-junit.jar" sourcepath="/dati/project/RH/arquillian/impl-base/src/main/java"/>
+	<classpathentry kind="lib" path="/ironjacamar-parent/lib/arquillian/arquillian-protocol-local.jar"/>
+	<classpathentry kind="lib" path="/ironjacamar-parent/lib/arquillian/arquillian-spi.jar"/>
+	<classpathentry kind="lib" path="/ironjacamar-parent/lib/arquillian/arquillian-testenricher-resource.jar"/>
+	<classpathentry kind="lib" path="/ironjacamar-parent/lib/embedded/shrinkwrap-api.jar"/>
+	<classpathentry kind="lib" path="/ironjacamar-parent/lib/common/jboss-logging.jar"/>
+	<classpathentry kind="lib" path="/ironjacamar-parent/lib/sjc/fungal.jar"/>
+	<classpathentry kind="lib" path="/ironjacamar-parent/lib/arquillian/arquillian-impl-base.jar"/>
+	<classpathentry kind="lib" path="/ironjacamar-parent/lib/common/jnpserver.jar"/>
+	<classpathentry kind="lib" path="/ironjacamar-parent/lib/common/jboss-transaction-api.jar"/>
+	<classpathentry kind="lib" path="/ironjacamar-parent/lib/common/jbossjts-integration.jar"/>
+	<classpathentry kind="lib" path="/ironjacamar-parent/lib/common/jbossjts.jar"/>
+	<classpathentry kind="lib" path="/ironjacamar-parent/lib/common/jboss-integration.jar"/>
+	<classpathentry kind="lib" path="/ironjacamar-parent/lib/common/jboss-stdio.jar"/>
+	<classpathentry kind="lib" path="/ironjacamar-parent/lib/common/hibernate-validator.jar"/>
 	<classpathentry kind="output" path="eclipse-target/classes"/>
 </classpath>

Modified: projects/jboss-jca/trunk/embedded/.project
===================================================================
--- projects/jboss-jca/trunk/embedded/.project	2010-12-09 22:28:49 UTC (rev 109812)
+++ projects/jboss-jca/trunk/embedded/.project	2010-12-09 23:12:07 UTC (rev 109813)
@@ -1,13 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-  <name>jboss-jca-embedded</name>
-  <comment>JBoss JCA Embedded</comment>
-  <projects/>
-  <buildSpec>
-    <buildCommand>
-      <name>org.eclipse.jdt.core.javabuilder</name>
-    </buildCommand>
-  </buildSpec>
-  <natures>
-    <nature>org.eclipse.jdt.core.javanature</nature>
-  </natures>
+	<name>ironjacamar-embedded</name>
+	<comment>JBoss JCA Embedded</comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
 </projectDescription>

Modified: projects/jboss-jca/trunk/embedded/build.xml
===================================================================
--- projects/jboss-jca/trunk/embedded/build.xml	2010-12-09 22:28:49 UTC (rev 109812)
+++ projects/jboss-jca/trunk/embedded/build.xml	2010-12-09 23:12:07 UTC (rev 109813)
@@ -76,7 +76,7 @@
     <mkdir dir="${build.embedded.dir}/impl/META-INF"/>
     <mkdir dir="${build.embedded.dir}/impl/META-INF/services"/>
     <copy todir="${build.embedded.dir}/impl/META-INF/services">
-      <fileset dir="src/main/resources/services" includes="*"/>
+      <fileset dir="src/main/resources/META-INF/services" includes="*"/>
     </copy>
 
     <jar destfile="${target.dir}/${name}-embedded-arquillian.jar"

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-12-09 22:28:49 UTC (rev 109812)
+++ projects/jboss-jca/trunk/embedded/src/test/java/org/jboss/jca/embedded/unit/ArquillianTestCase.java	2010-12-09 23:12:07 UTC (rev 109813)
@@ -45,8 +45,9 @@
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import static org.junit.Assert.*;
 
+import static org.junit.Assert.assertNotNull;
+
 /**
  * Unit test for Arquillian integration
  * 

Modified: projects/jboss-jca/trunk/sjc/.classpath
===================================================================
--- projects/jboss-jca/trunk/sjc/.classpath	2010-12-09 22:28:49 UTC (rev 109812)
+++ projects/jboss-jca/trunk/sjc/.classpath	2010-12-09 23:12:07 UTC (rev 109813)
@@ -3,8 +3,8 @@
 	<classpathentry kind="src" path="src/main/java"/>
 	<classpathentry excluding="**/*.java" kind="src" path="src/main/resources"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/jboss-jca-api"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/jboss-jca-common"/>
-	<classpathentry kind="var" path="JBJCA_LIB/sjc/fungal.jar"/>
+	<classpathentry kind="lib" path="/ironjacamar-parent/lib/sjc/fungal.jar"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/ironjacamar-api"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/ironjacamar-common"/>
 	<classpathentry kind="output" path="eclipse-target/classes"/>
 </classpath>

Modified: projects/jboss-jca/trunk/sjc/.project
===================================================================
--- projects/jboss-jca/trunk/sjc/.project	2010-12-09 22:28:49 UTC (rev 109812)
+++ projects/jboss-jca/trunk/sjc/.project	2010-12-09 23:12:07 UTC (rev 109813)
@@ -1,13 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-  <name>jboss-jca-sjc</name>
-  <comment>JBoss JCA Simple Container</comment>
-  <projects/>
-  <buildSpec>
-    <buildCommand>
-      <name>org.eclipse.jdt.core.javabuilder</name>
-    </buildCommand>
-  </buildSpec>
-  <natures>
-    <nature>org.eclipse.jdt.core.javanature</nature>
-  </natures>
+	<name>ironjacamar-sjc</name>
+	<comment>JBoss JCA Simple Container</comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
 </projectDescription>

Modified: projects/jboss-jca/trunk/validator/.classpath
===================================================================
--- projects/jboss-jca/trunk/validator/.classpath	2010-12-09 22:28:49 UTC (rev 109812)
+++ projects/jboss-jca/trunk/validator/.classpath	2010-12-09 23:12:07 UTC (rev 109813)
@@ -5,14 +5,14 @@
 	<classpathentry kind="src" output="eclipse-target/tests-classes" path="src/test/java"/>
 	<classpathentry excluding="**/*.java" kind="src" output="eclipse-target/tests-classes" path="src/test/resources"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/jboss-jca-api"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/jboss-jca-common"/>
-	<classpathentry kind="var" path="JBJCA_LIB/sjc/fungal.jar"/>
-	<classpathentry kind="var" path="JBJCA_LIB/common/ant.jar"/>
-	<classpathentry kind="var" path="JBJCA_LIB/common/maven-plugin-api.jar"/>
-	<classpathentry kind="var" path="JBJCA_LIB/common/jboss-logging-spi.jar"/>
-	<classpathentry kind="var" path="JBJCA_LIB/test/junit.jar"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/jboss-jca-embedded"/>
-	<classpathentry kind="var" path="JBJCA_LIB/embedded/shrinkwrap-api.jar"/>
+	<classpathentry kind="lib" path="/ironjacamar-parent/lib/common/jboss-logging.jar"/>
+	<classpathentry kind="lib" path="/ironjacamar-parent/lib/sjc/fungal.jar"/>
+	<classpathentry kind="lib" path="/ironjacamar-parent/lib/test/junit.jar"/>
+	<classpathentry kind="lib" path="/ironjacamar-parent/lib/tools/ant.jar"/>
+	<classpathentry kind="lib" path="/ironjacamar-parent/lib/tools/maven-plugin-api.jar"/>
+	<classpathentry kind="lib" path="/ironjacamar-parent/lib/embedded/shrinkwrap-api.jar"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/ironjacamar-api"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/ironjacamar-common"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/ironjacamar-embedded"/>
 	<classpathentry kind="output" path="eclipse-target/classes"/>
 </classpath>

Modified: projects/jboss-jca/trunk/validator/.project
===================================================================
--- projects/jboss-jca/trunk/validator/.project	2010-12-09 22:28:49 UTC (rev 109812)
+++ projects/jboss-jca/trunk/validator/.project	2010-12-09 23:12:07 UTC (rev 109813)
@@ -1,13 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-  <name>jboss-jca-validator</name>
-  <comment>JBoss JCA Validator</comment>
-  <projects/>
-  <buildSpec>
-    <buildCommand>
-      <name>org.eclipse.jdt.core.javabuilder</name>
-    </buildCommand>
-  </buildSpec>
-  <natures>
-    <nature>org.eclipse.jdt.core.javanature</nature>
-  </natures>
+	<name>ironjacamar-validator</name>
+	<comment>JBoss JCA Validator</comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
 </projectDescription>



More information about the jboss-cvs-commits mailing list