[jboss-cvs] JBossAS SVN: r100395 - in projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers: common/validator/rules/ao and 6 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Feb 4 04:35:36 EST 2010
Author: jeff.zhang
Date: 2010-02-04 04:35:35 -0500 (Thu, 04 Feb 2010)
New Revision: 100395
Added:
projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/ValidateClass.java
Modified:
projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/Rule.java
projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/Validator.java
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
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
projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployer.java
Log:
[JBJCA-261] Replace ValidateObject by ValidateClass
Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/Rule.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/Rule.java 2010-02-04 07:57:33 UTC (rev 100394)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/Rule.java 2010-02-04 09:35:35 UTC (rev 100395)
@@ -36,5 +36,5 @@
* @param rb The resource bundle
* @return The list of failures found; <code>null</code> if none
*/
- public List<Failure> validate(ValidateObject obj, ResourceBundle rb);
+ public List<Failure> validate(ValidateClass obj, ResourceBundle rb);
}
Added: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/ValidateClass.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/ValidateClass.java (rev 0)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/ValidateClass.java 2010-02-04 09:35:35 UTC (rev 100395)
@@ -0,0 +1,107 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.jca.deployers.common.validator;
+
+import java.util.List;
+
+import org.jboss.metadata.rar.spec.ConfigPropertyMetaData;
+
+/**
+ * ValidateClass for objects that should be validated
+ */
+public class ValidateClass
+{
+ /** Key */
+ private int key;
+
+ /** Onject */
+ private Object object;
+
+ /** config-property */
+ private List<ConfigPropertyMetaData> configProperties;
+
+ /** clazz */
+ private Class<?> clazz;
+
+ /**
+ * Constructor
+ * @param key The key
+ * @param object The key
+ */
+ public ValidateClass(int key,
+ Object object)
+ {
+ this(key, object, null);
+ }
+
+ /**
+ * Constructor
+ * @param key The key
+ * @param object The key
+ * @param configProperties The list of config property metadata
+ */
+ public ValidateClass(int key,
+ Object object,
+ List<ConfigPropertyMetaData> configProperties)
+ {
+ this.key = key;
+ this.object = object;
+ this.clazz = object.getClass();
+ this.configProperties = configProperties;
+ }
+
+ /**
+ * Get the key
+ * @return The key
+ */
+ public int getKey()
+ {
+ return key;
+ }
+
+ /**
+ * Get the object
+ * @return The object
+ */
+ public Object getObject()
+ {
+ return object;
+ }
+
+ /**
+ * Get the clazz
+ * @return The clazz
+ */
+ public Class<?> getClazz()
+ {
+ return clazz;
+ }
+
+ /**
+ * Get the list of config properties
+ * @return The list
+ */
+ public List<ConfigPropertyMetaData> getConfigProperties()
+ {
+ return configProperties;
+ }
+}
Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/Validator.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/Validator.java 2010-02-04 07:57:33 UTC (rev 100394)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/Validator.java 2010-02-04 09:35:35 UTC (rev 100395)
@@ -77,7 +77,7 @@
* @param objects Objects that should be validated
* @return The list of failures; <code>null</code> if no errors
*/
- public List<Failure> validate(ValidateObject[] objects)
+ public List<Failure> validate(ValidateClass[] objects)
{
if (objects == null || objects.length == 0)
return null;
@@ -105,7 +105,7 @@
for (Rule rule : rules)
{
- for (ValidateObject obj : objects)
+ for (ValidateClass obj : objects)
{
List<Failure> failures = rule.validate(obj, resourceBundle);
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 07:57:33 UTC (rev 100394)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/rules/ao/AOConfigProperties.java 2010-02-04 09:35:35 UTC (rev 100395)
@@ -26,7 +26,7 @@
import org.jboss.jca.deployers.common.validator.Key;
import org.jboss.jca.deployers.common.validator.Rule;
import org.jboss.jca.deployers.common.validator.Severity;
-import org.jboss.jca.deployers.common.validator.ValidateObject;
+import org.jboss.jca.deployers.common.validator.ValidateClass;
import java.lang.reflect.Method;
import java.util.ArrayList;
@@ -78,7 +78,7 @@
* @return The list of failures found; <code>null</code> if none
*/
@SuppressWarnings("unchecked")
- public List<Failure> validate(ValidateObject vo, ResourceBundle rb)
+ public List<Failure> validate(ValidateClass vo, ResourceBundle rb)
{
if (vo != null &&
Key.ADMIN_OBJECT == vo.getKey() &&
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 07:57:33 UTC (rev 100394)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/rules/as/ASConfigProperties.java 2010-02-04 09:35:35 UTC (rev 100395)
@@ -26,7 +26,7 @@
import org.jboss.jca.deployers.common.validator.Key;
import org.jboss.jca.deployers.common.validator.Rule;
import org.jboss.jca.deployers.common.validator.Severity;
-import org.jboss.jca.deployers.common.validator.ValidateObject;
+import org.jboss.jca.deployers.common.validator.ValidateClass;
import java.lang.reflect.Method;
import java.util.ArrayList;
@@ -80,7 +80,7 @@
* @return The list of failures found; <code>null</code> if none
*/
@SuppressWarnings("unchecked")
- public List<Failure> validate(ValidateObject vo, ResourceBundle rb)
+ public List<Failure> validate(ValidateClass vo, ResourceBundle rb)
{
if (vo != null &&
Key.ACTIVATION_SPEC == vo.getKey() &&
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 07:57:33 UTC (rev 100394)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/rules/cf/CFNull.java 2010-02-04 09:35:35 UTC (rev 100395)
@@ -26,7 +26,7 @@
import org.jboss.jca.deployers.common.validator.Key;
import org.jboss.jca.deployers.common.validator.Rule;
import org.jboss.jca.deployers.common.validator.Severity;
-import org.jboss.jca.deployers.common.validator.ValidateObject;
+import org.jboss.jca.deployers.common.validator.ValidateClass;
import java.util.ArrayList;
import java.util.List;
@@ -54,7 +54,7 @@
* @return The list of failures found; <code>null</code> if none
*/
@SuppressWarnings("unchecked")
- public List<Failure> validate(ValidateObject vo, ResourceBundle rb)
+ public List<Failure> validate(ValidateClass vo, ResourceBundle rb)
{
if (vo != null && Key.CONNECTION_FACTORY == vo.getKey())
{
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 07:57:33 UTC (rev 100394)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/rules/cf/CFReferenceable.java 2010-02-04 09:35:35 UTC (rev 100395)
@@ -26,7 +26,7 @@
import org.jboss.jca.deployers.common.validator.Key;
import org.jboss.jca.deployers.common.validator.Rule;
import org.jboss.jca.deployers.common.validator.Severity;
-import org.jboss.jca.deployers.common.validator.ValidateObject;
+import org.jboss.jca.deployers.common.validator.ValidateClass;
import java.util.ArrayList;
import java.util.List;
@@ -57,7 +57,7 @@
* @return The list of failures found; <code>null</code> if none
*/
@SuppressWarnings("unchecked")
- public List<Failure> validate(ValidateObject vo, ResourceBundle rb)
+ public List<Failure> validate(ValidateClass vo, ResourceBundle rb)
{
if (vo != null && Key.CONNECTION_FACTORY == vo.getKey())
{
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 07:57:33 UTC (rev 100394)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/rules/cf/CFSerializable.java 2010-02-04 09:35:35 UTC (rev 100395)
@@ -26,7 +26,7 @@
import org.jboss.jca.deployers.common.validator.Key;
import org.jboss.jca.deployers.common.validator.Rule;
import org.jboss.jca.deployers.common.validator.Severity;
-import org.jboss.jca.deployers.common.validator.ValidateObject;
+import org.jboss.jca.deployers.common.validator.ValidateClass;
import java.io.Serializable;
import java.util.ArrayList;
@@ -56,7 +56,7 @@
* @return The list of failures found; <code>null</code> if none
*/
@SuppressWarnings("unchecked")
- public List<Failure> validate(ValidateObject vo, ResourceBundle rb)
+ public List<Failure> validate(ValidateClass vo, ResourceBundle rb)
{
if (vo != null && Key.CONNECTION_FACTORY == vo.getKey())
{
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 07:57:33 UTC (rev 100394)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/rules/mc/MC.java 2010-02-04 09:35:35 UTC (rev 100395)
@@ -26,7 +26,7 @@
import org.jboss.jca.deployers.common.validator.Key;
import org.jboss.jca.deployers.common.validator.Rule;
import org.jboss.jca.deployers.common.validator.Severity;
-import org.jboss.jca.deployers.common.validator.ValidateObject;
+import org.jboss.jca.deployers.common.validator.ValidateClass;
import java.util.ArrayList;
import java.util.List;
@@ -56,7 +56,7 @@
* @return The list of failures found; <code>null</code> if none
*/
@SuppressWarnings("unchecked")
- public List<Failure> validate(ValidateObject vo, ResourceBundle rb)
+ public List<Failure> validate(ValidateClass vo, ResourceBundle rb)
{
if (vo != null && Key.MANAGED_CONNECTION == vo.getKey())
{
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 07:57:33 UTC (rev 100394)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/rules/mc/MCGetMetaData.java 2010-02-04 09:35:35 UTC (rev 100395)
@@ -26,7 +26,7 @@
import org.jboss.jca.deployers.common.validator.Key;
import org.jboss.jca.deployers.common.validator.Rule;
import org.jboss.jca.deployers.common.validator.Severity;
-import org.jboss.jca.deployers.common.validator.ValidateObject;
+import org.jboss.jca.deployers.common.validator.ValidateClass;
import java.lang.reflect.Method;
import java.util.ArrayList;
@@ -57,7 +57,7 @@
* @return The list of failures found; <code>null</code> if none
*/
@SuppressWarnings("unchecked")
- public List<Failure> validate(ValidateObject vo, ResourceBundle rb)
+ public List<Failure> validate(ValidateClass vo, ResourceBundle rb)
{
if (vo != null &&
Key.MANAGED_CONNECTION == vo.getKey() &&
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 07:57:33 UTC (rev 100394)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/rules/mcf/MCF.java 2010-02-04 09:35:35 UTC (rev 100395)
@@ -26,7 +26,7 @@
import org.jboss.jca.deployers.common.validator.Key;
import org.jboss.jca.deployers.common.validator.Rule;
import org.jboss.jca.deployers.common.validator.Severity;
-import org.jboss.jca.deployers.common.validator.ValidateObject;
+import org.jboss.jca.deployers.common.validator.ValidateClass;
import java.util.ArrayList;
import java.util.List;
@@ -56,7 +56,7 @@
* @return The list of failures found; <code>null</code> if none
*/
@SuppressWarnings("unchecked")
- public List<Failure> validate(ValidateObject vo, ResourceBundle rb)
+ public List<Failure> validate(ValidateClass vo, ResourceBundle rb)
{
if (vo != null && Key.MANAGED_CONNECTION_FACTORY == vo.getKey())
{
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 07:57:33 UTC (rev 100394)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/rules/mcf/MCFConfigProperties.java 2010-02-04 09:35:35 UTC (rev 100395)
@@ -26,7 +26,7 @@
import org.jboss.jca.deployers.common.validator.Key;
import org.jboss.jca.deployers.common.validator.Rule;
import org.jboss.jca.deployers.common.validator.Severity;
-import org.jboss.jca.deployers.common.validator.ValidateObject;
+import org.jboss.jca.deployers.common.validator.ValidateClass;
import java.lang.reflect.Method;
import java.util.ArrayList;
@@ -80,7 +80,7 @@
* @return The list of failures found; <code>null</code> if none
*/
@SuppressWarnings("unchecked")
- public List<Failure> validate(ValidateObject vo, ResourceBundle rb)
+ public List<Failure> validate(ValidateClass vo, ResourceBundle rb)
{
if (vo != null &&
Key.MANAGED_CONNECTION_FACTORY == vo.getKey() &&
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 07:57:33 UTC (rev 100394)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/rules/mcf/MCFEquals.java 2010-02-04 09:35:35 UTC (rev 100395)
@@ -26,7 +26,7 @@
import org.jboss.jca.deployers.common.validator.Key;
import org.jboss.jca.deployers.common.validator.Rule;
import org.jboss.jca.deployers.common.validator.Severity;
-import org.jboss.jca.deployers.common.validator.ValidateObject;
+import org.jboss.jca.deployers.common.validator.ValidateClass;
import java.lang.reflect.Method;
import java.util.ArrayList;
@@ -57,7 +57,7 @@
* @return The list of failures found; <code>null</code> if none
*/
@SuppressWarnings("unchecked")
- public List<Failure> validate(ValidateObject vo, ResourceBundle rb)
+ public List<Failure> validate(ValidateClass vo, ResourceBundle rb)
{
if (vo != null &&
Key.MANAGED_CONNECTION_FACTORY == vo.getKey() &&
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 07:57:33 UTC (rev 100394)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/rules/mcf/MCFHashCode.java 2010-02-04 09:35:35 UTC (rev 100395)
@@ -26,7 +26,7 @@
import org.jboss.jca.deployers.common.validator.Key;
import org.jboss.jca.deployers.common.validator.Rule;
import org.jboss.jca.deployers.common.validator.Severity;
-import org.jboss.jca.deployers.common.validator.ValidateObject;
+import org.jboss.jca.deployers.common.validator.ValidateClass;
import java.lang.reflect.Method;
import java.util.ArrayList;
@@ -57,7 +57,7 @@
* @return The list of failures found; <code>null</code> if none
*/
@SuppressWarnings("unchecked")
- public List<Failure> validate(ValidateObject vo, ResourceBundle rb)
+ public List<Failure> validate(ValidateClass vo, ResourceBundle rb)
{
if (vo != null &&
Key.MANAGED_CONNECTION_FACTORY == vo.getKey() &&
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 07:57:33 UTC (rev 100394)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/rules/ra/RA.java 2010-02-04 09:35:35 UTC (rev 100395)
@@ -26,7 +26,7 @@
import org.jboss.jca.deployers.common.validator.Key;
import org.jboss.jca.deployers.common.validator.Rule;
import org.jboss.jca.deployers.common.validator.Severity;
-import org.jboss.jca.deployers.common.validator.ValidateObject;
+import org.jboss.jca.deployers.common.validator.ValidateClass;
import java.util.ArrayList;
import java.util.List;
@@ -56,7 +56,7 @@
* @return The list of failures found; <code>null</code> if none
*/
@SuppressWarnings("unchecked")
- public List<Failure> validate(ValidateObject vo, ResourceBundle rb)
+ public List<Failure> validate(ValidateClass vo, ResourceBundle rb)
{
if (vo != null && Key.RESOURCE_ADAPTER == vo.getKey())
{
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 07:57:33 UTC (rev 100394)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/rules/ra/RAConfigProperties.java 2010-02-04 09:35:35 UTC (rev 100395)
@@ -26,7 +26,7 @@
import org.jboss.jca.deployers.common.validator.Key;
import org.jboss.jca.deployers.common.validator.Rule;
import org.jboss.jca.deployers.common.validator.Severity;
-import org.jboss.jca.deployers.common.validator.ValidateObject;
+import org.jboss.jca.deployers.common.validator.ValidateClass;
import java.lang.reflect.Method;
import java.util.ArrayList;
@@ -80,7 +80,7 @@
* @return The list of failures found; <code>null</code> if none
*/
@SuppressWarnings("unchecked")
- public List<Failure> validate(ValidateObject vo, ResourceBundle rb)
+ public List<Failure> validate(ValidateClass vo, ResourceBundle rb)
{
if (vo != null &&
Key.RESOURCE_ADAPTER == vo.getKey() &&
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 07:57:33 UTC (rev 100394)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/rules/ra/RAEquals.java 2010-02-04 09:35:35 UTC (rev 100395)
@@ -26,7 +26,7 @@
import org.jboss.jca.deployers.common.validator.Key;
import org.jboss.jca.deployers.common.validator.Rule;
import org.jboss.jca.deployers.common.validator.Severity;
-import org.jboss.jca.deployers.common.validator.ValidateObject;
+import org.jboss.jca.deployers.common.validator.ValidateClass;
import java.lang.reflect.Method;
import java.util.ArrayList;
@@ -57,15 +57,15 @@
* @return The list of failures found; <code>null</code> if none
*/
@SuppressWarnings("unchecked")
- public List<Failure> validate(ValidateObject vo, ResourceBundle rb)
+ public List<Failure> validate(ValidateClass vo, ResourceBundle rb)
{
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();
System.out.println("Hello World");
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 07:57:33 UTC (rev 100394)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/rules/ra/RAHashCode.java 2010-02-04 09:35:35 UTC (rev 100395)
@@ -26,7 +26,7 @@
import org.jboss.jca.deployers.common.validator.Key;
import org.jboss.jca.deployers.common.validator.Rule;
import org.jboss.jca.deployers.common.validator.Severity;
-import org.jboss.jca.deployers.common.validator.ValidateObject;
+import org.jboss.jca.deployers.common.validator.ValidateClass;
import java.lang.reflect.Method;
import java.util.ArrayList;
@@ -57,7 +57,7 @@
* @return The list of failures found; <code>null</code> if none
*/
@SuppressWarnings("unchecked")
- public List<Failure> validate(ValidateObject vo, ResourceBundle rb)
+ public List<Failure> validate(ValidateClass vo, ResourceBundle rb)
{
if (vo != null &&
Key.RESOURCE_ADAPTER == vo.getKey() &&
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 07:57:33 UTC (rev 100394)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/rules/ra/RANull.java 2010-02-04 09:35:35 UTC (rev 100395)
@@ -26,7 +26,7 @@
import org.jboss.jca.deployers.common.validator.Key;
import org.jboss.jca.deployers.common.validator.Rule;
import org.jboss.jca.deployers.common.validator.Severity;
-import org.jboss.jca.deployers.common.validator.ValidateObject;
+import org.jboss.jca.deployers.common.validator.ValidateClass;
import java.util.ArrayList;
import java.util.List;
@@ -54,7 +54,7 @@
* @return The list of failures found; <code>null</code> if none
*/
@SuppressWarnings("unchecked")
- public List<Failure> validate(ValidateObject vo, ResourceBundle rb)
+ public List<Failure> validate(ValidateClass vo, ResourceBundle rb)
{
if (vo != null && Key.RESOURCE_ADAPTER == vo.getKey())
{
Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployer.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployer.java 2010-02-04 07:57:33 UTC (rev 100394)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployer.java 2010-02-04 09:35:35 UTC (rev 100395)
@@ -28,7 +28,8 @@
import org.jboss.jca.deployers.common.validator.FailureHelper;
import org.jboss.jca.deployers.common.validator.Key;
import org.jboss.jca.deployers.common.validator.Severity;
-import org.jboss.jca.deployers.common.validator.ValidateObject;
+import org.jboss.jca.deployers.common.validator.ValidateClass;
+//import org.jboss.jca.deployers.common.validator.ValidateObject;
import org.jboss.jca.deployers.common.validator.Validator;
import org.jboss.jca.fungal.deployers.CloneableDeployer;
import org.jboss.jca.fungal.deployers.DeployException;
@@ -57,7 +58,7 @@
import javax.naming.Context;
import javax.naming.InitialContext;
-import javax.naming.NamingException;
+//import javax.naming.NamingException;
import javax.naming.Reference;
import javax.resource.Referenceable;
import javax.resource.spi.BootstrapContext;
@@ -321,7 +322,7 @@
log.info("Required license terms for " + url.toExternalForm());
ResourceAdapter resourceAdapter = null;
- List<ValidateObject> archiveValidationObjects = new ArrayList<ValidateObject>();
+ List<ValidateClass> archiveValidationObjects = new ArrayList<ValidateClass>();
List<Object> beanValidationObjects = new ArrayList<Object>();
List<Object> associationObjects = new ArrayList<Object>();
@@ -342,7 +343,7 @@
log.trace("ResourceAdapter defined in classloader: " + resourceAdapter.getClass().getClassLoader());
}
- archiveValidationObjects.add(new ValidateObject(Key.RESOURCE_ADAPTER,
+ archiveValidationObjects.add(new ValidateClass(Key.RESOURCE_ADAPTER,
resourceAdapter,
cmd.getRa().getConfigProperty()));
beanValidationObjects.add(resourceAdapter);
@@ -373,7 +374,7 @@
mcf.setLogWriter(new PrintWriter(printStream));
- archiveValidationObjects.add(new ValidateObject(Key.MANAGED_CONNECTION_FACTORY,
+ archiveValidationObjects.add(new ValidateClass(Key.MANAGED_CONNECTION_FACTORY,
mcf,
cdMeta.getConfigProps()));
beanValidationObjects.add(mcf);
@@ -389,7 +390,7 @@
cf.getClass().getClassLoader());
}
- archiveValidationObjects.add(new ValidateObject(Key.CONNECTION_FACTORY, cf));
+ archiveValidationObjects.add(new ValidateClass(Key.CONNECTION_FACTORY, cf));
if (cf instanceof Serializable && cf instanceof Referenceable)
{
@@ -437,7 +438,7 @@
o.getClass().getClassLoader());
}
- archiveValidationObjects.add(new ValidateObject(Key.ACTIVATION_SPEC, o, cpm));
+ archiveValidationObjects.add(new ValidateClass(Key.ACTIVATION_SPEC, o, cpm));
beanValidationObjects.add(o);
associationObjects.add(o);
}
@@ -466,7 +467,7 @@
o.getClass().getClassLoader());
}
- archiveValidationObjects.add(new ValidateObject(Key.ADMIN_OBJECT, o, aoMeta.getConfigProps()));
+ archiveValidationObjects.add(new ValidateClass(Key.ADMIN_OBJECT, o, aoMeta.getConfigProps()));
beanValidationObjects.add(o);
}
}
@@ -479,7 +480,7 @@
{
Validator validator = new Validator();
List<Failure> failures = validator.validate(archiveValidationObjects.toArray(
- new ValidateObject[archiveValidationObjects.size()]));
+ new ValidateClass[archiveValidationObjects.size()]));
if (failures != null && failures.size() > 0)
{
More information about the jboss-cvs-commits
mailing list