[jboss-cvs] JBossAS SVN: r106878 - in projects/jboss-jca/trunk/common: src/main/java/org/jboss/jca/common/metadata/jbossra and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Jul 20 02:23:56 EDT 2010
Author: maeste
Date: 2010-07-20 02:23:56 -0400 (Tue, 20 Jul 2010)
New Revision: 106878
Added:
projects/jboss-jca/trunk/common/src/test/resources/jboss-ra-2.0-multiple-attributes.xml
projects/jboss-jca/trunk/common/src/test/resources/jboss-ra-2.0-no-attributes.xml
projects/jboss-jca/trunk/common/src/test/resources/jboss-ra-2.0-single-attribute.xml
Modified:
projects/jboss-jca/trunk/common/build.xml
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/jbossra/JbossRaParser.java
projects/jboss-jca/trunk/common/src/test/java/org/jboss/jca/common/metadata/ra/JbossRaParserTestCase.java
Log:
JBJCA-385: jboss-ra_2_0 test suite completed and fixed a bug with bootstrap-context. Fixed common/build.xml indentation.
Modified: projects/jboss-jca/trunk/common/build.xml
===================================================================
--- projects/jboss-jca/trunk/common/build.xml 2010-07-20 06:15:37 UTC (rev 106877)
+++ projects/jboss-jca/trunk/common/build.xml 2010-07-20 06:23:56 UTC (rev 106878)
@@ -23,47 +23,47 @@
default="compile"
xmlns:ivy="antlib:org.apache.ivy.ant">
- <!-- =================================
+ <!-- =================================
Properties
================================= -->
- <property name="build.common.dir" value="${build.dir}/common" />
+ <property name="build.common.dir" value="${build.dir}/common" />
- <!-- =================================
+ <!-- =================================
Target: compile
================================= -->
- <target name="compile">
- <mkdir dir="${build.common.dir}" />
+ <target name="compile">
+ <mkdir dir="${build.common.dir}" />
- <javac srcdir="src/main"
+ <javac srcdir="src/main"
destdir="${build.common.dir}"
classpathref="sjc.lib.path.id"
debug="${javac.debug}">
- <compilerarg value="-Xlint"/>
- </javac>
+ <compilerarg value="-Xlint"/>
+ </javac>
- </target>
+ </target>
- <!-- =================================
+ <!-- =================================
Target: jars
================================= -->
- <target name="jars" depends="compile">
- <jar destfile="${target.dir}/${name}-common.jar"
+ <target name="jars" depends="compile">
+ <jar destfile="${target.dir}/${name}-common.jar"
basedir="${build.common.dir}">
- <manifest>
- <attribute name="Implementation-Title" value="IronJacamar Common"/>
- <attribute name="Implementation-Version" value="${major}.${minor}.${patch}.${type}"/>
- <attribute name="Implementation-Vendor" value="The IronJacamar project (http://www.jboss.org/jca)"/>
- <attribute name="Implementation-Vendor-Id" value="org.jboss"/>
- </manifest>
- </jar>
- </target>
+ <manifest>
+ <attribute name="Implementation-Title" value="IronJacamar Common"/>
+ <attribute name="Implementation-Version" value="${major}.${minor}.${patch}.${type}"/>
+ <attribute name="Implementation-Vendor" value="The IronJacamar project (http://www.jboss.org/jca)"/>
+ <attribute name="Implementation-Vendor-Id" value="org.jboss"/>
+ </manifest>
+ </jar>
+ </target>
- <!-- =================================
+ <!-- =================================
Target: docs
================================= -->
- <target name="docs" depends="compile">
- <mkdir dir="${target.dir}/docs/common"/>
- <javadoc packagenames="org.*"
+ <target name="docs" depends="compile">
+ <mkdir dir="${target.dir}/docs/common"/>
+ <javadoc packagenames="org.*"
sourcepath="src/main/java"
destdir="${target.dir}/docs/common"
doclet="org.jboss.apiviz.APIviz"
@@ -77,126 +77,105 @@
classpath="${build.common.dir}"
classpathref="sjc.lib.path.id"
bottom="Copyright © 2008 Red Hat Middleware LLC (http://www.jboss.com/)">
- <link offline="true" href="http://java.sun.com/j2se/5/docs/api/" packagelistLoc="${java.home}/../docs/api"/>
- </javadoc>
- <copy todir="${target.dir}/docs/common" overwrite="true">
- <fileset dir="${tools.dir}/api"/>
- </copy>
- </target>
-
+ <link offline="true" href="http://java.sun.com/j2se/5/docs/api/" packagelistLoc="${java.home}/../docs/api"/>
+ </javadoc>
+ <copy todir="${target.dir}/docs/common" overwrite="true">
+ <fileset dir="${tools.dir}/api"/>
+ </copy>
+ </target>
+
<!-- =================================
- Target: test
- ================================= -->
- <target name="test" depends="jars, prepare-test">
- <mkdir dir="${reports.dir}"/>
- <mkdir dir="${reports.dir}/common"/>
+ Target: test
+ ================================= -->
+ <target name="test" depends="jars, prepare-test">
+ <mkdir dir="${reports.dir}" />
+ <mkdir dir="${reports.dir}/common" />
- <junit dir="src/test"
- printsummary="${junit.printsummary}"
- haltonerror="${junit.haltonerror}"
- haltonfailure="${junit.haltonfailure}"
- fork="${junit.fork}"
- timeout="${junit.timeout}">
-
- <jvmarg line="${junit.jvm.options}"/>
- <sysproperty key="archives.dir" value="${build.common.dir}"/>
- <sysproperty key="java.util.logging.manager" value="org.jboss.logmanager.LogManager"/>
- <sysproperty key="log4j.defaultInitOverride" value="true"/>
- <sysproperty key="org.jboss.logging.Logger.pluginClass" value="org.jboss.logging.logmanager.LoggerPluginImpl"/>
- <sysproperty key="test.dir" value="${test.dir}"/>
- <sysproperty key="xb.builder.useUnorderedSequence" value="true"/>
- <sysproperty key="javax.xml.stream.XMLInputFactory" value="com.sun.xml.internal.stream.XMLInputFactoryImpl"/>
-
- <classpath>
- <pathelement location="${build.common.dir}/test"/>
- <fileset dir="${target.dir}" includes="*.jar"/>
- <fileset dir="${lib.dir}/common" includes="*.jar" />
- <fileset dir="${lib.dir}/embedded" includes="*.jar" />
- <fileset dir="${lib.dir}/sjc" includes="*.jar" />
- <fileset dir="${lib.dir}/test" includes="*.jar" />
- </classpath>
-
- <formatter type="plain"/>
- <formatter type="xml"/>
-
- <batchtest todir="${reports.dir}/common"
- haltonerror="${junit.batchtest.haltonerror}"
- haltonfailure="${junit.batchtest.haltonfailure}"
- fork="${junit.batchtest.fork}">
-
- <fileset dir="${build.common.dir}/test">
- <include name="**/*TestCase.class"/>
- </fileset>
- </batchtest>
+ <junit dir="src/test" printsummary="${junit.printsummary}" haltonerror="${junit.haltonerror}" haltonfailure="${junit.haltonfailure}" fork="${junit.fork}" timeout="${junit.timeout}">
- </junit>
-
- </target>
+ <jvmarg line="${junit.jvm.options}" />
+ <sysproperty key="archives.dir" value="${build.common.dir}" />
+ <sysproperty key="java.util.logging.manager" value="org.jboss.logmanager.LogManager" />
+ <sysproperty key="log4j.defaultInitOverride" value="true" />
+ <sysproperty key="org.jboss.logging.Logger.pluginClass" value="org.jboss.logging.logmanager.LoggerPluginImpl" />
+ <sysproperty key="test.dir" value="${test.dir}" />
+ <sysproperty key="xb.builder.useUnorderedSequence" value="true" />
+ <sysproperty key="javax.xml.stream.XMLInputFactory" value="com.sun.xml.internal.stream.XMLInputFactoryImpl" />
+ <classpath>
+ <pathelement location="${build.common.dir}/test" />
+ <fileset dir="${target.dir}" includes="*.jar" />
+ <fileset dir="${lib.dir}/common" includes="*.jar" />
+ <fileset dir="${lib.dir}/embedded" includes="*.jar" />
+ <fileset dir="${lib.dir}/sjc" includes="*.jar" />
+ <fileset dir="${lib.dir}/test" includes="*.jar" />
+ </classpath>
- <!-- =================================
- Target: one-test
- ================================= -->
- <target name="one-test" depends="jars, prepare-test">
- <mkdir dir="${reports.dir}"/>
- <mkdir dir="${reports.dir}/common"/>
+ <formatter type="plain" />
+ <formatter type="xml" />
- <junit dir="src/test"
- printsummary="${junit.printsummary}"
- haltonerror="${junit.haltonerror}"
- haltonfailure="${junit.haltonfailure}"
- fork="${junit.fork}"
- timeout="${junit.timeout}">
-
- <jvmarg line="${junit.jvm.options}"/>
- <sysproperty key="archives.dir" value="${build.common.dir}"/>
- <sysproperty key="java.util.logging.manager" value="org.jboss.logmanager.LogManager"/>
- <sysproperty key="log4j.defaultInitOverride" value="true"/>
- <sysproperty key="org.jboss.logging.Logger.pluginClass" value="org.jboss.logging.logmanager.LoggerPluginImpl"/>
- <sysproperty key="test.dir" value="${test.dir}"/>
- <sysproperty key="xb.builder.useUnorderedSequence" value="true"/>
- <sysproperty key="javax.xml.stream.XMLInputFactory" value="com.sun.xml.internal.stream.XMLInputFactoryImpl"/>
-
- <classpath>
- <pathelement location="${build.common.dir}/test"/>
- <fileset dir="${target.dir}" includes="*.jar"/>
- <fileset dir="${lib.dir}/common" includes="*.jar" />
- <fileset dir="${lib.dir}/embedded" includes="*.jar" />
- <fileset dir="${lib.dir}/sjc" includes="*.jar" />
- <fileset dir="${lib.dir}/test" includes="*.jar" />
- </classpath>
-
- <formatter type="plain"/>
- <formatter type="xml"/>
-
- <test todir="${reports.dir}/common" name="${test}"
- haltonerror="${junit.batchtest.haltonerror}"
- haltonfailure="${junit.batchtest.haltonfailure}"
- fork="${junit.batchtest.fork}"/>
- </junit>
- </target>
+ <batchtest todir="${reports.dir}/common" haltonerror="${junit.batchtest.haltonerror}" haltonfailure="${junit.batchtest.haltonfailure}" fork="${junit.batchtest.fork}">
- <!-- =================================
- Target: prepare-test
- ================================= -->
- <target name="prepare-test">
- <mkdir dir="${build.common.dir}" />
- <mkdir dir="${build.common.dir}/test" />
+ <fileset dir="${build.common.dir}/test">
+ <include name="**/*TestCase.class" />
+ </fileset>
+ </batchtest>
- <javac srcdir="src/test"
- destdir="${build.common.dir}/test"
- classpathref="test.lib.path.id"
- debug="${javac.debug}"
- deprecation="${javac.deprecation}"
- optimize="${javac.optimize}">
- <compilerarg value="-Xlint"/>
- </javac>
+ </junit>
- <copy todir="${build.common.dir}/test">
- <fileset dir="src/test/resources"/>
- </copy>
+ </target>
- </target>
+ <!-- =================================
+ Target: one-test
+ ================================= -->
+ <target name="one-test" depends="jars, prepare-test">
+ <mkdir dir="${reports.dir}" />
+ <mkdir dir="${reports.dir}/common" />
+ <junit dir="src/test" printsummary="${junit.printsummary}" haltonerror="${junit.haltonerror}" haltonfailure="${junit.haltonfailure}" fork="${junit.fork}" timeout="${junit.timeout}">
+
+ <jvmarg line="${junit.jvm.options}" />
+ <sysproperty key="archives.dir" value="${build.common.dir}" />
+ <sysproperty key="java.util.logging.manager" value="org.jboss.logmanager.LogManager" />
+ <sysproperty key="log4j.defaultInitOverride" value="true" />
+ <sysproperty key="org.jboss.logging.Logger.pluginClass" value="org.jboss.logging.logmanager.LoggerPluginImpl" />
+ <sysproperty key="test.dir" value="${test.dir}" />
+ <sysproperty key="xb.builder.useUnorderedSequence" value="true" />
+ <sysproperty key="javax.xml.stream.XMLInputFactory" value="com.sun.xml.internal.stream.XMLInputFactoryImpl" />
+
+ <classpath>
+ <pathelement location="${build.common.dir}/test" />
+ <fileset dir="${target.dir}" includes="*.jar" />
+ <fileset dir="${lib.dir}/common" includes="*.jar" />
+ <fileset dir="${lib.dir}/embedded" includes="*.jar" />
+ <fileset dir="${lib.dir}/sjc" includes="*.jar" />
+ <fileset dir="${lib.dir}/test" includes="*.jar" />
+ </classpath>
+
+ <formatter type="plain" />
+ <formatter type="xml" />
+
+ <test todir="${reports.dir}/common" name="${test}" haltonerror="${junit.batchtest.haltonerror}" haltonfailure="${junit.batchtest.haltonfailure}" fork="${junit.batchtest.fork}" />
+ </junit>
+ </target>
+
+ <!-- =================================
+ Target: prepare-test
+ ================================= -->
+ <target name="prepare-test">
+ <mkdir dir="${build.common.dir}" />
+ <mkdir dir="${build.common.dir}/test" />
+
+ <javac srcdir="src/test" destdir="${build.common.dir}/test" classpathref="test.lib.path.id" debug="${javac.debug}" deprecation="${javac.deprecation}" optimize="${javac.optimize}">
+ <compilerarg value="-Xlint" />
+ </javac>
+
+ <copy todir="${build.common.dir}/test">
+ <fileset dir="src/test/resources" />
+ </copy>
+
+
+ </target>
+
</project>
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/jbossra/JbossRaParser.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/jbossra/JbossRaParser.java 2010-07-20 06:15:37 UTC (rev 106877)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/jbossra/JbossRaParser.java 2010-07-20 06:23:56 UTC (rev 106878)
@@ -282,8 +282,7 @@
switch (reader.nextTag())
{
case END_ELEMENT : {
- if (JbossRa10.Tag.forName(reader.getLocalName()) == JbossRa10.Tag.RA_CONFIG_PROPERTY
- || JbossRa20.Tag.forName(reader.getLocalName()) == JbossRa20.Tag.RA_CONFIG_PROPERTY)
+ if (JbossRa20.Tag.forName(reader.getLocalName()) == JbossRa20.Tag.BEAN_VALIDATION_GROUPS)
{
beanValidationGroup.trimToSize();
return new BeanValidationGroup(beanValidationGroup);
Modified: projects/jboss-jca/trunk/common/src/test/java/org/jboss/jca/common/metadata/ra/JbossRaParserTestCase.java
===================================================================
--- projects/jboss-jca/trunk/common/src/test/java/org/jboss/jca/common/metadata/ra/JbossRaParserTestCase.java 2010-07-20 06:15:37 UTC (rev 106877)
+++ projects/jboss-jca/trunk/common/src/test/java/org/jboss/jca/common/metadata/ra/JbossRaParserTestCase.java 2010-07-20 06:23:56 UTC (rev 106878)
@@ -24,6 +24,7 @@
import org.jboss.jca.common.metadata.jbossra.JbossRa;
import org.jboss.jca.common.metadata.jbossra.JbossRaParser;
import org.jboss.jca.common.metadata.jbossra.jbossra10.JbossRa10;
+import org.jboss.jca.common.metadata.jbossra.jbossra20.JbossRa20;
import org.jboss.jca.common.metadata.jbossra.jbossra20.RaConfigProperty;
import java.io.File;
@@ -124,6 +125,93 @@
"ra-config-property-type1", null)), is(true));
}
+ /**
+ * shouldParseJbossRa20WithSingleProperty
+ * @throws Exception in case of error
+ */
+ @Test
+ public void shouldParseJbossRa20WithSingleProperty() throws Exception
+ {
+ //given
+ File xmlFile = new File(Thread.currentThread().getContextClassLoader()
+ .getResource("jboss-ra-2.0-single-attribute.xml").toURI());
+ JbossRaParser parser = new JbossRaParser();
+ //when
+ JbossRa jbossRa = parser.parse(xmlFile);
+ //then
+ assertThat(jbossRa, instanceOf(JbossRa20.class));
+ assertThat(jbossRa.getRaConfigProperties().size(), is(1));
+ assertThat(
+ jbossRa
+ .getRaConfigProperties()
+ .get(0)
+ .equals(
+ RaConfigProperty.buildRaConfigProperty("ra-config-property-name0", "ra-config-property-value0",
+ "java.lang.Boolean", null)), is(true));
+ assertThat(((JbossRa20) jbossRa).getBeanValidationGroups().size(), is(1));
+ assertThat(((JbossRa20) jbossRa).getBootstrapContext(), is("bootstrap-context0"));
+
+ }
+
+ /**
+ *
+ * shouldParseJbossRa20WithOutProperties
+ *
+ * @throws Exception in case of error
+ */
+ @Test
+ public void shouldParseJbossRa20WithOutProperties() throws Exception
+ {
+ //given
+ File xmlFile = new File(Thread.currentThread().getContextClassLoader()
+ .getResource("jboss-ra-2.0-no-attributes.xml").toURI());
+ JbossRaParser parser = new JbossRaParser();
+ //when
+ JbossRa jbossRa = parser.parse(xmlFile);
+ //then
+ assertThat(jbossRa, instanceOf(JbossRa20.class));
+ assertThat(jbossRa.getRaConfigProperties().size(), is(0));
+ assertThat(((JbossRa20) jbossRa).getBeanValidationGroups().size(), is(0));
+
+ }
+
+ /**
+ *
+ * shouldParseJbossRa20WithMultipleProperties
+ *
+ * @throws Exception in case of error
+ */
+ @Test
+ public void shouldParseJbossRa20WithMultipleProperties() throws Exception
+ {
+ //given
+ File xmlFile = new File(Thread.currentThread().getContextClassLoader()
+ .getResource("jboss-ra-2.0-multiple-attributes.xml").toURI());
+ JbossRaParser parser = new JbossRaParser();
+ //when
+ JbossRa jbossRa = parser.parse(xmlFile);
+ //then
+ assertThat(jbossRa, instanceOf(JbossRa20.class));
+ assertThat(jbossRa.getRaConfigProperties().size(), is(2));
+ assertThat(
+ jbossRa
+ .getRaConfigProperties()
+ .get(0)
+ .equals(
+ RaConfigProperty.buildRaConfigProperty("ra-config-property-name0", "ra-config-property-value0",
+ "java.lang.Boolean", null)), is(true));
+ assertThat(
+ jbossRa
+ .getRaConfigProperties()
+ .get(1)
+ .equals(
+ RaConfigProperty.buildRaConfigProperty("ra-config-property-name1", "ra-config-property-value1",
+ "java.lang.Boolean", null)), is(true));
+ assertThat(((JbossRa20) jbossRa).getBeanValidationGroups().size(), is(2));
+ assertThat(((JbossRa20) jbossRa).getBootstrapContext(), is("bootstrap-context0"));
+
+ }
+
// @Test
// public void shouldParseJbossRa10WithTonsOfProperties() throws Exception
// {
Added: projects/jboss-jca/trunk/common/src/test/resources/jboss-ra-2.0-multiple-attributes.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/jboss-ra-2.0-multiple-attributes.xml (rev 0)
+++ projects/jboss-jca/trunk/common/src/test/resources/jboss-ra-2.0-multiple-attributes.xml 2010-07-20 06:23:56 UTC (rev 106878)
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jboss-ra xmlns="http://www.jboss.org/schema/ra/2.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.jboss.org/schema/ra/2.0 file:/dati/project/RH/jboss-jca/common/src/main/resources/schema/jboss-ra_2_0.xsd">
+ <ra-config-property override-element="resourceadapter">
+ <ra-config-property-name>ra-config-property-name0</ra-config-property-name>
+ <ra-config-property-type>java.lang.Boolean</ra-config-property-type>
+ <ra-config-property-value>ra-config-property-value0</ra-config-property-value>
+ </ra-config-property>
+ <ra-config-property override-element="resourceadapter">
+ <ra-config-property-name>ra-config-property-name1</ra-config-property-name>
+ <ra-config-property-type>java.lang.Boolean</ra-config-property-type>
+ <ra-config-property-value>ra-config-property-value1</ra-config-property-value>
+ </ra-config-property>
+ <bean-validation-groups>
+ <bean-validation-group>bean-validation-group0</bean-validation-group>
+ <bean-validation-group>bean-validation-group1</bean-validation-group>
+ </bean-validation-groups>
+ <bean-validation-groups>
+ <bean-validation-group>bean-validation-group2</bean-validation-group>
+ <bean-validation-group>bean-validation-group3</bean-validation-group>
+ </bean-validation-groups>
+ <bootstrap-context>bootstrap-context0</bootstrap-context>
+</jboss-ra>
Added: projects/jboss-jca/trunk/common/src/test/resources/jboss-ra-2.0-no-attributes.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/jboss-ra-2.0-no-attributes.xml (rev 0)
+++ projects/jboss-jca/trunk/common/src/test/resources/jboss-ra-2.0-no-attributes.xml 2010-07-20 06:23:56 UTC (rev 106878)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jboss-ra xmlns="http://www.jboss.org/schema/ra/2.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.jboss.org/schema/ra/2.0 file:/dati/project/RH/jboss-jca/common/src/main/resources/schema/jboss-ra_2_0.xsd">
+
+</jboss-ra>
Added: projects/jboss-jca/trunk/common/src/test/resources/jboss-ra-2.0-single-attribute.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/jboss-ra-2.0-single-attribute.xml (rev 0)
+++ projects/jboss-jca/trunk/common/src/test/resources/jboss-ra-2.0-single-attribute.xml 2010-07-20 06:23:56 UTC (rev 106878)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jboss-ra xmlns="http://www.jboss.org/schema/ra/2.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.jboss.org/schema/ra/2.0 file:/dati/project/RH/jboss-jca/common/src/main/resources/schema/jboss-ra_2_0.xsd">
+ <ra-config-property override-element="resourceadapter">
+ <ra-config-property-name>ra-config-property-name0</ra-config-property-name>
+ <ra-config-property-type>java.lang.Boolean</ra-config-property-type>
+ <ra-config-property-value>ra-config-property-value0</ra-config-property-value>
+ </ra-config-property>
+ <bean-validation-groups>
+ <bean-validation-group>bean-validation-group0</bean-validation-group>
+ <bean-validation-group>bean-validation-group1</bean-validation-group>
+ </bean-validation-groups>
+ <bootstrap-context>bootstrap-context0</bootstrap-context>
+</jboss-ra>
More information about the jboss-cvs-commits
mailing list