User: oberg
Date: 00/05/19 00:11:49
Modified: src/main/org/jboss/ejb Container.java
DeploymentException.java
StatefulSessionContainer.java
StatefulSessionEnterpriseContext.java
Log:
Prefixed deployment classes with Jaws and jBoss
Added server-side JMX RMI Adaptor
Added shorthand JMX commands for deploy and stop of server
Added read-only functionality to JAWS
Revision Changes Path
1.5 +11 -11 jboss/src/main/org/jboss/ejb/Container.java
Index: Container.java
===================================================================
RCS file: /products/cvs/ejboss/jboss/src/main/org/jboss/ejb/Container.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Container.java 2000/05/18 13:12:11 1.4
+++ Container.java 2000/05/19 07:11:48 1.5
@@ -27,11 +27,11 @@
import javax.naming.NameNotFoundException;
import javax.transaction.TransactionManager;
-import org.jboss.ejb.deployment.EnterpriseBean;
+import org.jboss.ejb.deployment.jBossEnterpriseBean;
import com.dreambean.ejx.ejb.EnvironmentEntry;
-import org.jboss.ejb.deployment.EjbJar;
-import org.jboss.ejb.deployment.EjbReference;
-import org.jboss.ejb.deployment.ResourceReference;
+import org.jboss.ejb.deployment.jBossEjbJar;
+import org.jboss.ejb.deployment.jBossEjbReference;
+import org.jboss.ejb.deployment.jBossResourceReference;
import org.jboss.ejb.deployment.ResourceManagers;
import org.jboss.ejb.deployment.ResourceManager;
import org.jboss.ejb.deployment.JDBCResource;
@@ -47,7 +47,7 @@
*
* @see <related>
* @author Rickard �berg ([EMAIL PROTECTED])
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
*/
public abstract class Container
{
@@ -56,7 +56,7 @@
// Attributes ----------------------------------------------------
protected Application application;
protected ClassLoader classLoader;
- protected EnterpriseBean metaData;
+ protected jBossEnterpriseBean metaData;
protected InstancePool instancePool;
protected ContainerInvoker containerInvoker;
protected TransactionManager transactionManager;
@@ -92,7 +92,7 @@
this.classLoader = cl;
}
- public void setMetaData(EnterpriseBean metaData)
+ public void setMetaData(jBossEnterpriseBean metaData)
{
this.metaData = metaData;
}
@@ -136,7 +136,7 @@
}
public ClassLoader getClassLoader(ClassLoader cl) { return classLoader; }
- public EnterpriseBean getMetaData() { return metaData; }
+ public jBossEnterpriseBean getMetaData() { return metaData; }
public ContainerInvoker getContainerInvoker() { return containerInvoker; }
public InstancePool getInstancePool() { return instancePool; }
public Interceptor getInterceptor() { return interceptor; }
@@ -334,7 +334,7 @@
Iterator enum = getMetaData().getEjbReferences();
while(enum.hasNext())
{
- EjbReference ref = (EjbReference)enum.next();
+ jBossEjbReference ref = (jBossEjbReference)enum.next();
Name n = ctx.getNameParser("").parse(ref.getLink());
ContainerInvoker ci = getContainerInvoker();
@@ -357,10 +357,10 @@
// Bind resource references
{
Iterator enum = getMetaData().getResourceReferences();
- ResourceManagers rms =
((EjbJar)getMetaData().getBeanContext().getBeanContext()).getResourceManagers();
+ ResourceManagers rms =
((jBossEjbJar)getMetaData().getBeanContext().getBeanContext()).getResourceManagers();
while(enum.hasNext())
{
- ResourceReference ref = (ResourceReference)enum.next();
+ jBossResourceReference ref = (jBossResourceReference)enum.next();
ResourceManager rm = rms.getResourceManager(ref.getResourceName());
1.2 +2 -2 jboss/src/main/org/jboss/ejb/DeploymentException.java
Index: DeploymentException.java
===================================================================
RCS file:
/products/cvs/ejboss/jboss/src/main/org/jboss/ejb/DeploymentException.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DeploymentException.java 2000/04/22 14:30:13 1.1
+++ DeploymentException.java 2000/05/19 07:11:48 1.2
@@ -10,7 +10,7 @@
*
* @see <related>
* @author Rickard �berg ([EMAIL PROTECTED])
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class DeploymentException
extends Exception
@@ -38,5 +38,5 @@
// Public --------------------------------------------------------
public Exception getCause() { return cause; }
- public String toString() { return super.toString()+", Cause:"+cause; }
+ public String toString() { return cause == null ? super.toString() :
super.toString()+", Cause:"+cause; }
}
1.2 +2 -8 jboss/src/main/org/jboss/ejb/StatefulSessionContainer.java
Index: StatefulSessionContainer.java
===================================================================
RCS file:
/products/cvs/ejboss/jboss/src/main/org/jboss/ejb/StatefulSessionContainer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- StatefulSessionContainer.java 2000/04/22 14:30:10 1.1
+++ StatefulSessionContainer.java 2000/05/19 07:11:48 1.2
@@ -31,7 +31,7 @@
*
* @see <related>
* @author Rickard �berg ([EMAIL PROTECTED])
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class StatefulSessionContainer
extends Container
@@ -91,13 +91,7 @@
public Object invokeHome(Method method, Object[] args)
throws Exception
{
- try
- {
- return getInterceptor().invokeHome(method, args, null);
- } finally
- {
-// System.out.println("Invoke home on bean finished");
- }
+ return getInterceptor().invokeHome(method, args, null);
}
/**
1.2 +31 -6
jboss/src/main/org/jboss/ejb/StatefulSessionEnterpriseContext.java
Index: StatefulSessionEnterpriseContext.java
===================================================================
RCS file:
/products/cvs/ejboss/jboss/src/main/org/jboss/ejb/StatefulSessionEnterpriseContext.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- StatefulSessionEnterpriseContext.java 2000/04/22 14:30:13 1.1
+++ StatefulSessionEnterpriseContext.java 2000/05/19 07:11:48 1.2
@@ -6,6 +6,7 @@
*/
package org.jboss.ejb;
+import java.io.IOException;
import java.rmi.RemoteException;
import javax.ejb.EJBHome;
@@ -18,16 +19,20 @@
*
* @see <related>
* @author Rickard �berg ([EMAIL PROTECTED])
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class StatefulSessionEnterpriseContext
extends EnterpriseContext
+ implements java.io.Serializable
{
// Constants -----------------------------------------------------
// Attributes ----------------------------------------------------
EJBObject ejbObject;
- boolean invoked = false;
+ Object cacheCtx;
+ Object persistenceCtx;
+
+ SessionContext ctx;
// Static --------------------------------------------------------
@@ -36,27 +41,47 @@
throws RemoteException
{
super(instance, con);
- ((SessionBean)instance).setSessionContext(new StatefulSessionContextImpl());
+ ctx = new StatefulSessionContextImpl();
+ ((SessionBean)instance).setSessionContext(ctx);
}
// Public --------------------------------------------------------
public void discard()
throws RemoteException
{
-// ((SessionBean)instance).unsetEntityContext();
+ // Do nothing
}
public void setEJBObject(EJBObject eo) { ejbObject = eo; }
public EJBObject getEJBObject() { return ejbObject; }
- public void setInvoked(boolean invoked) { this.invoked = invoked; }
- public boolean isInvoked() { return invoked; }
+ public void setPersistenceContext(Object ctx) { this.persistenceCtx = ctx; }
+ public Object getPersistenceContext() { return persistenceCtx; }
+
+ public void setCacheContext(Object ctx) { this.cacheCtx = ctx; }
+ public Object getCacheContext() { return cacheCtx; }
+
+ public SessionContext getSessionContext()
+ {
+ return ctx;
+ }
// Package protected ---------------------------------------------
// Protected -----------------------------------------------------
// Private -------------------------------------------------------
+ private void writeObject(java.io.ObjectOutputStream out)
+ throws IOException, ClassNotFoundException
+ {
+ // No state
+ }
+
+ private void readObject(java.io.ObjectInputStream in)
+ throws IOException, ClassNotFoundException
+ {
+ // No state
+ }
// Inner classes -------------------------------------------------
protected class StatefulSessionContextImpl
