|
From: Michael K. <ko...@us...> - 2004-10-04 09:59:15
|
Update of /cvsroot/cobricks/cobricks2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14113 Modified Files: build.xml Log Message: Index: build.xml =================================================================== RCS file: /cvsroot/cobricks/cobricks2/build.xml,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- build.xml 16 Sep 2004 14:39:41 -0000 1.22 +++ build.xml 4 Oct 2004 09:59:02 -0000 1.23 @@ -29,6 +29,7 @@ <property name="conf.home" value="${basedir}/conf"/> <property name="web.home" value="${basedir}/web"/> <property name="weblib.home" value="${basedir}/web/WEB-INF/lib"/> +<property name="webappname" value="ROOT"/> <property name="catalina.serverport" value="8005"/> <property name="catalina.httpport" value="8080"/> @@ -86,7 +87,7 @@ </path> <path id="exec.classpath"> - <pathelement location="${build.home}/webapps/ROOT/WEB-INF/classes" /> + <pathelement location="${build.home}/webapps/${webappname}/WEB-INF/classes" /> <path refid="compile.classpath"/> </path> @@ -112,9 +113,9 @@ description="Compile Java sources"> <!-- Compile Java classes as necessary --> - <mkdir dir="${build.home}/webapps/ROOT/WEB-INF/classes"/> + <mkdir dir="${build.home}/webapps/${webappname}/WEB-INF/classes"/> <javac srcdir="${src.home}" - destdir="${build.home}/webapps/ROOT/WEB-INF/classes" + destdir="${build.home}/webapps/${webappname}/WEB-INF/classes" debug="${compile.debug}" deprecation="${compile.deprecation}" optimize="${compile.optimize}"> @@ -127,10 +128,10 @@ <!-- Create RMI stubs and skeletons --> <rmic classname="org.cobricks.user.rpc.UserManagerRMIImpl" - base="${build.home}/webapps/ROOT/WEB-INF/classes" /> + base="${build.home}/webapps/${webappname}/WEB-INF/classes" /> <!-- Copy application resources --> - <copy todir="${build.home}/webapps/ROOT/WEB-INF/classes"> + <copy todir="${build.home}/webapps/${webappname}/WEB-INF/classes"> <fileset dir="${src.home}" excludes="**/*.java"/> </copy> @@ -184,34 +185,34 @@ <!-- Create JAR file for core components --> <jar destfile="${distbin}/web/WEB-INF/lib/cobricks.jar"> - <fileset dir="${build.home}/webapps/ROOT/WEB-INF/classes" + <fileset dir="${build.home}/webapps/${webappname}/WEB-INF/classes" includes="org/cobricks/core/**" /> - <fileset dir="${build.home}/webapps/ROOT/WEB-INF/classes" + <fileset dir="${build.home}/webapps/${webappname}/WEB-INF/classes" includes="org/cobricks/user/**" /> - <fileset dir="${build.home}/webapps/ROOT/WEB-INF/classes" + <fileset dir="${build.home}/webapps/${webappname}/WEB-INF/classes" includes="org/cobricks/item/**" /> - <fileset dir="${build.home}/webapps/ROOT/WEB-INF/classes" + <fileset dir="${build.home}/webapps/${webappname}/WEB-INF/classes" includes="org/cobricks/category/**" /> - <fileset dir="${build.home}/webapps/ROOT/WEB-INF/classes" + <fileset dir="${build.home}/webapps/${webappname}/WEB-INF/classes" includes="org/cobricks/context/**" /> - <fileset dir="${build.home}/webapps/ROOT/WEB-INF/classes" + <fileset dir="${build.home}/webapps/${webappname}/WEB-INF/classes" includes="org/cobricks/message/**" /> - <fileset dir="${build.home}/webapps/ROOT/WEB-INF/classes" + <fileset dir="${build.home}/webapps/${webappname}/WEB-INF/classes" includes="org/cobricks/portal/**" /> </jar> <jar jarfile="${distbin}/web/WEB-INF/lib/cobricksVoting.jar"> - <fileset dir="${build.home}/webapps/ROOT/WEB-INF/classes" + <fileset dir="${build.home}/webapps/${webappname}/WEB-INF/classes" includes="org/cobricks/voting/**" /> </jar> <jar jarfile="${distbin}/web/WEB-INF/lib/cobricksCourse.jar"> - <fileset dir="${build.home}/webapps/ROOT/WEB-INF/classes" + <fileset dir="${build.home}/webapps/${webappname}/WEB-INF/classes" includes="org/cobricks/course/**" /> </jar> <jar jarfile="${distbin}/web/WEB-INF/lib/cobricksCwall.jar"> - <fileset dir="${build.home}/webapps/ROOT/WEB-INF/classes" + <fileset dir="${build.home}/webapps/${webappname}/WEB-INF/classes" includes="org/cobricks/cwall/**" /> </jar> @@ -393,10 +394,10 @@ <!-- Create build directories as needed --> <mkdir dir="${build.home}"/> <mkdir dir="${build.home}/webapps"/> - <mkdir dir="${build.home}/webapps/ROOT"/> - <mkdir dir="${build.home}/webapps/ROOT/WEB-INF"/> - <mkdir dir="${build.home}/webapps/ROOT/WEB-INF/conf"/> - <mkdir dir="${build.home}/webapps/ROOT/WEB-INF/classes"/> + <mkdir dir="${build.home}/webapps/${webappname}"/> + <mkdir dir="${build.home}/webapps/${webappname}/WEB-INF"/> + <mkdir dir="${build.home}/webapps/${webappname}/WEB-INF/conf"/> + <mkdir dir="${build.home}/webapps/${webappname}/WEB-INF/classes"/> <mkdir dir="${build.home}/conf"/> <mkdir dir="${build.home}/logs"/> @@ -415,12 +416,12 @@ value="${catalina.httpsport}" /> <!-- Copy static content of this web application --> - <copy todir="${build.home}/webapps/ROOT"> + <copy todir="${build.home}/webapps/${webappname}"> <fileset dir="${web.home}"/> </copy> <!-- copy Cobricks configuration --> - <copy todir="${build.home}/webapps/ROOT/WEB-INF/conf"> + <copy todir="${build.home}/webapps/${webappname}/WEB-INF/conf"> <fileset dir="${conf.home}"/> </copy> @@ -434,14 +435,14 @@ <fileset dir="${basedir}/tomcat/webapps" excludes="**/CVS"/> </copy> - <copy todir="${build.home}/webapps/ROOT/WEB-INF/lib"> + <copy todir="${build.home}/webapps/${webappname}/WEB-INF/lib"> <fileset dir="${axis.home}/webapps/axis/WEB-INF/lib"> <include name="*"/> <exclude name="commons-logging.jar"/> </fileset> </copy> - <copy todir="${build.home}/webapps/ROOT/WEB-INF/lib"> + <copy todir="${build.home}/webapps/${webappname}/WEB-INF/lib"> <fileset dir="${xindice.home}/lib"> <include name="xml*.jar" if="xindice.home"/> <exclude name="xmldb-api-sdk*"/> |