You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2011/08/17 09:47:23 UTC
svn commit: r1158551 - in /openejb/trunk/openejb3: assembly/openejb-tomcat/openejb-tomcat-webapp/ assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/assembly/ container/openejb-loader/ container/openejb-loader/src/main/java/org/apache/openejb/loader/

Author: rmannibucau
Date: Wed Aug 17 07:47:22 2011
New Revision: 1158551

URL: http://svn.apache.org/viewvc?rev=1158551&view=rev
Log:
fixing openejb-loader dependencies

Modified:
    openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/pom.xml
    openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/assembly/war.xml
    openejb/trunk/openejb3/container/openejb-loader/pom.xml
    openejb/trunk/openejb3/container/openejb-loader/src/main/java/org/apache/openejb/loader/Loader.java

Modified: openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/pom.xml?rev=1158551&r1=1158550&r2=1158551&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/pom.xml (original)
+++ openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/pom.xml Wed Aug 17 07:47:22 2011
@@ -109,12 +109,6 @@
       <artifactId>openejb-tomcat-loader</artifactId>
       <version>${project.version}</version>
       <scope>runtime</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>${project.groupId}</groupId>
-          <artifactId>javaee-api</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.openejb</groupId>

Modified: openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/assembly/war.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/assembly/war.xml?rev=1158551&r1=1158550&r2=1158551&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/assembly/war.xml (original)
+++ openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/assembly/war.xml Wed Aug 17 07:47:22 2011
@@ -72,6 +72,7 @@
       <scope>runtime</scope>
       <excludes>
           <exclude>org.apache.tomcat:tomcat-catalina</exclude>
+          <exclude>org.apache.openejb:javaee-api</exclude>
       </excludes>
     </dependencySet>
     <dependencySet>

Modified: openejb/trunk/openejb3/container/openejb-loader/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-loader/pom.xml?rev=1158551&r1=1158550&r2=1158551&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-loader/pom.xml (original)
+++ openejb/trunk/openejb3/container/openejb-loader/pom.xml Wed Aug 17 07:47:22 2011
@@ -41,7 +41,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.openejb</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>javaee-api-embedded</artifactId>
       <version>${javaee-api.version}</version>
     </dependency>
     <dependency>

Modified: openejb/trunk/openejb3/container/openejb-loader/src/main/java/org/apache/openejb/loader/Loader.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-loader/src/main/java/org/apache/openejb/loader/Loader.java?rev=1158551&r1=1158550&r2=1158551&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-loader/src/main/java/org/apache/openejb/loader/Loader.java (original)
+++ openejb/trunk/openejb3/container/openejb-loader/src/main/java/org/apache/openejb/loader/Loader.java Wed Aug 17 07:47:22 2011
@@ -16,11 +16,7 @@
  */
 package org.apache.openejb.loader;
 
-import java.io.IOException;
 import java.util.Properties;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
 public interface Loader {