[jboss-cvs] JBossAS SVN: r100470 - in projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers: fungal and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Feb 5 03:33:18 EST 2010
Author: jeff.zhang
Date: 2010-02-05 03:33:18 -0500 (Fri, 05 Feb 2010)
New Revision: 100470
Added:
projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/Validate.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/ValidateClass.java
projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/ValidateObject.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/fungal/RADeployer.java
Log:
[JBJCA-261] add Validate interface, seperate rules
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-05 08:17:22 UTC (rev 100469)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/Rule.java 2010-02-05 08:33:18 UTC (rev 100470)
@@ -28,7 +28,7 @@
/**
* Rule
*/
-public interface Rule
+public interface Rule extends Validate
{
/**
* Validate
Added: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/Validate.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/Validate.java (rev 0)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/Validate.java 2010-02-05 08:33:18 UTC (rev 100470)
@@ -0,0 +1,31 @@
+/*
+ * 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;
+
+/**
+ * Validate. interface
+ */
+public interface Validate
+{
+
+}
Modified: 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 2010-02-05 08:17:22 UTC (rev 100469)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/ValidateClass.java 2010-02-05 08:33:18 UTC (rev 100470)
@@ -28,7 +28,7 @@
/**
* ValidateClass for objects that should be validated
*/
-public class ValidateClass
+public class ValidateClass implements Validate
{
/** Key */
private int key;
@@ -42,7 +42,7 @@
/**
* Constructor
* @param key The key
- * @param object The key
+ * @param clazz The class
*/
public ValidateClass(int key,
Class<?> clazz)
@@ -53,7 +53,7 @@
/**
* Constructor
* @param key The key
- * @param object The key
+ * @param clazz The class
* @param configProperties The list of config property metadata
*/
public ValidateClass(int key,
Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/ValidateObject.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/ValidateObject.java 2010-02-05 08:17:22 UTC (rev 100469)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/ValidateObject.java 2010-02-05 08:33:18 UTC (rev 100470)
@@ -29,17 +29,11 @@
/**
* Object wrapper for objects that should be validated
*/
-public class ValidateObject
+public class ValidateObject extends ValidateClass
{
- /** Key */
- private int key;
-
/** Onject */
private Object object;
- /** config-property */
- private List<ConfigPropertyMetaData> configProperties;
-
/**
* Constructor
* @param key The key
@@ -61,19 +55,9 @@
Object object,
List<ConfigPropertyMetaData> configProperties)
{
- this.key = key;
+ super(key, object.getClass(), configProperties);
this.object = object;
- this.configProperties = configProperties;
}
-
- /**
- * Get the key
- * @return The key
- */
- public int getKey()
- {
- return key;
- }
/**
* Get the object
@@ -84,12 +68,4 @@
return object;
}
- /**
- * 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-05 08:17:22 UTC (rev 100469)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/Validator.java 2010-02-05 08:33:18 UTC (rev 100470)
@@ -23,6 +23,7 @@
package org.jboss.jca.deployers.common.validator;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
import java.util.Locale;
import java.util.ResourceBundle;
@@ -37,7 +38,7 @@
* as we may want to externalize them into a
* properties file
*/
- private static final String[] RULES = {
+ private static final String[] CLASS_RULES = {
"org.jboss.jca.deployers.common.validator.rules.mcf.MCF",
"org.jboss.jca.deployers.common.validator.rules.mcf.MCFHashCode",
"org.jboss.jca.deployers.common.validator.rules.mcf.MCFEquals",
@@ -55,6 +56,19 @@
"org.jboss.jca.deployers.common.validator.rules.as.ASConfigProperties",
"org.jboss.jca.deployers.common.validator.rules.ao.AOConfigProperties"
};
+
+ private static final String[] OBJECT_RULES = {
+ "org.jboss.jca.deployers.common.validator.rules.mc.MCGetMetaData",
+ };
+
+ private static String[] allRules;
+ static
+ {
+ List<String> arrayList = new ArrayList<String>();
+ arrayList.addAll(Arrays.asList(CLASS_RULES));
+ arrayList.addAll(Arrays.asList(OBJECT_RULES));
+ allRules = arrayList.toArray(new String[CLASS_RULES.length + OBJECT_RULES.length]);
+ };
/**
* Constructor
@@ -82,20 +96,20 @@
if (objects == null || objects.length == 0)
return null;
- List<Rule> rules = new ArrayList<Rule>(RULES.length);
+ List<Rule> rules = new ArrayList<Rule>(allRules.length);
- for (int i = 0; i < RULES.length; i++)
+ for (int i = 0; i < allRules.length; i++)
{
try
{
- Class clz = Class.forName(RULES[i], true, Validator.class.getClassLoader());
+ Class clz = Class.forName(allRules[i], true, Validator.class.getClassLoader());
Rule rule = (Rule)clz.newInstance();
rules.add(rule);
}
catch (Throwable t)
{
- throw new IllegalArgumentException(RULES[i], t);
+ throw new IllegalArgumentException(allRules[i], t);
}
}
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-05 08:17:22 UTC (rev 100469)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployer.java 2010-02-05 08:33:18 UTC (rev 100470)
@@ -466,7 +466,8 @@
o.getClass().getClassLoader());
}
- archiveValidationObjects.add(new ValidateClass(Key.ADMIN_OBJECT, o.getClass(), aoMeta.getConfigProps()));
+ archiveValidationObjects.add(
+ new ValidateClass(Key.ADMIN_OBJECT, o.getClass(), aoMeta.getConfigProps()));
beanValidationObjects.add(o);
}
}
More information about the jboss-cvs-commits
mailing list