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 09:43:54 UTC
svn commit: r1295012 - in
/openejb/trunk/openejb/tomee/tomee-common/src/main/java/org/apache/tomee/installer:
Installer.java Paths.java
Author: rmannibucau
Date: Wed Feb 29 08:43:53 2012
New Revision: 1295012
URL: http://svn.apache.org/viewvc?rev=1295012&view=rev
Log:
TOMEE-145 endorsing jaxb 2.2
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=1295012&r1=1295011&r2=1295012&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 08:43:53 2012
@@ -114,10 +114,9 @@ public class Installer {
File endorsed = new File(paths.getCatalinaHomeDir(), "endorsed");
endorsed.mkdir();
- File sourceJar = paths.getJavaEEAPIJAr();
- copyClasses(sourceJar, new File(endorsed, "annotation-api.jar"), "javax/annotation/.*");
-// copyClasses(sourceJar, new File(endorsed, "jaxb-api.jar"), "javax/xml/bind/.*");
+ copyClasses(paths.getJavaEEAPIJar(), new File(endorsed, "annotation-api.jar"), "javax/annotation/.*");
+ copyClasses(paths.getJavaEEAPIJar(), new File(endorsed, "jaxb-api.jar"), "javax/xml/bind/.*");
}
private void copyClasses(File sourceJar, File destinationJar, String pattern) {
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=1295012&r1=1295011&r2=1295012&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 08:43:53 2012
@@ -213,7 +213,7 @@ public class Paths {
public File getOpenEJBTomcatLoaderJar() {
return findOpenEJBJar("tomee-loader");
}
- public File getJavaEEAPIJAr() {
+ public File getJavaEEAPIJar() {
return findOpenEJBJar("javaee-api");
}
/**
Re: JAXB Upgrade (was: svn commit: r1295012)
Posted by Romain Manni-Bucau <rm...@gmail.com>.
some more info on it:
i added jaxb-api and jaxb-impl in endorsed folder.
jaxb-impl is a copy of the RI jar (on repo1).
jaxb-api is extracted from javaee-api (like annotation-api). The weird
thing is i excluded ContextFinder class because the geronimo jaxb api jar
was depending on OSGi because of this class (geronimo locator). Since the
Context of the jre 6 is fine it is fine for us but that's a bit odd when
you don't know the cause.
- Romain
2012/2/29 David Blevins <da...@gmail.com>
>
> On Feb 29, 2012, at 9:38 AM, Romain Manni-Bucau wrote:
>
> > that's ok for me,
> >
> > but in that case we remove geronimo jaxb from javaee-api
>
> We need both the api and impl jars in the endorsed dir.
>
>
> -David
>
> > 2012/2/29 David Blevins <da...@gmail.com>
> >
> >> Thanks for the two JIRAs!! :)
> >>
> >> On Feb 29, 2012, at 12:43 AM, rmannibucau@apache.org wrote:
> >>>
> >>
> ==============================================================================
> >>> ---
> >>
> 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 08:43:53 2012
> >>> @@ -114,10 +114,9 @@ public class Installer {
> >>> File endorsed = new File(paths.getCatalinaHomeDir(),
> "endorsed");
> >>> endorsed.mkdir();
> >>>
> >>> - File sourceJar = paths.getJavaEEAPIJAr();
> >>>
> >>> - copyClasses(sourceJar, new File(endorsed,
> >> "annotation-api.jar"), "javax/annotation/.*");
> >>> -// copyClasses(sourceJar, new File(endorsed, "jaxb-api.jar"),
> >> "javax/xml/bind/.*");
> >>> + copyClasses(paths.getJavaEEAPIJar(), new File(endorsed,
> >> "annotation-api.jar"), "javax/annotation/.*");
> >>> + copyClasses(paths.getJavaEEAPIJar(), new File(endorsed,
> >> "jaxb-api.jar"), "javax/xml/bind/.*");
> >>> }
> >>
> >> I think we need to move the JAXB 2.2. RI in there too as the JAXB 2.1 RI
> >> is part of the JVM.
> >>
> >>
> >> -David
> >>
> >>
>
>
Re: JAXB Upgrade (was: svn commit: r1295012)
Posted by David Blevins <da...@gmail.com>.
On Feb 29, 2012, at 9:38 AM, Romain Manni-Bucau wrote:
> that's ok for me,
>
> but in that case we remove geronimo jaxb from javaee-api
We need both the api and impl jars in the endorsed dir.
-David
> 2012/2/29 David Blevins <da...@gmail.com>
>
>> Thanks for the two JIRAs!! :)
>>
>> On Feb 29, 2012, at 12:43 AM, rmannibucau@apache.org wrote:
>>>
>> ==============================================================================
>>> ---
>> 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 08:43:53 2012
>>> @@ -114,10 +114,9 @@ public class Installer {
>>> File endorsed = new File(paths.getCatalinaHomeDir(), "endorsed");
>>> endorsed.mkdir();
>>>
>>> - File sourceJar = paths.getJavaEEAPIJAr();
>>>
>>> - copyClasses(sourceJar, new File(endorsed,
>> "annotation-api.jar"), "javax/annotation/.*");
>>> -// copyClasses(sourceJar, new File(endorsed, "jaxb-api.jar"),
>> "javax/xml/bind/.*");
>>> + copyClasses(paths.getJavaEEAPIJar(), new File(endorsed,
>> "annotation-api.jar"), "javax/annotation/.*");
>>> + copyClasses(paths.getJavaEEAPIJar(), new File(endorsed,
>> "jaxb-api.jar"), "javax/xml/bind/.*");
>>> }
>>
>> I think we need to move the JAXB 2.2. RI in there too as the JAXB 2.1 RI
>> is part of the JVM.
>>
>>
>> -David
>>
>>
Re: JAXB Upgrade (was: svn commit: r1295012)
Posted by Romain Manni-Bucau <rm...@gmail.com>.
that's ok for me,
but in that case we remove geronimo jaxb from javaee-api
- Romain
2012/2/29 David Blevins <da...@gmail.com>
> Thanks for the two JIRAs!! :)
>
> On Feb 29, 2012, at 12:43 AM, rmannibucau@apache.org wrote:
> >
> ==============================================================================
> > ---
> 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 08:43:53 2012
> > @@ -114,10 +114,9 @@ public class Installer {
> > File endorsed = new File(paths.getCatalinaHomeDir(), "endorsed");
> > endorsed.mkdir();
> >
> > - File sourceJar = paths.getJavaEEAPIJAr();
> >
> > - copyClasses(sourceJar, new File(endorsed,
> "annotation-api.jar"), "javax/annotation/.*");
> > -// copyClasses(sourceJar, new File(endorsed, "jaxb-api.jar"),
> "javax/xml/bind/.*");
> > + copyClasses(paths.getJavaEEAPIJar(), new File(endorsed,
> "annotation-api.jar"), "javax/annotation/.*");
> > + copyClasses(paths.getJavaEEAPIJar(), new File(endorsed,
> "jaxb-api.jar"), "javax/xml/bind/.*");
> > }
>
> I think we need to move the JAXB 2.2. RI in there too as the JAXB 2.1 RI
> is part of the JVM.
>
>
> -David
>
>
JAXB Upgrade (was: svn commit: r1295012)
Posted by David Blevins <da...@gmail.com>.
Thanks for the two JIRAs!! :)
On Feb 29, 2012, at 12:43 AM, rmannibucau@apache.org wrote:
> ==============================================================================
> --- 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 08:43:53 2012
> @@ -114,10 +114,9 @@ public class Installer {
> File endorsed = new File(paths.getCatalinaHomeDir(), "endorsed");
> endorsed.mkdir();
>
> - File sourceJar = paths.getJavaEEAPIJAr();
>
> - copyClasses(sourceJar, new File(endorsed, "annotation-api.jar"), "javax/annotation/.*");
> -// copyClasses(sourceJar, new File(endorsed, "jaxb-api.jar"), "javax/xml/bind/.*");
> + copyClasses(paths.getJavaEEAPIJar(), new File(endorsed, "annotation-api.jar"), "javax/annotation/.*");
> + copyClasses(paths.getJavaEEAPIJar(), new File(endorsed, "jaxb-api.jar"), "javax/xml/bind/.*");
> }
I think we need to move the JAXB 2.2. RI in there too as the JAXB 2.1 RI is part of the JVM.
-David