svn commit: r1338019 - in /openejb/trunk/openejb: container/openejb-core/src/main/java/org/apache/openejb/config/SystemApps.java tck/cdi-tomee/pom.xml tck/tck-common/src/main/java/org/apache/openejb/tck/impl/FullRestartContainer.java

[rmannibucau]

Author: rmannibucau
Date: Mon May 14 01:08:30 2012
New Revision: 1338019

URL: http://svn.apache.org/viewvc?rev=1338019&view=rev
Log:
fixing webapp deployer (jndi name and webdeployer folder)

Modified:
    
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/SystemApps.java
    openejb/trunk/openejb/tck/cdi-tomee/pom.xml
    
openejb/trunk/openejb/tck/tck-common/src/main/java/org/apache/openejb/tck/impl/FullRestartContainer.java

Modified: 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/SystemApps.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/SystemApps.java?rev=1338019&r1=1338018&r2=1338019&view=diff
==============================================================================
--- 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/SystemApps.java
 (original)
+++ 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/SystemApps.java
 Mon May 14 01:08:30 2012
@@ -50,7 +50,8 @@ public class SystemApps {
             deployment.getProperties().put("openejb.jndiname.format", 
"{deploymentId}{interfaceType.annotationName}");
 
             final SingletonBean exceptionManager = 
ejbJar.addEnterpriseBean(new SingletonBean("openejb/ExceptionManagerFacade", 
"org.apache.tomee.catalina.facade.ExceptionManagerFacadeBean"));
-            
openejbJar.addEjbDeployment(exceptionManager).getProperties().put("openejb.jndiname.format",
 "{deploymentId}{interfaceType.annotationName}");
+            final EjbDeployment exceptionMgr = 
openejbJar.addEjbDeployment(exceptionManager);
+            exceptionMgr.getProperties().put("openejb.jndiname.format", 
"{deploymentId}{interfaceType.annotationName}");
         }
 
 

Modified: openejb/trunk/openejb/tck/cdi-tomee/pom.xml
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/tck/cdi-tomee/pom.xml?rev=1338019&r1=1338018&r2=1338019&view=diff
==============================================================================
--- openejb/trunk/openejb/tck/cdi-tomee/pom.xml (original)
+++ openejb/trunk/openejb/tck/cdi-tomee/pom.xml Mon May 14 01:08:30 2012
@@ -158,7 +158,7 @@
                   <groupId>org.apache.openejb</groupId>
                   <artifactId>webdeployer</artifactId>
                   <version>${project.version}</version>
-                  
<outputDirectory>${openejb.home}/webapps/tomee/lib</outputDirectory>
+                  <outputDirectory>${openejb.home}/lib</outputDirectory>
                 </artifactItem>
                 <artifactItem>
                   <groupId>org.apache.openejb</groupId>

Modified: 
openejb/trunk/openejb/tck/tck-common/src/main/java/org/apache/openejb/tck/impl/FullRestartContainer.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/tck/tck-common/src/main/java/org/apache/openejb/tck/impl/FullRestartContainer.java?rev=1338019&r1=1338018&r2=1338019&view=diff
==============================================================================
--- 
openejb/trunk/openejb/tck/tck-common/src/main/java/org/apache/openejb/tck/impl/FullRestartContainer.java
 (original)
+++ 
openejb/trunk/openejb/tck/tck-common/src/main/java/org/apache/openejb/tck/impl/FullRestartContainer.java
 Mon May 14 01:08:30 2012
@@ -116,7 +116,7 @@ public class FullRestartContainer extend
 
         try {
             InitialContext context = new InitialContext(props);
-            return (ExceptionManagerFacade) 
context.lookup("openejb/ExceptionManagerFacadeRemote");
+            return (ExceptionManagerFacade) 
context.lookup("openejb/ExceptionManagerFacadeBusinessRemote");
         } catch (Exception e) {
             throw new OpenEJBTCKRuntimeException(e);
         }