[jboss-cvs] JBossAS SVN: r79790 - in projects/metadata/trunk/src: main/java/org/jboss/metadata/process/processor/ejb/jboss and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Oct 21 02:22:49 EDT 2008
Author: ALRubinger
Date: 2008-10-21 02:22:48 -0400 (Tue, 21 Oct 2008)
New Revision: 79790
Added:
projects/metadata/trunk/src/main/java/org/jboss/metadata/process/processor/ejb/jboss/JBossMetaDataValidatorChainProcessor.java
Removed:
projects/metadata/trunk/src/main/java/org/jboss/metadata/process/processor/ejb/jboss/JBoss50MetaDataValidatorChainProcessor.java
Modified:
projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/jboss/JBoss50Creator.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/process/processor/ejb/jboss/SetDefaultLocalBusinessInterfaceProcessor.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/jbmeta117/unit/BindingsWithNoAssociatedBusinessInterfaceTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/jbmeta130/unit/CompleteEjb2xViewTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/jbmeta40/unit/JBossImplicitLocalIntefaceUnitTestCase.java
Log:
[JBMETA-132] Rework Processors to be run from outside jboss-metadata, apply Generics for more proper usage
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/jboss/JBoss50Creator.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/jboss/JBoss50Creator.java 2008-10-21 06:20:17 UTC (rev 79789)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/jboss/JBoss50Creator.java 2008-10-21 06:22:48 UTC (rev 79790)
@@ -41,7 +41,7 @@
import org.jboss.metadata.ejb.spec.SessionType;
import org.jboss.metadata.process.chain.ProcessorChain;
import org.jboss.metadata.process.chain.ejb.jboss.JBossMetaDataProcessorChain;
-import org.jboss.metadata.process.processor.ejb.jboss.JBoss50MetaDataValidatorChainProcessor;
+import org.jboss.metadata.process.processor.ejb.jboss.JBossMetaDataValidatorChainProcessor;
import org.jboss.metadata.process.processor.ejb.jboss.SetDefaultLocalBusinessInterfaceProcessor;
/**
Deleted: projects/metadata/trunk/src/main/java/org/jboss/metadata/process/processor/ejb/jboss/JBoss50MetaDataValidatorChainProcessor.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/process/processor/ejb/jboss/JBoss50MetaDataValidatorChainProcessor.java 2008-10-21 06:20:17 UTC (rev 79789)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/process/processor/ejb/jboss/JBoss50MetaDataValidatorChainProcessor.java 2008-10-21 06:22:48 UTC (rev 79790)
@@ -1,74 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, 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.metadata.process.processor.ejb.jboss;
-
-import org.jboss.logging.Logger;
-import org.jboss.metadata.ejb.jboss.JBoss50MetaData;
-import org.jboss.metadata.process.ProcessingException;
-import org.jboss.metadata.process.processor.JBossMetaDataProcessor;
-import org.jboss.metadata.validation.chain.ejb.jboss.JBoss50MetaDataValidatorChain;
-
-/**
- * JBoss50MetaDataValidatorChainProcessor
- *
- * Processor to send the specified metadata
- * through the default validation chain
- *
- * @author <a href="mailto:andrew.rubinger at jboss.org">ALR</a>
- * @version $Revision: $
- */
-public class JBoss50MetaDataValidatorChainProcessor implements JBossMetaDataProcessor<JBoss50MetaData>
-{
-
- // --------------------------------------------------------------------------------||
- // Class Members ------------------------------------------------------------------||
- // --------------------------------------------------------------------------------||
-
- private static final Logger log = Logger.getLogger(JBoss50MetaDataValidatorChainProcessor.class);
-
- public static final JBoss50MetaDataValidatorChainProcessor INSTANCE = new JBoss50MetaDataValidatorChainProcessor();
-
- // --------------------------------------------------------------------------------||
- // Required Implementations -------------------------------------------------------||
- // --------------------------------------------------------------------------------||
-
- /* (non-Javadoc)
- * @see org.jboss.metadata.process.processor.JBossMetaDataProcessor#process(org.jboss.metadata.ejb.jboss.JBoss50MetaData)
- */
- public JBoss50MetaData process(JBoss50MetaData metadata) throws ProcessingException
- {
- // Sanity check
- assert metadata != null : "Specified metadata was null";
-
- // Set up the default validator chain
- JBoss50MetaDataValidatorChain chain = new JBoss50MetaDataValidatorChain();
-
- // Validate
- chain.validate(metadata);
-
- // Return
- log.debug(metadata + " has been validated by " + chain);
- return metadata;
-
- }
-
-}
Copied: projects/metadata/trunk/src/main/java/org/jboss/metadata/process/processor/ejb/jboss/JBossMetaDataValidatorChainProcessor.java (from rev 79787, projects/metadata/trunk/src/main/java/org/jboss/metadata/process/processor/ejb/jboss/JBoss50MetaDataValidatorChainProcessor.java)
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/process/processor/ejb/jboss/JBossMetaDataValidatorChainProcessor.java (rev 0)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/process/processor/ejb/jboss/JBossMetaDataValidatorChainProcessor.java 2008-10-21 06:22:48 UTC (rev 79790)
@@ -0,0 +1,76 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, 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.metadata.process.processor.ejb.jboss;
+
+import org.jboss.logging.Logger;
+import org.jboss.metadata.ejb.jboss.JBossMetaData;
+import org.jboss.metadata.process.ProcessingException;
+import org.jboss.metadata.process.processor.JBossMetaDataProcessor;
+import org.jboss.metadata.validation.chain.ValidatorChain;
+import org.jboss.metadata.validation.chain.ejb.jboss.JBossMetaDataValidatorChain;
+
+/**
+ * JBossMetaDataValidatorChainProcessor
+ *
+ * Processor to send the specified metadata
+ * through the default validation chain
+ *
+ * @author <a href="mailto:andrew.rubinger at jboss.org">ALR</a>
+ * @version $Revision: $
+ */
+public class JBossMetaDataValidatorChainProcessor<T extends JBossMetaData> implements JBossMetaDataProcessor<T>
+{
+
+ // --------------------------------------------------------------------------------||
+ // Class Members ------------------------------------------------------------------||
+ // --------------------------------------------------------------------------------||
+
+ private static final Logger log = Logger.getLogger(JBossMetaDataValidatorChainProcessor.class);
+
+ @SuppressWarnings("unchecked")
+ public static final JBossMetaDataValidatorChainProcessor INSTANCE = new JBossMetaDataValidatorChainProcessor();
+
+ // --------------------------------------------------------------------------------||
+ // Required Implementations -------------------------------------------------------||
+ // --------------------------------------------------------------------------------||
+
+ /* (non-Javadoc)
+ * @see org.jboss.metadata.process.processor.JBossMetaDataProcessor#process(org.jboss.metadata.ejb.jboss.JBossMetaData)
+ */
+ public T process(T metadata) throws ProcessingException
+ {
+ // Sanity check
+ assert metadata != null : "Specified metadata was null";
+
+ // Set up the default validator chain
+ ValidatorChain<T> chain = new JBossMetaDataValidatorChain<T>();
+
+ // Validate
+ chain.validate(metadata);
+
+ // Return
+ log.debug(metadata + " has been validated by " + chain);
+ return metadata;
+
+ }
+
+}
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/process/processor/ejb/jboss/SetDefaultLocalBusinessInterfaceProcessor.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/process/processor/ejb/jboss/SetDefaultLocalBusinessInterfaceProcessor.java 2008-10-21 06:20:17 UTC (rev 79789)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/process/processor/ejb/jboss/SetDefaultLocalBusinessInterfaceProcessor.java 2008-10-21 06:22:48 UTC (rev 79790)
@@ -24,9 +24,9 @@
import javax.ejb.EJBLocalObject;
import org.jboss.logging.Logger;
-import org.jboss.metadata.ejb.jboss.JBoss50MetaData;
import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData;
import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeansMetaData;
+import org.jboss.metadata.ejb.jboss.JBossMetaData;
import org.jboss.metadata.ejb.jboss.JBossSessionBeanMetaData;
import org.jboss.metadata.ejb.spec.BusinessLocalsMetaData;
import org.jboss.metadata.lang.ClassHelper;
@@ -45,7 +45,7 @@
* @author <a href="mailto:andrew.rubinger at jboss.org">ALR</a>
* @version $Revision: $
*/
-public class SetDefaultLocalBusinessInterfaceProcessor implements JBossMetaDataProcessor<JBoss50MetaData>
+public class SetDefaultLocalBusinessInterfaceProcessor<T extends JBossMetaData> implements JBossMetaDataProcessor<T>
{
// --------------------------------------------------------------------------------||
@@ -54,16 +54,35 @@
private static final Logger log = Logger.getLogger(SetDefaultLocalBusinessInterfaceProcessor.class);
- public static final SetDefaultLocalBusinessInterfaceProcessor INSTANCE = new SetDefaultLocalBusinessInterfaceProcessor();
+ // --------------------------------------------------------------------------------||
+ // Instance Members ---------------------------------------------------------------||
+ // --------------------------------------------------------------------------------||
+ private ClassLoader cl;
+
// --------------------------------------------------------------------------------||
+ // Constructor --------------------------------------------------------------------||
+ // --------------------------------------------------------------------------------||
+
+ /**
+ * Sole Constructor
+ *
+ * @param cl The ClassLoader to use in Processing
+ */
+ public SetDefaultLocalBusinessInterfaceProcessor(final ClassLoader cl)
+ {
+ assert cl != null : "Specified ClassLoader was null";
+ this.setCl(cl);
+ }
+
+ // --------------------------------------------------------------------------------||
// Required Implementations -------------------------------------------------------||
// --------------------------------------------------------------------------------||
/* (non-Javadoc)
- * @see org.jboss.metadata.process.processor.JBossMetaDataProcessor#process(org.jboss.metadata.ejb.jboss.JBoss50MetaData)
+ * @see org.jboss.metadata.process.processor.JBossMetaDataProcessor#process(org.jboss.metadata.ejb.jboss.JBossMetaData)
*/
- public JBoss50MetaData process(JBoss50MetaData metadata) throws ProcessingException
+ public T process(T metadata) throws ProcessingException
{
// Sanity check
assert metadata != null : "Specified metadata was null";
@@ -84,26 +103,18 @@
// Cast
JBossSessionBeanMetaData smd = (JBossSessionBeanMetaData) ejb;
- /*
- * Maintainer's note:
- *
- * This processing check must be executed within the TCL
- * for the deployment it's checking. ie. The classes
- * specified in the metadata must be visible to the TCL
- */
-
// Load the EJB Implementation Class
String ejbImplementationClassName = smd.getEjbClass();
- ClassLoader tcl = Thread.currentThread().getContextClassLoader();
+ ClassLoader cl = this.getCl();
Class<?> ejbImplementationClass = null;
try
{
- ejbImplementationClass = Class.forName(ejbImplementationClassName, false, tcl);
+ ejbImplementationClass = Class.forName(ejbImplementationClassName, false, cl);
}
catch (ClassNotFoundException e)
{
- throw new ProcessingException(this
- + " must be run on metadata while the deployment's ClassLoader is the Thread Context ClassLoader");
+ throw new ProcessingException("Could not load EJB Implementation Class " + ejbImplementationClassName
+ + " from the specified ClassLoader: " + cl);
}
// If there are already local business interfaces specified
@@ -138,4 +149,18 @@
}
+ // --------------------------------------------------------------------------------||
+ // Accessors / Mutators -----------------------------------------------------------||
+ // --------------------------------------------------------------------------------||
+
+ public ClassLoader getCl()
+ {
+ return cl;
+ }
+
+ protected void setCl(ClassLoader cl)
+ {
+ this.cl = cl;
+ }
+
}
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/jbmeta117/unit/BindingsWithNoAssociatedBusinessInterfaceTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/jbmeta117/unit/BindingsWithNoAssociatedBusinessInterfaceTestCase.java 2008-10-21 06:20:17 UTC (rev 79789)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/jbmeta117/unit/BindingsWithNoAssociatedBusinessInterfaceTestCase.java 2008-10-21 06:22:48 UTC (rev 79790)
@@ -33,7 +33,7 @@
import org.jboss.metadata.annotation.finder.DefaultAnnotationFinder;
import org.jboss.metadata.common.spi.ErrorCodes;
import org.jboss.metadata.ejb.jboss.JBoss50MetaData;
-import org.jboss.metadata.process.processor.ejb.jboss.JBoss50MetaDataValidatorChainProcessor;
+import org.jboss.metadata.process.processor.ejb.jboss.JBossMetaDataValidatorChainProcessor;
import org.jboss.metadata.validation.ValidationException;
import org.jboss.test.metadata.jbmeta117.TestBeanWithRemoteBindingButNoRemoteBusinessInterface;
@@ -104,7 +104,7 @@
// Run the Validation Processor
try
{
- JBoss50MetaDataValidatorChainProcessor.INSTANCE.process(md);
+ JBossMetaDataValidatorChainProcessor.INSTANCE.process(md);
}
// Expected
catch (ValidationException ve)
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/jbmeta130/unit/CompleteEjb2xViewTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/jbmeta130/unit/CompleteEjb2xViewTestCase.java 2008-10-21 06:20:17 UTC (rev 79789)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/jbmeta130/unit/CompleteEjb2xViewTestCase.java 2008-10-21 06:22:48 UTC (rev 79790)
@@ -160,7 +160,9 @@
JBoss50MetaData md = creator.create(classes);
// Run the implicit local processor
- SetDefaultLocalBusinessInterfaceProcessor processor = new SetDefaultLocalBusinessInterfaceProcessor();
+ ClassLoader cl = Thread.currentThread().getContextClassLoader();
+ SetDefaultLocalBusinessInterfaceProcessor<JBoss50MetaData> processor = new SetDefaultLocalBusinessInterfaceProcessor<JBoss50MetaData>(
+ cl);
md = processor.process(md);
// Get the Metadata
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/jbmeta40/unit/JBossImplicitLocalIntefaceUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/jbmeta40/unit/JBossImplicitLocalIntefaceUnitTestCase.java 2008-10-21 06:20:17 UTC (rev 79789)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/jbmeta40/unit/JBossImplicitLocalIntefaceUnitTestCase.java 2008-10-21 06:22:48 UTC (rev 79790)
@@ -65,7 +65,8 @@
jbossMetaData = creator.create(classes);
// Run the implicit local processor
- SetDefaultLocalBusinessInterfaceProcessor processor = new SetDefaultLocalBusinessInterfaceProcessor();
+ ClassLoader cl = Thread.currentThread().getContextClassLoader();
+ SetDefaultLocalBusinessInterfaceProcessor<JBoss50MetaData> processor = new SetDefaultLocalBusinessInterfaceProcessor<JBoss50MetaData>(cl);
jbossMetaData = processor.process(jbossMetaData);
assertTrue(jbossMetaData.isEJB3x());
More information about the jboss-cvs-commits
mailing list