[jboss-cvs] JBossAS SVN: r67040 - in projects/metadata/trunk/src: main/resources/schema and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Nov 13 15:29:42 EST 2007
Author: ALRubinger
Date: 2007-11-13 15:29:41 -0500 (Tue, 13 Nov 2007)
New Revision: 67040
Modified:
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/PoolConfigMetaData.java
projects/metadata/trunk/src/main/resources/schema/jboss_5_0.xsd
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss5xEverythingUnitTestCase.java
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testBaseData.xml
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testEverything.xml
Log:
Updated @Pool to resolve API Leakage
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/PoolConfigMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/PoolConfigMetaData.java 2007-11-13 20:24:01 UTC (rev 67039)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/PoolConfigMetaData.java 2007-11-13 20:29:41 UTC (rev 67040)
@@ -33,18 +33,19 @@
*/
public class PoolConfigMetaData
{
- private String poolClass = null;
+ private String value = null;
private Integer maxSize = null;
private Integer timeout = null;
- public String getPoolClass()
+ public String getValue()
{
- return poolClass;
+ return value;
}
- public void setPoolClass(String poolClass)
+ @XmlElement(name="pool-value")
+ public void setValue(String value)
{
- this.poolClass = poolClass;
+ this.value = value;
}
@XmlElement(name="pool-max-size")
@@ -73,7 +74,7 @@
{
StringBuffer sb = new StringBuffer(100);
sb.append("[");
- sb.append("poolClass=").append(poolClass);
+ sb.append("poolClass=").append(value);
sb.append(", maxSize=").append(maxSize);
sb.append(", timeout=").append(timeout);
sb.append("]");
Modified: projects/metadata/trunk/src/main/resources/schema/jboss_5_0.xsd
===================================================================
--- projects/metadata/trunk/src/main/resources/schema/jboss_5_0.xsd 2007-11-13 20:24:01 UTC (rev 67039)
+++ projects/metadata/trunk/src/main/resources/schema/jboss_5_0.xsd 2007-11-13 20:29:41 UTC (rev 67040)
@@ -999,7 +999,7 @@
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
- <xsd:element name="pool-class" type="jboss:pool-classType" minOccurs="0"/>
+ <xsd:element name="pool-value" type="jboss:pool-valueType" minOccurs="0"/>
<xsd:element name="pool-max-size" type="jboss:pool-max-sizeType" minOccurs="0"/>
<xsd:element name="pool-timeout" type="jboss:pool-timeoutType" minOccurs="0"/>
</xsd:sequence>
@@ -1007,9 +1007,9 @@
<!-- **************************************************** -->
- <xsd:complexType name="pool-classType">
+ <xsd:complexType name="pool-valueType">
<xsd:annotation>
- <xsd:documentation>The class of the pool</xsd:documentation>
+ <xsd:documentation>The type of the pool</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
<xsd:restriction base="javaee:string"/>
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss5xEverythingUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss5xEverythingUnitTestCase.java 2007-11-13 20:24:01 UTC (rev 67039)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss5xEverythingUnitTestCase.java 2007-11-13 20:29:41 UTC (rev 67040)
@@ -1214,7 +1214,7 @@
private void assertPoolConfig(String prefix, PoolConfigMetaData poolConfig)
{
assertNotNull(prefix + " has no poolConfig", poolConfig);
- assertEquals(prefix + "PoolClass", poolConfig.getPoolClass());
+ assertEquals(prefix + "PoolClass", poolConfig.getValue());
assertEquals(10, (int) poolConfig.getMaxSize());
assertEquals(11, (int) poolConfig.getTimeout());
}
Modified: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testBaseData.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testBaseData.xml 2007-11-13 20:24:01 UTC (rev 67039)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testBaseData.xml 2007-11-13 20:29:41 UTC (rev 67040)
@@ -473,7 +473,7 @@
</cache-config>
<pool-config>
- <pool-class>session1PoolClass</pool-class>
+ <pool-value>session1PoolClass</pool-value>
<pool-max-size>10</pool-max-size>
<pool-timeout>11</pool-timeout>
</pool-config>
@@ -922,7 +922,7 @@
</cache-config>
<pool-config>
- <pool-class>session2PoolClass</pool-class>
+ <pool-value>session2PoolClass</pool-value>
<pool-max-size>10</pool-max-size>
<pool-timeout>11</pool-timeout>
</pool-config>
Modified: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testEverything.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testEverything.xml 2007-11-13 20:24:01 UTC (rev 67039)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testEverything.xml 2007-11-13 20:29:41 UTC (rev 67040)
@@ -473,7 +473,7 @@
</cache-config>
<pool-config>
- <pool-class>session1PoolClass</pool-class>
+ <pool-value>session1PoolClass</pool-value>
<pool-max-size>10</pool-max-size>
<pool-timeout>11</pool-timeout>
</pool-config>
@@ -922,7 +922,7 @@
</cache-config>
<pool-config>
- <pool-class>session2PoolClass</pool-class>
+ <pool-value>session2PoolClass</pool-value>
<pool-max-size>10</pool-max-size>
<pool-timeout>11</pool-timeout>
</pool-config>
More information about the jboss-cvs-commits
mailing list