svn commit: r1160450 - /openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-common/src/main/java/org/apache/openejb/tomcat/installer/Installer.java

[rmannibucau]

Author: rmannibucau
Date: Mon Aug 22 21:37:40 2011
New Revision: 1160450

URL: http://svn.apache.org/viewvc?rev=1160450&view=rev
Log:
merging endorsed and lib

Modified:
    
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-common/src/main/java/org/apache/openejb/tomcat/installer/Installer.java

Modified: 
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-common/src/main/java/org/apache/openejb/tomcat/installer/Installer.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-common/src/main/java/org/apache/openejb/tomcat/installer/Installer.java?rev=1160450&r1=1160449&r2=1160450&view=diff
==============================================================================
--- 
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-common/src/main/java/org/apache/openejb/tomcat/installer/Installer.java
 (original)
+++ 
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-common/src/main/java/org/apache/openejb/tomcat/installer/Installer.java
 Mon Aug 22 21:37:40 2011
@@ -100,15 +100,8 @@ public class Installer {
     }
 
     private void addJavaeeInEndorsed() {
-        File endorsed = new File(paths.getCatalinaHomeDir(), "endorsed/");
-        if (!endorsed.exists()) {
-            if (!endorsed.mkdirs()) {
-                alerts.addError("can't add endorsed folder");
-                return;
-            }
-        }
-
-        for (File f : endorsed.listFiles()) {
+        File lib = paths.getCatalinaLibDir();
+        for (File f : lib.listFiles()) {
             if (f.getName().startsWith("javaee-api") && 
f.getName().endsWith(".jar")) {
                 return;
             }
@@ -116,7 +109,7 @@ public class Installer {
 
         File javaeeApi = paths.getJavaEEAPIJAr();
         try {
-            Installers.copy(javaeeApi, new File(endorsed, 
javaeeApi.getName()));
+            Installers.copy(javaeeApi, new File(lib, javaeeApi.getName()));
         } catch (IOException e) {
             alerts.addError(e.getMessage());
         }