Author: bpapez
Date: Mon Jan 7 18:11:38 2008
New Revision: 19463
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19463&repname=
=3Djahia
Log:
Set catalina.shared.lib automatically in maven.xml
Modified:
branches/JAHIA-INCLUDE-TAG-BRANCH/core/maven.xml
branches/JAHIA-INCLUDE-TAG-BRANCH/core/project.properties
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/maven.xml
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/maven.xml&rev=3D19463&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/maven.xml (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/maven.xml Mon Jan 7 18:11:38 20=
08
@@ -31,21 +31,25 @@
<j:set var=3D"context_file" value=3D"./src/conf/metadata/j=
ahia-tomcat6.xml"/>
<j:set var=3D"context_dir" value=3D"${catalina.home.dir}/c=
onf/Catalina/localhost"/>
<j:set var=3D"use_contextclassloader" value=3D'useContextC=
lassLoader=3D"false"'/>
+ <j:set var=3D"catalina.shared.lib" value=3D"${catalina.home.d=
ir}/lib/"/>
</j:when> =
<j:when test=3D"${catalina_version_major =3D=3D '5.5'}">
<j:set var=3D"context_file" value=3D"./src/conf/metadata/j=
ahia-tomcat5.5.xml"/>
<j:set var=3D"context_dir" value=3D"${catalina.home.dir}/c=
onf/Catalina/localhost"/>
<j:set var=3D"use_contextclassloader" value=3D'useContextC=
lassLoader=3D"false"'/>
+ <j:set var=3D"catalina.shared.lib" value=3D"${catalina.home.d=
ir}/shared/lib/"/>
</j:when>
<j:when test=3D"${catalina_version_major =3D=3D '5'}">
<j:set var=3D"context_file" value=3D"./src/conf/metadata/j=
ahia-tomcat5.xml"/>
<j:set var=3D"context_dir" value=3D"${catalina.home.dir}/c=
onf/Catalina/localhost"/>
<j:set var=3D"use_contextclassloader" value=3D'useContextC=
lassLoader=3D"false"'/>
+ <j:set var=3D"catalina.shared.lib" value=3D"${catalina.hom=
e.dir}/shared/lib/"/> =
</j:when>
<j:otherwise>
<j:set var=3D"context_file" value=3D"./src/conf/metadata/j=
ahia.xml"/>
<j:set var=3D"context_dir" value=3D"${deploy.war.dir}"/>
<j:set var=3D"use_contextclassloader" value=3D""/>
+ <j:set var=3D"catalina.shared.lib" value=3D"${catalina.home.d=
ir}/shared/lib/"/>
</j:otherwise>
</j:choose>
<!-- Now let's reset all the files that contain markers that are r=
eplaced during configuration wizard -->
@@ -92,21 +96,25 @@
<j:set var=3D"context_file" value=3D"./src/conf/metadata/j=
ahia-tomcat6.xml"/>
<j:set var=3D"context_dir" value=3D"${catalina.home.dir}/c=
onf/Catalina/localhost"/>
<j:set var=3D"use_contextclassloader" value=3D'useContextC=
lassLoader=3D"false"'/>
+ <j:set var=3D"catalina.shared.lib" value=3D"${catalina.home.d=
ir}/lib/"/>
</j:when> =
<j:when test=3D"${catalina_version_major =3D=3D '5.5'}">
<j:set var=3D"context_file" value=3D"./src/conf/metadata/j=
ahia-tomcat5.5.xml"/>
<j:set var=3D"context_dir" value=3D"${catalina.home.dir}/c=
onf/Catalina/localhost"/>
<j:set var=3D"use_contextclassloader" value=3D'useContextC=
lassLoader=3D"false"'/>
+ <j:set var=3D"catalina.shared.lib" value=3D"${catalina.home.d=
ir}/shared/lib/"/>
</j:when>
<j:when test=3D"${catalina_version_major =3D=3D '5'}">
<j:set var=3D"context_file" value=3D"./src/conf/metadata/j=
ahia-tomcat5.xml"/>
<j:set var=3D"context_dir" value=3D"${catalina.home.dir}/c=
onf/Catalina/localhost"/>
<j:set var=3D"use_contextclassloader" value=3D'useContextC=
lassLoader=3D"false"'/>
+ <j:set var=3D"catalina.shared.lib" value=3D"${catalina.home.d=
ir}/shared/lib/"/>
</j:when>
<j:otherwise>
<j:set var=3D"context_file" value=3D"./src/conf/metadata/j=
ahia.xml"/>
<j:set var=3D"context_dir" value=3D"${deploy.war.dir}"/>
<j:set var=3D"use_contextclassloader" value=3D""/>
+ <j:set var=3D"catalina.shared.lib" value=3D"${catalina.home.d=
ir}/shared/lib/"/>
</j:otherwise>
</j:choose>
<copy file=3D"${context_file}" tofile=3D"${context_dir}/${webapp.n=
ame}.xml"/>
@@ -130,21 +138,25 @@
<j:set var=3D"context_file" value=3D"./src/conf/metadata/j=
ahia-tomcat6.xml"/>
<j:set var=3D"context_dir" value=3D"${catalina.home.dir}/c=
onf/Catalina/localhost"/>
<j:set var=3D"use_contextclassloader" value=3D'useContextC=
lassLoader=3D"false"'/>
+ <j:set var=3D"catalina.shared.lib" value=3D"${catalina.home.d=
ir}/lib/"/>
</j:when> =
<j:when test=3D"${catalina_version_major =3D=3D '5.5'}">
<j:set var=3D"context_file" value=3D"./src/conf/metadata/j=
ahia-tomcat5.5.xml"/>
<j:set var=3D"context_dir" value=3D"${catalina.home.dir}/c=
onf/Catalina/localhost"/>
<j:set var=3D"use_contextclassloader" value=3D'useContextC=
lassLoader=3D"false"'/>
+ <j:set var=3D"catalina.shared.lib" value=3D"${catalina.home.d=
ir}/shared/lib/"/>
</j:when>
<j:when test=3D"${catalina_version_major =3D=3D '5'}">
<j:set var=3D"context_file" value=3D"./src/conf/metadata/j=
ahia-tomcat5.xml"/>
<j:set var=3D"context_dir" value=3D"${catalina.home.dir}/c=
onf/Catalina/localhost"/>
<j:set var=3D"use_contextclassloader" value=3D'useContextC=
lassLoader=3D"false"'/>
+ <j:set var=3D"catalina.shared.lib" value=3D"${catalina.home.d=
ir}/shared/lib/"/>
</j:when>
<j:otherwise>
<j:set var=3D"context_file" value=3D"./src/conf/metadata/j=
ahia.xml"/>
<j:set var=3D"context_dir" value=3D"${deploy.war.dir}"/>
<j:set var=3D"use_contextclassloader" value=3D""/>
+ <j:set var=3D"catalina.shared.lib" value=3D"${catalina.home.d=
ir}/shared/lib/"/>
</j:otherwise>
</j:choose>
<copy overwrite=3D"true" file=3D"${context_file}" tofile=3D"${cont=
ext_dir}/${webapp.name}.xml"/>
@@ -159,18 +171,22 @@
<j:when test=3D"${catalina_version_major =3D=3D '6'}">
<j:set var=3D"context_dir" value=3D"${catalina.home.dir}/c=
onf/Catalina/localhost"/>
<j:set var=3D"use_contextclassloader" value=3D'useContextC=
lassLoader=3D"false"'/>
+ <j:set var=3D"catalina.shared.lib" value=3D"${catalina.home.d=
ir}/lib/"/>
</j:when> =
<j:when test=3D"${catalina_version_major =3D=3D '5.5'}">
<j:set var=3D"context_dir" value=3D"${catalina.home.dir}/c=
onf/Catalina/localhost"/>
<j:set var=3D"use_contextclassloader" value=3D'useContextC=
lassLoader=3D"false"'/>
+ <j:set var=3D"catalina.shared.lib" value=3D"${catalina.home.d=
ir}/shared/lib/"/>
</j:when>
<j:when test=3D"${catalina_version_major =3D=3D '5'}">
<j:set var=3D"context_dir" value=3D"${catalina.home.dir}/c=
onf/Catalina/localhost"/>
<j:set var=3D"use_contextclassloader" value=3D'useContextC=
lassLoader=3D"false"'/>
+ <j:set var=3D"catalina.shared.lib" value=3D"${catalina.home.d=
ir}/shared/lib/"/>
</j:when>
<j:otherwise>
<j:set var=3D"context_dir" value=3D"${deploy.war.dir}"/>
<j:set var=3D"use_contextclassloader" value=3D""/>
+ <j:set var=3D"catalina.shared.lib" value=3D"${catalina.home.d=
ir}/shared/lib/"/>
</j:otherwise>
</j:choose>
<delete file=3D"${context_dir}/${webapp.name}.xml"/>
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/project.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/project.properties&rev=3D19463&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/project.properties (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/project.properties Mon Jan 7 18=
:11:38 2008
@@ -125,11 +125,9 @@
=
### Tomcat 5.5:
#catalina.version.major=3D5.5
-#catalina.shared.lib=3D${catalina.home.dir}/shared/lib/
=
### Tomcat 6:
#catalina.version.major=3D6
-#catalina.shared.lib=3D${catalina.home.dir}/lib/
=
#tlddoc.path=3D/Users/joepi/Documents/jahia_source/taglibrarydoc-1_3
taglib.src.dir=3D ${basedir}/src/webapp/WEB-INF/etc/taglibs
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
