Author: rmannibucau
Date: Mon Aug 22 14:15:06 2011
New Revision: 1160271
URL: http://svn.apache.org/viewvc?rev=1160271&view=rev
Log:
removing no more useful annotation-api jar
Removed:
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/webapp/tomcat/
Modified:
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/src/main/assembly/tomee.xml
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-common/src/main/java/org/apache/openejb/tomcat/installer/Installer.java
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-common/src/main/java/org/apache/openejb/tomcat/installer/Paths.java
Modified:
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/src/main/assembly/tomee.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/src/main/assembly/tomee.xml?rev=1160271&r1=1160270&r2=1160271&view=diff
==============================================================================
---
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/src/main/assembly/tomee.xml
(original)
+++
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/src/main/assembly/tomee.xml
Mon Aug 22 14:15:06 2011
@@ -35,6 +35,7 @@
</includes>
<excludes>
<exclude>**/bin/**/*</exclude>
+ <exclude>**/lib/annotations-api.jar</exclude>
</excludes>
</fileSet>
<fileSet>
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=1160271&r1=1160270&r2=1160271&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 14:15:06 2011
@@ -90,12 +90,27 @@ public class Installer {
installJavaagent();
installConfigFiles();
+
+ removeAnnotationApiJar();
if (!alerts.hasErrors()) {
status = Status.REBOOT_REQUIRED;
}
}
+ /**
+ * javaee-api* contains all classes in annotation-api which is outdated so
we simply strip it.
+ */
+ private void removeAnnotationApiJar() {
+ File annotationApi = new File(paths.getCatalinaLibDir(),
"annotations-api.jar");
+ if (annotationApi.exists()) {
+ if (!annotationApi.delete()) {
+ annotationApi.deleteOnExit();
+ System.err.println("Please restart the server or delete
manually annotation-api.jar");
+ }
+ }
+ }
+
public void installListener() {
if (listenerInstalled && !force) {
// addInfo("OpenEJB Listener already installed");
Modified:
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-common/src/main/java/org/apache/openejb/tomcat/installer/Paths.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-common/src/main/java/org/apache/openejb/tomcat/installer/Paths.java?rev=1160271&r1=1160270&r2=1160271&view=diff
==============================================================================
---
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-common/src/main/java/org/apache/openejb/tomcat/installer/Paths.java
(original)
+++
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-common/src/main/java/org/apache/openejb/tomcat/installer/Paths.java
Mon Aug 22 14:15:06 2011
@@ -241,16 +241,6 @@ public class Paths {
return openejbLoaderJar;
}
- /**
- * Returns the {@link #openejbWarDir}/tomcat/annotations-api.jar file.
- * Returns null if {@link #openejbWarDir} is null
- * @return the {@link #openejbWarDir}/tomcat/annotations-api.jar file.
- */
- public File getUpdatedAnnotationApiJar() {
- if (openejbWarDir == null) return null;
-
- return new File(openejbWarDir, "tomcat/annotations-api.jar");
- }
/**Verifies the following:
* <ul>
* <li>{@link #openejbWarDir} is unpacked</li>
@@ -318,8 +308,6 @@ public class Paths {
verifyFile("OpenEJB core jar", openejbCoreJar);
}
- verifyFile("Updated Tomcat annotation-api jar",
getUpdatedAnnotationApiJar());
-
return !hasErrors();
}
/**
