[jboss-cvs] JBossAS SVN: r66976 - 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
Mon Nov 12 15:34:28 EST 2007
Author: ALRubinger
Date: 2007-11-12 15:34:28 -0500 (Mon, 12 Nov 2007)
New Revision: 66976
Modified:
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/CacheConfigMetaData.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:
Refactored @Cache to prevent API leakage
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/CacheConfigMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/CacheConfigMetaData.java 2007-11-12 19:56:15 UTC (rev 66975)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/CacheConfigMetaData.java 2007-11-12 20:34:28 UTC (rev 66976)
@@ -33,7 +33,7 @@
*/
public class CacheConfigMetaData
{
- private String cacheClass = null;
+ private String value = null;
private Integer maxSize = null;
private Integer idleTimeoutSeconds = null;
private Integer removeTimeoutSeconds = null;
@@ -51,14 +51,15 @@
this.persistenceManager = persistenceManager;
}
- public String getCacheClass()
+ public String getValue()
{
- return cacheClass;
+ return value;
}
- public void setCacheClass(String cacheClass)
+ @XmlElement(name="cache-value")
+ public void setValue(String value)
{
- this.cacheClass = cacheClass;
+ this.value = value;
}
public Integer getMaxSize()
@@ -117,7 +118,7 @@
{
StringBuffer sb = new StringBuffer(100);
sb.append("[");
- sb.append("cacheClass=").append(cacheClass);
+ sb.append("cacheValue=").append(value);
sb.append(", maxSize=").append(maxSize);
sb.append(", idleTimeoutSeconds=").append(idleTimeoutSeconds);
sb.append(", name=").append(name);
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-12 19:56:15 UTC (rev 66975)
+++ projects/metadata/trunk/src/main/resources/schema/jboss_5_0.xsd 2007-11-12 20:34:28 UTC (rev 66976)
@@ -1047,7 +1047,7 @@
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
- <xsd:element name="cache-class" type="jboss:cache-classType" minOccurs="0"/>
+ <xsd:element name="cache-value" type="jboss:cache-valueType" minOccurs="0"/>
<xsd:element name="cache-max-size" type="jboss:cache-max-sizeType" minOccurs="0"/>
<xsd:element name="idle-timeout-seconds" type="jboss:idle-timeout-secondsType" minOccurs="0"/>
<xsd:element name="remove-timeout-seconds" type="jboss:remove-timeout-secondsType" minOccurs="0"/>
@@ -1069,9 +1069,9 @@
<!-- **************************************************** -->
- <xsd:complexType name="cache-classType">
+ <xsd:complexType name="cache-valueType">
<xsd:annotation>
- <xsd:documentation>The class of the cache</xsd:documentation>
+ <xsd:documentation>The value of the cache</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-12 19:56:15 UTC (rev 66975)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss5xEverythingUnitTestCase.java 2007-11-12 20:34:28 UTC (rev 66976)
@@ -276,7 +276,7 @@
public void assertCacheConfig(String prefix, int num, CacheConfigMetaData cacheConfig)
{
assertNotNull(prefix, cacheConfig);
- assertEquals(prefix + "CacheClass", cacheConfig.getCacheClass());
+ assertEquals(prefix + "CacheClass", cacheConfig.getValue());
assertEquals(10 * num, (int) cacheConfig.getMaxSize());
assertEquals(11 * num, (int) cacheConfig.getIdleTimeoutSeconds());
assertEquals(12 * num, (int) cacheConfig.getRemoveTimeoutSeconds());
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-12 19:56:15 UTC (rev 66975)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testBaseData.xml 2007-11-12 20:34:28 UTC (rev 66976)
@@ -464,7 +464,7 @@
<aop-domain-name>session1AOPDomain</aop-domain-name>
<cache-config>
- <cache-class>session1CacheClass</cache-class>
+ <cache-value>session1CacheClass</cache-value>
<cache-max-size>10</cache-max-size>
<idle-timeout-seconds>11</idle-timeout-seconds>
<remove-timeout-seconds>12</remove-timeout-seconds>
@@ -913,7 +913,7 @@
<aop-domain-name>session2AOPDomain</aop-domain-name>
<cache-config>
- <cache-class>session2CacheClass</cache-class>
+ <cache-value>session2CacheClass</cache-value>
<cache-max-size>20</cache-max-size>
<idle-timeout-seconds>22</idle-timeout-seconds>
<remove-timeout-seconds>24</remove-timeout-seconds>
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-12 19:56:15 UTC (rev 66975)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testEverything.xml 2007-11-12 20:34:28 UTC (rev 66976)
@@ -464,7 +464,7 @@
<aop-domain-name>session1AOPDomain</aop-domain-name>
<cache-config>
- <cache-class>session1CacheClass</cache-class>
+ <cache-value>session1CacheClass</cache-value>
<cache-max-size>10</cache-max-size>
<idle-timeout-seconds>11</idle-timeout-seconds>
<remove-timeout-seconds>12</remove-timeout-seconds>
@@ -913,7 +913,7 @@
<aop-domain-name>session2AOPDomain</aop-domain-name>
<cache-config>
- <cache-class>session2CacheClass</cache-class>
+ <cache-value>session2CacheClass</cache-value>
<cache-max-size>20</cache-max-size>
<idle-timeout-seconds>22</idle-timeout-seconds>
<remove-timeout-seconds>24</remove-timeout-seconds>
More information about the jboss-cvs-commits
mailing list