You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2007/01/19 07:30:34 UTC
svn commit: r497714 - in
/incubator/openejb/trunk/openejb3/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd:
ClientObjectFactory.java EjbDaemon.java JndiRequestHandler.java
Author: dblevins
Date: Thu Jan 18 22:30:32 2007
New Revision: 497714
URL: http://svn.apache.org/viewvc?view=rev&rev=497714
Log:
Unhooking the DeploymentIndex concept for now
Modified:
incubator/openejb/trunk/openejb3/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/ClientObjectFactory.java
incubator/openejb/trunk/openejb3/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/EjbDaemon.java
incubator/openejb/trunk/openejb3/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/JndiRequestHandler.java
Modified: incubator/openejb/trunk/openejb3/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/ClientObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/ClientObjectFactory.java?view=diff&rev=497714&r1=497713&r2=497714
==============================================================================
--- incubator/openejb/trunk/openejb3/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/ClientObjectFactory.java (original)
+++ incubator/openejb/trunk/openejb3/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/ClientObjectFactory.java Thu Jan 18 22:30:32 2007
@@ -72,7 +72,7 @@
protected javax.ejb.EJBMetaData _getEJBMetaData(CallContext call, ProxyInfo info) {
DeploymentInfo deployment = info.getDeploymentInfo();
- int idCode = this.daemon.deploymentIndex.getDeploymentIndex(deployment);
+ int idCode = -1;
EJBMetaDataImpl metaData = new EJBMetaDataImpl(deployment.getHomeInterface(),
deployment.getRemoteInterface(),
@@ -86,7 +86,7 @@
protected javax.ejb.Handle _getHandle(CallContext call, ProxyInfo info) {
DeploymentInfo deployment = info.getDeploymentInfo();
- int idCode = this.daemon.deploymentIndex.getDeploymentIndex(deployment);
+ int idCode = -1;
Object securityIdentity = null;
try {
@@ -111,7 +111,7 @@
protected javax.ejb.HomeHandle _getHomeHandle(CallContext call, ProxyInfo info) {
DeploymentInfo deployment = info.getDeploymentInfo();
- int idCode = this.daemon.deploymentIndex.getDeploymentIndex(deployment);
+ int idCode = -1;
Object securityIdentity = null;
try {
@@ -135,7 +135,7 @@
protected javax.ejb.EJBObject _getEJBObject(CallContext call, ProxyInfo info) {
DeploymentInfo deployment = info.getDeploymentInfo();
- int idCode = this.daemon.deploymentIndex.getDeploymentIndex(deployment);
+ int idCode = -1;
Object securityIdentity = null;
try {
@@ -160,7 +160,7 @@
protected javax.ejb.EJBHome _getEJBHome(CallContext call, ProxyInfo info) {
DeploymentInfo deployment = info.getDeploymentInfo();
- int idCode = this.daemon.deploymentIndex.getDeploymentIndex(deployment);
+ int idCode = -1;
Object securityIdentity = null;
try {
Modified: incubator/openejb/trunk/openejb3/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/EjbDaemon.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/EjbDaemon.java?view=diff&rev=497714&r1=497713&r2=497714
==============================================================================
--- incubator/openejb/trunk/openejb3/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/EjbDaemon.java (original)
+++ incubator/openejb/trunk/openejb3/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/EjbDaemon.java Thu Jan 18 22:30:32 2007
@@ -41,7 +41,7 @@
Logger logger = Logger.getInstance("OpenEJB.server.remote", "org.apache.openejb.server.util.resources");
ClientObjectFactory clientObjectFactory;
- DeploymentIndex deploymentIndex;
+// DeploymentIndex deploymentIndex;
EjbRequestHandler ejbHandler;
JndiRequestHandler jndiHandler;
AuthRequestHandler authHandler;
@@ -49,6 +49,7 @@
boolean stop = false;
static EjbDaemon thiss;
+ private ContainerSystem containerSystem;
private EjbDaemon() {
}
@@ -61,9 +62,8 @@
}
public void init(Properties props) throws Exception {
- // TODO: DMB: Naughty naugty, static badness
- ContainerSystem containerSystem = SystemInstance.get().getComponent(ContainerSystem.class);
- deploymentIndex = new DeploymentIndex(containerSystem.deployments());
+ containerSystem = SystemInstance.get().getComponent(ContainerSystem.class);
+// deploymentIndex = new DeploymentIndex(containerSystem.deployments());
clientObjectFactory = new ClientObjectFactory(this);
@@ -139,7 +139,8 @@
}
protected DeploymentInfo getDeployment(EJBRequest req) throws RemoteException {
- return deploymentIndex.getDeployment(req);
+ String deploymentId = req.getDeploymentId();
+ return containerSystem.getDeploymentInfo(deploymentId);
}
public void processEjbRequest(ObjectInputStream in, ObjectOutputStream out) {
Modified: incubator/openejb/trunk/openejb3/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/JndiRequestHandler.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/JndiRequestHandler.java?view=diff&rev=497714&r1=497713&r2=497714
==============================================================================
--- incubator/openejb/trunk/openejb3/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/JndiRequestHandler.java (original)
+++ incubator/openejb/trunk/openejb3/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/JndiRequestHandler.java Thu Jan 18 22:30:32 2007
@@ -147,7 +147,7 @@
deployment.getPrimaryKeyClass(),
deployment.getComponentType().toString(),
deploymentID,
- this.daemon.deploymentIndex.getDeploymentIndex(deploymentID));
+ -1);
res.setResult(metaData);
break;
}
@@ -163,7 +163,7 @@
deployment.getPrimaryKeyClass(),
deployment.getComponentType().toString(),
deploymentID,
- this.daemon.deploymentIndex.getDeploymentIndex(deploymentID));
+ -1);
Object[] data = {metaData, proxyInfo.getPrimaryKey()};
res.setResult(data);
break;
@@ -177,7 +177,7 @@
deployment.getPrimaryKeyClass(),
deployment.getComponentType().toString(),
deploymentID,
- this.daemon.deploymentIndex.getDeploymentIndex(deploymentID));
+ -1);
Object[] data = {metaData, proxyInfo.getPrimaryKey()};
res.setResult(data);
} else {