Author: bpapez
Date: Wed Jan 2 19:16:45 2008
New Revision: 19449
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19449&repname=
=3Djahia
Log:
Add Tomcat 6 deployment settings (you also need to install the latest maven=
-jahiawar-plugin-1.1-SNAPSHOT.jar and remove the old maven-jahiawar-plugin-=
1.0*.jar)
Added:
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/metadata/jahia-tomcat6.=
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=3D19449&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 Wed Jan 2 19:16:45 20=
08
@@ -27,6 +27,11 @@
<goal name=3D"reset:tomcat" prereqs=3D"hotdeploy:tomcat">
<j:set var=3D"catalina_version_major" value=3D"${catalina.version.=
major}"/>
<j:choose>
+ <j:when test=3D"${catalina_version_major =3D=3D '6'}">
+ <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: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"/>
@@ -83,6 +88,11 @@
</copy>
<j:set var=3D"catalina_version_major" value=3D"${catalina.version.=
major}"/>
<j:choose>
+ <j:when test=3D"${catalina_version_major =3D=3D '6'}">
+ <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: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"/>
@@ -116,6 +126,11 @@
<attainGoal name=3D"jahia:deploy-shared-libs"/>
<j:set var=3D"catalina_version_major" value=3D"${catalina.version.=
major}"/>
<j:choose>
+ <j:when test=3D"${catalina_version_major =3D=3D '6'}">
+ <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: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"/>
@@ -141,6 +156,10 @@
<goal name=3D"undeploy:tomcat" prereqs=3D"jahia:undeploy-tomcat,jahia:=
undeploy-shared-libs">
<j:set var=3D"catalina_version_major" value=3D"${catalina.version.=
major}"/>
<j:choose>
+ <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: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"'/>
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=3D19449&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 Wed Jan 2 19=
:16:45 2008
@@ -71,17 +71,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
@@ -125,9 +114,22 @@
#maven.compile.compilerargs=3D-Xlint:unchecked
=
=
-#version 5.5
+### Tomcat deployment locations
+tomcat.home=3D${catalina.home.dir}
+webapp.name=3Djahia
+deploy.war.dir=3D${catalina.home.dir}/webapps/
+
+### 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
+#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
@@ -135,7 +137,7 @@
=
### gwt
# change google.webtoolkit.home to the path to where you have GWT installed
-google.webtoolkit.home=3D C:/gwt-windows-1.4.60 =
+google.webtoolkit.home=3D C:/gwt-windows-1.4.61 =
=
# set this to the correct jar for your platform
#maven.jar.gwt-dev-platform=3D${google.webtoolkit.home}/gwt-dev-windows.ja=
r(to be set in your build.properties)
Added: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/metadata/jahia-tomca=
t6.xml
URL: https://svndev.jahia.net/websvn/filedetails.php?path=3D/branches/JAHIA=
-INCLUDE-TAG-BRANCH/core/src/conf/metadata/jahia-tomcat6.xml&rev=3D19449&re=
pname=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/src/conf/metadata/jahia-tomcat6.=
xml (added)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/metadata/jahia-tomcat6.=
xml Wed Jan 2 19:16:45 2008
@@ -0,0 +1,23 @@
+<Context path=3D"/jahia" docBase=3D"jahia" crossContext=3D"true">
+
+ <Manager pathname=3D""/>
+
+ <Resource name=3D"jdbc/jetspeed" auth=3D"Container"
+ factory=3D"org.apache.commons.dbcp.BasicDataSourceFactory"
+ type=3D"javax.sql.DataSource" username=3D"@USERNAME@" password=
=3D"@PASSWORD@"
+ driverClassName=3D"@DRIVER@" url=3D"@URL@" defaultAutoCommit=
=3D"true"
+ maxActive=3D"100" maxIdle=3D"30" maxWait=3D"10000"/>
+
+ <Resource name=3D"jdbc/jetspeedNonTx" auth=3D"Container"
+ factory=3D"org.apache.commons.dbcp.BasicDataSourceFactory"
+ type=3D"javax.sql.DataSource" username=3D"@USERNAME@" password=
=3D"@PASSWORD@"
+ driverClassName=3D"@DRIVER@" url=3D"@URL@" defaultAutoCommit=
=3D"true" =
+ maxActive=3D"20" maxIdle=3D"30" maxWait=3D"10000"/>
+
+ <!-- Resource configuration for UserTransaction use JOTM -->
+ <!--
+ <ResourceLink name=3D"UserTransaction"
+ global=3D"UserTransaction"
+ type=3D"javax.transaction.UserTransaction"/>
+ -->
+</Context>
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
