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 2010/09/14 09:43:45 UTC
svn commit: r996774 [8/8] - in /openejb/trunk/openejb3:
assembly/openejb-jetty/openejb-jetty-common/src/main/java/org/apache/openejb/jetty/common/
assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/
assembl...
Modified: openejb/trunk/openejb3/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/UberInterfaceTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/UberInterfaceTest.java?rev=996774&r1=996773&r2=996774&view=diff
==============================================================================
--- openejb/trunk/openejb3/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/UberInterfaceTest.java (original)
+++ openejb/trunk/openejb3/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/UberInterfaceTest.java Tue Sep 14 07:43:38 2010
@@ -17,18 +17,15 @@
package org.apache.openejb.server.ejbd;
import junit.framework.TestCase;
-import org.apache.openejb.client.LocalInitialContextFactory;
+import org.apache.openejb.BeanContext;
import org.apache.openejb.config.ConfigurationFactory;
import org.apache.openejb.assembler.classic.Assembler;
-import org.apache.openejb.assembler.classic.TransactionServiceInfo;
-import org.apache.openejb.assembler.classic.SecurityServiceInfo;
import org.apache.openejb.assembler.classic.EjbJarInfo;
import org.apache.openejb.assembler.classic.EnterpriseBeanInfo;
import org.apache.openejb.jee.EjbJar;
import org.apache.openejb.jee.StatelessBean;
import org.apache.openejb.spi.ContainerSystem;
import org.apache.openejb.loader.SystemInstance;
-import org.apache.openejb.DeploymentInfo;
import org.apache.openejb.OpenEJB;
import org.apache.openejb.server.ServicePool;
import org.apache.openejb.server.ServiceDaemon;
@@ -80,7 +77,7 @@ public class UberInterfaceTest extends T
assembler.createApplication(ejbJarInfo);
ContainerSystem containerSystem = SystemInstance.get().getComponent(ContainerSystem.class);
- DeploymentInfo deployment = containerSystem.getDeploymentInfo(beanInfo.ejbDeploymentId);
+ BeanContext deployment = containerSystem.getBeanContext(beanInfo.ejbDeploymentId);
assertEquals(asList(Everything.class), deployment.getBusinessLocalInterfaces());
assertEquals(asList(Everything.class), deployment.getBusinessRemoteInterfaces());
Modified: openejb/trunk/openejb3/server/openejb-telnet/src/main/java/org/apache/openejb/server/telnet/Ls.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-telnet/src/main/java/org/apache/openejb/server/telnet/Ls.java?rev=996774&r1=996773&r2=996774&view=diff
==============================================================================
--- openejb/trunk/openejb3/server/openejb-telnet/src/main/java/org/apache/openejb/server/telnet/Ls.java (original)
+++ openejb/trunk/openejb3/server/openejb-telnet/src/main/java/org/apache/openejb/server/telnet/Ls.java Tue Sep 14 07:43:38 2010
@@ -21,7 +21,7 @@ import java.io.IOException;
import java.io.PrintStream;
import org.apache.openejb.Container;
-import org.apache.openejb.DeploymentInfo;
+import org.apache.openejb.BeanContext;
import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.spi.ContainerSystem;
@@ -48,7 +48,7 @@ public class Ls extends Command {
out.println("Deployments:");
ContainerSystem containerSystem = SystemInstance.get().getComponent(ContainerSystem.class);
- DeploymentInfo[] d = containerSystem.deployments();
+ BeanContext[] d = containerSystem.deployments();
for (int i = 0; i < d.length; i++) {
out.print(" " + d[i].getDeploymentID());
out.println("");
Modified: openejb/trunk/openejb3/server/openejb-webadmin/src/main/java/org/apache/openejb/webadmin/clienttools/ViewEjbBean.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-webadmin/src/main/java/org/apache/openejb/webadmin/clienttools/ViewEjbBean.java?rev=996774&r1=996773&r2=996774&view=diff
==============================================================================
--- openejb/trunk/openejb3/server/openejb-webadmin/src/main/java/org/apache/openejb/webadmin/clienttools/ViewEjbBean.java (original)
+++ openejb/trunk/openejb3/server/openejb-webadmin/src/main/java/org/apache/openejb/webadmin/clienttools/ViewEjbBean.java Tue Sep 14 07:43:38 2010
@@ -19,7 +19,6 @@ package org.apache.openejb.webadmin.clie
import java.io.IOException;
import java.io.PrintWriter;
import java.util.HashMap;
-import java.util.Map;
import java.util.Properties;
import javax.naming.Context;
@@ -27,24 +26,18 @@ import javax.naming.InitialContext;
import javax.ejb.Stateless;
import javax.ejb.RemoteHome;
+import org.apache.openejb.BeanContext;
import org.apache.openejb.webadmin.HttpRequest;
import org.apache.openejb.webadmin.HttpResponse;
import org.apache.openejb.webadmin.HttpSession;
import org.apache.openejb.webadmin.WebAdminBean;
import org.apache.openejb.webadmin.HttpHome;
-import org.apache.openejb.assembler.classic.ContainerInfo;
-import org.apache.openejb.assembler.classic.EnterpriseBeanInfo;
-import org.apache.openejb.config.ConfigurationFactory;
-import org.apache.openejb.core.CoreDeploymentInfo;
-import org.apache.openejb.assembler.classic.ContainerInfo;
import org.apache.openejb.assembler.classic.EnterpriseBeanInfo;
import org.apache.openejb.assembler.classic.OpenEjbConfiguration;
import org.apache.openejb.assembler.classic.AppInfo;
import org.apache.openejb.assembler.classic.EjbJarInfo;
-import org.apache.openejb.config.ConfigurationFactory;
import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.spi.ContainerSystem;
-import org.apache.openejb.DeploymentInfo;
import org.apache.openejb.BeanType;
/**
@@ -102,7 +95,7 @@ public class ViewEjbBean extends WebAdmi
String id = (name.startsWith("/")) ? name.substring(1, name.length()) : name;
- org.apache.openejb.DeploymentInfo ejb = containerSystem.getDeploymentInfo(id);
+ BeanContext ejb = containerSystem.getBeanContext(id);
if (ejb == null) {
@@ -217,7 +210,7 @@ public class ViewEjbBean extends WebAdmi
printRow(pepperImg, invokerURL, out);
}
- Context enc = ((org.apache.openejb.core.CoreDeploymentInfo) ejb).getJndiEnc();
+ Context enc = ejb.getJndiEnc();
String ctxID = "enc" + enc.hashCode();
session.setAttribute(ctxID, enc);
String jndiURL =
Modified: openejb/trunk/openejb3/server/openejb-webadmin/src/main/java/org/apache/openejb/webadmin/main/DeploymentListBean.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-webadmin/src/main/java/org/apache/openejb/webadmin/main/DeploymentListBean.java?rev=996774&r1=996773&r2=996774&view=diff
==============================================================================
--- openejb/trunk/openejb3/server/openejb-webadmin/src/main/java/org/apache/openejb/webadmin/main/DeploymentListBean.java (original)
+++ openejb/trunk/openejb3/server/openejb-webadmin/src/main/java/org/apache/openejb/webadmin/main/DeploymentListBean.java Tue Sep 14 07:43:38 2010
@@ -21,8 +21,7 @@ import java.io.PrintWriter;
import java.util.Arrays;
import java.util.HashMap;
-import org.apache.openejb.DeploymentInfo;
-import org.apache.openejb.core.CoreDeploymentInfo;
+import org.apache.openejb.BeanContext;
import org.apache.openejb.spi.ContainerSystem;
import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.webadmin.HttpRequest;
@@ -131,7 +130,7 @@ public class DeploymentListBean extends
SystemInstance system = SystemInstance.get();
ContainerSystem containerSystem = system.getComponent(ContainerSystem.class);
- CoreDeploymentInfo di = (CoreDeploymentInfo) containerSystem.getDeploymentInfo(id);
+ BeanContext beanContext = containerSystem.getBeanContext(id);
printRow("Name", bean.ejbName, body);
printRow(
@@ -141,7 +140,7 @@ public class DeploymentListBean extends
String type = null;
- switch (di.getComponentType()) {
+ switch (beanContext.getComponentType()) {
case CMP_ENTITY :
type = "EntityBean with Container-Managed Persistence";
break;
@@ -172,7 +171,7 @@ public class DeploymentListBean extends
printRow("Jar location", bean.codebase, body);
//String container = URLEncoder.encode("" + di.getContainer().getContainerID());
- String container = (String)di.getContainer().getContainerID();
+ String container = (String) beanContext.getContainer().getContainerID();
printRow("Deployed in", container, body);
body.println("</table>");
@@ -230,7 +229,7 @@ public class DeploymentListBean extends
SystemInstance system = SystemInstance.get();
ContainerSystem containerSystem = system.getComponent(ContainerSystem.class);
- DeploymentInfo[] deployments = containerSystem.deployments();
+ BeanContext[] deployments = containerSystem.deployments();
String[] deploymentString = new String[deployments.length];
out.println("<table width=\"100%\" border=\"1\">");
out.println("<tr bgcolor=\"#5A5CB8\">");
Modified: openejb/trunk/openejb3/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/WsService.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/WsService.java?rev=996774&r1=996773&r2=996774&view=diff
==============================================================================
--- openejb/trunk/openejb3/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/WsService.java (original)
+++ openejb/trunk/openejb3/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/WsService.java Tue Sep 14 07:43:38 2010
@@ -17,6 +17,7 @@
*/
package org.apache.openejb.server.webservices;
+import org.apache.openejb.BeanContext;
import org.apache.openejb.server.ServerService;
import org.apache.openejb.server.SelfManaging;
import org.apache.openejb.server.ServiceException;
@@ -38,9 +39,8 @@ import org.apache.openejb.core.webservic
import org.apache.openejb.core.webservices.PortAddressRegistry;
import org.apache.openejb.core.webservices.PortData;
import org.apache.openejb.core.CoreContainerSystem;
-import org.apache.openejb.core.WebDeploymentInfo;
+import org.apache.openejb.core.WebContext;
import org.apache.openejb.spi.ContainerSystem;
-import org.apache.openejb.DeploymentInfo;
import org.apache.openejb.Injection;
import org.apache.openejb.util.Logger;
import org.apache.openejb.util.LogCategory;
@@ -185,7 +185,7 @@ public abstract class WsService implemen
}
}
- protected abstract HttpListener createEjbWsContainer(URL moduleBaseUrl, PortData port, DeploymentInfo deploymentInfo) throws Exception;
+ protected abstract HttpListener createEjbWsContainer(URL moduleBaseUrl, PortData port, BeanContext beanContext) throws Exception;
protected abstract void destroyEjbWsContainer(String deploymentId);
@@ -221,16 +221,16 @@ public abstract class WsService implemen
for (EnterpriseBeanInfo bean : ejbJar.enterpriseBeans) {
if (bean instanceof StatelessBeanInfo || bean instanceof SingletonBeanInfo) {
- DeploymentInfo deploymentInfo = containerSystem.getDeploymentInfo(bean.ejbDeploymentId);
- if (deploymentInfo == null) continue;
+ BeanContext beanContext = containerSystem.getBeanContext(bean.ejbDeploymentId);
+ if (beanContext == null) continue;
PortInfo portInfo = ports.get(bean.ejbName);
if (portInfo == null) continue;
try {
- PortData port = WsBuilder.toPortData(portInfo, deploymentInfo.getInjections(), moduleBaseUrl, deploymentInfo.getClassLoader());
+ PortData port = WsBuilder.toPortData(portInfo, beanContext.getInjections(), moduleBaseUrl, beanContext.getClassLoader());
- HttpListener container = createEjbWsContainer(moduleBaseUrl, port, deploymentInfo);
+ HttpListener container = createEjbWsContainer(moduleBaseUrl, port, beanContext);
// generate a location if one was not assigned
String location = port.getLocation();
@@ -240,7 +240,7 @@ public abstract class WsService implemen
if (!location.startsWith("/")) location = "/" + location;
ejbLocations.put(bean.ejbDeploymentId, location);
- ClassLoader classLoader = deploymentInfo.getClassLoader();
+ ClassLoader classLoader = beanContext.getClassLoader();
if (wsRegistry != null) {
String auth = authMethod;
String realm = realmName;
@@ -265,7 +265,7 @@ public abstract class WsService implemen
}
}
} catch (Throwable e) {
- logger.error("Error deploying CXF webservice for ejb " + deploymentInfo.getDeploymentID(), e);
+ logger.error("Error deploying CXF webservice for ejb " + beanContext.getDeploymentID(), e);
}
}
}
@@ -277,8 +277,8 @@ public abstract class WsService implemen
}
public void afterApplicationCreated(WebAppInfo webApp) {
- WebDeploymentInfo deploymentInfo = containerSystem.getWebDeploymentInfo(webApp.moduleId);
- if (deploymentInfo == null) return;
+ WebContext webContext = containerSystem.getWebContext(webApp.moduleId);
+ if (webContext == null) return;
// if already deployed skip this webapp
if (!deployedWebApps.add(webApp)) return;
@@ -300,9 +300,9 @@ public abstract class WsService implemen
if (portInfo == null) continue;
try {
- ClassLoader classLoader = deploymentInfo.getClassLoader();
- Collection<Injection> injections = deploymentInfo.getInjections();
- Context context = deploymentInfo.getJndiEnc();
+ ClassLoader classLoader = webContext.getClassLoader();
+ Collection<Injection> injections = webContext.getInjections();
+ Context context = webContext.getJndiEnc();
Class target = classLoader.loadClass(servlet.servletClass);
PortData port = WsBuilder.toPortData(portInfo, injections, moduleBaseUrl, classLoader);