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 2014/07/19 22:04:03 UTC

svn commit: r1611955 - /tomee/tomee/trunk/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java

Author: rmannibucau
Date: Sat Jul 19 20:04:03 2014
New Revision: 1611955

URL: http://svn.apache.org/r1611955
Log:
tomcat annotations-api is fully in javaee-api and jvm 7

Modified:
    tomee/tomee/trunk/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java

Modified: tomee/tomee/trunk/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java?rev=1611955&r1=1611954&r2=1611955&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java (original)
+++ tomee/tomee/trunk/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java Sat Jul 19 20:04:03 2014
@@ -99,6 +99,7 @@ public class Installer implements Instal
         installJavaagent();
         installConfigFiles();
 
+        removeTomcatLibJar("annotations-api.jar");
         addJavaeeInEndorsed();
         addTomEEJuli();
 
@@ -183,6 +184,7 @@ public class Installer implements Instal
         commentDeploymentDir();
         installConfigFiles();
 
+        removeTomcatLibJar("annotations-api.jar");
         addJavaeeInEndorsed();
         addTomEEJuli(); // before moveLibs
         moveLibs();
@@ -195,6 +197,11 @@ public class Installer implements Instal
         }
     }
 
+    private void removeTomcatLibJar(final String name) {
+        final File jar = new File(paths.getCatalinaLibDir(), name);
+        removeJar(jar);
+    }
+
     private void commentDeploymentDir() {
         final File tomeeXml = new File(paths.getCatalinaConfDir(), "tomee.xml");
         if (!tomeeXml.exists()) {