[jboss-cvs] JBossAS SVN: r100400 - in projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/rules: as and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Feb 4 05:05:38 EST 2010
Author: jeff.zhang
Date: 2010-02-04 05:05:37 -0500 (Thu, 04 Feb 2010)
New Revision: 100400
Modified:
projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/rules/ao/AOConfigProperties.java
projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/rules/as/ASConfigProperties.java
projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/rules/cf/CFNull.java
projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/rules/cf/CFReferenceable.java
projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/rules/cf/CFSerializable.java
projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/rules/mc/MC.java
projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/rules/mc/MCGetMetaData.java
projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/rules/mcf/MCF.java
projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/rules/mcf/MCFConfigProperties.java
projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/rules/mcf/MCFEquals.java
projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/rules/mcf/MCFHashCode.java
Log:
[JBJCA-261] modify rules on other packag
Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/rules/ao/AOConfigProperties.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/rules/ao/AOConfigProperties.java 2010-02-04 09:53:05 UTC (rev 100399)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/rules/ao/AOConfigProperties.java 2010-02-04 10:05:37 UTC (rev 100400)
@@ -82,11 +82,11 @@
{
if (vo != null &&
Key.ADMIN_OBJECT == vo.getKey() &&
- vo.getObject() != null)
+ vo.getClazz() != null)
{
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())
@@ -103,7 +103,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());
@@ -128,7 +128,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/as/ASConfigProperties.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/rules/as/ASConfigProperties.java 2010-02-04 09:53:05 UTC (rev 100399)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/rules/as/ASConfigProperties.java 2010-02-04 10:05:37 UTC (rev 100400)
@@ -84,12 +84,12 @@
{
if (vo != null &&
Key.ACTIVATION_SPEC == vo.getKey() &&
- vo.getObject() != null &&
- vo.getObject() instanceof ActivationSpec)
+ vo.getClazz() != null &&
+ vo.getClazz().isAssignableFrom(ActivationSpec.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/cf/CFNull.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/rules/cf/CFNull.java 2010-02-04 09:53:05 UTC (rev 100399)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/rules/cf/CFNull.java 2010-02-04 10:05:37 UTC (rev 100400)
@@ -58,7 +58,7 @@
{
if (vo != null && Key.CONNECTION_FACTORY == vo.getKey())
{
- if (vo.getObject() == null)
+ if (vo.getClazz() == null)
{
List<Failure> failures = new ArrayList<Failure>(1);
Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/rules/cf/CFReferenceable.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/rules/cf/CFReferenceable.java 2010-02-04 09:53:05 UTC (rev 100399)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/rules/cf/CFReferenceable.java 2010-02-04 10:05:37 UTC (rev 100400)
@@ -61,14 +61,14 @@
{
if (vo != null && Key.CONNECTION_FACTORY == vo.getKey())
{
- if (vo.getObject() != null && !(vo.getObject() instanceof Referenceable))
+ if (vo.getClazz() != null && !vo.getClazz().isAssignableFrom(Referenceable.class))
{
List<Failure> failures = new ArrayList<Failure>(1);
Failure failure = new Failure(Severity.ERROR,
SECTION,
rb.getString("cf.CFReferenceable"),
- 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/cf/CFSerializable.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/rules/cf/CFSerializable.java 2010-02-04 09:53:05 UTC (rev 100399)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/rules/cf/CFSerializable.java 2010-02-04 10:05:37 UTC (rev 100400)
@@ -33,7 +33,9 @@
import java.util.List;
import java.util.ResourceBundle;
+import javax.resource.Referenceable;
+
/**
* Serializable must be implemented if present
*/
@@ -60,14 +62,14 @@
{
if (vo != null && Key.CONNECTION_FACTORY == vo.getKey())
{
- if (vo.getObject() != null && !(vo.getObject() instanceof Serializable))
+ if (vo.getClazz() != null && !vo.getClazz().isAssignableFrom(Referenceable.class))
{
List<Failure> failures = new ArrayList<Failure>(1);
Failure failure = new Failure(Severity.ERROR,
SECTION,
rb.getString("cf.CFSerializable"),
- 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/mc/MC.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/rules/mc/MC.java 2010-02-04 09:53:05 UTC (rev 100399)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/rules/mc/MC.java 2010-02-04 10:05:37 UTC (rev 100400)
@@ -60,14 +60,14 @@
{
if (vo != null && Key.MANAGED_CONNECTION == vo.getKey())
{
- if (!(vo.getObject() instanceof ManagedConnection))
+ if (!vo.getClazz().isAssignableFrom(ManagedConnection.class))
{
List<Failure> failures = new ArrayList<Failure>(1);
Failure failure = new Failure(Severity.ERROR,
SECTION,
rb.getString("mc.MC"),
- 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/mc/MCGetMetaData.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/rules/mc/MCGetMetaData.java 2010-02-04 09:53:05 UTC (rev 100399)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/rules/mc/MCGetMetaData.java 2010-02-04 10:05:37 UTC (rev 100400)
@@ -61,13 +61,13 @@
{
if (vo != null &&
Key.MANAGED_CONNECTION == vo.getKey() &&
- vo.getObject() instanceof ManagedConnection)
+ vo.getClazz().isAssignableFrom(ManagedConnection.class))
{
boolean error = false;
try
{
- Class clz = vo.getObject().getClass();
+ Class clz = vo.getClazz();
Method gmd = clz.getMethod("getMetaData", (Class[])null);
Object md = gmd.invoke(vo.getObject(), (Object[])null);
@@ -86,7 +86,7 @@
Failure failure = new Failure(Severity.ERROR,
SECTION,
rb.getString("mc.MCGetMetaData"),
- 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/mcf/MCF.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/rules/mcf/MCF.java 2010-02-04 09:53:05 UTC (rev 100399)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/rules/mcf/MCF.java 2010-02-04 10:05:37 UTC (rev 100400)
@@ -60,14 +60,14 @@
{
if (vo != null && Key.MANAGED_CONNECTION_FACTORY == vo.getKey())
{
- if (!(vo.getObject() instanceof ManagedConnectionFactory))
+ if (!vo.getClazz().isAssignableFrom(ManagedConnectionFactory.class))
{
List<Failure> failures = new ArrayList<Failure>(1);
Failure failure = new Failure(Severity.ERROR,
SECTION,
rb.getString("mcf.MCF"),
- 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/mcf/MCFConfigProperties.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/rules/mcf/MCFConfigProperties.java 2010-02-04 09:53:05 UTC (rev 100399)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/rules/mcf/MCFConfigProperties.java 2010-02-04 10:05:37 UTC (rev 100400)
@@ -84,12 +84,12 @@
{
if (vo != null &&
Key.MANAGED_CONNECTION_FACTORY == vo.getKey() &&
- vo.getObject() != null &&
- vo.getObject() instanceof ManagedConnectionFactory)
+ vo.getClazz() != null &&
+ vo.getClazz().isAssignableFrom(ManagedConnectionFactory.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/mcf/MCFEquals.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/rules/mcf/MCFEquals.java 2010-02-04 09:53:05 UTC (rev 100399)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/rules/mcf/MCFEquals.java 2010-02-04 10:05:37 UTC (rev 100400)
@@ -61,10 +61,10 @@
{
if (vo != null &&
Key.MANAGED_CONNECTION_FACTORY == vo.getKey() &&
- vo.getObject() instanceof ManagedConnectionFactory)
+ vo.getClazz().isAssignableFrom(ManagedConnectionFactory.class))
{
boolean error = true;
- Class clz = vo.getObject().getClass();
+ Class clz = vo.getClazz();
while (error && !clz.equals(Object.class))
{
@@ -87,7 +87,7 @@
Failure failure = new Failure(Severity.ERROR,
SECTION,
rb.getString("mcf.MCFEquals"),
- 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/mcf/MCFHashCode.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/rules/mcf/MCFHashCode.java 2010-02-04 09:53:05 UTC (rev 100399)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/rules/mcf/MCFHashCode.java 2010-02-04 10:05:37 UTC (rev 100400)
@@ -61,10 +61,10 @@
{
if (vo != null &&
Key.MANAGED_CONNECTION_FACTORY == vo.getKey() &&
- vo.getObject() instanceof ManagedConnectionFactory)
+ vo.getClazz().isAssignableFrom(ManagedConnectionFactory.class))
{
boolean error = true;
- Class clz = vo.getObject().getClass();
+ Class clz = vo.getClazz();
while (error && !clz.equals(Object.class))
{
@@ -87,7 +87,7 @@
Failure failure = new Failure(Severity.ERROR,
SECTION,
rb.getString("mcf.MCFHashCode"),
- vo.getObject().getClass().getName());
+ vo.getClazz().getName());
failures.add(failure);
return failures;
More information about the jboss-cvs-commits
mailing list