svn commit: r1610232 - in /tomee/tomee/trunk: server/openejb-http/pom.xml server/openejb-http/src/test/java/org/apache/openejb/server/httpd/ServletRegistrationTest.java tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java

[rm...@apache.org]

Author: rmannibucau
Date: Sun Jul 13 15:15:32 2014
New Revision: 1610232

URL: http://svn.apache.org/r1610232
Log:
javax.annotation are fine in tomcat since few versions and jvm doesn't need anymore to be endorsed + forking tests in http module since we still rely on itests which needs to be fixed

Modified:
    tomee/tomee/trunk/server/openejb-http/pom.xml
    tomee/tomee/trunk/server/openejb-http/src/test/java/org/apache/openejb/server/httpd/ServletRegistrationTest.java
    tomee/tomee/trunk/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java

Modified: tomee/tomee/trunk/server/openejb-http/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-http/pom.xml?rev=1610232&r1=1610231&r2=1610232&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-http/pom.xml (original)
+++ tomee/tomee/trunk/server/openejb-http/pom.xml Sun Jul 13 15:15:32 2014
@@ -64,6 +64,7 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
+          <reuseForks>false</reuseForks>
           <!-- DEBUG: Uncomment this line and comment out the next -->
           <!--<argLine>-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005 -javaagent:${project.build.directory}/target/openejb-javaagent-${version}.jar=foo=bar</argLine>-->
           <argLine>"-javaagent:${project.build.directory}/openejb-javaagent-${project.version}.jar=foo=bar" -Dopenejb.classloader.forced-skip=org.apache.openejb.jee.,org.apache.openejb.api. -Dopenejb.classloader.forced-load=org.apache.openejb</argLine>

Modified: tomee/tomee/trunk/server/openejb-http/src/test/java/org/apache/openejb/server/httpd/ServletRegistrationTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-http/src/test/java/org/apache/openejb/server/httpd/ServletRegistrationTest.java?rev=1610232&r1=1610231&r2=1610232&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-http/src/test/java/org/apache/openejb/server/httpd/ServletRegistrationTest.java (original)
+++ tomee/tomee/trunk/server/openejb-http/src/test/java/org/apache/openejb/server/httpd/ServletRegistrationTest.java Sun Jul 13 15:15:32 2014
@@ -18,10 +18,10 @@ package org.apache.openejb.server.httpd;
 
 import org.apache.openejb.jee.WebApp;
 import org.apache.openejb.junit.ApplicationComposer;
-import org.apache.openejb.junit.Classes;
-import org.apache.openejb.junit.EnableServices;
-import org.apache.openejb.junit.Module;
 import org.apache.openejb.loader.IO;
+import org.apache.openejb.testing.Classes;
+import org.apache.openejb.testing.EnableServices;
+import org.apache.openejb.testing.Module;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -37,7 +37,7 @@ import java.net.URL;
 
 import static org.junit.Assert.assertEquals;
 
-@EnableServices({ "httpejbd" })
+@EnableServices("httpejbd")
 @RunWith(ApplicationComposer.class)
 public class ServletRegistrationTest {
     @Module

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=1610232&r1=1610231&r2=1610232&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 Sun Jul 13 15:15:32 2014
@@ -99,7 +99,6 @@ public class Installer implements Instal
         installJavaagent();
         installConfigFiles();
 
-        removeTomcatLibJar("annotations-api.jar");
         addJavaeeInEndorsed();
         addTomEEJuli();
 
@@ -184,7 +183,6 @@ public class Installer implements Instal
         commentDeploymentDir();
         installConfigFiles();
 
-        removeTomcatLibJar("annotations-api.jar");
         addJavaeeInEndorsed();
         addTomEEJuli(); // before moveLibs
         moveLibs();
@@ -265,8 +263,6 @@ public class Installer implements Instal
             alerts.addWarning("can't create endorsed directory");
         }
 
-        copyClasses(paths.getJavaEEAPIJar(), new File(endorsed, "annotation-api.jar"), "javax/annotation/.*");
-
         final File jaxbApi = paths.findOpenEJBJar("geronimo-jaxb_2.2_spec");
         copyClasses(paths.getJavaEEAPIJar(), jaxbApi, new File(endorsed, "jaxb-api.jar"), "javax/xml/bind/.*",
                 Arrays.asList("javax/xml/bind/ContextFinder.class", "javax/xml/bind/DatatypeConverter.class"));