You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@lenya.apache.org by Felix Röthenbacher <fe...@wyona.com> on 2005/12/09 11:20:49 UTC
Re: svn commit: r355050 - in /lenya/branches/BRANCH_1_2_X: lib/xercesImpl-2.6.2.jar
lib/xml-apis.jar src/targets/webapp-build.xml
Hi Josias
josias@apache.org wrote:
> Author: josias
> Date: Thu Dec 8 01:10:34 2005
> New Revision: 355050
>
> [...]
>
> Modified: lenya/branches/BRANCH_1_2_X/src/targets/webapp-build.xml
> URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/targets/webapp-build.xml?rev=355050&r1=355049&r2=355050&view=diff
> ==============================================================================
> --- lenya/branches/BRANCH_1_2_X/src/targets/webapp-build.xml (original)
> +++ lenya/branches/BRANCH_1_2_X/src/targets/webapp-build.xml Thu Dec 8 01:10:34 2005
> @@ -139,11 +139,8 @@
> <!-- now create directory for endorsed libraries -->
> <mkdir dir="${build.webapp}/WEB-INF/lib/endorsed"/>
>
> - <!-- Copy libraries from ${endorsed.lib.dir} and ${cocoon.endorsed.lib.dir} to ${build.webapp}/WEB-INF/lib/endorsed -->
> + <!-- Copy libraries from ${cocoon.endorsed.lib.dir} to ${build.webapp}/WEB-INF/lib/endorsed -->
> <copy todir="${build.webapp}/WEB-INF/lib/endorsed">
> - <fileset dir="${endorsed.lib.dir}">
> - <include name="**/*"/>
> - </fileset>
Did you remove the statements above by intention? The idea was to have a
place where you can put custom endorsed libs for easy copying to the
endorsed directory (Tomcat and Jetty). I don't know if that's a need at
all. WDYT?
- Felix
> <fileset dir="${cocoon.endorsed.lib.dir}">
> <include name="**/*"/>
> </fileset>
> @@ -153,6 +150,10 @@
> <delete>
> <fileset dir="${build.webapp}/WEB-INF/lib">
> <present present="both" targetdir="${cocoon.endorsed.lib.dir}"/>
> + </fileset>
> + <fileset dir="${build.webapp}/WEB-INF/lib">
> + <include name="xml-apis.jar"/>
> + <include name="xercesImpl-2.6.2.jar"/>
> </fileset>
> </delete>
>
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
> For additional commands, e-mail: commits-help@lenya.apache.org
>
>
--
Felix Röthenbacher felix.roethenbacher@wyona.com
Wyona Inc. - Open Source Content Management - Apache Lenya
http://www.wyona.com http://lenya.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@lenya.apache.org
For additional commands, e-mail: dev-help@lenya.apache.org
Re: svn commit: r355050 - in /lenya/branches/BRANCH_1_2_X: lib/xercesImpl-2.6.2.jar lib/xml-apis.jar src/targets/webapp-build.xml
Posted by so...@apache.org.
On 12/9/05, Josias Thoeny <jo...@wyona.com> wrote:
> BTW, it seems to me there should be a directory for libraries which are
> only used for building Lenya, but won't be copied to the build dir.
> Currently Lenya needs xerces and xml-apis for the build process. Cocoon
> 2.1.7 and 2.1.8 have different versions of these two jars, and Lenya has
> its own version.
> During the build process, those jars of Cocoon _and_ Lenya are copied to
> the build dir, which yields a conflict.
> I don't know how to solve this if Lenya should work with different
> versions of Cocoon. Currently those duplicate libraries are removed from
> the build dir in a "hardcoded" way.
I am not familiar with the code. Uncharacteristically, I forgot to
document all the manual changes to the libraries as I tried to get
Lenya working under Jetty, then Tomcat, then Jetty behind Apache. I
tried different versions of JSK, Cocoon, and library JARs until it
worked, then walked away.
One issue was Search had trouble due to multiple versions of Lucene,
which was solved by disabling "lucene-1.3-final.jar" so
"lucene-1.4.1.jar" would be used.
As policy, and with the unlikely assumption that no dependency breaks
their API in newer releases, best would be for Lenya to install all
the libraries for all the dependencies to the proper directory for the
container, then run a clean-up routine that checks for duplicate
libraries, and renames the lower version number from "ourlib-0.0.jar"
to "ourlib-0.0.jar.disabled".
Installation could also check the versions against the required list,
and complain if too old:
http://issues.apache.org/bugzilla/show_bug.cgi?id=35305
We also might want to check for libraries that are too new. I think I
remember an issue with a Lenya1.2.x not working with a newer release
of Cocoon.
Config: libraryname requiredversion [lastversionsupported]
For all of libraryname, oldest to newest (break if 1 file left):
- If oldest < required version: rename
For all of libraryname, newest to oldest (break if 1 file left):
- If kept, rename
- ElseIf newest > lastversionsupported, rename
- Else keep
If kept < requiredversion, complain
Can that be done with Ant? If not, should we work with Ant to make it
possible? Or write an add-on?
---
Related Question: Why are there no version numbers for some libraries,
such as "xml-apis.jar"? Does that imply the code is so good that
improvement is not possible?
Thinking too much too early,
solprovider
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@lenya.apache.org
For additional commands, e-mail: dev-help@lenya.apache.org
Re: svn commit: r355050 - in /lenya/branches/BRANCH_1_2_X:
lib/xercesImpl-2.6.2.jar lib/xml-apis.jar src/targets/webapp-build.xml
Posted by Josias Thoeny <jo...@wyona.com>.
On Fri, 2005-12-09 at 11:20 +0100, Felix Röthenbacher wrote:
> Hi Josias
>
> josias@apache.org wrote:
> > Author: josias
> > Date: Thu Dec 8 01:10:34 2005
> > New Revision: 355050
> >
> > [...]
> >
> > Modified: lenya/branches/BRANCH_1_2_X/src/targets/webapp-build.xml
> > URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/targets/webapp-build.xml?rev=355050&r1=355049&r2=355050&view=diff
> > ==============================================================================
> > --- lenya/branches/BRANCH_1_2_X/src/targets/webapp-build.xml (original)
> > +++ lenya/branches/BRANCH_1_2_X/src/targets/webapp-build.xml Thu Dec 8 01:10:34 2005
> > @@ -139,11 +139,8 @@
> > <!-- now create directory for endorsed libraries -->
> > <mkdir dir="${build.webapp}/WEB-INF/lib/endorsed"/>
> >
> > - <!-- Copy libraries from ${endorsed.lib.dir} and ${cocoon.endorsed.lib.dir} to ${build.webapp}/WEB-INF/lib/endorsed -->
> > + <!-- Copy libraries from ${cocoon.endorsed.lib.dir} to ${build.webapp}/WEB-INF/lib/endorsed -->
> > <copy todir="${build.webapp}/WEB-INF/lib/endorsed">
> > - <fileset dir="${endorsed.lib.dir}">
> > - <include name="**/*"/>
> > - </fileset>
>
> Did you remove the statements above by intention? The idea was to have a
> place where you can put custom endorsed libs for easy copying to the
> endorsed directory (Tomcat and Jetty). I don't know if that's a need at
> all. WDYT?
I removed them because there is a copy task in the same file which
copies all files (including files in subdirectories) from LENYA_HOME/lib
to LENYA_HOME/build/lenya/webapp/WEB-INF/lib:
<copy todir="${build.webapp}/WEB-INF/lib">
<fileset dir="${lib.dir}">
<include name="**/*"/>
</fileset>
<fileset dir="${tools.lib.dir}">
<include name="**/*"/>
</fileset>
</copy>
So the files in the endorsed dir are copied by this task already. Do you
agree?
BTW, it seems to me there should be a directory for libraries which are
only used for building Lenya, but won't be copied to the build dir.
Currently Lenya needs xerces and xml-apis for the build process. Cocoon
2.1.7 and 2.1.8 have different versions of these two jars, and Lenya has
its own version.
During the build process, those jars of Cocoon _and_ Lenya are copied to
the build dir, which yields a conflict.
I don't know how to solve this if Lenya should work with different
versions of Cocoon. Currently those duplicate libraries are removed from
the build dir in a "hardcoded" way.
Any ideas?
Josias
>
> - Felix
>
> > <fileset dir="${cocoon.endorsed.lib.dir}">
> > <include name="**/*"/>
> > </fileset>
> > @@ -153,6 +150,10 @@
> > <delete>
> > <fileset dir="${build.webapp}/WEB-INF/lib">
> > <present present="both" targetdir="${cocoon.endorsed.lib.dir}"/>
> > + </fileset>
> > + <fileset dir="${build.webapp}/WEB-INF/lib">
> > + <include name="xml-apis.jar"/>
> > + <include name="xercesImpl-2.6.2.jar"/>
> > </fileset>
> > </delete>
> >
> >
> >
> >
> > ---------------------------------------------------------------------
> > To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
> > For additional commands, e-mail: commits-help@lenya.apache.org
> >
> >
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@lenya.apache.org
For additional commands, e-mail: dev-help@lenya.apache.org