[JBoss-dev] CVS update: jboss/src/main/org/jboss/ejb Container.java ContainerFactory.java StatelessSessionContainer.java
User: ejort
Date: 02/01/05 04:08:50
Modified:src/main/org/jboss/ejb Container.java ContainerFactory.java
StatelessSessionContainer.java
Log:
Guarded debug logging
Revision ChangesPath
1.68 +72 -56jboss/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.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- Container.java2002/01/04 17:59:57 1.67
+++ Container.java2002/01/05 12:08:50 1.68
@@ -78,7 +78,7 @@
* @author mailto:[EMAIL PROTECTED]";>Marc Fleury
* @author mailto:[EMAIL PROTECTED]";>Scott Stark.
* @author Bill Burke
- * @version $Revision: 1.67 $
+ * @version $Revision: 1.68 $
*
* Revisions:
*
@@ -546,16 +546,16 @@
public Object invoke(String actionName, Object[] params, String[] signature)
throws MBeanException, ReflectionException
{
-
-
+
+
if( params != null && params.length == 1 && (params[0] instanceof Invocation)
== false )
throw new MBeanException(new IllegalArgumentException("Expected zero or
single Invocation argument"));
-
+
Object value = null;
Invocation mi = null;
if( params != null && params.length == 1 )
mi = (Invocation) params[0];
-
+
ClassLoader callerClassLoader =
Thread.currentThread().getContextClassLoader();
try
{
@@ -563,13 +563,13 @@
// Check against home, remote, localHome, local, getHome, getRemote,
getLocalHome, getLocal
if( actionName.equals("remote") )
{
-
-if (mi instanceof MarshalledInvocation)
-
+
+if (mi instanceof MarshalledInvocation)
+
{
((MarshalledInvocation)
mi).setMethodMap(marshalledInvocationMapping);
-
- if (log.isDebugEnabled())
+
+ if (log.isDebugEnabled())
// FIXME FIXME FIXME FIXME REMOVE WHEN CL ARE INTEGRATED
log.debug("METHOD REMOTE INVOKE
"+mi.getContainer()+"||"+mi.getMethod().getName()+"||");
@@ -705,10 +705,10 @@
{
Thread.currentThread().setContextClassLoader(callerClassLoader);
}
-
+
return value;
}
-
+
/**
* Build the container MBean information on attributes, contstructors,
* operations, and notifications. Currently there are no attributes, no
@@ -744,17 +744,17 @@
return new MBeanInfo(getClass().getName(), "EJB Container MBean",
null, ctorInfo, opInfo, notifyInfo);
}
-
+
// End DynamicMBean interface
-
+
// Protected -
-
+
abstract Interceptor createContainerInterceptor();
-
+
public abstract void addInterceptor(Interceptor in);
-
+
// Private ---
-
+
/**
* This method sets up the naming environment of the bean.
* We create the java:comp/env namespace with properties, EJB-References,
@@ -763,15 +763,19 @@
private void setupEnvironment()
throws DeploymentException
{
+ boolean debug = log.isDebugEnabled();
try
{
BeanMetaData beanMetaData = getBeanMetaData();
- log.debug("Begin java:comp/env for EJB: "+beanMetaData.getEjbName());
- log.debug("TCL: "+Thread.currentThread().getContextClassLoader());
+ if (debug)
+ {
+log.debug("Begin java:comp/env for EJB: "+beanMetaData.getEjbName());
+log.debug("TCL: "+Thread.currentThread().getContextClassLoader());
+ }
// Since the BCL is already associated with this thread we can start using
the java: namespace directly
Context ctx = (Context) new InitialContext().lookup("java:comp");
Context envCtx = ctx.createSubcontext("env");
-
+
// Bind environment properties
{
Iterator enum = beanMetaData.getEnvironmentEntries();
@@ -780,7 +784,8 @@
EnvEntryMetaData entry = (EnvEntryMetaData)enum.next();
try
{
- log.debug("Binding env-entry: "+entry.getName()+" of type:
"+entry.getType()+" to value:"+entry.getValue());
+ if (debug)
+ log.debug("Binding env-entry: "+entry.getName()+" of type:
"+entry.getType()+" to value:"+entry.getValue());
EnvEntryMetaData.bindEnvEntry(envCtx, entry);
}
catch(ClassNotFoundException e)
@@ -790,25 +795,27 @@
[JBoss-dev] CVS update: jboss/src/main/org/jboss/ejb Container.java ContainerFactory.java
User: user57
Date: 02/01/02 20:00:57
Modified:src/main/org/jboss/ejb Container.java ContainerFactory.java
Log:
o migrated all components to a new JMX domain name model. jboss.system
is now where to core/spine components live. moved all components that
were in JBOSS-SYSTEM that did not move into a jboss.* domain into
jboss (where the server is now registered). The point was to limit the
members of jboss.system to core bits only.
o Created org.jboss.system.Server, which does the work of initialization
that org.jboss.Main used to do. Main now only parses the command line,
sets up basic legecy properties and creates a Server instance.
o Moved functionality of Shutdown (component not cl tool) into Server (
which is bound as jboss.system:service=Server)
o Moved more Runtime access from Info into Server. Exposed memory info
as attributes.
o Logging a WARN everywhere that uses System.getProperty("jboss.system.home")
as that should go away soon/eventually.
o Initialized the invokerMap in the harmi impl to avoid NPE
o Made getopt.jar a member of the lib/* dir instead of adding it to the
run.jar and shutdown.jars each time.
o Minor cosmetic changes along the way.
Revision ChangesPath
1.66 +211 -209 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.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- Container.java2001/12/19 20:43:16 1.65
+++ Container.java2002/01/03 04:00:57 1.66
@@ -1,9 +1,10 @@
/*
-* JBoss, the OpenSource J2EE webOS
-*
-* Distributable under LGPL license.
-* See terms of license at gnu.org.
-*/
+ * JBoss, the OpenSource J2EE webOS
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+
package org.jboss.ejb;
import java.lang.reflect.Method;
@@ -41,7 +42,6 @@
import javax.naming.NameNotFoundException;
import javax.transaction.TransactionManager;
-
import org.jboss.deployment.DeploymentException;
import org.jboss.invocation.Invocation;
import org.jboss.invocation.MarshalledInvocation;
@@ -60,42 +60,43 @@
import org.jboss.ejb.plugins.local.BaseLocalContainerInvoker;
/**
-* This is the base class for all EJB-containers in JBoss. A Container
-* functions as the central hub of all metadata and plugins. Through this
-* the container plugins can get hold of the other plugins and any metadata
-* they need.
-*
-* The ContainerFactory creates instances of subclasses of this class
-*and calls the appropriate initialization methods.
-*
-* A Container does not perform any significant work, but instead delegates
-*to the plugins to provide for all kinds of algorithmic functionality.
-*
-* @see ContainerFactory
-*
-* @author mailto:[EMAIL PROTECTED]";>Rickard Öberg
-* @author mailto:[EMAIL PROTECTED]";>Marc Fleury
-* @author mailto:[EMAIL PROTECTED]";>Scott Stark.
-* @author Bill Burke
-* @version $Revision: 1.65 $
-*
-* Revisions:
-*
-* 2001/07/26 bill burke:
-*
-* Added BeanLockManager.
-*
-* 2001/08/13 scott.stark:
-*
-* Added DynamicMBean support for method invocations and access to EJB
interfaces.
-*
-* 2001/12/18 marc fleury:
-*
-* Moved to new Invocation layer and detached invokers.
-* Use the method mappings for MarshalledInvocation.
-*
-*/
-public abstract class Container implements DynamicMBean
+ * This is the base class for all EJB-containers in JBoss. A Container
+ * functions as the central hub of all metadata and plugins. Through this
+ * the container plugins can get hold of the other plugins and any metadata
+ * they need.
+ *
+ * The ContainerFactory creates instances of subclasses of this class
+ *and calls the appropriate initialization methods.
+ *
+ * A Container does not perform any significant work, but instead delegates
+ *to the plugins to provide for all kinds of algorithmic functionality.
+ *
+ * @see ContainerFactory
+ *
+ * @author mailto:[EMAIL PROTECTED]";>Rickard Öberg
+ * @author mailto:[EMAIL PROTECTED]";>Marc Fleury
+ * @author mailto:[EMAIL PROTECTED]";>Scott Stark.
+ * @author Bill Burke
+ * @version $Revision: 1.66 $
+ *
+ * Revisions:
+ *
+ * 2001/07/26 bill burke:
+ *
+ * Added BeanLockManager.
+ *
+ * 2001/08/13 scott.stark:
+ *
+ * Added DynamicMBean support for method invocations and access to EJB
interfaces.
+ *
+ * 2001/12/18 marc fleury:
+ *
+ * Moved to new Invocation layer and detached invokers.
+ * Use the method mappings for MarshalledInvocation.
+ *
+ */
+public abstract class Container
+ implements DynamicMBean
{
// Constants --
[JBoss-dev] CVS update: jboss/src/main/org/jboss/ejb Container.java ContainerFactory.java
User: starksm
Date: 01/12/02 19:43:42
Modified:src/main/org/jboss/ejb Container.java ContainerFactory.java
Log:
Rename EJBSecurityManager to AuthenticationManager
Revision ChangesPath
1.63 +5 -5 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.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- Container.java2001/11/27 06:15:26 1.62
+++ Container.java2001/12/03 03:43:41 1.63
@@ -50,7 +50,7 @@
import org.jboss.metadata.ResourceRefMetaData;
import org.jboss.metadata.ResourceEnvRefMetaData;
import org.jboss.metadata.ApplicationMetaData;
-import org.jboss.security.EJBSecurityManager;
+import org.jboss.security.AuthenticationManager;
import org.jboss.security.RealmMapping;
import org.jboss.ejb.plugins.local.BaseLocalContainerInvoker;
@@ -73,7 +73,7 @@
* @author mailto:[EMAIL PROTECTED]";>Marc Fleury
* @author mailto:[EMAIL PROTECTED]";>Scott Stark.
* @author Bill Burke
- * @version $Revision: 1.62 $
+ * @version $Revision: 1.63 $
*
* Revisions:
*
@@ -126,7 +126,7 @@
protected TransactionManager tm;
/** This is the SecurityManager */
- protected EJBSecurityManager sm;
+ protected AuthenticationManager sm;
/** This is the realm mapping */
protected RealmMapping rm;
@@ -192,12 +192,12 @@
return tm;
}
- public void setSecurityManager(EJBSecurityManager sm)
+ public void setSecurityManager(AuthenticationManager sm)
{
this.sm = sm;
}
- public EJBSecurityManager getSecurityManager()
+ public AuthenticationManager getSecurityManager()
{
return sm;
}
1.103 +3 -3 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.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- ContainerFactory.java 2001/11/28 01:15:08 1.102
+++ ContainerFactory.java 2001/12/03 03:43:42 1.103
@@ -41,7 +41,7 @@
import org.jboss.metadata.SessionMetaData;
import org.jboss.metadata.XmlFileLoader;
import org.jboss.metadata.XmlLoadable;
-import org.jboss.security.EJBSecurityManager;
+import org.jboss.security.AuthenticationManager;
import org.jboss.security.RealmMapping;
import org.jboss.system.ServiceMBeanSupport;
import org.jboss.util.MBeanProxy;
@@ -70,7 +70,7 @@
* @author mailto:[EMAIL PROTECTED]";>Peter Antman.
* @author mailto:[EMAIL PROTECTED]";>Scott Stark
* @author mailto:[EMAIL PROTECTED]";>Sacha Labourey
-* @version $Revision: 1.102 $
+* @version $Revision: 1.103 $
*/
public class ContainerFactory
extends ServiceMBeanSupport
@@ -714,7 +714,7 @@
confSecurityDomain = securityDomain;
//System.out.println("lookup securityDomain manager name:
"+confSecurityDomain);
Object securityMgr = iniCtx.lookup(confSecurityDomain);
-EJBSecurityManager ejbS = (EJBSecurityManager) securityMgr;
+AuthenticationManager ejbS = (AuthenticationManager) securityMgr;
RealmMapping rM = (RealmMapping) securityMgr;
container.setSecurityManager( ejbS );
container.setRealmMapping( rM );
___
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: jboss/src/main/org/jboss/ejb Container.java ContainerFactory.java ContainerFactoryMBean.java EnterpriseContext.java EntityContainer.java LocalHomeObjectFactory.java MessageDrivenEnterpriseContext.java StatefulSessionEnterpriseContext.java DeploymentException.java
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 ChangesPath 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.java2001/11/15 05:30:54 1.60 +++ Container.java2001/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 mailto:[EMAIL PROTECTED]";>Marc Fleury * @author mailto:[EMAIL PROTECTED]";>Scott Stark. * @author Bill Burke - * @version $Revision: 1.60 $ + * @version $Revision: 1.61 $ * * Revisions: * @@ -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 mailto:[EMAIL PROTECTED]";>Peter Antman. * @author mailto:[EMAIL PROTECTED]";>Scott Stark * @author mailto:[EMAIL PROTECTED]";>Sacha Labourey -* @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.java2001/08/30 03:10:02 1.16 +++ ContainerFactoryMBean.java2001/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 mailto:[EMAIL PROTECTED]";>Rickard Öberg * @author mailto:[EMAIL PROTECTED]";>Juha Lindfors - * @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.java2001/10/08 00:09:00 1.39 +++ EnterpriseContext.java2001/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
[JBoss-dev] CVS update: jboss/src/main/org/jboss/ejb Container.java ContainerFactory.java
User: starksm
Date: 01/11/04 20:09:36
Modified:src/main/org/jboss/ejb Tag: Branch_2_4 Container.java
ContainerFactory.java
Log:
Change the EJBSecurityManager interface to SecurityManager
Revision ChangesPath
No revision
No revision
1.44.2.6 +5 -5 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.44.2.5
retrieving revision 1.44.2.6
diff -u -r1.44.2.5 -r1.44.2.6
--- Container.java2001/11/02 08:42:32 1.44.2.5
+++ Container.java2001/11/05 04:09:36 1.44.2.6
@@ -41,7 +41,7 @@
import javax.sql.DataSource;
import org.jboss.logging.Logger;
-import org.jboss.security.EJBSecurityManager;
+import org.jboss.security.SecurityManager;
import org.jboss.security.RealmMapping;
import org.jboss.deployment.DeploymentException;
@@ -70,7 +70,7 @@
* @author Rickard Öberg ([EMAIL PROTECTED])
* @author Marc Fleury
* @author [EMAIL PROTECTED]
- * @version $Revision: 1.44.2.5 $
+ * @version $Revision: 1.44.2.6 $
*/
public abstract class Container
{
@@ -100,7 +100,7 @@
protected TransactionManager tm;
// This is the SecurityManager
- protected EJBSecurityManager sm;
+ protected SecurityManager sm;
// This is the realm mapping
protected RealmMapping rm;
@@ -182,12 +182,12 @@
return tm;
}
- public void setSecurityManager(EJBSecurityManager sm)
+ public void setSecurityManager(SecurityManager sm)
{
this.sm = sm;
}
- public EJBSecurityManager getSecurityManager()
+ public SecurityManager getSecurityManager()
{
return sm;
}
1.77.2.5 +3 -3 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.77.2.4
retrieving revision 1.77.2.5
diff -u -r1.77.2.4 -r1.77.2.5
--- ContainerFactory.java 2001/11/02 08:42:32 1.77.2.4
+++ ContainerFactory.java 2001/11/05 04:09:36 1.77.2.5
@@ -58,7 +58,7 @@
import org.jboss.metadata.ConfigurationMetaData;
import org.jboss.metadata.XmlLoadable;
import org.jboss.metadata.XmlFileLoader;
-import org.jboss.security.EJBSecurityManager;
+import org.jboss.security.SecurityManager;
import org.jboss.security.RealmMapping;
import org.jboss.util.MBeanProxy;
import org.jboss.verifier.BeanVerifier;
@@ -82,7 +82,7 @@
* @author Peter Antman ([EMAIL PROTECTED])
* @author Scott Stark([EMAIL PROTECTED])
*
-* @version $Revision: 1.77.2.4 $
+* @version $Revision: 1.77.2.5 $
*/
public class ContainerFactory
extends org.jboss.util.ServiceMBeanSupport
@@ -783,7 +783,7 @@
confSecurityDomain = securityDomain;
System.out.println("lookup securityDomain manager name:
"+confSecurityDomain);
Object securityMgr = iniCtx.lookup(confSecurityDomain);
-EJBSecurityManager ejbS = (EJBSecurityManager) securityMgr;
+SecurityManager ejbS = (SecurityManager) securityMgr;
RealmMapping rM = (RealmMapping) securityMgr;
container.setSecurityManager( ejbS );
container.setRealmMapping( rM );
___
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: jboss/src/main/org/jboss/ejb Container.java ContainerFactory.java ContainerFactoryMBean.java EntityContainer.java
User: starksm
Date: 01/11/02 00:42:33
Modified:src/main/org/jboss/ejb Tag: Branch_2_4 Container.java
ContainerFactory.java ContainerFactoryMBean.java
EntityContainer.java
Log:
Remove org.jboss.ejb.DeploymentException in favor of
org.jboss.deploymen.DeploymentException
Revision ChangesPath
No revision
No revision
1.44.2.5 +2 -1 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.44.2.4
retrieving revision 1.44.2.5
diff -u -r1.44.2.4 -r1.44.2.5
--- Container.java2001/09/30 22:14:26 1.44.2.4
+++ Container.java2001/11/02 08:42:32 1.44.2.5
@@ -44,6 +44,7 @@
import org.jboss.security.EJBSecurityManager;
import org.jboss.security.RealmMapping;
+import org.jboss.deployment.DeploymentException;
import org.jboss.metadata.BeanMetaData;
import org.jboss.metadata.EnvEntryMetaData;
import org.jboss.metadata.EjbRefMetaData;
@@ -69,7 +70,7 @@
* @author Rickard Öberg ([EMAIL PROTECTED])
* @author Marc Fleury
* @author [EMAIL PROTECTED]
- * @version $Revision: 1.44.2.4 $
+ * @version $Revision: 1.44.2.5 $
*/
public abstract class Container
{
1.77.2.4 +2 -1 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.77.2.3
retrieving revision 1.77.2.4
diff -u -r1.77.2.3 -r1.77.2.4
--- ContainerFactory.java 2001/09/04 01:51:49 1.77.2.3
+++ ContainerFactory.java 2001/11/02 08:42:32 1.77.2.4
@@ -48,6 +48,7 @@
import org.jboss.ejb.plugins.StatefulSessionInstancePool;
import org.jboss.logging.Log;
import org.jboss.logging.Logger;
+import org.jboss.deployment.DeploymentException;
import org.jboss.metadata.ApplicationMetaData;
import org.jboss.metadata.BeanMetaData;
import org.jboss.metadata.SessionMetaData;
@@ -81,7 +82,7 @@
* @author Peter Antman ([EMAIL PROTECTED])
* @author Scott Stark([EMAIL PROTECTED])
*
-* @version $Revision: 1.77.2.3 $
+* @version $Revision: 1.77.2.4 $
*/
public class ContainerFactory
extends org.jboss.util.ServiceMBeanSupport
1.12.2.1 +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.12
retrieving revision 1.12.2.1
diff -u -r1.12 -r1.12.2.1
--- ContainerFactoryMBean.java2001/06/14 23:44:31 1.12
+++ ContainerFactoryMBean.java2001/11/02 08:42:33 1.12.2.1
@@ -7,6 +7,7 @@
package org.jboss.ejb;
import java.net.MalformedURLException;
+import org.jboss.deployment.DeploymentException;
/**
* This is the interface of the ContainerFactory that is exposed for
administration
@@ -15,7 +16,7 @@
* @author Rickard Öberg ([EMAIL PROTECTED])
* @author Juha Lindfors ([EMAIL PROTECTED])
*
- * @version $Revision: 1.12 $
+ * @version $Revision: 1.12.2.1 $
*/
public interface ContainerFactoryMBean
extends org.jboss.util.ServiceMBean
1.41.2.3 +4 -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.41.2.2
retrieving revision 1.41.2.3
diff -u -r1.41.2.2 -r1.41.2.3
--- EntityContainer.java 2001/10/05 21:56:10 1.41.2.2
+++ EntityContainer.java 2001/11/02 08:42:33 1.41.2.3
@@ -27,6 +27,7 @@
import javax.ejb.FinderException;
import javax.ejb.RemoveException;
+import org.jboss.deployment.DeploymentException;
import org.jboss.logging.Logger;
import org.jboss.util.SerializableEnumeration;
import javax.transaction.Transaction;
@@ -40,11 +41,11 @@
* @author mailto:[EMAIL PROTECTED]";>Sebastien Alborini
* @author Daniel OConnor ([EMAIL PROTECTED])
* @author Bill Burke
-* @version $Revision: 1.41.2.2 $
+* @version $Revision: 1.41.2.3 $
*/
public class EntityContainer
-extends Container
-implements ContainerInvokerContainer, InstancePoolContainer
+ extends Container
+ implements ContainerInvokerContainer, InstancePoolContainer
{
// Constants -
___
Jboss-development mailing list
[EMAIL P
[JBoss-dev] CVS update: jboss/src/main/org/jboss/ejb Container.java ContainerFactory.java EnterpriseContext.java
User: starksm
Date: 01/06/10 13:50:31
Modified:src/main/org/jboss/ejb Container.java ContainerFactory.java
EnterpriseContext.java
Log:
Implement support for EJB 2.0 resource-env-ref element
Revision ChangesPath
1.43 +51 -50jboss/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.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- Container.java2001/06/03 20:59:40 1.42
+++ Container.java2001/06/10 20:50:31 1.43
@@ -49,6 +49,7 @@
import org.jboss.metadata.EjbRefMetaData;
import org.jboss.metadata.EjbLocalRefMetaData;
import org.jboss.metadata.ResourceRefMetaData;
+import org.jboss.metadata.ResourceEnvRefMetaData;
import org.jboss.metadata.ApplicationMetaData;
import org.jnp.interfaces.Naming;
@@ -71,7 +72,8 @@
* @see ContainerFactory
* @author Rickard Öberg ([EMAIL PROTECTED])
* @author Marc Fleury
- * @version $Revision: 1.42 $
+ * @author [EMAIL PROTECTED]
+ * @version $Revision: 1.43 $
*/
public abstract class Container
{
@@ -326,7 +328,7 @@
localContainerInvoker.init();
if (localHomeInterface != null)
application.addLocalHome(this, localContainerInvoker.getEJBLocalHome() );
- // Setup "java:" namespace
+ // Setup "java:comp/env" namespace
setupEnvironment();
}
@@ -401,7 +403,7 @@
* setupEnvironment
*
* This method sets up the naming environment of the bean.
- * We create the java: namespace with properties, EJB-References, and
+ * We create the java:comp/env namespace with properties, EJB-References, and
* DataSource ressources.
*
*/
@@ -410,56 +412,36 @@
{
try
{
+ BeanMetaData beanMetaData = getBeanMetaData();
+ Logger.debug("Begin java:comp/env for EJB: "+beanMetaData.getEjbName());
+ Logger.debug("TCL: "+Thread.currentThread().getContextClassLoader());
// Since the BCL is already associated with this thread we can start using
the java: namespace directly
Context ctx = (Context) new InitialContext().lookup("java:comp");
- ctx = ctx.createSubcontext("env");
+ Context envCtx = ctx.createSubcontext("env");
+ Logger.debug("java:comp/env: "+envCtx);
// Bind environment properties
{
-Iterator enum = getBeanMetaData().getEnvironmentEntries();
+Iterator enum = beanMetaData.getEnvironmentEntries();
while(enum.hasNext())
{
EnvEntryMetaData entry = (EnvEntryMetaData)enum.next();
- if (entry.getType().equals("java.lang.Integer"))
+ try
{
- bind(ctx, entry.getName(), new Integer(entry.getValue()));
+ Logger.debug("Binding env-entry: "+entry.getName()+" of type:
"+entry.getType()+" to value:"+entry.getValue());
+ EnvEntryMetaData.bindEnvEntry(envCtx, entry);
}
- else if (entry.getType().equals("java.lang.Long"))
+ catch(ClassNotFoundException e)
{
- bind(ctx, entry.getName(), new Long(entry.getValue()));
+ Logger.exception(e);
+ throw new DeploymentException("Could not set up environment", e);
}
- else if (entry.getType().equals("java.lang.Double"))
- {
- bind(ctx, entry.getName(), new Double(entry.getValue()));
- }
- else if (entry.getType().equals("java.lang.Float"))
- {
- bind(ctx, entry.getName(), new Float(entry.getValue()));
- }
- else if (entry.getType().equals("java.lang.Byte"))
- {
- bind(ctx, entry.getName(), new Byte(entry.getValue()));
- }
- else if (entry.getType().equals("java.lang.Short"))
- {
- bind(ctx, entry.getName(), new Short(entry.getValue()));
- }
- else if (entry.getType().equals("java.lang.Boolean"))
- {
- bind(ctx, entry.getName(), new Boolean(entry.getValue()));
- }
- else
- {
- // Unknown type
- // Default is string
- bind(ctx, entry.getName(), entry.getValue());
- }
}
}
// Bind EJB references
{
-Iterator enum = getBeanMetaData().getEjbReferences();
+Iterator enum = beanMetaData.getEjbR
