User: starksm
Date: 01/11/25 19:12:25
Modified: src/main/org/jboss/ejb Container.java ContainerFactory.java
ContainerFactoryMBean.java EnterpriseContext.java
EntityContainer.java LocalHomeObjectFactory.java
MessageDrivenEnterpriseContext.java
StatefulSessionEnterpriseContext.java
Removed: src/main/org/jboss/ejb DeploymentException.java
Log:
Drop the org.jboss.ejb.DeploymentException in favor of the
org.jboss.deployment.DeploymentException class.
Clean up the org.jboss.logging.Logger to use the Logger.getLogger
factory method.
Revision Changes Path
1.61 +3 -2 jboss/src/main/org/jboss/ejb/Container.java
Index: Container.java
===================================================================
RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/ejb/Container.java,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- Container.java 2001/11/15 05:30:54 1.60
+++ Container.java 2001/11/26 03:12:24 1.61
@@ -40,6 +40,7 @@
import javax.transaction.TransactionManager;
+import org.jboss.deployment.DeploymentException;
import org.jboss.ejb.BeanLockManager;
import org.jboss.logging.Logger;
import org.jboss.metadata.BeanMetaData;
@@ -72,7 +73,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Marc Fleury</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Scott Stark</a>.
* @author <a href="[EMAIL PROTECTED]">Bill Burke</a>
- * @version $Revision: 1.60 $
+ * @version $Revision: 1.61 $
*
* <p><b>Revisions:</b>
*
@@ -92,7 +93,7 @@
// Attributes ----------------------------------------------------
/** Instance logger. */
- protected Logger log = Logger.create(this.getClass());
+ protected Logger log = Logger.getLogger(this.getClass());
/** This is the application that this container is a part of */
protected Application application;
1.98 +4 -5 jboss/src/main/org/jboss/ejb/ContainerFactory.java
Index: ContainerFactory.java
===================================================================
RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/ejb/ContainerFactory.java,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- ContainerFactory.java 2001/11/19 06:58:56 1.97
+++ ContainerFactory.java 2001/11/26 03:12:24 1.98
@@ -6,10 +6,6 @@
*/
package org.jboss.ejb;
-
-
-
-
import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLClassLoader;
@@ -27,7 +23,10 @@
import javax.naming.InitialContext;
import javax.naming.NamingException;
import javax.transaction.TransactionManager;
+
import org.apache.log4j.NDC;
+
+import org.jboss.deployment.DeploymentException;
import org.jboss.ejb.BeanLockManager;
import org.jboss.ejb.plugins.AbstractInstanceCache;
import org.jboss.ejb.plugins.SecurityProxyInterceptor;
@@ -69,7 +68,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Antman</a>.
* @author <a href="mailto:[EMAIL PROTECTED]">Scott Stark</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Sacha Labourey</a>
-* @version $Revision: 1.97 $
+* @version $Revision: 1.98 $
*/
public class ContainerFactory
extends ServiceMBeanSupport
1.17 +2 -1 jboss/src/main/org/jboss/ejb/ContainerFactoryMBean.java
Index: ContainerFactoryMBean.java
===================================================================
RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/ejb/ContainerFactoryMBean.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ContainerFactoryMBean.java 2001/08/30 03:10:02 1.16
+++ ContainerFactoryMBean.java 2001/11/26 03:12:24 1.17
@@ -9,6 +9,7 @@
import java.util.Iterator;
import java.net.MalformedURLException;
+import org.jboss.deployment.DeploymentException;
import org.jboss.system.ServiceMBean;
/**
@@ -19,7 +20,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Rickard �berg</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Juha Lindfors</a>
- * @version $Revision: 1.16 $
+ * @version $Revision: 1.17 $
*/
public interface ContainerFactoryMBean
extends ServiceMBean
1.40 +4 -5 jboss/src/main/org/jboss/ejb/EnterpriseContext.java
Index: EnterpriseContext.java
===================================================================
RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/ejb/EnterpriseContext.java,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- EnterpriseContext.java 2001/10/08 00:09:00 1.39
+++ EnterpriseContext.java 2001/11/26 03:12:24 1.40
@@ -28,8 +28,7 @@
import javax.transaction.HeuristicMixedException;
import javax.transaction.HeuristicRollbackException;
-import org.apache.log4j.Category;
-
+import org.jboss.logging.Logger;
import org.jboss.metadata.ApplicationMetaData;
import org.jboss.metadata.SecurityRoleRefMetaData;
import org.jboss.security.RealmMapping;
@@ -48,7 +47,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Sebastien Alborini</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Juha Lindfors</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Ole Husgaard</a>
- * @version $Revision: 1.39 $
+ * @version $Revision: 1.40 $
*
* Revisions:
* 2001/06/29: marcf
@@ -62,8 +61,8 @@
// Attributes ----------------------------------------------------
/** Instance logger. */
- private Category log = Category.getInstance(this.getClass());
-
+ protected Logger log = Logger.getLogger(this.getClass());
+
/** The EJB instance */
Object instance;
1.58 +3 -3 jboss/src/main/org/jboss/ejb/EntityContainer.java
Index: EntityContainer.java
===================================================================
RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/ejb/EntityContainer.java,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- EntityContainer.java 2001/11/24 20:43:22 1.57
+++ EntityContainer.java 2001/11/26 03:12:24 1.58
@@ -22,13 +22,13 @@
import javax.ejb.EJBMetaData;
import javax.ejb.EJBException;
import javax.ejb.RemoveException;
+import javax.management.j2ee.CountStatistic;
import javax.transaction.Transaction;
+import org.jboss.deployment.DeploymentException;
import org.jboss.monitor.StatisticsProvider;
import org.jboss.util.SerializableEnumeration;
-import javax.management.j2ee.CountStatistic;
-
/**
* This is a Container for EntityBeans (both BMP and CMP).
*
@@ -41,7 +41,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Daniel OConnor</a>
* @author <a href="[EMAIL PROTECTED]">Bill Burke</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Andreas Schaefer</a>
- * @version $Revision: 1.57 $
+ * @version $Revision: 1.58 $
*
* <p><b>Revisions:</b>
*
1.6 +2 -2 jboss/src/main/org/jboss/ejb/LocalHomeObjectFactory.java
Index: LocalHomeObjectFactory.java
===================================================================
RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/ejb/LocalHomeObjectFactory.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- LocalHomeObjectFactory.java 2001/11/24 20:43:22 1.5
+++ LocalHomeObjectFactory.java 2001/11/26 03:12:24 1.6
@@ -20,9 +20,9 @@
/**
* Based on Scott Stark's NonSerializableObjectFactory
*
- * @author <a href="mailto:[EMAIL PROTECTED]">Scott Stark</a>.
+ * @author <a href="mailto:[EMAIL PROTECTED]">Scott Stark</a>.
* @author <a href="mailto:[EMAIL PROTECTED]">Daniel OConnor</a>
- * @version $Revision: 1.5 $
+ * @version $Revision: 1.6 $
*/
public class LocalHomeObjectFactory
implements ObjectFactory
1.12 +1 -3 jboss/src/main/org/jboss/ejb/MessageDrivenEnterpriseContext.java
Index: MessageDrivenEnterpriseContext.java
===================================================================
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/MessageDrivenEnterpriseContext.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- MessageDrivenEnterpriseContext.java 2001/09/11 18:34:59 1.11
+++ MessageDrivenEnterpriseContext.java 2001/11/26 03:12:24 1.12
@@ -20,7 +20,6 @@
import javax.ejb.MessageDrivenBean;
import javax.ejb.SessionContext;
import javax.ejb.EJBException;
-import org.jboss.logging.Logger;
import org.jboss.metadata.MetaData;
import org.jboss.metadata.MessageDrivenMetaData;
@@ -32,7 +31,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Antman</a>.
* @author <a href="mailto:[EMAIL PROTECTED]">Rickard �berg</a>
* @author <a href="[EMAIL PROTECTED]">Sebastien Alborini</a>
- * @version $Revision: 1.11 $
+ * @version $Revision: 1.12 $
*/
public class MessageDrivenEnterpriseContext
extends EnterpriseContext
@@ -40,7 +39,6 @@
// Constants -----------------------------------------------------
// Attributes ----------------------------------------------------
- protected static Logger log =
Logger.create(MessageDrivenEnterpriseContext.class);
//EJBObject ejbObject;
MessageDrivenContext ctx;
1.19 +1 -3
jboss/src/main/org/jboss/ejb/StatefulSessionEnterpriseContext.java
Index: StatefulSessionEnterpriseContext.java
===================================================================
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/StatefulSessionEnterpriseContext.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- StatefulSessionEnterpriseContext.java 2001/11/24 20:43:22 1.18
+++ StatefulSessionEnterpriseContext.java 2001/11/26 03:12:24 1.19
@@ -19,7 +19,6 @@
import javax.ejb.EJBLocalObject;
import javax.ejb.SessionBean;
import javax.ejb.SessionContext;
-import org.jboss.logging.Logger;
/**
@@ -27,7 +26,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Rickard �berg</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Daniel OConnor</a>
- * @version $Revision: 1.18 $
+ * @version $Revision: 1.19 $
*/
public class StatefulSessionEnterpriseContext
extends EnterpriseContext
@@ -36,7 +35,6 @@
// Constants -----------------------------------------------------
// Attributes ----------------------------------------------------
- protected static Logger log =
Logger.create(StatefulSessionEnterpriseContext.class);
private EJBObject ejbObject;
private EJBLocalObject ejbLocalObject;
private SessionContext ctx;
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development