[jboss-cvs] JBossAS SVN: r101214 - in projects/metadata/rar/trunk/src: main/resources/schema and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sun Feb 21 22:01:43 EST 2010
Author: jeff.zhang
Date: 2010-02-21 22:01:43 -0500 (Sun, 21 Feb 2010)
New Revision: 101214
Added:
projects/metadata/rar/trunk/src/test/resources/org/jboss/test/metadata/rar/JbossRA20_testBootstrapContextShouldBeNull.xml
Modified:
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
Log:
[JBMETA-255] Add bootstrap-context to jboss-ra.xml
Modified: 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 2010-02-22 01:18:51 UTC (rev 101213)
+++ projects/metadata/rar/trunk/src/main/java/org/jboss/metadata/rar/jboss/JBossRA20Base.java 2010-02-22 03:01:43 UTC (rev 101214)
@@ -36,6 +36,8 @@
private static final long serialVersionUID = -8045048197795930659L;
private List<BvGroupMetaData> bvGroupsList;
+
+ private String bootstrapContext = null;
/**
* @return the bvGroupsList
@@ -54,4 +56,24 @@
this.bvGroupsList = bvGroupsList;
}
+ /**
+ * Get the bootstrapContext.
+ *
+ * @return the bootstrapContext.
+ */
+ public String getBootstrapContext()
+ {
+ return bootstrapContext;
+ }
+
+ /**
+ * Set the bootstrapContext.
+ *
+ * @param bootstrapContext The bootstrapContext to set.
+ */
+ public void setBootstrapContext(String bootstrapContext)
+ {
+ this.bootstrapContext = bootstrapContext;
+ }
+
}
Modified: 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 2010-02-22 01:18:51 UTC (rev 101213)
+++ projects/metadata/rar/trunk/src/main/java/org/jboss/metadata/rar/jboss/JBossRA20DefaultNSMetaData.java 2010-02-22 03:01:43 UTC (rev 101214)
@@ -39,7 +39,7 @@
normalizeSpace=true,
strict=false)
@XmlType(name="jboss-raType",
- propOrder={"raConfigProps", "bvGroupsList"})
+ propOrder={"raConfigProps", "bvGroupsList", "bootstrapContext"})
public class JBossRA20DefaultNSMetaData extends JBossRA20Base
{
Modified: 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 2010-02-22 01:18:51 UTC (rev 101213)
+++ projects/metadata/rar/trunk/src/main/java/org/jboss/metadata/rar/jboss/JBossRA20MetaData.java 2010-02-22 03:01:43 UTC (rev 101214)
@@ -41,7 +41,7 @@
elementFormDefault=XmlNsForm.QUALIFIED,
normalizeSpace=true)
@XmlType(name="jboss-raType",
- propOrder={"raConfigProps", "bvGroupsList"})
+ propOrder={"raConfigProps", "bvGroupsList", "bootstrapContext"})
public class JBossRA20MetaData extends JBossRA20Base
{
Modified: 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 2010-02-22 01:18:51 UTC (rev 101213)
+++ projects/metadata/rar/trunk/src/main/resources/schema/jboss-ra_2_0.xsd 2010-02-22 03:01:43 UTC (rev 101214)
@@ -17,6 +17,7 @@
<xs:element name="bean-validation-groups" type="ra:bean-validation-groups-type" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:element name="bootstrap-context" type="xs:token" minOccurs="0" maxOccurs="1"/>
</xs:sequence>
</xs:complexType>
Modified: 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 2010-02-22 01:18:51 UTC (rev 101213)
+++ projects/metadata/rar/trunk/src/test/java/org/jboss/test/metadata/rar/JbossRA20DefaultNSUnitTestCase.java 2010-02-22 03:01:43 UTC (rev 101214)
@@ -50,6 +50,17 @@
{
JBossRA20DefaultNSMetaData jbossRA = unmarshal(JBossRA20DefaultNSMetaData.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");
+
+ assertEquals(jbossRA.getBootstrapContext(), "High");
}
}
Modified: 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 2010-02-22 01:18:51 UTC (rev 101213)
+++ projects/metadata/rar/trunk/src/test/java/org/jboss/test/metadata/rar/JbossRA20UnitTestCase.java 2010-02-22 03:01:43 UTC (rev 101214)
@@ -58,5 +58,14 @@
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");
+
+ assertEquals(jbossRA.getBootstrapContext(), "High");
}
+
+ public void testBootstrapContextShouldBeNull() throws Exception
+ {
+ JBossRA20MetaData jbossRA = unmarshal(JBossRA20MetaData.class);
+ assertNotNull(jbossRA);
+ assertEquals(jbossRA.getBootstrapContext(), null);
+ }
}
Modified: 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 2010-02-22 01:18:51 UTC (rev 101213)
+++ projects/metadata/rar/trunk/src/test/resources/org/jboss/test/metadata/rar/JbossRA20DefaultNS_testBasic.xml 2010-02-22 03:01:43 UTC (rev 101214)
@@ -57,8 +57,10 @@
<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>
+ <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>
+
+ <bootstrap-context>High</bootstrap-context>
</jboss-ra>
\ No newline at end of file
Modified: 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 2010-02-22 01:18:51 UTC (rev 101213)
+++ projects/metadata/rar/trunk/src/test/resources/org/jboss/test/metadata/rar/JbossRA20_testBasic.xml 2010-02-22 03:01:43 UTC (rev 101214)
@@ -60,8 +60,10 @@
<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>
+ <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>
+
+ <bootstrap-context>High</bootstrap-context>
</jboss-ra>
\ No newline at end of file
Added: projects/metadata/rar/trunk/src/test/resources/org/jboss/test/metadata/rar/JbossRA20_testBootstrapContextShouldBeNull.xml
===================================================================
--- projects/metadata/rar/trunk/src/test/resources/org/jboss/test/metadata/rar/JbossRA20_testBootstrapContextShouldBeNull.xml (rev 0)
+++ projects/metadata/rar/trunk/src/test/resources/org/jboss/test/metadata/rar/JbossRA20_testBootstrapContextShouldBeNull.xml 2010-02-22 03:01:43 UTC (rev 101214)
@@ -0,0 +1,19 @@
+<?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>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>
+
+ <!-- here no bootstrap-context element -->
+</jboss-ra>
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list