Author: bpapez
Date: Mon Jan  7 19:20:07 2008
New Revision: 19464

URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19464&repname=
=3Djahia
Log:
add Tomcat 6 deployment compatibility

Modified:
    trunk/core/maven.xml
    trunk/core/project.properties

Modified: trunk/core/maven.xml
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/maven.xml&=
rev=3D19464&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
--- trunk/core/maven.xml (original)
+++ trunk/core/maven.xml Mon Jan  7 19:20:07 2008
@@ -27,20 +27,29 @@
   <goal name=3D"reset:tomcat" prereqs=3D"hotdeploy:tomcat">
       <j:set var=3D"catalina_version_major" value=3D"${catalina.version.ma=
jor}"/>
       <j:choose>
+        <j:when test=3D"${catalina_version_major =3D=3D '6'}">
+          <j:set var=3D"context_file" value=3D"./src/conf/metadata/jahia-t=
omcat6.xml"/>
+          <j:set var=3D"context_dir" value=3D"${catalina.home.dir}/conf/Ca=
talina/localhost"/>
+          <j:set var=3D"use_contextclassloader" value=3D'useContextClassLo=
ader=3D"false"'/>
+          <j:set var=3D"catalina.shared.lib" value=3D"${catalina.home.dir}=
/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/jahia-t=
omcat5.5.xml"/>
           <j:set var=3D"context_dir" value=3D"${catalina.home.dir}/conf/Ca=
talina/localhost"/>
           <j:set var=3D"use_contextclassloader" value=3D'useContextClassLo=
ader=3D"false"'/>
+          <j:set var=3D"catalina.shared.lib" value=3D"${catalina.home.dir}=
/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/jahia-t=
omcat5.xml"/>
           <j:set var=3D"context_dir" value=3D"${catalina.home.dir}/conf/Ca=
talina/localhost"/>
           <j:set var=3D"use_contextclassloader" value=3D'useContextClassLo=
ader=3D"false"'/>
+          <j:set var=3D"catalina.shared.lib" value=3D"${catalina.home.dir}=
/shared/lib/"/>                 =

         </j:when>
         <j:otherwise>
           <j:set var=3D"context_file" value=3D"./src/conf/metadata/jahia.x=
ml"/>
           <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.dir}=
/shared/lib/"/>
         </j:otherwise>
       </j:choose>
      <!-- Now let's reset all the files that contain markers that are repl=
aced during configuration wizard -->
@@ -80,20 +89,29 @@
       </copy>
       <j:set var=3D"catalina_version_major" value=3D"${catalina.version.ma=
jor}"/>
       <j:choose>
+        <j:when test=3D"${catalina_version_major =3D=3D '6'}">
+          <j:set var=3D"context_file" value=3D"./src/conf/metadata/jahia-t=
omcat6.xml"/>
+          <j:set var=3D"context_dir" value=3D"${catalina.home.dir}/conf/Ca=
talina/localhost"/>
+          <j:set var=3D"use_contextclassloader" value=3D'useContextClassLo=
ader=3D"false"'/>
+          <j:set var=3D"catalina.shared.lib" value=3D"${catalina.home.dir}=
/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/jahia-t=
omcat5.5.xml"/>
           <j:set var=3D"context_dir" value=3D"${catalina.home.dir}/conf/Ca=
talina/localhost"/>
           <j:set var=3D"use_contextclassloader" value=3D'useContextClassLo=
ader=3D"false"'/>
+          <j:set var=3D"catalina.shared.lib" value=3D"${catalina.home.dir}=
/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/jahia-t=
omcat5.xml"/>
           <j:set var=3D"context_dir" value=3D"${catalina.home.dir}/conf/Ca=
talina/localhost"/>
           <j:set var=3D"use_contextclassloader" value=3D'useContextClassLo=
ader=3D"false"'/>
+          <j:set var=3D"catalina.shared.lib" value=3D"${catalina.home.dir}=
/shared/lib/"/>
         </j:when>
         <j:otherwise>
           <j:set var=3D"context_file" value=3D"./src/conf/metadata/jahia.x=
ml"/>
           <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.dir}=
/shared/lib/"/>
         </j:otherwise>
       </j:choose>
      <copy file=3D"${context_file}" tofile=3D"${context_dir}/${webapp.name=
}.xml"/>
@@ -113,20 +131,29 @@
       <attainGoal name=3D"jahia:deploy-shared-libs" />
       <j:set var=3D"catalina_version_major" value=3D"${catalina.version.ma=
jor}"/>
       <j:choose>
+        <j:when test=3D"${catalina_version_major =3D=3D '6'}">
+          <j:set var=3D"context_file" value=3D"./src/conf/metadata/jahia-t=
omcat6.xml"/>
+          <j:set var=3D"context_dir" value=3D"${catalina.home.dir}/conf/Ca=
talina/localhost"/>
+          <j:set var=3D"use_contextclassloader" value=3D'useContextClassLo=
ader=3D"false"'/>
+          <j:set var=3D"catalina.shared.lib" value=3D"${catalina.home.dir}=
/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/jahia-t=
omcat5.5.xml"/>
           <j:set var=3D"context_dir" value=3D"${catalina.home.dir}/conf/Ca=
talina/localhost"/>
           <j:set var=3D"use_contextclassloader" value=3D'useContextClassLo=
ader=3D"false"'/>
+          <j:set var=3D"catalina.shared.lib" value=3D"${catalina.home.dir}=
/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/jahia-t=
omcat5.xml"/>
           <j:set var=3D"context_dir" value=3D"${catalina.home.dir}/conf/Ca=
talina/localhost"/>
           <j:set var=3D"use_contextclassloader" value=3D'useContextClassLo=
ader=3D"false"'/>
+          <j:set var=3D"catalina.shared.lib" value=3D"${catalina.home.dir}=
/shared/lib/"/>
         </j:when>
         <j:otherwise>
           <j:set var=3D"context_file" value=3D"./src/conf/metadata/jahia.x=
ml"/>
           <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.dir}=
/shared/lib/"/>
         </j:otherwise>
       </j:choose>
      <copy overwrite=3D"true" file=3D"${context_file}" tofile=3D"${context=
_dir}/${webapp.name}.xml"/>
@@ -138,17 +165,25 @@
   <goal name=3D"undeploy:tomcat" prereqs=3D"jahia:undeploy-tomcat,jahia:un=
deploy-shared-libs">
       <j:set var=3D"catalina_version_major" value=3D"${catalina.version.ma=
jor}"/>
       <j:choose>
+        <j:when test=3D"${catalina_version_major =3D=3D '6'}">
+          <j:set var=3D"context_dir" value=3D"${catalina.home.dir}/conf/Ca=
talina/localhost"/>
+          <j:set var=3D"use_contextclassloader" value=3D'useContextClassLo=
ader=3D"false"'/>
+          <j:set var=3D"catalina.shared.lib" value=3D"${catalina.home.dir}=
/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}/conf/Ca=
talina/localhost"/>
           <j:set var=3D"use_contextclassloader" value=3D'useContextClassLo=
ader=3D"false"'/>
+          <j:set var=3D"catalina.shared.lib" value=3D"${catalina.home.dir}=
/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}/conf/Ca=
talina/localhost"/>
           <j:set var=3D"use_contextclassloader" value=3D'useContextClassLo=
ader=3D"false"'/>
+                 <j:set var=3D"catalina.shared.lib" 
value=3D"${catalina.home.dir}=
/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.dir}=
/shared/lib/"/>
         </j:otherwise>
       </j:choose>
      <delete file=3D"${context_dir}/${webapp.name}.xml"/>

Modified: trunk/core/project.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/project.pr=
operties&rev=3D19464&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
--- trunk/core/project.properties (original)
+++ trunk/core/project.properties Mon Jan  7 19:20:07 2008
@@ -70,17 +70,6 @@
 # Set to true if you want JSP precompilation to happen after war:webapp go=
al
 precompile.jsp=3Dfalse
 maven.jahiawar.precompile.jsp =3D false
-# Tomcat deployment locations
-tomcat.home=3D${catalina.home.dir}
-catalina.shared.lib=3D${catalina.home.dir}/shared/lib/
-# Set this to Tomcat's major version to change deployment of jahia.xml loc=
ation.
-#catalina.version.major=3D4
-webapp.name=3Djahia
-deploy.war.dir=3D${catalina.home.dir}/webapps/
-deploy.contextdescriptor.dir=3D${deploy.war.dir}
-# for Tomcat 5, comment the above line and replace with the one below, mak=
ing sure the directory names follow the convention :
-# ${catalina.home.dir}/conf/[enginename]/[hostname]/jahia.xml.
-# deploy.contextdescriptor.dir=3D${catalina.home.dir}/conf/Catalina/localh=
ost
 =

 maven.javadoc.additionalparam=3D-splitindex
 maven.javadoc.maxmemory=3D512M
@@ -123,11 +112,21 @@
 maven.compile.deprecation =3D off
 #maven.compile.compilerargs=3D-Xlint:unchecked
 =

+### Tomcat deployment locations
+tomcat.home=3D${catalina.home.dir}
+webapp.name=3Djahia
+deploy.war.dir=3D${catalina.home.dir}/webapps/
 =

-#version 5.5
+### Set the path to your tomcat runtime directory here and =

+### then uncomment the section according to the tomcat version below
 #catalina.home.dir=3D/Applications/apache-tomcat-5.5.12
+
+### Tomcat 5.5:
 #catalina.version.major=3D5.5
 =

+### Tomcat 6:
+#catalina.version.major=3D6
+
 #tlddoc.path=3D/Users/joepi/Documents/jahia_source/taglibrarydoc-1_3
 taglib.src.dir=3D ${basedir}/src/webapp/WEB-INF/etc/taglibs
 taglib.output.dir=3D${basedir}/docs
\ No newline at end of file

_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list

Reply via email to