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 2012/02/29 22:39:06 UTC
svn commit: r1295295 - in
/openejb/trunk/openejb/tomee/tomee-common/src/main/java/org/apache/tomee/installer:
Installer.java Paths.java
Author: rmannibucau
Date: Wed Feb 29 21:39:06 2012
New Revision: 1295295
URL: http://svn.apache.org/viewvc?rev=1295295&view=rev
Log:
TOMEE-145 adding jaxb-impl to endorsed dir
Modified:
openejb/trunk/openejb/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
openejb/trunk/openejb/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Paths.java
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=1295295&r1=1295294&r2=1295295&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 Wed Feb 29 21:39:06 2012
@@ -119,6 +119,14 @@ public class Installer {
// 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");
+ final File jaxbImpl = new File(endorsed, "jaxb-impl.jar");
+ if (!jaxbImpl.exists()) {
+ try {
+ Installers.copyFile(paths.getJAXBImpl(), jaxbImpl);
+ } catch (IOException e) {
+ alerts.addError("can't copy " + paths.getJAXBImpl().getPath() + " to " + endorsed.getPath() + "/jaxb-impl.jar");
+ }
+ }
}
private void copyClasses(File sourceJar, File destinationJar, String pattern, String excludePattern) {
Modified: openejb/trunk/openejb/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Paths.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Paths.java?rev=1295295&r1=1295294&r2=1295295&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Paths.java (original)
+++ openejb/trunk/openejb/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Paths.java Wed Feb 29 21:39:06 2012
@@ -17,11 +17,11 @@
*/
package org.apache.tomee.installer;
+import org.apache.tomee.common.TomcatVersion;
+
import java.io.File;
import java.util.ArrayList;
import java.util.List;
-
-import org.apache.tomee.common.TomcatVersion;
/**
* This class is used to verify that all the main directories and files exist.
* @see #verify() for more details
@@ -213,9 +213,15 @@ public class Paths {
public File getOpenEJBTomcatLoaderJar() {
return findOpenEJBJar("tomee-loader");
}
+
public File getJavaEEAPIJar() {
return findOpenEJBJar("javaee-api");
}
+
+ public File getJAXBImpl() {
+ return findOpenEJBJar("jaxb-impl");
+ }
+
/**
* Returns the openejb-javaagent.jar file
* @return the openejb-javaagent.jar file