You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by mi...@apache.org on 2003/12/18 17:02:19 UTC
cvs commit: cocoon-lenya/src/targets export-build.xml init-build.xml properties-build.xml test-build.xml webapp-build.xml
michi 2003/12/18 08:02:19
Modified: . build.properties.sample
src/targets export-build.xml init-build.xml
properties-build.xml test-build.xml
webapp-build.xml
Log:
build process simplified and endorsed libraries added
Revision Changes Path
1.28 +26 -12 cocoon-lenya/build.properties.sample
Index: build.properties.sample
===================================================================
RCS file: /home/cvs/cocoon-lenya/build.properties.sample,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- build.properties.sample 21 Nov 2003 21:36:50 -0000 1.27
+++ build.properties.sample 18 Dec 2003 16:02:19 -0000 1.28
@@ -4,56 +4,70 @@
#------------------------------------------------------------------------------------
# The original, unmodified and expanded cocoon webapp directory
-cocoon.webapp.dir=../cocoon-2.1/build/webapp
+cocoon.webapp.dir=../cocoon-2.1.2/build/webapp
#------------------------------------------------------------------------------------
# Root directories where publications are located
pubs.root.dirs=src/webapp/lenya/pubs
-#pubs.root.dirs=src/webapp/lenya/pubs:../anotherproject/pubs
+#pubs.root.dirs=src/webapp/lenya/pubs:../anotherproject/pubs:/home/user/my-pub
#------------------------------------------------------------------------------------
# Where the 'install' build target should put the webapp context
-# Warning: This has to be an absolute path! FIXME: cocoon.xconf needs absolute path (scr/targets/init-build.xml)
+# WARNING: This has to be an absolute path! (FIXME: cocoon.xconf needs absolute path (scr/targets/init-build.xml))
+# NOTE: Do not use white spaces within the path
-install.dir=/usr/local/tomcat/webapps/lenya
-#install.dir=C:/build/tomcat/webapps/lenya
+tomcat.home.dir=/usr/local/tomcat
+#tomcat.home.dir=C:/build/tomcat
+
+
+#------------------------------------------------------------------------------------
+# Where the 'install' build target should put the webapp context
+
+tomcat.webapps.dir=webapps/lenya
#------------------------------------------------------------------------------------
# The server cache directory to be cleaned by the 'reset' target
-# Either use an absolute path or a relative one based on the current directory
-cache.dir=/usr/local/tomcat/work/Standalone/localhost/lenya
-#cache.dir=C:/build/tomcat/work/Standalone/localhost/lenya
+tomcat.cache.dir=work/Standalone/localhost/lenya
+
+
+#------------------------------------------------------------------------------------
+# Where the 'install' build target should copy the endorsed libraries
+
+tomcat.endorsed.dir=common/endorsed
+
#------------------------------------------------------------------------------------
# Files and directories which should be excluded during 'install' and 'reset'
# Comma- or space-separated list of patterns
# All files are included when commented
-#target.install.excludes=**/default/**/authoring/**,**/default/**/live/**
-#target.reset.excludes=**/default/**/authoring/**,**/default/**/live/**
+#target.install.excludes=**/oscom/**/authoring/**,**/oscom/**/live/**
+#target.reset.excludes=**/oscom/**/authoring/**,**/oscom/**/live/**
#------------------------------------------------------------------------------------
# HSQL-DB server port (default is 9002)
+# NOTE: This parameter is useful if you want to run several lenya instances on the same server
#hsqldb-server.port=19002
#------------------------------------------------------------------------------------
-# Enable multipart requests (default is false)
+# Enable multipart requests (for security reasons turned off resp. set to false)
#enable.uploads=true
#------------------------------------------------------------------------------------
-# Enable RollingFileAppender of log4j (default is false)
+# Enable RollingFileAppender of log4j
#enable.log4j=true
+
#------------------------------------------------------------------------------------
# Anteater and Webtest home directories
1.4 +2 -2 cocoon-lenya/src/targets/export-build.xml
Index: export-build.xml
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/targets/export-build.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- export-build.xml 12 Sep 2003 09:42:51 -0000 1.3
+++ export-build.xml 18 Dec 2003 16:02:19 -0000 1.4
@@ -56,7 +56,7 @@
<classpath>
<pathelement location="${build.webapp}/WEB-INF/classes"/>
<fileset dir="${build.webapp}/WEB-INF/lib" includes="*.jar"/>
- <fileset dir="${install.dir}/../../common/lib" includes="servlet**.jar"/>
+ <fileset dir="${tomcat.home.dir}/${tomcat.webapps.dir}/../../common/lib" includes="servlet**.jar"/>
</classpath>
<jvmarg value="-Djava.endorsed.dirs=${build.webapp}/WEB-INF/lib/endorsed${path.separator}${java.endorsed.dirs}"/>
@@ -74,4 +74,4 @@
<arg value="-V" /> <!-- be verbose -->
</java>
-</target>
\ No newline at end of file
+</target>
1.20 +1 -1 cocoon-lenya/src/targets/init-build.xml
Index: init-build.xml
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/targets/init-build.xml,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- init-build.xml 11 Dec 2003 05:20:21 -0000 1.19
+++ init-build.xml 18 Dec 2003 16:02:19 -0000 1.20
@@ -190,7 +190,7 @@
force="false"
>
<param name="log4j-rollingFileAppender" expression="${enable.log4j}"/>
- <param name="webapp-directory" expression="${install.dir}"/>
+ <param name="webapp-directory" expression="${tomcat.home.dir}/${tomcat.webapps.dir}"/>
<outputproperty name="indent" value="yes"/>
</xslt>
1.13 +8 -2 cocoon-lenya/src/targets/properties-build.xml
Index: properties-build.xml
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/targets/properties-build.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- properties-build.xml 11 Dec 2003 05:20:21 -0000 1.12
+++ properties-build.xml 18 Dec 2003 16:02:19 -0000 1.13
@@ -66,11 +66,17 @@
<!-- Default publications dir -->
<property name="pubs.root.dirs" value="src/webapp/lenya/pubs"/>
+ <!-- Tomcat home dir -->
+ <property name="tomcat.home.dir" value="/usr/local/tomcat"/>
+
<!-- Tomcat webapps dir -->
- <property name="install.dir" value="../../build/tomcat/webapps/lenya"/>
+ <property name="tomcat.webapps.dir" value="webapps/lenya"/>
<!-- Tomcat cache dir -->
- <property name="cache.dir" value="../../build/tomcat/work/Standalone/localhost/lenya"/>
+ <property name="tomcat.cache.dir" value="work/Standalone/localhost/lenya"/>
+
+ <!-- Tomcat endorsed libraries dir -->
+ <property name="tomcat.endorsed.dir" value="common/endorsed"/>
<!--
The files that should be copied into the dist
1.16 +9 -9 cocoon-lenya/src/targets/test-build.xml
Index: test-build.xml
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/targets/test-build.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- test-build.xml 21 Nov 2003 21:35:53 -0000 1.15
+++ test-build.xml 18 Dec 2003 16:02:19 -0000 1.16
@@ -20,7 +20,7 @@
<!-- Prepares the test publication -->
<target name="test.pub.prepare">
- <property name="test.pub.dir" value="${install.dir}/lenya/pubs/${test.pub.id}"/>
+ <property name="test.pub.dir" value="${tomcat.home.dir}/${tomcat.webapps.dir}/lenya/pubs/${test.pub.id}"/>
<delete dir="${test.pub.dir}"/>
<mkdir dir="${test.pub.dir}"/>
@@ -73,7 +73,7 @@
<!-- Identity Test -->
<target name="test.identity">
<java fork="yes" classname="org.apache.lenya.cms.ac.IdentityTestCase">
- <arg value="${install.dir}"/>
+ <arg value="${tomcat.home.dir}/${tomcat.webapps.dir}"/>
<arg value="oscom"/>
<classpath refid="classpath"/>
<classpath>
@@ -91,7 +91,7 @@
classname="org.apache.lenya.cms.task.AntTaskTest"
>
<jvmarg value="-enableassertions"/>
- <arg value="${install.dir}"/>
+ <arg value="${tomcat.home.dir}/${tomcat.webapps.dir}"/>
<arg value="${test.pub.id}"/>
<classpath refid="classpath.default"/>
</java>
@@ -102,7 +102,7 @@
<target name="test.workflow" depends="test.pub.prepare">
<java fork="yes" classname="org.apache.lenya.cms.workflow.WorkflowTest">
<jvmarg value="-enableassertions"/>
- <arg value="${install.dir}"/>
+ <arg value="${tomcat.home.dir}/${tomcat.webapps.dir}"/>
<arg value="${test.pub.id}"/>
<arg value="simple"/> <!-- document type -->
<classpath refid="classpath.default"/>
@@ -114,7 +114,7 @@
<target name="test.creator" depends="test.pub.prepare">
<java fork="yes" classname="org.apache.lenya.cms.authoring.DocumentCreatorTest">
<jvmarg value="-enableassertions"/>
- <arg value="${install.dir}"/>
+ <arg value="${tomcat.home.dir}/${tomcat.webapps.dir}"/>
<arg value="${test.pub.id}"/>
<classpath refid="classpath.default"/>
</java>
@@ -124,7 +124,7 @@
<target name="test.publisher" depends="test.pub.prepare">
<java fork="yes" classname="org.apache.lenya.cms.task.PublisherTest">
<jvmarg value="-enableassertions"/>
- <arg value="${install.dir}"/>
+ <arg value="${tomcat.home.dir}/${tomcat.webapps.dir}"/>
<arg value="${test.pub.id}"/>
<classpath refid="classpath.default"/>
</java>
@@ -134,7 +134,7 @@
<target name="test.accesscontrol" depends="test.pub.prepare">
<java fork="yes" classname="org.apache.lenya.cms.ac.AccessControlTest">
<jvmarg value="-enableassertions"/>
- <arg value="${install.dir}"/>
+ <arg value="${tomcat.home.dir}/${tomcat.webapps.dir}"/>
<arg value="${test.pub.id}"/>
<classpath refid="classpath.default"/>
</java>
@@ -144,7 +144,7 @@
<target name="test.publication" depends="test.pub.prepare">
<java fork="yes" classname="org.apache.lenya.cms.publication.PublicationTest">
<jvmarg value="-enableassertions"/>
- <arg value="${install.dir}"/>
+ <arg value="${tomcat.home.dir}/${tomcat.webapps.dir}"/>
<arg value="${test.pub.id}"/>
<classpath refid="classpath.default"/>
</java>
@@ -154,7 +154,7 @@
<target name="test.deactivate" depends="test.pub.prepare">
<java fork="yes" classname="org.apache.lenya.cms.task.DocumentDeactivateTaskTest">
<jvmarg value="-enableassertions"/>
- <arg value="${install.dir}"/>
+ <arg value="${tomcat.home.dir}/${tomcat.webapps.dir}"/>
<arg value="${test.pub.id}"/>
<classpath refid="classpath.default"/>
</java>
1.10 +19 -9 cocoon-lenya/src/targets/webapp-build.xml
Index: webapp-build.xml
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/targets/webapp-build.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- webapp-build.xml 15 Dec 2003 17:36:07 -0000 1.9
+++ webapp-build.xml 18 Dec 2003 16:02:19 -0000 1.10
@@ -120,32 +120,42 @@
<target name="reset" depends="clean" description="Resets the deployment by also cleaning the servlet engine context">
<!-- Empty server cache - this directory is set in the "build.properties" file -->
- <delete dir="${cache.dir}"/>
- <mkdir dir="${install.dir}" />
+ <delete dir="${tomcat.home.dir}/${tomcat.cache.dir}"/>
+ <mkdir dir="${tomcat.home.dir}/${tomcat.webapps.dir}" />
<delete includeEmptyDirs="true">
- <fileset dir="${install.dir}" excludes="${target.reset.excludes}" />
+ <fileset dir="${tomcat.home.dir}/${tomcat.webapps.dir}" excludes="${target.reset.excludes}" />
</delete>
</target>
+
+
<!-- ============================================================ -->
<!-- Install webapp -->
<!-- ============================================================ -->
<target name="install" depends="webapp" description="Install the webapp into servlet engine context">
- <copy todir="${install.dir}" filtering="off">
- <fileset dir="${build.webapp}" excludes="${target.install.excludes}">
- </fileset>
+ <echo>INFO: Copy webapp to Tomcat</echo>
+ <echo>INFO: Copy From build.webapp=${build.webapp} To tomcat.webapps.dir=${tomcat.home.dir}/${tomcat.webapps.dir}</echo>
+ <copy todir="${tomcat.home.dir}/${tomcat.webapps.dir}" filtering="off">
+ <fileset dir="${build.webapp}" excludes="${target.install.excludes}"/>
+ </copy>
+
+ <echo>INFO: Copy endorsed libraries</echo>
+ <copy todir="${tomcat.home.dir}/${tomcat.endorsed.dir}">
+ <fileset dir="${build.webapp}/WEB-INF/lib/endorsed"/>
</copy>
- <echo>INFO: Copy From build.webapp=${build.webapp} To install.dir=${install.dir}</echo>
+ <copy file="${build.webapp}/WEB-INF/lib/xercesImpl-2.5.0.jar" todir="${tomcat.home.dir}/${tomcat.endorsed.dir}"/>
+ <copy file="${build.webapp}/WEB-INF/lib/xml-apis.jar" todir="${tomcat.home.dir}/${tomcat.endorsed.dir}"/>
</target>
+
+
<!-- ============================================================ -->
<!-- Reload Tomcat -->
<!-- ============================================================ -->
-
<target name="reload">
<!-- For Tomcat Tasks -->
<path id="tomcat.classpath">
- <fileset dir="${install.dir}/../../server/lib"
+ <fileset dir="${tomcat.home.dir}/${tomcat.webapps.dir}/../../server/lib"
includes="catalina-ant.jar" />
</path>
<taskdef name="reload"
---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org