User: docodan
Date: 01/06/02 12:30:27
Modified: src/main/org/jboss/ejb ContainerInvokerContainer.java
EntityContainer.java MessageDrivenContainer.java
StatefulSessionContainer.java
StatelessSessionContainer.java
Log:
ContainerInvokerContainer interface modified to add local interface support.
Revision Changes Path
1.3 +7 -2 jboss/src/main/org/jboss/ejb/ContainerInvokerContainer.java
Index: ContainerInvokerContainer.java
===================================================================
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/ContainerInvokerContainer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ContainerInvokerContainer.java 2000/12/07 15:44:09 1.2
+++ ContainerInvokerContainer.java 2001/06/02 19:30:27 1.3
@@ -21,7 +21,8 @@
*
* @see ContainerInvoker
* @author Rickard �berg ([EMAIL PROTECTED])
- * @version $Revision: 1.2 $
+ * @author Daniel OConnor ([EMAIL PROTECTED])
+ * @version $Revision: 1.3 $
*/
public interface ContainerInvokerContainer
{
@@ -29,7 +30,11 @@
public Class getHomeClass();
public Class getRemoteClass();
+
+ public Class getLocalHomeClass();
+
+ public Class getLocalClass();
- public ContainerInvoker getContainerInvoker();
+ public ContainerInvoker getContainerInvoker();
}
1.36 +28 -5 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.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- EntityContainer.java 2000/12/12 09:50:12 1.35
+++ EntityContainer.java 2001/06/02 19:30:27 1.36
@@ -36,7 +36,8 @@
* @author Rickard �berg ([EMAIL PROTECTED])
* @author <a href="mailto:[EMAIL PROTECTED]";>Marc Fleury</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Sebastien Alborini</a>
-* @version $Revision: 1.35 $
+* @author Daniel OConnor ([EMAIL PROTECTED])
+* @version $Revision: 1.36 $
*/
public class EntityContainer
extends Container
@@ -51,6 +52,10 @@
// This is the Remote interface class
protected Class remoteInterface;
+
+ protected Class localHomeInterface;
+
+ protected Class localInterface;
// These are the mappings between the home interface methods and the container
methods
protected Map homeMapping;
@@ -58,6 +63,7 @@
// These are the mappings between the remote interface methods and the bean
methods
protected Map beanMapping;
+
// This is the container invoker for this container
protected ContainerInvoker containerInvoker;
@@ -163,6 +169,17 @@
{
return remoteInterface;
}
+
+ public Class getLocalClass()
+ {
+ return localInterface;
+ }
+
+ public Class getLocalHomeClass()
+ {
+ return localHomeInterface;
+ }
+
// Container implementation --------------------------------------
public void init()
@@ -173,8 +190,14 @@
Thread.currentThread().setContextClassLoader(getClassLoader());
// Acquire classes from CL
- homeInterface = classLoader.loadClass(metaData.getHome());
- remoteInterface = classLoader.loadClass(metaData.getRemote());
+ if (metaData.getHome() != null)
+ homeInterface = classLoader.loadClass(metaData.getHome());
+ if (metaData.getRemote() != null)
+ remoteInterface = classLoader.loadClass(metaData.getRemote());
+ /*if (metaData.getHome() != null)
+ localHomeInterface = classLoader.loadClass(metaData.getLocalHome());
+ if (metaData.getRemote() != null)
+ localInterface = classLoader.loadClass(metaData.getLocal());*/
// Call default init
super.init();
@@ -592,11 +615,11 @@
}
- public Interceptor createContainerInterceptor()
+ Interceptor createContainerInterceptor()
{
return new ContainerInterceptor();
}
-
+
// Inner classes -------------------------------------------------
// This is the last step before invocation - all interceptors are done
class ContainerInterceptor
1.4 +13 -1 jboss/src/main/org/jboss/ejb/MessageDrivenContainer.java
Index: MessageDrivenContainer.java
===================================================================
RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/ejb/MessageDrivenContainer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MessageDrivenContainer.java 2001/02/28 09:25:38 1.3
+++ MessageDrivenContainer.java 2001/06/02 19:30:27 1.4
@@ -30,7 +30,8 @@
* @author Peter Antman ([EMAIL PROTECTED])
* @author Rickard �berg ([EMAIL PROTECTED])
* @author <a href="[EMAIL PROTECTED]">Marc Fleury</a>
-* @version $Revision: 1.3 $
+* @author Daniel OConnor ([EMAIL PROTECTED])
+* @version $Revision: 1.4 $
* extends StatelessSessionContainer
*/
public class MessageDrivenContainer
@@ -117,6 +118,17 @@
{
throw new Error("Not valid for MessageDriven beans");
}
+
+ public Class getLocalClass()
+ {
+ throw new Error("Not valid for MessageDriven beans");
+ }
+
+ public Class getLocalHomeClass()
+ {
+ throw new Error("Not valid for MessageDriven beans");
+ }
+
// Container implementation - overridden here ----------------------
public void init()
1.22 +17 -1 jboss/src/main/org/jboss/ejb/StatefulSessionContainer.java
Index: StatefulSessionContainer.java
===================================================================
RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/ejb/StatefulSessionContainer.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- StatefulSessionContainer.java 2000/12/07 15:44:11 1.21
+++ StatefulSessionContainer.java 2001/06/02 19:30:27 1.22
@@ -32,7 +32,8 @@
*
* @see <related>
* @author Rickard �berg ([EMAIL PROTECTED])
- * @version $Revision: 1.21 $
+ * @author Daniel OConnor ([EMAIL PROTECTED])
+ * @version $Revision: 1.22 $
*/
public class StatefulSessionContainer
extends Container
@@ -47,6 +48,10 @@
// This is the Remote interface class
protected Class remoteInterface;
+ protected Class localHomeInterface;
+
+ protected Class localInterface;
+
// These are the mappings between the home interface methods and the container
methods
protected Map homeMapping;
@@ -154,6 +159,17 @@
{
return remoteInterface;
}
+
+ public Class getLocalClass()
+ {
+ return localInterface;
+ }
+
+ public Class getLocalHomeClass()
+ {
+ return localHomeInterface;
+ }
+
// Container implementation --------------------------------------
public void init()
1.16 +18 -2 jboss/src/main/org/jboss/ejb/StatelessSessionContainer.java
Index: StatelessSessionContainer.java
===================================================================
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/StatelessSessionContainer.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- StatelessSessionContainer.java 2000/12/07 15:44:11 1.15
+++ StatelessSessionContainer.java 2001/06/02 19:30:27 1.16
@@ -29,7 +29,8 @@
* @see <related>
* @author Rickard �berg ([EMAIL PROTECTED])
* @author <a href="[EMAIL PROTECTED]">Marc Fleury</a>
-* @version $Revision: 1.15 $
+* @author Daniel OConnor ([EMAIL PROTECTED])
+* @version $Revision: 1.16 $
*/
public class StatelessSessionContainer
extends Container
@@ -44,7 +45,11 @@
// This is the Remote interface class
protected Class remoteInterface;
- // These are the mappings between the home interface methods and the container
methods
+ protected Class localHomeInterface;
+
+ protected Class localInterface;
+
+ // These are the mappings between the home interface methods and the container
methods
protected Map homeMapping;
// These are the mappings between the remote interface methods and the bean
methods
@@ -124,6 +129,17 @@
{
return remoteInterface;
}
+
+ public Class getLocalClass()
+ {
+ return localInterface;
+ }
+
+ public Class getLocalHomeClass()
+ {
+ return localHomeInterface;
+ }
+
// Container implementation --------------------------------------
public void init()
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development
