Modified: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/EjbRefTest.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/EjbRefTest.java?rev=987790&r1=987789&r2=987790&view=diff ============================================================================== --- openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/EjbRefTest.java (original) +++ openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/EjbRefTest.java Sat Aug 21 16:58:57 2010 @@ -31,7 +31,6 @@ import javax.ejb.EJB; import javax.naming.InitialContext; import javax.naming.NamingException; import java.io.IOException; -import java.util.Arrays; /** * A potential issue with this feature is that the stateless bean is created @@ -62,7 +61,7 @@ public class EjbRefTest extends TestCase protected void tearDown() throws Exception { for (AppInfo appInfo : assembler.getDeployedApplications()) { - assembler.destroyApplication(appInfo.jarPath); + assembler.destroyApplication(appInfo.path); } SystemInstance.get().setComponent(Assembler.class, null); SystemInstance.get().setComponent(ContainerSystem.class, null);
Modified: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/ConfigurationFactoryTest.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/ConfigurationFactoryTest.java?rev=987790&r1=987789&r2=987790&view=diff ============================================================================== --- openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/ConfigurationFactoryTest.java (original) +++ openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/ConfigurationFactoryTest.java Sat Aug 21 16:58:57 2010 @@ -51,7 +51,7 @@ public class ConfigurationFactoryTest { ejbJar.setMetadataComplete(true); EjbJarInfo info = factory.configureApplication(ejbJar); // not much to assert - assertEquals(id, info.jarPath); + assertEquals(id, info.path); } @Test Modified: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/InheritedAppExceptionTest.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/InheritedAppExceptionTest.java?rev=987790&r1=987789&r2=987790&view=diff ============================================================================== --- openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/InheritedAppExceptionTest.java (original) +++ openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/InheritedAppExceptionTest.java Sat Aug 21 16:58:57 2010 @@ -23,7 +23,6 @@ package org.apache.openejb.core; import java.util.HashMap; import java.util.Properties; -import junit.framework.TestCase; import org.apache.openejb.loader.SystemInstance; import org.junit.Test; @@ -54,7 +53,7 @@ public class InheritedAppExceptionTest { @Test public void testRollback() throws Exception { SystemInstance.init(new Properties()); - CoreDeploymentInfo cdi = new CoreDeploymentInfo("foo", null, new ModuleContext("foo", new AppContext("foo", SystemInstance.get(), null, null, null), null), Object.class, null, new HashMap<String, String>()); + CoreDeploymentInfo cdi = new CoreDeploymentInfo("foo", null, new ModuleContext("foo", new AppContext("foo", SystemInstance.get(), null, null, null, false), null), Object.class, null, new HashMap<String, String>()); cdi.addApplicationException(AE1.class, true, true); cdi.addApplicationException(AE3.class, true, false); cdi.addApplicationException(AE6.class, false, true); Modified: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/cmp/jpa/AuthorBean.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/cmp/jpa/AuthorBean.java?rev=987790&r1=987789&r2=987790&view=diff ============================================================================== --- openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/cmp/jpa/AuthorBean.java (original) +++ openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/cmp/jpa/AuthorBean.java Sat Aug 21 16:58:57 2010 @@ -36,7 +36,7 @@ public class AuthorBean implements Entit public static Object deploymentInfo; static { try { - deploymentInfo = new CoreDeploymentInfo("author", null, new ModuleContext("", new AppContext("", SystemInstance.get(), Author.class.getClassLoader(), new IvmContext(), new IvmContext()), new IvmContext()), + deploymentInfo = new CoreDeploymentInfo("author", null, new ModuleContext("", new AppContext("", SystemInstance.get(), Author.class.getClassLoader(), new IvmContext(), new IvmContext(), false), new IvmContext()), AuthorBean.class, null, null, Modified: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/cmp/jpa/BookBean.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/cmp/jpa/BookBean.java?rev=987790&r1=987789&r2=987790&view=diff ============================================================================== --- openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/cmp/jpa/BookBean.java (original) +++ openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/cmp/jpa/BookBean.java Sat Aug 21 16:58:57 2010 @@ -36,7 +36,7 @@ public class BookBean implements EntityB public static Object deploymentInfo; static { try { - deploymentInfo = new CoreDeploymentInfo("book", null, new ModuleContext("", new AppContext("", SystemInstance.get(), Book.class.getClassLoader(), new IvmContext(), new IvmContext()), new IvmContext()), + deploymentInfo = new CoreDeploymentInfo("book", null, new ModuleContext("", new AppContext("", SystemInstance.get(), Book.class.getClassLoader(), new IvmContext(), new IvmContext(), false), new IvmContext()), BookBean.class, null, null, Modified: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/CustomMdbContainerTest.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/CustomMdbContainerTest.java?rev=987790&r1=987789&r2=987790&view=diff ============================================================================== --- openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/CustomMdbContainerTest.java (original) +++ openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/CustomMdbContainerTest.java Sat Aug 21 16:58:57 2010 @@ -87,7 +87,7 @@ public class CustomMdbContainerTest exte MessageAdapter messageAdapter = inbound.setMessageAdapter(new MessageAdapter()); MessageListener listener = messageAdapter.addMessageListener(new MessageListener(EmailConsumer.class, EmailAccountInfo.class)); listener.getActivationSpec().addRequiredConfigProperty("address"); - app.getResourceModules().add(new ConnectorModule(connector)); + app.getConnectorModules().add(new ConnectorModule(connector)); EjbJar ejbJar = new EjbJar(); ejbJar.addEnterpriseBean(new MessageDrivenBean(EmailBean.class)); Modified: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/QuartzMdbContainerTest.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/QuartzMdbContainerTest.java?rev=987790&r1=987789&r2=987790&view=diff ============================================================================== --- openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/QuartzMdbContainerTest.java (original) +++ openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/QuartzMdbContainerTest.java Sat Aug 21 16:58:57 2010 @@ -78,7 +78,7 @@ public class QuartzMdbContainerTest exte MessageAdapter messageAdapter = inbound.setMessageAdapter(new MessageAdapter()); MessageListener listener = messageAdapter.addMessageListener(new MessageListener(Job.class, JobSpec.class)); listener.getActivationSpec().addRequiredConfigProperty("cronExpression"); - app.getResourceModules().add(new ConnectorModule(connector)); + app.getConnectorModules().add(new ConnectorModule(connector)); EjbJar ejbJar = new EjbJar(); ejbJar.addEnterpriseBean(new MessageDrivenBean(CronBean.class)); Modified: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/singleton/DependsOnTest.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/singleton/DependsOnTest.java?rev=987790&r1=987789&r2=987790&view=diff ============================================================================== --- openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/singleton/DependsOnTest.java (original) +++ openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/singleton/DependsOnTest.java Sat Aug 21 16:58:57 2010 @@ -31,18 +31,15 @@ import org.apache.openejb.core.ivm.namin import org.apache.openejb.jee.EjbJar; import org.apache.openejb.jee.SingletonBean; import org.apache.openejb.jee.StatelessBean; -import org.apache.openejb.OpenEJBException; import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; import javax.ejb.DependsOn; import javax.ejb.Singleton; import javax.ejb.Startup; -import javax.naming.NamingException; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import java.io.IOException; /** * @version $Rev$ $Date$ @@ -89,7 +86,7 @@ public class DependsOnTest extends TestC // startup and trigger @PreDestroy for (AppInfo appInfo : assembler.getDeployedApplications()) { - assembler.destroyApplication(appInfo.jarPath); + assembler.destroyApplication(appInfo.path); } assertEquals(expected(one, two, three, four), actual); Modified: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Application.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Application.java?rev=987790&r1=987789&r2=987790&view=diff ============================================================================== --- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Application.java (original) +++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Application.java Sat Aug 21 16:58:57 2010 @@ -147,6 +147,13 @@ public class Application implements Jndi @XmlSchemaType(name = "ID") protected java.lang.String id; + public Application() { + } + + public Application(String applicationName) { + this.applicationName = applicationName; + } + public String getApplicationName() { return applicationName; } Modified: openejb/trunk/openejb3/container/openejb-junit/src/main/java/org/apache/openejb/junit/LocalClientRunner.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-junit/src/main/java/org/apache/openejb/junit/LocalClientRunner.java?rev=987790&r1=987789&r2=987790&view=diff ============================================================================== --- openejb/trunk/openejb3/container/openejb-junit/src/main/java/org/apache/openejb/junit/LocalClientRunner.java (original) +++ openejb/trunk/openejb3/container/openejb-junit/src/main/java/org/apache/openejb/junit/LocalClientRunner.java Sat Aug 21 16:58:57 2010 @@ -107,7 +107,7 @@ public class LocalClientRunner extends B private CoreDeploymentInfo createDeployment(Class<?> testClass) { try { - return new CoreDeploymentInfo(null, new IvmContext(), new ModuleContext("", new AppContext("", SystemInstance.get(), testClass.getClassLoader(), new IvmContext(), new IvmContext()), new IvmContext()), testClass, null, null, null, null, null, null, null, null, BeanType.MANAGED, false); + return new CoreDeploymentInfo(null, new IvmContext(), new ModuleContext("", new AppContext("", SystemInstance.get(), testClass.getClassLoader(), new IvmContext(), new IvmContext(), false), new IvmContext()), testClass, null, null, null, null, null, null, null, null, BeanType.MANAGED, false); } catch (SystemException e) { throw new IllegalStateException(e); } Modified: openejb/trunk/openejb3/container/openejb-osgi/src/main/java/org/apache/openejb/core/osgi/impl/Deployer.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-osgi/src/main/java/org/apache/openejb/core/osgi/impl/Deployer.java?rev=987790&r1=987789&r2=987790&view=diff ============================================================================== --- openejb/trunk/openejb3/container/openejb-osgi/src/main/java/org/apache/openejb/core/osgi/impl/Deployer.java (original) +++ openejb/trunk/openejb3/container/openejb-osgi/src/main/java/org/apache/openejb/core/osgi/impl/Deployer.java Sat Aug 21 16:58:57 2010 @@ -78,7 +78,7 @@ public class Deployer implements BundleL System.out.println(appInfo); assembler.createApplication(appInfo); - System.out.println("[Deployer] Application deployed: " + appInfo.jarPath); + System.out.println("[Deployer] Application deployed: " + appInfo.path); registerService(bundle, appInfo); Modified: openejb/trunk/openejb3/container/openejb-spring/src/main/java/org/apache/openejb/spring/AbstractApplication.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-spring/src/main/java/org/apache/openejb/spring/AbstractApplication.java?rev=987790&r1=987789&r2=987790&view=diff ============================================================================== --- openejb/trunk/openejb3/container/openejb-spring/src/main/java/org/apache/openejb/spring/AbstractApplication.java (original) +++ openejb/trunk/openejb3/container/openejb-spring/src/main/java/org/apache/openejb/spring/AbstractApplication.java Sat Aug 21 16:58:57 2010 @@ -129,7 +129,7 @@ public abstract class AbstractApplicatio if (e instanceof OpenEJBException) { throw (OpenEJBException) e; } - throw new OpenEJBException("Error starting application " + appInfo.jarPath, e); + throw new OpenEJBException("Error starting application " + appInfo.path, e); } } } @@ -208,9 +208,9 @@ public abstract class AbstractApplicatio for (AppInfo application : applications) { try { - getAssembler().destroyApplication(application.jarPath); + getAssembler().destroyApplication(application.path); } catch (Exception e) { - logger.error("Error stopping application " + application.jarPath, e); + logger.error("Error stopping application " + application.path, e); } } } Modified: openejb/trunk/openejb3/container/openejb-spring/src/main/java/org/apache/openejb/spring/ClassPathApplication.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-spring/src/main/java/org/apache/openejb/spring/ClassPathApplication.java?rev=987790&r1=987789&r2=987790&view=diff ============================================================================== --- openejb/trunk/openejb3/container/openejb-spring/src/main/java/org/apache/openejb/spring/ClassPathApplication.java (original) +++ openejb/trunk/openejb3/container/openejb-spring/src/main/java/org/apache/openejb/spring/ClassPathApplication.java Sat Aug 21 16:58:57 2010 @@ -81,18 +81,18 @@ public class ClassPathApplication extend Set<String> declaredApps = new TreeSet<String>(); Collection<AppInfo> applications = getAssembler().getDeployedApplications(); for (AppInfo application : applications) { - declaredApps.add(application.jarPath); + declaredApps.add(application.path); for (EjbJarInfo ejbJar : application.ejbJars) { - declaredApps.add(ejbJar.jarPath); + declaredApps.add(ejbJar.path); } for (ConnectorInfo connector : application.connectors) { - declaredApps.add(connector.codebase); + declaredApps.add(connector.path); } for (WebAppInfo webApp : application.webApps) { - declaredApps.add(webApp.codebase); + declaredApps.add(webApp.path); } for (ClientInfo client : application.clients) { - declaredApps.add(client.codebase); + declaredApps.add(client.path); } } return declaredApps; Modified: openejb/trunk/openejb3/server/openejb-client/src/main/java/org/apache/openejb/client/Main.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-client/src/main/java/org/apache/openejb/client/Main.java?rev=987790&r1=987789&r2=987790&view=diff ============================================================================== --- openejb/trunk/openejb3/server/openejb-client/src/main/java/org/apache/openejb/client/Main.java (original) +++ openejb/trunk/openejb3/server/openejb-client/src/main/java/org/apache/openejb/client/Main.java Sat Aug 21 16:58:57 2010 @@ -48,7 +48,7 @@ public class Main { InitialContext initialContext = new InitialContext(); // path to the client jar file - String path = (String) initialContext.lookup("java:comp/path"); + String path = (String) initialContext.lookup("java:info/path"); // TODO: Download the file File file = new File(path); @@ -63,7 +63,7 @@ public class Main { // load the main class and get the main method // do this first so we fail fast on a bad class path - String mainClassName = (String) initialContext.lookup("java:comp/mainClass"); + String mainClassName = (String) initialContext.lookup("java:info/mainClass"); Class mainClass = classLoader.loadClass(mainClassName); final Method mainMethod = mainClass.getMethod("main", String[].class); @@ -71,16 +71,16 @@ public class Main { // again do this before any major work so we can fail fase Class callbackHandlerClass = null; try { - String callbackHandlerName = (String) initialContext.lookup("java:comp/callbackHandler"); + String callbackHandlerName = (String) initialContext.lookup("java:info/callbackHandler"); callbackHandlerClass = classLoader.loadClass(callbackHandlerName); } catch (NameNotFoundException ignored) { } - InjectionMetaData injectionMetaData = (InjectionMetaData) initialContext.lookup("java:comp/injections"); + InjectionMetaData injectionMetaData = (InjectionMetaData) initialContext.lookup("java:info/injections"); ClientInstance.get().setComponent(InjectionMetaData.class, injectionMetaData); for (Injection injection : injectionMetaData.getInjections()) { try { - Object value = initialContext.lookup("java:comp/env/" + injection.getJndiName()); + Object value = initialContext.lookup("java:" + injection.getJndiName()); Class target = classLoader.loadClass(injection.getTargetClass()); Field field = target.getDeclaredField(injection.getName()); setAccessible(field); Modified: openejb/trunk/openejb3/server/openejb-client/src/test/java/org/apache/openejb/client/MainTest.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-client/src/test/java/org/apache/openejb/client/MainTest.java?rev=987790&r1=987789&r2=987790&view=diff ============================================================================== --- openejb/trunk/openejb3/server/openejb-client/src/test/java/org/apache/openejb/client/MainTest.java (original) +++ openejb/trunk/openejb3/server/openejb-client/src/test/java/org/apache/openejb/client/MainTest.java Sat Aug 21 16:58:57 2010 @@ -54,29 +54,29 @@ public class MainTest extends TestCase { LoginTestUtil.initialize(); jndi.clear(); - jndi.put("java:comp/path", "fake.jar"); - jndi.put("java:comp/injections", new InjectionMetaData()); + jndi.put("java:info/path", "fake.jar"); + jndi.put("java:info/injections", new InjectionMetaData()); } public void testSecureMain() throws Exception { - jndi.put("java:comp/callbackHandler", StaticUsernamePasswordCallbackHandler.class.getName()); + jndi.put("java:info/callbackHandler", StaticUsernamePasswordCallbackHandler.class.getName()); StaticUsernamePasswordCallbackHandler.setUsername("victoria"); StaticUsernamePasswordCallbackHandler.setPassword("secret"); LoginTestUtil.setAuthGranted(); - jndi.put("java:comp/mainClass", SecureMain.class.getName()); + jndi.put("java:info/mainClass", SecureMain.class.getName()); Main.main(new String[0]); } public void testSecureMainFailed() throws Exception { - jndi.put("java:comp/callbackHandler", StaticUsernamePasswordCallbackHandler.class.getName()); + jndi.put("java:info/callbackHandler", StaticUsernamePasswordCallbackHandler.class.getName()); StaticUsernamePasswordCallbackHandler.setUsername("victoria"); StaticUsernamePasswordCallbackHandler.setPassword("secret"); LoginTestUtil.setAuthDenied(); - jndi.put("java:comp/mainClass", SecureMain.class.getName()); + jndi.put("java:info/mainClass", SecureMain.class.getName()); try { Main.main(new String[0]); fail("Expected main method to throw FailedLoginException"); @@ -101,7 +101,7 @@ public class MainTest extends TestCase { } public void testNormalMain() throws Exception { - jndi.put("java:comp/mainClass", NormalMain.class.getName()); + jndi.put("java:info/mainClass", NormalMain.class.getName()); Main.main(new String[0]); } Modified: openejb/trunk/openejb3/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/JndiRequestHandler.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/JndiRequestHandler.java?rev=987790&r1=987789&r2=987790&view=diff ============================================================================== --- openejb/trunk/openejb3/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/JndiRequestHandler.java (original) +++ openejb/trunk/openejb3/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/JndiRequestHandler.java Sat Aug 21 16:58:57 2010 @@ -64,6 +64,7 @@ import org.apache.openejb.core.webservic import org.apache.openejb.core.webservices.ServiceRefData; import org.apache.openejb.loader.SystemInstance; import org.apache.openejb.spi.ContainerSystem; +import org.apache.openejb.util.Debug; import org.apache.openejb.util.LogCategory; import org.apache.openejb.util.Logger; import org.apache.openejb.util.proxy.ProxyManager; @@ -173,7 +174,7 @@ class JndiRequestHandler { try { - if (name.equals("comp/injections")) { + if (name.equals("info/injections")) { //noinspection unchecked List<Injection> injections = (List<Injection>) context.lookup(name); @@ -184,15 +185,6 @@ class JndiRequestHandler { res.setResponseCode(ResponseCodes.JNDI_INJECTIONS); res.setResult(metaData); return; - } else if (name.startsWith("comp/env/")){ - // In the assembler we do a "clientContext.bind("comp/env", envContext)" - // seems the result of binding a context into a context is that name - // lookups don't resolve correctly when spanning the two contexts. - // As a hack, we first lookup "comp/env/", then finish our lookup on - // the returned context. - context = (Context) context.lookup("comp/env/"); - name = name.substring("comp/env/".length()); - object = context.lookup(name); } else { object = context.lookup(name); } Modified: openejb/trunk/openejb3/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/DeploymentIndexTest.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/DeploymentIndexTest.java?rev=987790&r1=987789&r2=987790&view=diff ============================================================================== --- openejb/trunk/openejb3/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/DeploymentIndexTest.java (original) +++ openejb/trunk/openejb3/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/DeploymentIndexTest.java Sat Aug 21 16:58:57 2010 @@ -40,7 +40,7 @@ public class DeploymentIndexTest { @Before public void setUp() throws SystemException { method = Method.class.getMethods()[0]; - deploymentInfo = new CoreDeploymentInfo("aDeploymentId", null, new ModuleContext("", new AppContext("", SystemInstance.get(), null, null, null), null), DeploymentIndexTest.class, null, null, null, null, null, null, null, null, null, false); + deploymentInfo = new CoreDeploymentInfo("aDeploymentId", null, new ModuleContext("", new AppContext("", SystemInstance.get(), null, null, null, false), null), DeploymentIndexTest.class, null, null, null, null, null, null, null, null, null, false); deploymentIndex = new DeploymentIndex(new DeploymentInfo[] { deploymentInfo, deploymentInfo }); } 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=987790&r1=987789&r2=987790&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 Sat Aug 21 16:58:57 2010 @@ -196,7 +196,7 @@ public abstract class WsService implemen public void afterApplicationCreated(AppInfo appInfo) { if (deployedApplications.add(appInfo)) { Map<String,String> contextData = new HashMap<String,String>(); - contextData.put("appId", appInfo.jarPath); + contextData.put("appId", appInfo.path); for (EjbJarInfo ejbJar : appInfo.ejbJars) { Map<String, PortInfo> ports = new TreeMap<String,PortInfo>(); for (PortInfo port : ejbJar.portInfos) { @@ -205,9 +205,9 @@ public abstract class WsService implemen URL moduleBaseUrl = null; try { - moduleBaseUrl = new File(ejbJar.jarPath).toURI().toURL(); + moduleBaseUrl = new File(ejbJar.path).toURI().toURL(); } catch (MalformedURLException e) { - logger.error("Invalid ejb jar location " + ejbJar.jarPath, e); + logger.error("Invalid ejb jar location " + ejbJar.path, e); } StringTemplate deploymentIdTemplate = this.wsAddressTemplate; @@ -290,9 +290,9 @@ public abstract class WsService implemen URL moduleBaseUrl = null; try { - moduleBaseUrl = new File(webApp.codebase).toURI().toURL(); + moduleBaseUrl = new File(webApp.path).toURI().toURL(); } catch (MalformedURLException e) { - logger.error("Invalid ejb jar location " + webApp.codebase, e); + logger.error("Invalid ejb jar location " + webApp.path, e); } for (ServletInfo servlet : webApp.servlets) {
