[jboss-cvs] JBossAS SVN: r92254 - in projects/metadata/rar/trunk/src: main/resources/schema and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Aug 12 04:39:35 EDT 2009
Author: jeff.zhang
Date: 2009-08-12 04:39:35 -0400 (Wed, 12 Aug 2009)
New Revision: 92254
Added:
projects/metadata/rar/trunk/src/main/java/org/jboss/metadata/rar/jboss/BvGroupMetaData.java
projects/metadata/rar/trunk/src/main/java/org/jboss/metadata/rar/jboss/JBossRA20Base.java
projects/metadata/rar/trunk/src/main/java/org/jboss/metadata/rar/jboss/JBossRA20DefaultNSMetaData.java
projects/metadata/rar/trunk/src/main/java/org/jboss/metadata/rar/jboss/JBossRA20MetaData.java
projects/metadata/rar/trunk/src/main/resources/schema/jboss-ra_2_0.xsd
projects/metadata/rar/trunk/src/test/java/org/jboss/test/metadata/rar/JbossRA20DefaultNSUnitTestCase.java
projects/metadata/rar/trunk/src/test/java/org/jboss/test/metadata/rar/JbossRA20UnitTestCase.java
projects/metadata/rar/trunk/src/test/resources/org/jboss/test/metadata/rar/JbossRA20DefaultNS_testBasic.xml
projects/metadata/rar/trunk/src/test/resources/org/jboss/test/metadata/rar/JbossRA20_testBasic.xml
Modified:
projects/metadata/rar/trunk/src/main/java/org/jboss/metadata/rar/jboss/RaConfigPropertyMetaData.java
projects/metadata/rar/trunk/src/test/java/org/jboss/test/metadata/xml/RarXmlValidationUnitTestCase.java
Log:
[JBMETA-219] jboss-ra 2.0 and JBossRA20MetaData
Added: projects/metadata/rar/trunk/src/main/java/org/jboss/metadata/rar/jboss/BvGroupMetaData.java
===================================================================
--- projects/metadata/rar/trunk/src/main/java/org/jboss/metadata/rar/jboss/BvGroupMetaData.java (rev 0)
+++ projects/metadata/rar/trunk/src/main/java/org/jboss/metadata/rar/jboss/BvGroupMetaData.java 2009-08-12 08:39:35 UTC (rev 92254)
@@ -0,0 +1,48 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.metadata.rar.jboss;
+
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlElement;
+
+/**
+ * BvGroupMetaData
+ * @author <a href="mailto:jeff.zhang at jboss.org">Jeff Zhang</a>
+ * @version $Revision: $
+ */
+public class BvGroupMetaData
+{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = -8045048197795930659L;
+
+ private List<String> bvGroups;
+
+ @XmlElement(name="bean-validation-group")
+ public void setBvGroups(List<String> bvGroups) {
+ this.bvGroups = bvGroups;
+ }
+
+ public List<String> getBvGroups() {
+ return bvGroups;
+ }
+}
Property changes on: projects/metadata/rar/trunk/src/main/java/org/jboss/metadata/rar/jboss/BvGroupMetaData.java
___________________________________________________________________
Name: svn:keywords
+ Id Reversion Date
Added: projects/metadata/rar/trunk/src/main/java/org/jboss/metadata/rar/jboss/JBossRA20Base.java
===================================================================
--- projects/metadata/rar/trunk/src/main/java/org/jboss/metadata/rar/jboss/JBossRA20Base.java (rev 0)
+++ projects/metadata/rar/trunk/src/main/java/org/jboss/metadata/rar/jboss/JBossRA20Base.java 2009-08-12 08:39:35 UTC (rev 92254)
@@ -0,0 +1,57 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.metadata.rar.jboss;
+
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlElement;
+
+/**
+ * JBossRA20Base
+ * @author <a href="mailto:jeff.zhang at jboss.org">Jeff Zhang</a>
+ * @version $Revision: $
+ */
+public class JBossRA20Base extends JBossRAMetaData
+{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = -8045048197795930659L;
+
+ private List<BvGroupMetaData> bvGroupsList;
+
+ /**
+ * @return the bvGroupsList
+ */
+ public List<BvGroupMetaData> getBvGroupsList()
+ {
+ return bvGroupsList;
+ }
+
+ /**
+ * @param bvGroupsList the bvGroupsList to set
+ */
+ @XmlElement(name="bean-validation-groups")
+ public void setBvGroupsList(List<BvGroupMetaData> bvGroupsList)
+ {
+ this.bvGroupsList = bvGroupsList;
+ }
+
+}
Property changes on: projects/metadata/rar/trunk/src/main/java/org/jboss/metadata/rar/jboss/JBossRA20Base.java
___________________________________________________________________
Name: svn:keywords
+ Id Reversion Date
Added: projects/metadata/rar/trunk/src/main/java/org/jboss/metadata/rar/jboss/JBossRA20DefaultNSMetaData.java
===================================================================
--- projects/metadata/rar/trunk/src/main/java/org/jboss/metadata/rar/jboss/JBossRA20DefaultNSMetaData.java (rev 0)
+++ projects/metadata/rar/trunk/src/main/java/org/jboss/metadata/rar/jboss/JBossRA20DefaultNSMetaData.java 2009-08-12 08:39:35 UTC (rev 92254)
@@ -0,0 +1,46 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.metadata.rar.jboss;
+
+import javax.xml.bind.annotation.XmlNsForm;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+import org.jboss.xb.annotations.JBossXmlSchema;
+
+/**
+ * JBossRA20DefaultNSMetaData
+ * @author <a href="mailto:jeff.zhang at jboss.org">Jeff Zhang</a>
+ * @version $Revision: $
+ */
+ at XmlRootElement(name="jboss-ra")
+ at JBossXmlSchema(
+ ignoreUnresolvedFieldOrClass=false,
+ elementFormDefault=XmlNsForm.QUALIFIED,
+ normalizeSpace=true,
+ strict=false)
+ at XmlType(name="jboss-raType",
+ propOrder={"raConfigProps", "bvGroupsList"})
+public class JBossRA20DefaultNSMetaData extends JBossRA20Base
+{
+
+}
Property changes on: projects/metadata/rar/trunk/src/main/java/org/jboss/metadata/rar/jboss/JBossRA20DefaultNSMetaData.java
___________________________________________________________________
Name: svn:keywords
+ Id Reversion Date
Added: projects/metadata/rar/trunk/src/main/java/org/jboss/metadata/rar/jboss/JBossRA20MetaData.java
===================================================================
--- projects/metadata/rar/trunk/src/main/java/org/jboss/metadata/rar/jboss/JBossRA20MetaData.java (rev 0)
+++ projects/metadata/rar/trunk/src/main/java/org/jboss/metadata/rar/jboss/JBossRA20MetaData.java 2009-08-12 08:39:35 UTC (rev 92254)
@@ -0,0 +1,48 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.metadata.rar.jboss;
+
+import javax.xml.bind.annotation.XmlNs;
+import javax.xml.bind.annotation.XmlNsForm;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+import org.jboss.xb.annotations.JBossXmlSchema;
+
+/**
+ * JBossRA20MetaData
+ * @author <a href="mailto:jeff.zhang at jboss.org">Jeff Zhang</a>
+ * @version $Revision: $
+ */
+ at XmlRootElement(name="jboss-ra", namespace="http://www.jboss.org/schema/ra")
+ at JBossXmlSchema(
+ xmlns={@XmlNs(namespaceURI = "http://www.jboss.org/schema/ra", prefix = "ra")},
+ ignoreUnresolvedFieldOrClass=false,
+ namespace="http://www.jboss.org/schema/ra",
+ elementFormDefault=XmlNsForm.QUALIFIED,
+ normalizeSpace=true)
+ at XmlType(name="jboss-raType",
+ propOrder={"raConfigProps", "bvGroupsList"})
+public class JBossRA20MetaData extends JBossRA20Base
+{
+
+}
Property changes on: projects/metadata/rar/trunk/src/main/java/org/jboss/metadata/rar/jboss/JBossRA20MetaData.java
___________________________________________________________________
Name: svn:keywords
+ Id Reversion Date
Modified: projects/metadata/rar/trunk/src/main/java/org/jboss/metadata/rar/jboss/RaConfigPropertyMetaData.java
===================================================================
--- projects/metadata/rar/trunk/src/main/java/org/jboss/metadata/rar/jboss/RaConfigPropertyMetaData.java 2009-08-12 07:18:48 UTC (rev 92253)
+++ projects/metadata/rar/trunk/src/main/java/org/jboss/metadata/rar/jboss/RaConfigPropertyMetaData.java 2009-08-12 08:39:35 UTC (rev 92254)
@@ -21,6 +21,7 @@
*/
package org.jboss.metadata.rar.jboss;
+import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
@@ -45,6 +46,9 @@
/** The value */
private String value = "";
+
+ /** The override */
+ private String override;
/**
* Get the name
@@ -97,18 +101,39 @@
{
return value;
}
+
+ /**
+ * Get the override
+ *
+ * @return the override
+ */
+ public String getOverride()
+ {
+ return override;
+ }
/**
* Set the value
*
* @param value the value
*/
+ @XmlAttribute(name="override-element")
+ public void setOverride(String override)
+ {
+ this.override = override;
+ }
+
+
+ /**
+ * Set the value
+ *
+ * @param value the value
+ */
@XmlElement(name="ra-config-property-value")
public void setValue(String value)
{
this.value = value;
}
-
public String toString()
{
StringBuffer buffer = new StringBuffer();
@@ -119,6 +144,8 @@
buffer.append(" type=").append(type);
if (value != null)
buffer.append(" value=").append(value);
+ if (override != null)
+ buffer.append(" override=").append(override);
buffer.append(']');
return buffer.toString();
}
Added: projects/metadata/rar/trunk/src/main/resources/schema/jboss-ra_2_0.xsd
===================================================================
--- projects/metadata/rar/trunk/src/main/resources/schema/jboss-ra_2_0.xsd (rev 0)
+++ projects/metadata/rar/trunk/src/main/resources/schema/jboss-ra_2_0.xsd 2009-08-12 08:39:35 UTC (rev 92254)
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema"
+ targetNamespace="http://www.jboss.org/schema/ra"
+ xmlns:ra="http://www.jboss.org/schema/ra" xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ xmlns:javaee="http://java.sun.com/xml/ns/javaee"
+ elementFormDefault="qualified" attributeFormDefault="unqualified" version="2.0">
+
+
+ <xs:import namespace="http://java.sun.com/xml/ns/javaee" schemaLocation="http://java.sun.com/xml/ns/javaee/javaee_5.xsd"/>
+
+ <xs:element name="jboss-ra" type="ra:jbossRaType"/>
+
+ <xs:complexType name="jbossRaType">
+
+ <xs:sequence>
+ <xs:element name="ra-config-property" type="ra:ra-config-property-type" minOccurs="0" maxOccurs="unbounded"/>
+
+ <xs:element name="bean-validation-groups" type="ra:bean-validation-groups-type" minOccurs="0" maxOccurs="unbounded"/>
+
+ </xs:sequence>
+
+ </xs:complexType>
+
+ <xs:complexType name="ra-config-property-type">
+
+ <xs:sequence>
+ <xs:element name="ra-config-property-name" type="xs:string" minOccurs="1" maxOccurs="1"/>
+ <xs:element name="ra-config-property-type" type="ra:ra-config-property-typeType" minOccurs="1" maxOccurs="1"/>
+ <xs:element name="ra-config-property-value" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ </xs:sequence>
+ <xs:attribute name="override-element" type="xs:string" default="resourceadapter"/>
+ </xs:complexType>
+
+ <xs:complexType name="bean-validation-groups-type">
+ <xs:sequence>
+ <xs:element name="bean-validation-group" nillable="true" minOccurs="0" maxOccurs="unbounded">
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="xs:string">
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="ra-config-property-typeType">
+ <xs:simpleContent>
+ <xs:restriction base="javaee:string">
+ <xs:enumeration value="java.lang.Boolean"/>
+ <xs:enumeration value="java.lang.String"/>
+ <xs:enumeration value="java.lang.Integer"/>
+ <xs:enumeration value="java.lang.Double"/>
+ <xs:enumeration value="java.lang.Byte"/>
+ <xs:enumeration value="java.lang.Short"/>
+ <xs:enumeration value="java.lang.Long"/>
+ <xs:enumeration value="java.lang.Float"/>
+ <xs:enumeration value="java.lang.Character"/>
+ </xs:restriction>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:complexType name="override-elementType">
+ <xs:simpleContent>
+ <xs:restriction base="javaee:string">
+ <xs:enumeration value="connection-definition"/>
+ <xs:enumeration value="resourceadapter"/>
+ <xs:enumeration value="activationspec"/>
+ <xs:enumeration value="adminobject"/>
+ <xs:enumeration value="authentication-mechanism"/>
+ </xs:restriction>
+ </xs:simpleContent>
+ </xs:complexType>
+</xs:schema>
\ No newline at end of file
Added: projects/metadata/rar/trunk/src/test/java/org/jboss/test/metadata/rar/JbossRA20DefaultNSUnitTestCase.java
===================================================================
--- projects/metadata/rar/trunk/src/test/java/org/jboss/test/metadata/rar/JbossRA20DefaultNSUnitTestCase.java (rev 0)
+++ projects/metadata/rar/trunk/src/test/java/org/jboss/test/metadata/rar/JbossRA20DefaultNSUnitTestCase.java 2009-08-12 08:39:35 UTC (rev 92254)
@@ -0,0 +1,55 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.metadata.rar;
+
+import org.jboss.metadata.rar.jboss.JBossRA20DefaultNSMetaData;
+import org.jboss.test.metadata.common.MetaDataSchemaResolverFactory;
+import org.jboss.test.metadata.javaee.AbstractJavaEEMetaDataTest;
+
+import org.jboss.xb.binding.resolver.MutableSchemaResolver;
+import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
+/**
+ * JbossRA20DefaultNSUnitTestCase
+ * @author <a href="mailto:jeff.zhang at jboss.org">Jeff Zhang</a>
+ * @version $Revision: $
+ */
+public class JbossRA20DefaultNSUnitTestCase extends AbstractJavaEEMetaDataTest
+{
+ public static SchemaBindingResolver initResolver()
+ {
+ MutableSchemaResolver resolver = MetaDataSchemaResolverFactory.createSchemaResolver();
+ resolver.mapLocationToClass("jboss-ra", JBossRA20DefaultNSMetaData.class);
+ return resolver;
+ }
+
+ public JbossRA20DefaultNSUnitTestCase(String name)
+ {
+ super(name);
+ }
+
+ public void testBasic() throws Exception
+ {
+ JBossRA20DefaultNSMetaData jbossRA = unmarshal(JBossRA20DefaultNSMetaData.class);
+ assertNotNull(jbossRA);
+ }
+
+}
Property changes on: projects/metadata/rar/trunk/src/test/java/org/jboss/test/metadata/rar/JbossRA20DefaultNSUnitTestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Reversion Date
Added: projects/metadata/rar/trunk/src/test/java/org/jboss/test/metadata/rar/JbossRA20UnitTestCase.java
===================================================================
--- projects/metadata/rar/trunk/src/test/java/org/jboss/test/metadata/rar/JbossRA20UnitTestCase.java (rev 0)
+++ projects/metadata/rar/trunk/src/test/java/org/jboss/test/metadata/rar/JbossRA20UnitTestCase.java 2009-08-12 08:39:35 UTC (rev 92254)
@@ -0,0 +1,62 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.metadata.rar;
+
+import org.jboss.metadata.rar.jboss.JBossRA20MetaData;
+import org.jboss.test.metadata.common.MetaDataSchemaResolverFactory;
+import org.jboss.test.metadata.javaee.AbstractJavaEEMetaDataTest;
+import org.jboss.xb.binding.resolver.MutableSchemaResolver;
+import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
+
+/**
+ * JbossRA20UnitTestCase
+ * @author <a href="mailto:jeff.zhang at jboss.org">Jeff Zhang</a>
+ * @version $Revision: $
+ */
+public class JbossRA20UnitTestCase extends AbstractJavaEEMetaDataTest
+{
+ public static SchemaBindingResolver initResolver()
+ {
+ MutableSchemaResolver resolver = MetaDataSchemaResolverFactory.createSchemaResolver();
+ resolver.mapLocationToClass("http://www.jboss.org/schema/jboss-ra_2_0.xsd", JBossRA20MetaData.class);
+ return resolver;
+ }
+
+ public JbossRA20UnitTestCase(String name)
+ {
+ super(name);
+ }
+
+ public void testBasic() throws Exception
+ {
+ JBossRA20MetaData jbossRA = unmarshal(JBossRA20MetaData.class);
+ assertNotNull(jbossRA);
+ assertEquals(jbossRA.getRaConfigProps().size(), 9);
+ assertEquals(jbossRA.getRaConfigProps().get(0).getValue(), "XMLOVERRIDE");
+ assertEquals(jbossRA.getRaConfigProps().get(8).getName(), "DoubleRAR");
+ assertEquals(jbossRA.getRaConfigProps().get(1).getOverride(), "connection-definition");
+
+ assertEquals(jbossRA.getBvGroupsList().size(), 1);
+ assertEquals(jbossRA.getBvGroupsList().get(0).getBvGroups().size(), 2);
+ assertEquals(jbossRA.getBvGroupsList().get(0).getBvGroups().get(0), "com.mycompany.myproject.bv.Group1");
+ }
+}
Property changes on: projects/metadata/rar/trunk/src/test/java/org/jboss/test/metadata/rar/JbossRA20UnitTestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Reversion Date
Modified: projects/metadata/rar/trunk/src/test/java/org/jboss/test/metadata/xml/RarXmlValidationUnitTestCase.java
===================================================================
--- projects/metadata/rar/trunk/src/test/java/org/jboss/test/metadata/xml/RarXmlValidationUnitTestCase.java 2009-08-12 07:18:48 UTC (rev 92253)
+++ projects/metadata/rar/trunk/src/test/java/org/jboss/test/metadata/xml/RarXmlValidationUnitTestCase.java 2009-08-12 08:39:35 UTC (rev 92254)
@@ -37,5 +37,6 @@
exclude("RA15DefaultNS_testDefaultNS.xml");
exclude("RA16DefaultNS_testDefaultNS.xml");
exclude("JbossRA10DefaultNS_testBasic.xml");
+ exclude("JbossRA20DefaultNS_testBasic.xml");
}
}
Added: projects/metadata/rar/trunk/src/test/resources/org/jboss/test/metadata/rar/JbossRA20DefaultNS_testBasic.xml
===================================================================
--- projects/metadata/rar/trunk/src/test/resources/org/jboss/test/metadata/rar/JbossRA20DefaultNS_testBasic.xml (rev 0)
+++ projects/metadata/rar/trunk/src/test/resources/org/jboss/test/metadata/rar/JbossRA20DefaultNS_testBasic.xml 2009-08-12 08:39:35 UTC (rev 92254)
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jboss-ra>
+ <ra-config-property>
+ <ra-config-property-name>StringRAR</ra-config-property-name>
+ <ra-config-property-type>java.lang.String</ra-config-property-type>
+ <ra-config-property-value>XMLOVERRIDE</ra-config-property-value>
+ </ra-config-property>
+
+ <ra-config-property override-element="connection-definition">
+ <ra-config-property-name>
+ BooleanRAR</ra-config-property-name>
+
+ <ra-config-property-type>java.lang.Boolean</ra-config-property-type>
+ <ra-config-property-value>False</ra-config-property-value>
+ </ra-config-property>
+ <ra-config-property override-element="resourceadapter">
+ <ra-config-property-name>ByteRAR
+ </ra-config-property-name>
+ <ra-config-property-type>java.lang.Byte</ra-config-property-type>
+ <ra-config-property-value>1</ra-config-property-value>
+
+ </ra-config-property>
+ <ra-config-property override-element="activationspec">
+ <ra-config-property-name>
+ CharacterRAR
+ </ra-config-property-name>
+ <ra-config-property-type>java.lang.Character</ra-config-property-type>
+ <ra-config-property-value>A</ra-config-property-value>
+ </ra-config-property>
+ <ra-config-property override-element="adminobject">
+
+ <ra-config-property-name>ShortRAR</ra-config-property-name>
+ <ra-config-property-type>java.lang.Short</ra-config-property-type>
+ <ra-config-property-value>2</ra-config-property-value>
+ </ra-config-property>
+ <ra-config-property override-element="authentication-mechanism">
+ <ra-config-property-name>IntegerRAR</ra-config-property-name>
+ <ra-config-property-type>java.lang.Integer</ra-config-property-type>
+
+ <ra-config-property-value>3</ra-config-property-value>
+ </ra-config-property>
+ <ra-config-property>
+ <ra-config-property-name>LongRAR</ra-config-property-name>
+ <ra-config-property-type>java.lang.Long</ra-config-property-type>
+ <ra-config-property-value>4</ra-config-property-value>
+ </ra-config-property>
+
+ <ra-config-property>
+ <ra-config-property-name>FloatRAR</ra-config-property-name>
+ <ra-config-property-type>java.lang.Float</ra-config-property-type>
+ <ra-config-property-value>5e6</ra-config-property-value>
+ </ra-config-property>
+ <ra-config-property>
+ <ra-config-property-name>DoubleRAR</ra-config-property-name>
+
+ <ra-config-property-type>java.lang.Double</ra-config-property-type>
+ <ra-config-property-value>7e8</ra-config-property-value>
+ </ra-config-property>
+
+ <bean-validation-groups>
+ <bean-validation-group>com.mycompany.myproject.bv.Group1</bean-validation-group>
+ <bean-validation-group>com.mycompany.myproject.bv.Group2</bean-validation-group>
+ </bean-validation-groups>
+</jboss-ra>
\ No newline at end of file
Property changes on: projects/metadata/rar/trunk/src/test/resources/org/jboss/test/metadata/rar/JbossRA20DefaultNS_testBasic.xml
___________________________________________________________________
Name: svn:keywords
+ Id Reversion Date
Added: projects/metadata/rar/trunk/src/test/resources/org/jboss/test/metadata/rar/JbossRA20_testBasic.xml
===================================================================
--- projects/metadata/rar/trunk/src/test/resources/org/jboss/test/metadata/rar/JbossRA20_testBasic.xml (rev 0)
+++ projects/metadata/rar/trunk/src/test/resources/org/jboss/test/metadata/rar/JbossRA20_testBasic.xml 2009-08-12 08:39:35 UTC (rev 92254)
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jboss-ra xmlns="http://www.jboss.org/schema/ra"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.jboss.org/schema/ra
+ http://www.jboss.org/schema/jboss-ra_2_0.xsd">
+ <ra-config-property>
+ <ra-config-property-name>StringRAR</ra-config-property-name>
+ <ra-config-property-type>java.lang.String</ra-config-property-type>
+ <ra-config-property-value>XMLOVERRIDE</ra-config-property-value>
+ </ra-config-property>
+
+ <ra-config-property override-element="connection-definition">
+ <ra-config-property-name>
+ BooleanRAR</ra-config-property-name>
+
+ <ra-config-property-type>java.lang.Boolean</ra-config-property-type>
+ <ra-config-property-value>False</ra-config-property-value>
+ </ra-config-property>
+ <ra-config-property override-element="resourceadapter">
+ <ra-config-property-name>ByteRAR
+ </ra-config-property-name>
+ <ra-config-property-type>java.lang.Byte</ra-config-property-type>
+ <ra-config-property-value>1</ra-config-property-value>
+
+ </ra-config-property>
+ <ra-config-property override-element="activationspec">
+ <ra-config-property-name>
+ CharacterRAR
+ </ra-config-property-name>
+ <ra-config-property-type>java.lang.Character</ra-config-property-type>
+ <ra-config-property-value>A</ra-config-property-value>
+ </ra-config-property>
+ <ra-config-property override-element="adminobject">
+
+ <ra-config-property-name>ShortRAR</ra-config-property-name>
+ <ra-config-property-type>java.lang.Short</ra-config-property-type>
+ <ra-config-property-value>2</ra-config-property-value>
+ </ra-config-property>
+ <ra-config-property override-element="authentication-mechanism">
+ <ra-config-property-name>IntegerRAR</ra-config-property-name>
+ <ra-config-property-type>java.lang.Integer</ra-config-property-type>
+
+ <ra-config-property-value>3</ra-config-property-value>
+ </ra-config-property>
+ <ra-config-property>
+ <ra-config-property-name>LongRAR</ra-config-property-name>
+ <ra-config-property-type>java.lang.Long</ra-config-property-type>
+ <ra-config-property-value>4</ra-config-property-value>
+ </ra-config-property>
+
+ <ra-config-property>
+ <ra-config-property-name>FloatRAR</ra-config-property-name>
+ <ra-config-property-type>java.lang.Float</ra-config-property-type>
+ <ra-config-property-value>5e6</ra-config-property-value>
+ </ra-config-property>
+ <ra-config-property>
+ <ra-config-property-name>DoubleRAR</ra-config-property-name>
+
+ <ra-config-property-type>java.lang.Double</ra-config-property-type>
+ <ra-config-property-value>7e8</ra-config-property-value>
+ </ra-config-property>
+
+ <bean-validation-groups>
+ <bean-validation-group>com.mycompany.myproject.bv.Group1</bean-validation-group>
+ <bean-validation-group>com.mycompany.myproject.bv.Group2</bean-validation-group>
+ </bean-validation-groups>
+</jboss-ra>
\ No newline at end of file
Property changes on: projects/metadata/rar/trunk/src/test/resources/org/jboss/test/metadata/rar/JbossRA20_testBasic.xml
___________________________________________________________________
Name: svn:keywords
+ Id Reversion Date
More information about the jboss-cvs-commits
mailing list