[jboss-cvs] JBossAS SVN: r112686 - in projects/jboss-jca/trunk/deployers: src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Feb 23 16:13:24 EST 2012
Author: jesper.pedersen
Date: 2012-02-23 16:13:23 -0500 (Thu, 23 Feb 2012)
New Revision: 112686
Modified:
projects/jboss-jca/trunk/deployers/build.xml
projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra16Standard303IronJacamarTestCase.java
projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra16User303IronJacamarTestCase.java
projects/jboss-jca/trunk/deployers/src/test/resources/ra16standard303ironjacamar.rar/META-INF/ironjacamar.xml
projects/jboss-jca/trunk/deployers/src/test/resources/ra16user303ironjacamar.rar/META-INF/ironjacamar.xml
Log:
Fix BV tests
Modified: projects/jboss-jca/trunk/deployers/build.xml
===================================================================
--- projects/jboss-jca/trunk/deployers/build.xml 2012-02-23 13:22:36 UTC (rev 112685)
+++ projects/jboss-jca/trunk/deployers/build.xml 2012-02-23 21:13:23 UTC (rev 112686)
@@ -196,6 +196,13 @@
includes="org/jboss/jca/test/deployers/spec/rars/configproperty/*.class"/>
<fileset dir="src/test/resources/config-property.rar"/>
</jar>
+ <jar destfile="${build.deployers.dir}/ra16standard303ironjacamar.rar">
+ <fileset dir="${build.deployers.dir}/test"
+ includes="org/jboss/jca/test/deployers/spec/rars/*.class"/>
+ <fileset dir="${build.deployers.dir}/test"
+ includes="org/jboss/jca/test/deployers/spec/rars/ra16standard303ironjacamar/*.class"/>
+ <fileset dir="src/test/resources/ra16standard303ironjacamar.rar"/>
+ </jar>
<jar destfile="${build.deployers.dir}/lazy.rar">
<fileset dir="${build.deployers.dir}/test"
includes="org/jboss/jca/test/deployers/spec/rars/lazy/*.class"/>
Modified: projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra16Standard303IronJacamarTestCase.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra16Standard303IronJacamarTestCase.java 2012-02-23 13:22:36 UTC (rev 112685)
+++ projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra16Standard303IronJacamarTestCase.java 2012-02-23 21:13:23 UTC (rev 112686)
@@ -62,6 +62,7 @@
String packageName = "org.jboss.jca.test.deployers.spec.rars.ra16standard303ironjacamar";
ResourceAdapterArchive raa = ArquillianJCATestUtils.buidShrinkwrapRa(archiveName, packageName);
raa.addAsManifestResource(archiveName + "/META-INF/ra.xml", "ra.xml");
+ raa.addAsManifestResource(archiveName + "/META-INF/ironjacamar.xml", "ironjacamar.xml");
return raa;
}
Modified: projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra16User303IronJacamarTestCase.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra16User303IronJacamarTestCase.java 2012-02-23 13:22:36 UTC (rev 112685)
+++ projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra16User303IronJacamarTestCase.java 2012-02-23 21:13:23 UTC (rev 112686)
@@ -62,6 +62,7 @@
String packageName = "org.jboss.jca.test.deployers.spec.rars.ra16user303ironjacamar";
ResourceAdapterArchive raa = ArquillianJCATestUtils.buidShrinkwrapRa(archiveName, packageName);
raa.addAsManifestResource(archiveName + "/META-INF/ra.xml", "ra.xml");
+ raa.addAsManifestResource(archiveName + "/META-INF/ironjacamar.xml", "ironjacamar.xml");
return raa;
}
Modified: projects/jboss-jca/trunk/deployers/src/test/resources/ra16standard303ironjacamar.rar/META-INF/ironjacamar.xml
===================================================================
--- projects/jboss-jca/trunk/deployers/src/test/resources/ra16standard303ironjacamar.rar/META-INF/ironjacamar.xml 2012-02-23 13:22:36 UTC (rev 112685)
+++ projects/jboss-jca/trunk/deployers/src/test/resources/ra16standard303ironjacamar.rar/META-INF/ironjacamar.xml 2012-02-23 21:13:23 UTC (rev 112686)
@@ -4,9 +4,11 @@
<bean-validation-groups>
<bean-validation-group>org.jboss.jca.test.deployers.spec.rars.ra16standard303ironjacamar.FirstStep</bean-validation-group>
<bean-validation-group>org.jboss.jca.test.deployers.spec.rars.ra16standard303ironjacamar.SecondStep</bean-validation-group>
+ <bean-validation-group>javax.validation.groups.Default</bean-validation-group>
</bean-validation-groups>
<connection-definitions>
- <connection-definition class-name="a" jndi-name="aa">
+ <connection-definition class-name="org.jboss.jca.test.deployers.spec.rars.ra16standard303ironjacamar.TestManagedConnectionFactory"
+ jndi-name="java:/eis/ra16standard303ironjacamar">
<config-property name="myStringProperty">newJCA</config-property>
</connection-definition>
</connection-definitions>
Modified: projects/jboss-jca/trunk/deployers/src/test/resources/ra16user303ironjacamar.rar/META-INF/ironjacamar.xml
===================================================================
--- projects/jboss-jca/trunk/deployers/src/test/resources/ra16user303ironjacamar.rar/META-INF/ironjacamar.xml 2012-02-23 13:22:36 UTC (rev 112685)
+++ projects/jboss-jca/trunk/deployers/src/test/resources/ra16user303ironjacamar.rar/META-INF/ironjacamar.xml 2012-02-23 21:13:23 UTC (rev 112686)
@@ -4,7 +4,18 @@
<ironjacamar xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="../../../../../../common/src/main/resources/schema/ironjacamar_1_0.xsd">
+
+ <bean-validation-groups>
+ <bean-validation-group>org.jboss.jca.test.deployers.spec.rars.ra16user303ironjacamar.CheckCase</bean-validation-group>
+ <bean-validation-group>javax.validation.groups.Default</bean-validation-group>
+ </bean-validation-groups>
- <config-property name="StringRAR">XMLOVERRIDE</config-property>
+ <config-property name="MyStringProperty">XMLOVERRIDE</config-property>
+ <connection-definitions>
+ <connection-definition class-name="org.jboss.jca.test.deployers.spec.rars.ra16user303ironjacamar.TestManagedConnectionFactory"
+ jndi-name="java:/eis/ra16user303ironjacamar">
+ </connection-definition>
+ </connection-definitions>
+
</ironjacamar>
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list