Author: bpapez
Date: Mon Jan 14 15:11:04 2008
New Revision: 1275
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D1275&repname=
=3Dcorporate_portal_templates
Log:
get build job from 5.x to be able to change files in existing template depl=
oyments
Modified:
branches/JAHIA-4-1-BRANCH/ant.build.properties.example
branches/JAHIA-4-1-BRANCH/build.xml
Modified: branches/JAHIA-4-1-BRANCH/ant.build.properties.example
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-4-1-BR=
ANCH/ant.build.properties.example&rev=3D1275&repname=3Dcorporate_portal_tem=
plates
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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-4-1-BRANCH/ant.build.properties.example (original)
+++ branches/JAHIA-4-1-BRANCH/ant.build.properties.example Mon Jan 14 15:11=
:04 2008
@@ -1,6 +1,16 @@
# Change this file and rename it to ant.build.properties
build.base=3Dbuild
-tomcat.home=3Dc:/jahia401/tomcat
+tomcat.home=3Dc:/jakarta-tomcat-5.5.9
classes=3D${tomcat.home}/webapps/jahia/WEB-INF/classes
lib=3D${tomcat.home}/webapps/jahia/WEB-INF/lib
-commonlib=3D${tomcat.home}/common/lib
\ No newline at end of file
+
+# please update the sitekey to conform it at your deployed environnement
+siteName=3DmySite
+jspTargetDir =3D ${tomcat.home}/webapps/jahia/jsp/jahia/templates/${siteNa=
me}
+jarTargetDir =3D ${tomcat.home}/webapps/jahia/WEB-INF/var/new_templates/${=
siteName}
+
+# Change this value if you want the generated jar to be automatically copi=
ed in the jahia
+# core directory.
+# {JAHIA_HOME}/core/src/webapp/WEB-INF/var/shared_templates
+sharedTemplateDir =3D ./dist
+ =
Modified: branches/JAHIA-4-1-BRANCH/build.xml
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-4-1-BR=
ANCH/build.xml&rev=3D1275&repname=3Dcorporate_portal_templates
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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-4-1-BRANCH/build.xml (original)
+++ branches/JAHIA-4-1-BRANCH/build.xml Mon Jan 14 15:11:04 2008
@@ -1,5 +1,4 @@
<?xml version=3D"1.0"?>
-
<project name=3D"corporate_templates" default=3D"dist" basedir=3D".">
<description>
This file is used to create a template jar file.
@@ -90,9 +89,6 @@
<fileset dir=3D"${lib}">
<include name=3D"**/*.jar"/>
</fileset>
- <fileset dir=3D"${commonlib}">
- <include name=3D"**/*.jar"/>
- </fileset>
</classpath>
</javac>
=
@@ -100,6 +96,8 @@
jarfile=3D"${build.base}/${templates}/${bundle}">
<include name=3D"**/*.properties"/>
<include name=3D"**/*.class"/>
+ <exclude name=3D"**/Thumbs.db"/>
+ <exclude name=3D"**/*.bak"/>
</jar>
</target>
=
@@ -108,16 +106,59 @@
<!-- Create the distribution directory -->
<mkdir dir=3D"${dist}"/>
<jar basedir=3D"${build.base}/${templates}"
- jarfile=3D"${dist}/${templates}.jar"/>
+ jarfile=3D"${dist}/${templates}.jar">
+ <exclude name=3D"**/Thumbs.db"/>
+ <exclude name=3D"**/*.bak"/>
+ </jar>
+
+ <copy file=3D"${dist}/${templates}.jar" todir=3D"${sharedTemplateD=
ir}" />
+
</target>
=
<target name=3D"compile" depends=3D"prepare"
description=3D"Compile the source " >
</target>
=
- <target name=3D"clean" description=3D"Clean up">
+ <target name=3D"clean" description=3D"Clean up" depends=3D"init" >
<!-- Delete the ${build.base} and ${dist} directory trees -->
<delete dir=3D"${build.base}"/>
<delete dir=3D"${dist}"/>
+ <delete>
+ <fileset dir=3D"${src.java}" includes=3D"**/*.class"/>
+ </delete>
+ </target>
+
+ <target name=3D"deployNewJspToTomcat" description=3D"deploy new jsp i=
n tomcat" depends=3D"prepare">
+ <copy todir=3D"${jspTargetDir}/${templates}">
+ <fileset dir=3D"${src}/view/jsp"/>
+ </copy>
+
+ </target>
+
+ <target name=3D"refreshJspToTomcat" description=3D"refresh all jsp in =
tomcat" depends=3D"prepare">
+ <copy todir=3D"${jspTargetDir}/${templates}" overwrite=3D"yes">
+ <fileset dir=3D"${src}/view/jsp"/>
+ </copy>
+
+ </target>
+
+ <target name=3D"deployJarToTomcat" description=3D"deploy jar in to=
mcat" depends=3D"dist"> =
+ <copy todir=3D"${jarTargetDir}" overwrite=3D"yes">
+ <fileset dir=3D"${dist}">
+ <include name=3D"**/*.jar"/>
+ </fileset>
+ </copy>
+ </target> =
+ =
+ <target name=3D"fullDeployClassToTomcat" description=3D"deploy all cla=
ss in tomcat" depends=3D"prepare">
+ <copy todir=3D"${classes}" overwrite=3D"yes">
+ <fileset dir=3D"${src.java}">
+ <include name=3D"**/*.properties"/>
+ <include name=3D"**/*.class"/>
+ <exclude name=3D"**/Thumbs.db"/>
+ <exclude name=3D"**/*.bak"/>
+ <exclude name=3D"**/*.java"/>
+ </fileset>
+ </copy>
</target>
</project>
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
