[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openejb-cvs
Subject:    svn commit: r1206987 - in /openejb/trunk/openejb/tck: cdi-tomee/pom.xml
From:       dblevins () apache ! org
Date:       2011-11-28 6:27:31
Message-ID: 20111128062732.196D123889D7 () eris ! apache ! org
[Download RAW message or body]

Author: dblevins
Date: Mon Nov 28 06:27:30 2011
New Revision: 1206987

URL: http://svn.apache.org/viewvc?rev=1206987&view=rev
Log:
TOMEE-37
Ability to run the CDI TCK with the apps deployed from webapps/

Modified:
    openejb/trunk/openejb/tck/cdi-tomee/pom.xml
    openejb/trunk/openejb/tck/tck-common/src/main/java/org/apache/openejb/tck/impl/ContainersImplTomEE.java


Modified: openejb/trunk/openejb/tck/cdi-tomee/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tck/cdi-tomee/pom.xml?rev=1206987&r1=1206986&r2=1206987&view=diff
 ==============================================================================
--- openejb/trunk/openejb/tck/cdi-tomee/pom.xml (original)
+++ openejb/trunk/openejb/tck/cdi-tomee/pom.xml Mon Nov 28 06:27:30 2011
@@ -26,10 +26,13 @@
   <artifactId>cdi-tomee</artifactId>
   <packaging>jar</packaging>
   <name>OpenEJB :: TCK :: CDI TomEE</name>
+
   <properties>
     <!-- where we will unpack tomcat -->
     <openejb.home>${project.build.directory}${file.separator}apache-tomee-webprofile-1.0.0-beta-2-SNAPSHOT</openejb.home>
 +    <openejb.deployer.jndiname>openejb/DeployerBusinessRemote</openejb.deployer.jndiname>
  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.openejb</groupId>
@@ -37,6 +40,11 @@
       <version>${project.version}</version>
     </dependency>
     <dependency>
+      <groupId>org.apache.openejb</groupId>
+      <artifactId>webdeployer</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <scope>test</scope>
@@ -143,6 +151,12 @@
               <artifactItems>
                 <artifactItem>
                   <groupId>org.apache.openejb</groupId>
+                  <artifactId>webdeployer</artifactId>
+                  <version>${project.version}</version>
+                  <outputDirectory>${openejb.home}/webapps/openejb/lib</outputDirectory>
 +                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.openejb</groupId>
                   <artifactId>tck-common</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
 @@ -214,6 +228,7 @@
             <server.shutdown.port>${tomee.shutdown.port}</server.shutdown.port>
             <java.opts>-Xmx512m -Xms256m -XX:PermSize=64m -XX:MaxPermSize=512m \
-XX:ReservedCodeCacheSize=64m</java.opts>  \
<openejb.home>${openejb.home}</openejb.home> +            \
<openejb.deployer.jndiname>${openejb.deployer.jndiname}</openejb.deployer.jndiname>  \
</systemPropertyVariables>  </configuration>
         <executions>
@@ -235,4 +250,15 @@
       </plugin>
     </plugins>
   </build>
+
+
+  <profiles>
+    <profile>
+      <id>webapp-deployer</id>
+      <properties>
+        <openejb.deployer.jndiname>openejb/WebappDeployerRemote</openejb.deployer.jndiname>
 +      </properties>
+    </profile>
+  </profiles>
+
 </project>

Modified: openejb/trunk/openejb/tck/tck-common/src/main/java/org/apache/openejb/tck/impl/ContainersImplTomEE.java
                
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tck/tck-common/src/main/java/o \
rg/apache/openejb/tck/impl/ContainersImplTomEE.java?rev=1206987&r1=1206986&r2=1206987&view=diff
 ==============================================================================
--- openejb/trunk/openejb/tck/tck-common/src/main/java/org/apache/openejb/tck/impl/ContainersImplTomEE.java \
                (original)
+++ openejb/trunk/openejb/tck/tck-common/src/main/java/org/apache/openejb/tck/impl/ContainersImplTomEE.java \
Mon Nov 28 06:27:30 2011 @@ -58,9 +58,12 @@ public class ContainersImplTomEE impleme
         } else {
             throw new RuntimeException("Please set the tomee port as a system \
property");  }
+
+        final String deployerJndi = System.getProperty("openejb.deployer.jndiname", \
"openejb/DeployerBusinessRemote"); +
         try {
             InitialContext context = new InitialContext(props);
-            return (Deployer) context.lookup("openejb/DeployerBusinessRemote");
+            return (Deployer) context.lookup(deployerJndi);
         } catch (Exception e) {
             throw new RuntimeException(e);
         }


[prev in list] [next in list] [prev in thread] [next in thread]