[jboss-cvs] JBossAS SVN: r100397 - projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/rules/ra.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Feb 4 04:48:21 EST 2010
Author: jeff.zhang
Date: 2010-02-04 04:48:20 -0500 (Thu, 04 Feb 2010)
New Revision: 100397
Modified:
projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/rules/ra/RA.java
projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/rules/ra/RAConfigProperties.java
projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/rules/ra/RAEquals.java
projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/rules/ra/RAHashCode.java
projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/rules/ra/RANull.java
Log:
[JBJCA-261] modify ResourceAdpater rules
Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/rules/ra/RA.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/rules/ra/RA.java 2010-02-04 09:41:01 UTC (rev 100396)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/rules/ra/RA.java 2010-02-04 09:48:20 UTC (rev 100397)
@@ -60,14 +60,14 @@
{
if (vo != null && Key.RESOURCE_ADAPTER == vo.getKey())
{
- if (vo.getObject() != null && !(vo.getObject() instanceof ResourceAdapter))
+ if (vo.getClazz() != null && !vo.getClazz().isAssignableFrom(ResourceAdapter.class))
{
List<Failure> failures = new ArrayList<Failure>(1);
Failure failure = new Failure(Severity.ERROR,
SECTION,
rb.getString("ra.RA"),
- vo.getObject().getClass().getName());
+ vo.getClazz().getName());
failures.add(failure);
return failures;
Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/rules/ra/RAConfigProperties.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/rules/ra/RAConfigProperties.java 2010-02-04 09:41:01 UTC (rev 100396)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/rules/ra/RAConfigProperties.java 2010-02-04 09:48:20 UTC (rev 100397)
@@ -84,12 +84,12 @@
{
if (vo != null &&
Key.RESOURCE_ADAPTER == vo.getKey() &&
- vo.getObject() != null &&
- vo.getObject() instanceof ResourceAdapter)
+ vo.getClazz() != null &&
+ vo.getClazz().isAssignableFrom(ResourceAdapter.class))
{
if (vo.getConfigProperties() != null && vo.getConfigProperties().size() > 0)
{
- Class clz = vo.getObject().getClass();
+ Class clz = vo.getClazz();
List<Failure> failures = new ArrayList<Failure>(1);
for (ConfigPropertyMetaData cpmd : vo.getConfigProperties())
@@ -106,7 +106,7 @@
if (!VALID_TYPES.contains(method.getReturnType()))
{
- StringBuilder sb = new StringBuilder("Class: " + vo.getObject().getClass().getName());
+ StringBuilder sb = new StringBuilder("Class: " + vo.getClazz().getName());
sb = sb.append(" Property: " + cpmd.getName());
sb = sb.append(" Type: " + method.getReturnType().getName());
@@ -131,7 +131,7 @@
if (!VALID_TYPES.contains(method.getReturnType()))
{
- StringBuilder sb = new StringBuilder("Class: " + vo.getObject().getClass().getName());
+ StringBuilder sb = new StringBuilder("Class: " + vo.getClazz().getName());
sb = sb.append(" Property: " + cpmd.getName());
sb = sb.append(" Type: " + method.getReturnType().getName());
Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/rules/ra/RAEquals.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/rules/ra/RAEquals.java 2010-02-04 09:41:01 UTC (rev 100396)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/rules/ra/RAEquals.java 2010-02-04 09:48:20 UTC (rev 100397)
@@ -90,7 +90,7 @@
Failure failure = new Failure(Severity.ERROR,
SECTION,
rb.getString("ra.RAEquals"),
- vo.getObject().getClass().getName());
+ vo.getClazz().getName());
failures.add(failure);
return failures;
Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/rules/ra/RAHashCode.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/rules/ra/RAHashCode.java 2010-02-04 09:41:01 UTC (rev 100396)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/rules/ra/RAHashCode.java 2010-02-04 09:48:20 UTC (rev 100397)
@@ -61,11 +61,11 @@
{
if (vo != null &&
Key.RESOURCE_ADAPTER == vo.getKey() &&
- vo.getObject() != null &&
- vo.getObject() instanceof ResourceAdapter)
+ vo.getClazz() != null &&
+ vo.getClazz().isAssignableFrom(ResourceAdapter.class))
{
boolean error = true;
- Class clz = vo.getObject().getClass();
+ Class clz = vo.getClazz();
while (error && !clz.equals(Object.class))
{
@@ -88,7 +88,7 @@
Failure failure = new Failure(Severity.ERROR,
SECTION,
rb.getString("ra.RAHashCode"),
- vo.getObject().getClass().getName());
+ vo.getClazz().getName());
failures.add(failure);
return failures;
Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/rules/ra/RANull.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/rules/ra/RANull.java 2010-02-04 09:41:01 UTC (rev 100396)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/rules/ra/RANull.java 2010-02-04 09:48:20 UTC (rev 100397)
@@ -58,7 +58,7 @@
{
if (vo != null && Key.RESOURCE_ADAPTER == vo.getKey())
{
- if (vo.getObject() == null)
+ if (vo.getClazz() == null)
{
List<Failure> failures = new ArrayList<Failure>(1);
More information about the jboss-cvs-commits
mailing list