User: salborini
Date: 00/08/11 17:42:14
Modified: src/main/org/jboss/verifier/strategy AbstractVerifier.java
EJBVerifier11.java EJBVerifier20.java
VerificationContext.java VerificationStrategy.java
Log:
Modified to use the new metadata
Revision Changes Path
1.8 +11 -14 jboss/src/main/org/jboss/verifier/strategy/AbstractVerifier.java
Index: AbstractVerifier.java
===================================================================
RCS file:
/products/cvs/ejboss/jboss/src/main/org/jboss/verifier/strategy/AbstractVerifier.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- AbstractVerifier.java 2000/08/07 14:27:02 1.7
+++ AbstractVerifier.java 2000/08/12 00:42:13 1.8
@@ -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: AbstractVerifier.java,v 1.7 2000/08/07 14:27:02 mulder Exp $
+ * $Id: AbstractVerifier.java,v 1.8 2000/08/12 00:42:13 salborini Exp $
*/
// standard imports
@@ -32,9 +32,12 @@
import java.util.Iterator;
import java.util.Arrays;
+import org.jboss.metadata.ApplicationMetaData;
+import org.jboss.metadata.BeanMetaData;
+import org.jboss.metadata.EntityMetaData;
+import org.jboss.metadata.SessionMetaData;
// non-standard class dependencies
-import com.dreambean.ejx.ejb.Session;
/**
@@ -46,7 +49,7 @@
* @see org.jboss.verifier.strategy.VerificationStrategy
*
* @author Juha Lindfors ([EMAIL PROTECTED])
- * @version $Revision: 1.7 $
+ * @version $Revision: 1.8 $
* @since JDK 1.3
*/
public abstract class AbstractVerifier implements VerificationStrategy {
@@ -91,23 +94,17 @@
/*
* checks if the session type is 'Stateful'
*/
- public boolean isStateful(Session session) {
+ public boolean isStateful(SessionMetaData session) {
- if (STATEFUL_SESSION.equals(session.getSessionType()))
- return true;
-
- return false;
+ return session.isStateful();
}
/*
* checks if the session type is 'Stateless'
*/
- public boolean isStateless(Session session) {
+ public boolean isStateless(SessionMetaData session) {
- if (STATELESS_SESSION.equals(session.getSessionType()))
- return true;
-
- return false;
+ return session.isStateless();
}
/*
@@ -379,7 +376,7 @@
return false;
}
- public boolean hasRemoteReturnType(Session session, Method m) {
+ public boolean hasRemoteReturnType(BeanMetaData session, Method m) {
if (m.getReturnType().getName().equals(session.getRemote()))
return true;
1.12 +25 -71 jboss/src/main/org/jboss/verifier/strategy/EJBVerifier11.java
Index: EJBVerifier11.java
===================================================================
RCS file:
/products/cvs/ejboss/jboss/src/main/org/jboss/verifier/strategy/EJBVerifier11.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- EJBVerifier11.java 2000/07/25 17:36:12 1.11
+++ EJBVerifier11.java 2000/08/12 00:42:13 1.12
@@ -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: EJBVerifier11.java,v 1.11 2000/07/25 17:36:12 juha Exp $
+ * $Id: EJBVerifier11.java,v 1.12 2000/08/12 00:42:13 salborini Exp $
*/
@@ -41,8 +41,10 @@
import org.jboss.verifier.factory.VerificationEventFactory;
import org.jboss.verifier.factory.DefaultEventFactory;
-import com.dreambean.ejx.ejb.Session;
-import com.dreambean.ejx.ejb.Entity;
+import org.jboss.metadata.ApplicationMetaData;
+import org.jboss.metadata.BeanMetaData;
+import org.jboss.metadata.SessionMetaData;
+import org.jboss.metadata.EntityMetaData;
/**
@@ -56,7 +58,7 @@
* @see org.jboss.verifier.strategy.AbstractVerifier
*
* @author Juha Lindfors ([EMAIL PROTECTED])
- * @version $Revision: 1.11 $
+ * @version $Revision: 1.12 $
* @since JDK 1.3
*/
public class EJBVerifier11 extends AbstractVerifier {
@@ -85,8 +87,17 @@
+/*
+ ***********************************************************************
+ *
+ * IMPLEMENTS VERIFICATION STRATEGY INTERFACE
+ *
+ ***********************************************************************
+ */
+
+
- public void checkSession(Session session) {
+ public void checkSession(SessionMetaData session) {
boolean sessionDescriptorVerified = true; // false;
@@ -116,7 +127,7 @@
}
- public void checkEntity(Entity entity) {
+ public void checkEntity(EntityMetaData entity) {
boolean pkVerified = false;
// will put this back later
@@ -125,48 +136,11 @@
// NO IMPLEMENTATION
}
-
-
-
-/*
- ***********************************************************************
- *
- * IMPLEMENTS VERIFICATION STRATEGY INTERFACE
- *
- ***********************************************************************
- */
-
public StrategyContext getContext() {
return context;
}
-
- public void checkSessions(Iterator beans) {
-
- while (beans.hasNext()) {
- try {
- checkSession((Session)beans.next());
- }
- catch (ClassCastException e) {
- System.err.println(e);
- // THROW INTERNAL ERROR
- }
- }
- }
-
- public void checkEntities(Iterator beans) {
-
- while (beans.hasNext()) {
- try {
- checkEntity((Entity)beans.next());
- }
- catch (ClassCastException e) {
- System.err.println(e);
- // THROW INTERNAL ERROR
- }
- }
- }
- public void checkMessageDriven(Iterator beans) {
+ public void checkMessageDriven(BeanMetaData beans) {
// EMPTY IMPLEMENTATION, EJB 2.0 ONLY
}
@@ -180,7 +154,7 @@
*****************************************************************************
*/
- private boolean verifySessionHome(Session session) {
+ private boolean verifySessionHome(SessionMetaData session) {
/*
* Indicates whether we issued warnings or not during verification.
@@ -204,7 +178,7 @@
*
* Spec 6.8
*/
- if (isStateless(session)) {
+ if (session.isStateless()) {
if (!hasDefaultCreateMethod(home)) {
fireSpecViolationEvent(new Section("6.8.a"));
@@ -309,7 +283,7 @@
- private boolean verifySessionRemote(Session session) {
+ private boolean verifySessionRemote(SessionMetaData session) {
/*
* Indicates whether we issued warnings or not during verification.
@@ -434,7 +408,7 @@
- private boolean verifySessionBean(Session session) {
+ private boolean verifySessionBean(SessionMetaData session) {
/*
* Indicates whether we issued warnings or not during verification.
@@ -475,13 +449,13 @@
*/
if (hasSessionSynchronizationInterface(bean)) {
- if (!isStateful(session)) {
+ if (session.isStateless()) {
fireSpecViolationEvent(new Section("6.5.3.a"));
status = false;
}
- if (!isContainerManagedTx(session)) {
+ if (session.isBeanManagedTx()) {
fireSpecViolationEvent(new Section("6.5.3.b"));
status = false;
@@ -508,7 +482,7 @@
*
* Spec 6.6.1 (table 2)
*/
- if (hasSessionSynchronizationInterface(bean) &&
isBeanManagedTx(session)) {
+ if (hasSessionSynchronizationInterface(bean) &&
session.isBeanManagedTx()) {
fireSpecViolationEvent(new Section("6.6.1"));
@@ -709,26 +683,6 @@
return true;
} catch(Exception e) {
}
- return false;
- }
-
-
-
-
- private boolean isBeanManagedTx(Session session) {
-
- if (BEAN_MANAGED_TX.equals(session.getTransactionType()))
- return true;
-
- return false;
- }
-
-
- private boolean isContainerManagedTx(Session session) {
-
- if (CONTAINER_MANAGED_TX.equals(session.getTransactionType()))
- return true;
-
return false;
}
1.6 +12 -27 jboss/src/main/org/jboss/verifier/strategy/EJBVerifier20.java
Index: EJBVerifier20.java
===================================================================
RCS file:
/products/cvs/ejboss/jboss/src/main/org/jboss/verifier/strategy/EJBVerifier20.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- EJBVerifier20.java 2000/07/19 21:27:45 1.5
+++ EJBVerifier20.java 2000/08/12 00:42:13 1.6
@@ -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: EJBVerifier20.java,v 1.5 2000/07/19 21:27:45 juha Exp $
+ * $Id: EJBVerifier20.java,v 1.6 2000/08/12 00:42:13 salborini Exp $
*/
@@ -36,8 +36,9 @@
import org.jboss.verifier.event.VerificationEvent;
import org.jboss.verifier.factory.VerificationEventFactory;
-import com.dreambean.ejx.ejb.Session;
-import com.dreambean.ejx.ejb.Entity;
+import org.jboss.metadata.BeanMetaData;
+import org.jboss.metadata.SessionMetaData;
+import org.jboss.metadata.EntityMetaData;
@@ -50,7 +51,7 @@
* @see << OTHER RELATED CLASSES >>
*
* @author Juha Lindfors ([EMAIL PROTECTED])
- * @version $Revision: 1.5 $
+ * @version $Revision: 1.6 $
* @since JDK 1.3
*/
public class EJBVerifier20 extends AbstractVerifier {
@@ -78,33 +79,17 @@
return context;
}
- public void checkSessions(Iterator beans) {
-
- while (beans.hasNext()) {
- try {
- //checkSession((Session)beans.next());
- }
- catch (ClassCastException e) {
- System.err.println(e);
- // THROW INTERNAL ERROR
- }
- }
+ public void checkSession(SessionMetaData session) {
+
+ // NOT IMPLEMENTED YET
}
- public void checkEntities(Iterator beans) {
-
- while (beans.hasNext()) {
- try {
- //checkEntity((Entity)beans.next());
- }
- catch (ClassCastException e) {
- System.err.println(e);
- // THROW INTERNAL ERROR
- }
- }
+ public void checkEntity(EntityMetaData entity) {
+
+ // NOT IMPLEMENTED YET
}
- public void checkMessageDriven(Iterator beans) {
+ public void checkMessageDriven(BeanMetaData bean) {
// NOT IMPLEMENTED YET
}
1.3 +4 -4
jboss/src/main/org/jboss/verifier/strategy/VerificationContext.java
Index: VerificationContext.java
===================================================================
RCS file:
/products/cvs/ejboss/jboss/src/main/org/jboss/verifier/strategy/VerificationContext.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- VerificationContext.java 2000/07/19 21:27:45 1.2
+++ VerificationContext.java 2000/08/12 00:42:13 1.3
@@ -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.gjt.org
- * $Id: VerificationContext.java,v 1.2 2000/07/19 21:27:45 juha Exp $
+ * $Id: VerificationContext.java,v 1.3 2000/08/12 00:42:13 salborini Exp $
*
* You can reach the author by sending email to [EMAIL PROTECTED] or
* directly to [EMAIL PROTECTED]
@@ -36,7 +36,7 @@
import org.jboss.verifier.event.VerificationEventGenerator;
import org.jboss.verifier.factory.VerificationEventFactory;
-import org.jboss.ejb.deployment.jBossEjbJar;
+import org.jboss.metadata.ApplicationMetaData;
/**
@@ -48,7 +48,7 @@
* @see << OTHER RELATED CLASSES >>
*
* @author Juha Lindfors
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
* @since JDK 1.3
*/
public interface VerificationContext extends StrategyContext,
@@ -71,7 +71,7 @@
/*
* Returns the loaded and parsed ejb jar file
*/
- abstract jBossEjbJar getEJBJar();
+ abstract ApplicationMetaData getApplicationMetaData();
/*
* Returns the location of the ejb jar file
1.4 +11 -7
jboss/src/main/org/jboss/verifier/strategy/VerificationStrategy.java
Index: VerificationStrategy.java
===================================================================
RCS file:
/products/cvs/ejboss/jboss/src/main/org/jboss/verifier/strategy/VerificationStrategy.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- VerificationStrategy.java 2000/06/03 17:49:32 1.3
+++ VerificationStrategy.java 2000/08/12 00:42:13 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: VerificationStrategy.java,v 1.3 2000/06/03 17:49:32 juha Exp $
+ * $Id: VerificationStrategy.java,v 1.4 2000/08/12 00:42:13 salborini Exp $
*/
@@ -30,7 +30,11 @@
// non-standard class dependencies
import org.gjt.lindfors.pattern.Strategy;
+import org.jboss.metadata.BeanMetaData;
+import org.jboss.metadata.EntityMetaData;
+import org.jboss.metadata.SessionMetaData;
+
/**
* << DESCRIBE THE CLASS HERE >>
*
@@ -40,25 +44,25 @@
* @see << OTHER RELATED CLASSES >>
*
* @author Juha Lindfors ([EMAIL PROTECTED])
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
* @since JDK 1.3
*/
public interface VerificationStrategy extends Strategy {
/*
- * Does the entity checks
+ * Does the entity check
*/
- abstract void checkEntities(Iterator entities);
+ abstract void checkEntity(EntityMetaData entity);
/*
- * Checks the sessions
+ * Checks the session
*/
- abstract void checkSessions(Iterator sessions);
+ abstract void checkSession(SessionMetaData session);
/*
* Checks the message driven beans (EJB 2.0 only).
*/
- abstract void checkMessageDriven(Iterator sessions);
+ abstract void checkMessageDriven(BeanMetaData session);
}
