svn commit: r1333487 - in /openejb/trunk/openejb: pom.xml tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java

[rmannibucau]

Author: rmannibucau
Date: Thu May  3 14:52:29 2012
New Revision: 1333487

URL: http://svn.apache.org/viewvc?rev=1333487&view=rev
Log:
TOMEE-185 fixing ContextFinder updating javaee-api

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

Modified: openejb/trunk/openejb/pom.xml
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/pom.xml?rev=1333487&r1=1333486&r2=1333487&view=diff
==============================================================================
--- openejb/trunk/openejb/pom.xml (original)
+++ openejb/trunk/openejb/pom.xml Thu May  3 14:52:29 2012
@@ -111,7 +111,7 @@
     
<openejb.osgi.symbolic.name>${project.groupId}.${project.artifactId}</openejb.osgi.symbolic.name>
 
     <!-- to change easily the javaee api version -->
-    <javaee-api.version>6.0-3</javaee-api.version>
+    <javaee-api.version>6.0-4-SNAPSHOT</javaee-api.version>
 
     <!-- Used mainly in assembly/openejb-tomcat* projects  -->
     <tomcat.bundle.version>7.0.27</tomcat.bundle.version> <!-- don't merge 
with tomcat.version since we can release it ourself -->

Modified: 
openejb/trunk/openejb/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java?rev=1333487&r1=1333486&r2=1333487&view=diff
==============================================================================
--- 
openejb/trunk/openejb/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
 (original)
+++ 
openejb/trunk/openejb/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
 Thu May  3 14:52:29 2012
@@ -149,10 +149,10 @@ public class Installer {
         endorsed.mkdir();
 
 
-        copyClasses(paths.getJavaEEAPIJar(), new File(endorsed, 
"annotation-api.jar"), "javax/annotation/.*", null);
+        copyClasses(paths.getJavaEEAPIJar(), new File(endorsed, 
"annotation-api.jar"), "javax/annotation/.*");
 
         // a bit odd but we don't want to depend on OSGi and geronimo jaxb api 
ContextFinder depends on it
-        copyClasses(paths.getJavaEEAPIJar(), new File(endorsed, 
"jaxb-api.jar"), "javax/xml/bind/.*", "javax/xml/bind/ContextFinder.class");
+        copyClasses(paths.getJavaEEAPIJar(), new File(endorsed, 
"jaxb-api.jar"), "javax/xml/bind/.*");
         final File jaxbImpl = new File(endorsed, "jaxb-impl.jar");
         if (!jaxbImpl.exists()) {
             try {
@@ -163,7 +163,7 @@ public class Installer {
         }
     }
 
-    private void copyClasses(File sourceJar, File destinationJar, String 
pattern, String excludePattern) {
+    private void copyClasses(File sourceJar, File destinationJar, String 
pattern) {
         if (sourceJar == null) throw new NullPointerException("sourceJar");
         if (destinationJar == null) throw new 
NullPointerException("destinationJar");
         if (pattern == null) throw new NullPointerException("pattern");
@@ -182,8 +182,6 @@ public class Installer {
 
                 if (!entryName.matches(pattern)) continue;
 
-                if (excludePattern != null && 
entryName.matches(excludePattern)) continue;
-
                 destination.putNextEntry(new ZipEntry(entryName));
 
                 IO.copy(source, destination);