User: salborini
Date: 00/08/11 17:42:13
Modified: src/main/org/jboss/verifier BeanVerifier.java
Log:
Modified to use the new metadata
Revision Changes Path
1.4 +21 -52 jboss/src/main/org/jboss/verifier/BeanVerifier.java
Index: BeanVerifier.java
===================================================================
RCS file: /products/cvs/ejboss/jboss/src/main/org/jboss/verifier/BeanVerifier.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- BeanVerifier.java 2000/07/19 21:27:43 1.3
+++ BeanVerifier.java 2000/08/12 00:42:12 1.4
@@ -19,7 +19,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* This package and its source code is available at www.jboss.org
- * $Id: BeanVerifier.java,v 1.3 2000/07/19 21:27:43 juha Exp $
+ * $Id: BeanVerifier.java,v 1.4 2000/08/12 00:42:12 salborini Exp $
*/
@@ -42,16 +42,12 @@
import org.jboss.verifier.factory.VerificationEventFactory;
import org.jboss.verifier.factory.DefaultEventFactory;
-import com.dreambean.ejx.ejb.EnterpriseBeans;
-import com.dreambean.ejx.xml.ProjectX;
-import com.dreambean.ejx.xml.XMLManager;
-
-import org.jboss.ejb.deployment.jBossFileManager;
-import org.jboss.ejb.deployment.jBossFileManagerFactory;
-import org.jboss.ejb.deployment.jBossEjbJar;
+import org.jboss.metadata.ApplicationMetaData;
+import org.jboss.metadata.BeanMetaData;
+import org.jboss.metadata.EntityMetaData;
+import org.jboss.metadata.SessionMetaData;
-
/**
* Attempts to verify the spec compliance of the beans in a given
* EJB-JAR file. Works against EJB spec 1.1. Built for use in jBoss
@@ -64,12 +60,12 @@
* @see org.jboss.verifier.factory.VerificationEventFactory
*
* @author Juha Lindfors ([EMAIL PROTECTED])
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
* @since JDK 1.3
*/
public class BeanVerifier implements VerificationContext {
- private jBossEjbJar ejbJar = null;
+ private ApplicationMetaData ejbMetaData = null;
private URL ejbURL = null;
private VerificationStrategy verifier = null;
@@ -103,21 +99,25 @@
*
* @param url URL to the bean jar file
*/
- public void verify(URL url) {
+ public void verify(URL url, ApplicationMetaData metaData) {
ejbURL = url;
- ejbJar = loadBeanJar(url);
+ ejbMetaData = metaData;
setVerifier(VERSION_1_1);
-
- EnterpriseBeans beans = ejbJar.getEnterpriseBeans();
- Iterator entities = beans.getEntities();
- Iterator sessions = beans.getSessions();
+ Iterator beans = ejbMetaData.getEnterpriseBeans();
- verifier.checkEntities(entities);
- verifier.checkSessions(sessions);
+ while (beans.hasNext()) {
+ BeanMetaData bean = (BeanMetaData)beans.next();
+ if (bean.isEntity()) {
+ verifier.checkEntity((EntityMetaData)bean);
+ } else {
+ verifier.checkSession((SessionMetaData)bean);
+ }
+ }
+
}
@@ -149,8 +149,8 @@
*
**************************************************************************
*/
- public jBossEjbJar getEJBJar() {
- return ejbJar;
+ public ApplicationMetaData getApplicationMetaData() {
+ return ejbMetaData;
}
public URL getJarLocation() {
@@ -189,37 +189,6 @@
*/
protected VerificationStrategy getVerifier() {
return verifier;
- }
-
-
-
- /**
- * Loads the bean jar file.
- *
- * @param file ejb jar
- */
- private jBossEjbJar loadBeanJar(URL file) {
-
- jBossFileManagerFactory factory = new jBossFileManagerFactory();
- BeanContextServicesSupport ctx = new BeanContextServicesSupport();
- jBossFileManager fm =
(jBossFileManager)factory.createFileManager();
-
- ProjectX xml = new ProjectX();
-
- ctx.addService(XMLManager.class, xml);
- ctx.add(fm);
-
-
- try {
- return fm.load(file);
- }
- catch (Exception e) {
-
- // [TODO] a generic exception is no good
-
- throw new IllegalArgumentException(e.toString());
- //return null;
- }
}
