|
From: Michael K. <ko...@us...> - 2005-01-27 15:38:47
|
Update of /cvsroot/cobricks/cobricks2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6976 Modified Files: build.xml Log Message: Index: build.xml =================================================================== RCS file: /cvsroot/cobricks/cobricks2/build.xml,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- build.xml 27 Jan 2005 15:29:13 -0000 1.35 +++ build.xml 27 Jan 2005 15:38:38 -0000 1.36 @@ -353,13 +353,13 @@ <target name="copydoc" description="Copies documentation from Wiki to docs directory"> <!-- use wget version 1.9 or higher --> - <!-- keep file convFiles.java and style.css !!! --> + <!-- keep files: convFiles.java, style.css, README.txt !!! --> <exec executable="/usr/bin/wget" dir="docs"> - <arg line="-q -r -l 2 -nd -E -k -p -R 'index.php*' -R 'Image:*' -R 'Help:*' -R 'CobricksWiki:*' -R 'Special:*' http://131.159.24.138/wiki/mw/index.php/Cobricks2_doc" /> + <arg line="-q -r -l 2 -nd -E -k -p -nc -R 'index.php*' -R 'Image:*' -R 'Help:*' -R 'CobricksWiki:*' -R 'Special:*' http://131.159.24.138/wiki/mw/index.php/Cobricks2_doc" /> </exec> <java classname="convFiles" fork="true" dir="docs"> </java> - <move file="docs/Main_Page.html" tofile="docs/index.html" /> + <copy file="docs/Main_Page.html" tofile="docs/index.html" /> </target> |
|
From: Michael K. <ko...@us...> - 2005-01-27 16:05:55
|
Update of /cvsroot/cobricks/cobricks2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13150 Modified Files: build.xml Log Message: ---------------------------------------------------------------------- Index: build.xml =================================================================== RCS file: /cvsroot/cobricks/cobricks2/build.xml,v retrieving revision 1.36 retrieving revision 1.37 diff -u -d -r1.36 -r1.37 --- build.xml 27 Jan 2005 15:38:38 -0000 1.36 +++ build.xml 27 Jan 2005 16:05:13 -0000 1.37 @@ -22,8 +22,8 @@ <property name="axis.home" value="/usr/proj/java/axis-1.1"/> <property name="xindice.home" value="/usr/proj/java/xindice-1.1"/> <property name="dist.home" value="${basedir}/dist"/> -<property name="distbin" value="${basedir}/dist/cobricks2-v0.23"/> -<property name="distsrc" value="${basedir}/dist/cobricks2-v0.23-src"/> +<property name="distbin" value="${basedir}/dist/cobricks2-v0.32"/> +<property name="distsrc" value="${basedir}/dist/cobricks2-v0.32-src"/> <property name="docs.home" value="${basedir}/docs"/> <property name="src.home" value="${basedir}/src"/> <property name="conf.home" value="${basedir}/conf"/> |
|
From: wus <wu...@us...> - 2005-07-01 15:22:24
|
Update of /cvsroot/cobricks/cobricks2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31950 Modified Files: build.xml Log Message: something was added, just for the cobricks in jetspeed Index: build.xml =================================================================== RCS file: /cvsroot/cobricks/cobricks2/build.xml,v retrieving revision 1.38 retrieving revision 1.39 diff -u -d -r1.38 -r1.39 --- build.xml 26 May 2005 13:56:04 -0000 1.38 +++ build.xml 1 Jul 2005 15:22:09 -0000 1.39 @@ -29,6 +29,7 @@ <property name="web.home" value="${basedir}/web"/> <property name="weblib.home" value="${basedir}/web/WEB-INF/lib"/> <property name="webappname" value="ROOT"/> +<property name="jetspeed.home" value="${catalina.home}/webapps/jetspeed"/> <property name="catalina.serverport" value="8005"/> <property name="catalina.httpport" value="8080"/> @@ -127,6 +128,9 @@ </copy> <antcall target="compilexindice"/> + + <!-- copy the configfile to jetspeed--> + <antcall target="cobricks2jetspeed"/> </target> @@ -421,7 +425,7 @@ <!-- Copy static content of this web application --> <copy todir="${build.home}/webapps/${webappname}"> - <fileset dir="${web.home}"/> + <fileset dir="${web.home}" excludes="**/jetspeed/**"/> </copy> <!-- copy Cobricks configuration --> @@ -475,6 +479,31 @@ <fileset dir="${jetspeed.home}"/> </copy> </target> + +<target name="cobricks2jetspeed"> + <!-- copy Cobricks configuration for jetspeed--> + <copy todir="${build.home}/webapps/jetspeed"> + <fileset dir="${web.home}/jetspeed"/> + </copy> + <!-- make cobricks.jar and add into the lib of jetspeed--> + <jar destfile="${build.home}/webapps/jetspeed/WEB-INF/lib/cobricks.jar"> + <fileset dir="${build.home}/webapps/${webappname}/WEB-INF/classes" + includes="org/cobricks/core/**" /> + <fileset dir="${build.home}/webapps/${webappname}/WEB-INF/classes" + includes="org/cobricks/user/**" /> + <fileset dir="${build.home}/webapps/${webappname}/WEB-INF/classes" + includes="org/cobricks/item/**" /> + <fileset dir="${build.home}/webapps/${webappname}/WEB-INF/classes" + includes="org/cobricks/category/**" /> + <fileset dir="${build.home}/webapps/${webappname}/WEB-INF/classes" + includes="org/cobricks/context/**" /> + <fileset dir="${build.home}/webapps/${webappname}/WEB-INF/classes" + includes="org/cobricks/message/**" /> + <fileset dir="${build.home}/webapps/${webappname}/WEB-INF/classes" + includes="org/cobricks/portal/**" /> + </jar> + +</target> <!-- ==================== Start Targets ================================= --> |
|
From: wus <wu...@us...> - 2005-07-01 15:38:23
|
Update of /cvsroot/cobricks/cobricks2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8463 Modified Files: build.xml Log Message: just add a secrete check Index: build.xml =================================================================== RCS file: /cvsroot/cobricks/cobricks2/build.xml,v retrieving revision 1.39 retrieving revision 1.40 diff -u -d -r1.39 -r1.40 --- build.xml 1 Jul 2005 15:22:09 -0000 1.39 +++ build.xml 1 Jul 2005 15:38:14 -0000 1.40 @@ -480,7 +480,7 @@ </copy> </target> -<target name="cobricks2jetspeed"> +<target name="cobricks2jetspeed" if="jetspeed.home"> <!-- copy Cobricks configuration for jetspeed--> <copy todir="${build.home}/webapps/jetspeed"> <fileset dir="${web.home}/jetspeed"/> |
|
From: wus <wu...@us...> - 2005-07-01 22:19:05
|
Update of /cvsroot/cobricks/cobricks2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28824 Modified Files: build.xml Log Message: something was changed for cobricksportal Index: build.xml =================================================================== RCS file: /cvsroot/cobricks/cobricks2/build.xml,v retrieving revision 1.40 retrieving revision 1.41 diff -u -d -r1.40 -r1.41 --- build.xml 1 Jul 2005 15:38:14 -0000 1.40 +++ build.xml 1 Jul 2005 22:18:56 -0000 1.41 @@ -29,8 +29,7 @@ <property name="web.home" value="${basedir}/web"/> <property name="weblib.home" value="${basedir}/web/WEB-INF/lib"/> <property name="webappname" value="ROOT"/> -<property name="jetspeed.home" value="${catalina.home}/webapps/jetspeed"/> - + <property name="catalina.serverport" value="8005"/> <property name="catalina.httpport" value="8080"/> <property name="catalina.httpsport" value="8443"/> @@ -423,11 +422,6 @@ <replace file="${build.home}/conf/server.xml" token="@@@HTTPSPORT@@@" value="${catalina.httpsport}" /> - <!-- Copy static content of this web application --> - <copy todir="${build.home}/webapps/${webappname}"> - <fileset dir="${web.home}" excludes="**/jetspeed/**"/> - </copy> - <!-- copy Cobricks configuration --> <copy todir="${build.home}/webapps/${webappname}/WEB-INF/conf"> <fileset dir="${conf.home}"/> @@ -480,11 +474,12 @@ </copy> </target> -<target name="cobricks2jetspeed" if="jetspeed.home"> +<target name="cobricks2jetspeed" > <!-- copy Cobricks configuration for jetspeed--> <copy todir="${build.home}/webapps/jetspeed"> <fileset dir="${web.home}/jetspeed"/> </copy> + <mkdir dir="${build.home}/webapps/jetspeed/WEB-INF/lib"/> <!-- make cobricks.jar and add into the lib of jetspeed--> <jar destfile="${build.home}/webapps/jetspeed/WEB-INF/lib/cobricks.jar"> <fileset dir="${build.home}/webapps/${webappname}/WEB-INF/classes" |
|
From: wus <wu...@us...> - 2005-07-04 20:24:47
|
Update of /cvsroot/cobricks/cobricks2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29009 Modified Files: build.xml Log Message: correctur has been done Index: build.xml =================================================================== RCS file: /cvsroot/cobricks/cobricks2/build.xml,v retrieving revision 1.41 retrieving revision 1.42 diff -u -d -r1.41 -r1.42 --- build.xml 1 Jul 2005 22:18:56 -0000 1.41 +++ build.xml 4 Jul 2005 20:24:38 -0000 1.42 @@ -112,8 +112,8 @@ <classpath refid="compile.classpath"/> <include name="org/cobricks/**"/> <include name="de/tum/cobricks/**"/> - <exclude name="org/cobricks/portal/portlet/**/*.java" - unless="jetspeed.home"/> + <!--exclude name="org/cobricks/portal/portlet/**/*.java" + unless="jetspeed.home"/--> <exclude name="org/cobricks/item/xmldb/**/*.java"/> </javac> @@ -171,6 +171,12 @@ </javac> </target> --> + +<target name="copyjetspeed" if="jetspeed.home"> + <copy todir="${build.home}/webapps/jetspeed"> + <fileset dir="${jetspeed.home}"/> + </copy> +</target> <!-- Create Corba skeleton files --> @@ -422,6 +428,11 @@ <replace file="${build.home}/conf/server.xml" token="@@@HTTPSPORT@@@" value="${catalina.httpsport}" /> + <!-- Copy static content of this web application --> + <copy todir="${build.home}/webapps/${webappname}"> + <fileset dir="${web.home}" excludes="**/jetspeed/**"/> + </copy> + <!-- copy Cobricks configuration --> <copy todir="${build.home}/webapps/${webappname}/WEB-INF/conf"> <fileset dir="${conf.home}"/> @@ -468,36 +479,30 @@ </copy> </target> -<target name="copyjetspeed" if="jetspeed.home"> - <copy todir="${build.home}/webapps/jetspeed"> - <fileset dir="${jetspeed.home}"/> - </copy> -</target> - <target name="cobricks2jetspeed" > <!-- copy Cobricks configuration for jetspeed--> <copy todir="${build.home}/webapps/jetspeed"> - <fileset dir="${web.home}/jetspeed"/> + <fileset dir="${web.home}/jetspeed"/> </copy> <mkdir dir="${build.home}/webapps/jetspeed/WEB-INF/lib"/> <!-- make cobricks.jar and add into the lib of jetspeed--> <jar destfile="${build.home}/webapps/jetspeed/WEB-INF/lib/cobricks.jar"> <fileset dir="${build.home}/webapps/${webappname}/WEB-INF/classes" - includes="org/cobricks/core/**" /> - <fileset dir="${build.home}/webapps/${webappname}/WEB-INF/classes" - includes="org/cobricks/user/**" /> + includes="org/cobricks/core/**" /> <fileset dir="${build.home}/webapps/${webappname}/WEB-INF/classes" - includes="org/cobricks/item/**" /> + includes="org/cobricks/user/**" /> <fileset dir="${build.home}/webapps/${webappname}/WEB-INF/classes" - includes="org/cobricks/category/**" /> + includes="org/cobricks/item/**" /> <fileset dir="${build.home}/webapps/${webappname}/WEB-INF/classes" - includes="org/cobricks/context/**" /> + includes="org/cobricks/category/**" /> + <fileset dir="${build.home}/webapps/${webappname}/WEB-INF/classes" + includes="org/cobricks/context/**" /> <fileset dir="${build.home}/webapps/${webappname}/WEB-INF/classes" - includes="org/cobricks/message/**" /> + includes="org/cobricks/message/**" /> <fileset dir="${build.home}/webapps/${webappname}/WEB-INF/classes" - includes="org/cobricks/portal/**" /> + includes="org/cobricks/portal/**" /> </jar> - + </target> |
|
From: Michael K. <ko...@us...> - 2005-07-26 10:57:14
|
Update of /cvsroot/cobricks/cobricks2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26516 Modified Files: build.xml Log Message: Index: build.xml =================================================================== RCS file: /cvsroot/cobricks/cobricks2/build.xml,v retrieving revision 1.42 retrieving revision 1.43 diff -u -d -r1.42 -r1.43 --- build.xml 4 Jul 2005 20:24:38 -0000 1.42 +++ build.xml 26 Jul 2005 10:57:03 -0000 1.43 @@ -112,8 +112,7 @@ <classpath refid="compile.classpath"/> <include name="org/cobricks/**"/> <include name="de/tum/cobricks/**"/> - <!--exclude name="org/cobricks/portal/portlet/**/*.java" - unless="jetspeed.home"/--> + <exclude name="org/cobricks/portal/portlet/**/*.java"/> <exclude name="org/cobricks/item/xmldb/**/*.java"/> </javac> @@ -127,9 +126,7 @@ </copy> <antcall target="compilexindice"/> - - <!-- copy the configfile to jetspeed--> - <antcall target="cobricks2jetspeed"/> + <antcall target="compilejetspeed"/> </target> @@ -152,32 +149,26 @@ </javac> </target> -<!-- -<target name="compilexindice" description="Compile xindice wrapper files" - if="xindice.home"/> +<target name="compilejetspeed" depends="prepare" + description="Compile Java sources for Jetspeed portlet support" + if="jetspeed.home"> <javac srcdir="${src.home}" destdir="${build.home}/webapps/${webappname}/WEB-INF/classes" debug="${compile.debug}" deprecation="${compile.deprecation}" optimize="${compile.optimize}"> <classpath> - <filelist refid="compile.classpath"/> - <fileset dir="${xindice.home}"> - <include name="lib/xml*.jar"/> - <exclude name="lib/xmldb-api-sdk*.jar"/> + <path refid="compile.classpath"/> + <pathelement location="${jetspeed.home}/WEB-INF/classes"/> + <fileset dir="${jetspeed.home}"> + <include name="WEB-INF/lib/jetspeed*.jar"/> </fileset> </classpath> - <include name="org/cobricks/item/xmldb/**/*.java"/> + <include name="org/cobricks/portal/portlet/**/*.java"/> </javac> </target> ---> - -<target name="copyjetspeed" if="jetspeed.home"> - <copy todir="${build.home}/webapps/jetspeed"> - <fileset dir="${jetspeed.home}"/> - </copy> -</target> + <!-- Create Corba skeleton files --> <target name="corba" description="Create Corba sekeleton files"> @@ -430,7 +421,7 @@ <!-- Copy static content of this web application --> <copy todir="${build.home}/webapps/${webappname}"> - <fileset dir="${web.home}" excludes="**/jetspeed/**"/> + <fileset dir="${web.home}"/> </copy> <!-- copy Cobricks configuration --> @@ -443,7 +434,7 @@ <copy file="conf/log.properties.orig" tofile="conf/log.properties" overwrite="false"/> - <!-- copy manager web application --> + <!-- copy manager web application and other web apps --> <copy todir="${build.home}/webapps"> <fileset dir="${basedir}/tomcat/webapps" excludes="**/CVS"/> </copy> @@ -465,27 +456,95 @@ <!-- copy xindice libraries --> <antcall target="copyxindice"/> - <!-- copy other web applications to webapps directory --> - <antcall target="copyjetspeed"/> - </target> <target name="copyxindice" if="xindice.home"> <copy todir="${build.home}/webapps/${webappname}/WEB-INF/lib"> <fileset dir="${xindice.home}/lib"> - <include name="xml*.jar" if="xindice.home"/> + <include name="xml*.jar"/> <exclude name="xmldb-api-sdk*"/> </fileset> </copy> </target> -<target name="cobricks2jetspeed" > - <!-- copy Cobricks configuration for jetspeed--> - <copy todir="${build.home}/webapps/jetspeed"> - <fileset dir="${web.home}/jetspeed"/> +<!-- this target has to be called manually !!! --> +<target name="copytojetspeed" if ="jetspeed.home"> + <!-- copy Cobricks configuration for jetspeed --> + <mkdir dir="${jetspeed.home}/WEB-INF/conf/cobricksconfig"/> + <copy todir="${jetspeed.home}/WEB-INF/conf/cobricksconfig"> + <fileset dir="${conf.home}"> + <include name="localproperties.txt"/> + <include name="log.properties"/> + </fileset> </copy> - <mkdir dir="${build.home}/webapps/jetspeed/WEB-INF/lib"/> + <copy todir="${jetspeed.home}/WEB-INF/conf"> + <fileset dir="${conf.home}"> + <include name="localproperties.txt"/> + <include name="cobricks-portlet.xreg"/> + </fileset> + </copy> + + <!-- copy portlet templates --> + <mkdir dir="${jetspeed.home}/WEB-INF/templates/vm/portlets/html/cobricks"/> + <copy todir="${jetspeed.home}/WEB-INF/templates/vm/portlets/html/cobricks"> + <fileset dir="${basedir}/web.portlets"> + <include name="**/*"/> + </fileset> + </copy> + + <!-- make cobricks.jar and add into the lib of jetspeed--> + <mkdir dir="${jetspeed.home}/WEB-INF/lib"/> + <jar destfile="${jetspeed.home}/WEB-INF/lib/cobricks.jar"> + <fileset dir="${build.home}/webapps/${webappname}/WEB-INF/classes" + includes="org/cobricks/core/**" /> + <fileset dir="${build.home}/webapps/${webappname}/WEB-INF/classes" + includes="org/cobricks/user/**" /> + <fileset dir="${build.home}/webapps/${webappname}/WEB-INF/classes" + includes="org/cobricks/item/**" /> + <fileset dir="${build.home}/webapps/${webappname}/WEB-INF/classes" + includes="org/cobricks/category/**" /> + <fileset dir="${build.home}/webapps/${webappname}/WEB-INF/classes" + includes="org/cobricks/context/**" /> + <fileset dir="${build.home}/webapps/${webappname}/WEB-INF/classes" + includes="org/cobricks/message/**" /> + <fileset dir="${build.home}/webapps/${webappname}/WEB-INF/classes" + includes="org/cobricks/portal/**" /> + </jar> +</target> + +<!-- this target has to be called manually !!! --> +<target name="copyjetspeedwebapp" if ="jetspeed.home"> + <copy todir="${build.home}/webapps/jetspeed"> + <fileset dir="${jetspeed.home}"> + <include name="**/*"/> + </fileset> + </copy> + + <!-- copy Cobricks configuration for jetspeed --> + <mkdir dir="${build.home}/webapps/jetspeed/WEB-INF/conf/cobricksconfig"/> + <copy todir="${build.home}/webapps/jetspeed/WEB-INF/conf/cobricksconfig"> + <fileset dir="${conf.home}"> + <include name="localproperties.txt"/> + <include name="log.properties"/> + </fileset> + </copy> + <copy todir="${build.home}/webapps/jetspeed/WEB-INF/conf"> + <fileset dir="${conf.home}"> + <include name="localproperties.txt"/> + <include name="cobricks-portlet.xreg"/> + </fileset> + </copy> + + <!-- copy portlet templates --> + <mkdir dir="${build.home}/webapps/jetspeed/WEB-INF/templates/vm/portlets/html/cobricks"/> + <copy todir="${build.home}/webapps/jetspeed/WEB-INF/templates/vm/portlets/html/cobricks"> + <fileset dir="${basedir}/web.portlets"> + <include name="**/*"/> + </fileset> + </copy> + <!-- make cobricks.jar and add into the lib of jetspeed--> + <mkdir dir="${build.home}/webapps/jetspeed/WEB-INF/lib"/> <jar destfile="${build.home}/webapps/jetspeed/WEB-INF/lib/cobricks.jar"> <fileset dir="${build.home}/webapps/${webappname}/WEB-INF/classes" includes="org/cobricks/core/**" /> @@ -501,8 +560,7 @@ includes="org/cobricks/message/**" /> <fileset dir="${build.home}/webapps/${webappname}/WEB-INF/classes" includes="org/cobricks/portal/**" /> - </jar> - + </jar> </target> |
|
From: Michael K. <ko...@us...> - 2005-08-05 11:30:30
|
Update of /cvsroot/cobricks/cobricks2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5057 Modified Files: build.xml Log Message: Index: build.xml =================================================================== RCS file: /cvsroot/cobricks/cobricks2/build.xml,v retrieving revision 1.43 retrieving revision 1.44 diff -u -d -r1.43 -r1.44 --- build.xml 26 Jul 2005 10:57:03 -0000 1.43 +++ build.xml 5 Aug 2005 11:30:21 -0000 1.44 @@ -715,6 +715,13 @@ </java> </target> +<target name="log" depends="compile"> + <java fork="yes" classname="org.cobricks.util.logbrowser.LogBrowser" + classpathref="exec.classpath"> + <arg line=""/> + </java> +</target> + <target name="migrate" depends="compile"> <java fork="yes" classname="org.cobricks.util.migration.MigrationTool" classpathref="exec.classpath"> |
|
From: thammer <mth...@us...> - 2005-10-17 14:27:31
|
Update of /cvsroot/cobricks/cobricks2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20746 Modified Files: build.xml Log Message: Index: build.xml =================================================================== RCS file: /cvsroot/cobricks/cobricks2/build.xml,v retrieving revision 1.45 retrieving revision 1.46 diff -u -d -r1.45 -r1.46 --- build.xml 11 Aug 2005 13:15:55 -0000 1.45 +++ build.xml 17 Oct 2005 14:27:22 -0000 1.46 @@ -114,6 +114,11 @@ <include name="de/tum/cobricks/**"/> <exclude name="org/cobricks/portal/portlet/**/*.java"/> <exclude name="org/cobricks/item/xmldb/**/*.java"/> + <exclude name="org/cobricks/cwall/meeting/rfid/ReaderConfig.java"/> + <exclude name="org/cobricks/cwall/meeting/rfid/TagReaderImpl.java"/> + <exclude name="org/cobricks/cwall/meeting/rfid/TagSchedulerImpl.java"/> + <exclude name="org/cobricks/cwall/meeting/rfid/rfidAdapter/**"/> + </javac> <!-- Create RMI stubs and skeletons --> @@ -127,6 +132,7 @@ <antcall target="compilexindice"/> <antcall target="compilejetspeed"/> + <antcall target="compilerfid"/> </target> @@ -168,6 +174,26 @@ </javac> </target> +<target name="compilerfid" depends="prepare" + description="Compile Java sources for RFID support" + if="rfid.home"> + <javac srcdir="${src.home}" + destdir="${build.home}/webapps/${webappname}/WEB-INF/classes" + debug="${compile.debug}" + deprecation="${compile.deprecation}" + optimize="${compile.optimize}"> + <classpath> + <path refid="compile.classpath"/> + <fileset dir="${rfid.home}"> + <include name="WEB-INF/lib/OBIDISC4J.jar"/> + </fileset> + </classpath> + <include name="org/cobricks/cwall/meeting/rfid/ReaderConfig.java"/> + <include name="org/cobricks/cwall/meeting/rfid/TagReaderImpl.java"/> + <include name="org/cobricks/cwall/meeting/rfid/TagSchedulerImpl.java"/> + <include name="org/cobricks/cwall/meeting/rfid/rfidAdapter/**"/> + </javac> +</target> <!-- Create Corba skeleton files --> @@ -455,6 +481,9 @@ <!-- copy xindice libraries --> <antcall target="copyxindice"/> + + <!-- copy rfid libraries --> + <antcall target="copyrfid"/> </target> @@ -467,6 +496,14 @@ </copy> </target> +<target name="copyrfid" if="rfid.home"> + <copy todir="${build.home}/webapps/${webappname}/WEB-INF/lib"> + <fileset dir="${rfid.home}"> + <include name="OBIDISC4J.jar"/> + </fileset> + </copy> +</target> + <!-- this target has to be called manually !!! --> <target name="copytojetspeed" if ="jetspeed.home"> <!-- copy Cobricks configuration for jetspeed --> @@ -710,11 +747,17 @@ <target name="cwall" depends="compile"> <java fork="yes" classname="org.cobricks.cwall.CWall" - classpathref="exec.classpath"> + classpathref="exec.classpath"> <arg line="-c conf -e http://localhost:${catalina.serverport}/ -u testuser -p testpw"/> </java> </target> + +<target name="rfidtool" depends="compile" if="rfid.home"> + <java fork="yes" classname="org.cobricks.cwall.meeting.rfid.rfidAdapter.RfidAdapter" classpathref="exec.classpath"/> +</target> + + <target name="log" depends="compile"> <java fork="yes" classname="org.cobricks.util.logbrowser.LogBrowser" classpathref="exec.classpath"> |
|
From: thammer <mth...@us...> - 2005-10-18 23:54:42
|
Update of /cvsroot/cobricks/cobricks2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14130 Modified Files: build.xml Log Message: Index: build.xml =================================================================== RCS file: /cvsroot/cobricks/cobricks2/build.xml,v retrieving revision 1.46 retrieving revision 1.47 diff -u -d -r1.46 -r1.47 --- build.xml 17 Oct 2005 14:27:22 -0000 1.46 +++ build.xml 18 Oct 2005 23:54:30 -0000 1.47 @@ -114,11 +114,11 @@ <include name="de/tum/cobricks/**"/> <exclude name="org/cobricks/portal/portlet/**/*.java"/> <exclude name="org/cobricks/item/xmldb/**/*.java"/> - <exclude name="org/cobricks/cwall/meeting/rfid/ReaderConfig.java"/> - <exclude name="org/cobricks/cwall/meeting/rfid/TagReaderImpl.java"/> - <exclude name="org/cobricks/cwall/meeting/rfid/TagSchedulerImpl.java"/> - <exclude name="org/cobricks/cwall/meeting/rfid/rfidAdapter/**"/> - + <exclude name="org/cobricks/cwall/meeting/rfid/ReaderConfig.java"/> + <exclude name="org/cobricks/cwall/meeting/rfid/TagReaderImpl.java"/> + <exclude name="org/cobricks/cwall/meeting/rfid/TagSchedulerImpl.java"/> + <exclude name="org/cobricks/cwall/meeting/rfid/rfidAdapter/**"/> + </javac> <!-- Create RMI stubs and skeletons --> @@ -175,26 +175,26 @@ </target> <target name="compilerfid" depends="prepare" - description="Compile Java sources for RFID support" - if="rfid.home"> - <javac srcdir="${src.home}" - destdir="${build.home}/webapps/${webappname}/WEB-INF/classes" - debug="${compile.debug}" - deprecation="${compile.deprecation}" - optimize="${compile.optimize}"> - <classpath> - <path refid="compile.classpath"/> - <fileset dir="${rfid.home}"> - <include name="WEB-INF/lib/OBIDISC4J.jar"/> - </fileset> - </classpath> - <include name="org/cobricks/cwall/meeting/rfid/ReaderConfig.java"/> - <include name="org/cobricks/cwall/meeting/rfid/TagReaderImpl.java"/> - <include name="org/cobricks/cwall/meeting/rfid/TagSchedulerImpl.java"/> - <include name="org/cobricks/cwall/meeting/rfid/rfidAdapter/**"/> - </javac> + description="Compile Java sources for RFID support" + if="rfid.home"> + <javac srcdir="${src.home}" + destdir="${build.home}/webapps/${webappname}/WEB-INF/classes" + debug="${compile.debug}" + deprecation="${compile.deprecation}" + optimize="${compile.optimize}"> + <classpath> + <path refid="compile.classpath"/> + <fileset dir="${rfid.home}"> + <include name="WEB-INF/lib/OBIDISC4J.jar"/> + </fileset> + </classpath> + <include name="org/cobricks/cwall/meeting/rfid/ReaderConfig.java"/> + <include name="org/cobricks/cwall/meeting/rfid/TagReaderImpl.java"/> + <include name="org/cobricks/cwall/meeting/rfid/TagSchedulerImpl.java"/> + <include name="org/cobricks/cwall/meeting/rfid/rfidAdapter/**"/> + </javac> </target> - + <!-- Create Corba skeleton files --> <target name="corba" description="Create Corba sekeleton files"> @@ -354,13 +354,13 @@ <target name="test_Windows_OS" depends="check_Windows_OS" if="is_Windows_OS"> - <echo message="Is checker-Windows"/> + <echo message="Is checker-Windows"/> </target> <target name="test_Unix_OS" depends="check_Unix_OS" if="is_Unix_OS"> - <echo message="Is checker-Unix"/> + <echo message="Is checker-Unix"/> </target> @@ -481,7 +481,7 @@ <!-- copy xindice libraries --> <antcall target="copyxindice"/> - + <!-- copy rfid libraries --> <antcall target="copyrfid"/> @@ -503,7 +503,7 @@ </fileset> </copy> </target> - + <!-- this target has to be called manually !!! --> <target name="copytojetspeed" if ="jetspeed.home"> <!-- copy Cobricks configuration for jetspeed --> @@ -532,21 +532,21 @@ <!-- make cobricks.jar and add into the lib of jetspeed--> <mkdir dir="${jetspeed.home}/WEB-INF/lib"/> <jar destfile="${jetspeed.home}/WEB-INF/lib/cobricks.jar"> - <fileset dir="${build.home}/webapps/${webappname}/WEB-INF/classes" - includes="org/cobricks/core/**" /> - <fileset dir="${build.home}/webapps/${webappname}/WEB-INF/classes" - includes="org/cobricks/user/**" /> - <fileset dir="${build.home}/webapps/${webappname}/WEB-INF/classes" - includes="org/cobricks/item/**" /> - <fileset dir="${build.home}/webapps/${webappname}/WEB-INF/classes" - includes="org/cobricks/category/**" /> + <fileset dir="${build.home}/webapps/${webappname}/WEB-INF/classes" + includes="org/cobricks/core/**" /> + <fileset dir="${build.home}/webapps/${webappname}/WEB-INF/classes" + includes="org/cobricks/user/**" /> + <fileset dir="${build.home}/webapps/${webappname}/WEB-INF/classes" + includes="org/cobricks/item/**" /> + <fileset dir="${build.home}/webapps/${webappname}/WEB-INF/classes" + includes="org/cobricks/category/**" /> <fileset dir="${build.home}/webapps/${webappname}/WEB-INF/classes" - includes="org/cobricks/context/**" /> - <fileset dir="${build.home}/webapps/${webappname}/WEB-INF/classes" - includes="org/cobricks/message/**" /> - <fileset dir="${build.home}/webapps/${webappname}/WEB-INF/classes" - includes="org/cobricks/portal/**" /> - </jar> + includes="org/cobricks/context/**" /> + <fileset dir="${build.home}/webapps/${webappname}/WEB-INF/classes" + includes="org/cobricks/message/**" /> + <fileset dir="${build.home}/webapps/${webappname}/WEB-INF/classes" + includes="org/cobricks/portal/**" /> + </jar> </target> <!-- this target has to be called manually !!! --> @@ -583,21 +583,21 @@ <!-- make cobricks.jar and add into the lib of jetspeed--> <mkdir dir="${build.home}/webapps/jetspeed/WEB-INF/lib"/> <jar destfile="${build.home}/webapps/jetspeed/WEB-INF/lib/cobricks.jar"> - <fileset dir="${build.home}/webapps/${webappname}/WEB-INF/classes" - includes="org/cobricks/core/**" /> - <fileset dir="${build.home}/webapps/${webappname}/WEB-INF/classes" - includes="org/cobricks/user/**" /> - <fileset dir="${build.home}/webapps/${webappname}/WEB-INF/classes" - includes="org/cobricks/item/**" /> - <fileset dir="${build.home}/webapps/${webappname}/WEB-INF/classes" - includes="org/cobricks/category/**" /> + <fileset dir="${build.home}/webapps/${webappname}/WEB-INF/classes" + includes="org/cobricks/core/**" /> + <fileset dir="${build.home}/webapps/${webappname}/WEB-INF/classes" + includes="org/cobricks/user/**" /> + <fileset dir="${build.home}/webapps/${webappname}/WEB-INF/classes" + includes="org/cobricks/item/**" /> + <fileset dir="${build.home}/webapps/${webappname}/WEB-INF/classes" + includes="org/cobricks/category/**" /> <fileset dir="${build.home}/webapps/${webappname}/WEB-INF/classes" - includes="org/cobricks/context/**" /> - <fileset dir="${build.home}/webapps/${webappname}/WEB-INF/classes" - includes="org/cobricks/message/**" /> - <fileset dir="${build.home}/webapps/${webappname}/WEB-INF/classes" - includes="org/cobricks/portal/**" /> - </jar> + includes="org/cobricks/context/**" /> + <fileset dir="${build.home}/webapps/${webappname}/WEB-INF/classes" + includes="org/cobricks/message/**" /> + <fileset dir="${build.home}/webapps/${webappname}/WEB-INF/classes" + includes="org/cobricks/portal/**" /> + </jar> </target> @@ -606,11 +606,11 @@ <antcall target="start_Windows_OS" /> <antcall target="start_Unix_OS" /> </target> - + <target name="restart"> <antcall target="stop" /> <antcall target="start" /> -</target> +</target> <target name="s"> <antcall target="start_Windows_OS" /> @@ -747,16 +747,16 @@ <target name="cwall" depends="compile"> <java fork="yes" classname="org.cobricks.cwall.CWall" - classpathref="exec.classpath"> + classpathref="exec.classpath"> <arg line="-c conf -e http://localhost:${catalina.serverport}/ -u testuser -p testpw"/> </java> </target> <target name="rfidtool" depends="compile" if="rfid.home"> - <java fork="yes" classname="org.cobricks.cwall.meeting.rfid.rfidAdapter.RfidAdapter" classpathref="exec.classpath"/> + <java fork="yes" classname="org.cobricks.cwall.meeting.rfid.rfidAdapter.RfidAdapter" classpathref="exec.classpath"/> </target> - + <target name="log" depends="compile"> <java fork="yes" classname="org.cobricks.util.logbrowser.LogBrowser" @@ -764,30 +764,30 @@ <arg line=""/> </java> </target> - + <target name="migrate" depends="compile"> <java fork="yes" classname="org.cobricks.util.migration.MigrationTool" classpathref="exec.classpath"> </java> </target> - + <target name="adminuser" depends="compile"> <java fork="yes" classname="org.cobricks.util.createAdminUser" classpathref="exec.classpath"> <arg line="-c conf"/> </java> </target> - + <target name="updateweb"> - <!-- Create build directories as needed --> - <mkdir dir="${build.home}"/> - <mkdir dir="${build.home}/webapps"/> - <mkdir dir="${build.home}/webapps/ROOT"/> - <!-- Copy static content of this web application --> - <copy todir="${build.home}/webapps/ROOT"> - <fileset dir="${web.home}"/> - </copy> -</target> - + <!-- Create build directories as needed --> + <mkdir dir="${build.home}"/> + <mkdir dir="${build.home}/webapps"/> + <mkdir dir="${build.home}/webapps/ROOT"/> + <!-- Copy static content of this web application --> + <copy todir="${build.home}/webapps/ROOT"> + <fileset dir="${web.home}"/> + </copy> +</target> + </project> |
|
From: Michael K. <ko...@us...> - 2005-11-22 08:34:55
|
Update of /cvsroot/cobricks/cobricks2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv962 Modified Files: build.xml Log Message: Index: build.xml =================================================================== RCS file: /cvsroot/cobricks/cobricks2/build.xml,v retrieving revision 1.48 retrieving revision 1.49 diff -u -d -r1.48 -r1.49 --- build.xml 21 Oct 2005 16:04:05 -0000 1.48 +++ build.xml 22 Nov 2005 08:34:45 -0000 1.49 @@ -21,8 +21,8 @@ <property name="catalina.home" value="/usr/proj/java/jakarta-tomcat-5.0.28"/> <property name="axis.home" value="/usr/proj/java/axis-1.2"/> <property name="dist.home" value="${basedir}/dist"/> -<property name="distbin" value="${basedir}/dist/cobricks2-v0.34"/> -<property name="distsrc" value="${basedir}/dist/cobricks2-v0.34-src"/> +<property name="distbin" value="${basedir}/dist/cobricks2-v0.36"/> +<property name="distsrc" value="${basedir}/dist/cobricks2-v0.36-src"/> <property name="docs.home" value="${basedir}/docs"/> <property name="src.home" value="${basedir}/src"/> <property name="conf.home" value="${basedir}/conf"/> |
|
From: Michael K. <ko...@us...> - 2005-11-22 12:43:36
|
Update of /cvsroot/cobricks/cobricks2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27536 Modified Files: build.xml Log Message: Index: build.xml =================================================================== RCS file: /cvsroot/cobricks/cobricks2/build.xml,v retrieving revision 1.49 retrieving revision 1.50 diff -u -d -r1.49 -r1.50 --- build.xml 22 Nov 2005 08:34:45 -0000 1.49 +++ build.xml 22 Nov 2005 12:43:28 -0000 1.50 @@ -19,6 +19,7 @@ <property name="build.home" value="${basedir}/build"/> <property name="java.home.dir" value="/usr/local/java"/> <property name="catalina.home" value="/usr/proj/java/jakarta-tomcat-5.0.28"/> +<property name="catalina.version" value="5.0"/> <property name="axis.home" value="/usr/proj/java/axis-1.2"/> <property name="dist.home" value="${basedir}/dist"/> <property name="distbin" value="${basedir}/dist/cobricks2-v0.36"/> @@ -220,7 +221,7 @@ </copy> <mkdir dir="${distbin}/tomcat"/> <copy todir="${distbin}/tomcat"> - <fileset dir="${basedir}/tomcat" includes="**/*" /> + <fileset dir="${basedir}/tomcat/${catalina.version}" includes="**/*" /> </copy> <mkdir dir="${distbin}/web"/> <copy todir="${distbin}/web"> @@ -299,7 +300,7 @@ </copy> <mkdir dir="${distsrc}/tomcat"/> <copy todir="${distsrc}/tomcat"> - <fileset dir="${basedir}/tomcat" includes="**/*" /> + <fileset dir="${basedir}/tomcat/${catalina.version}" includes="**/*" /> </copy> <mkdir dir="${distsrc}/web"/> <copy todir="${distsrc}/web"> @@ -435,7 +436,7 @@ <!-- copy tomcat configuration --> <copy todir="${build.home}/conf"> - <fileset dir="${basedir}/tomcat/conf"/> + <fileset dir="${basedir}/tomcat/${catalina.version}/conf"/> </copy> <!-- adapt server.xml (port numbers) --> <replace file="${build.home}/conf/server.xml" token="@@@SERVERPORT@@@" @@ -462,7 +463,7 @@ <!-- copy manager web application and other web apps --> <copy todir="${build.home}/webapps"> - <fileset dir="${basedir}/tomcat/webapps" excludes="**/CVS"/> + <fileset dir="${basedir}/tomcat/${catalina.version}/webapps" excludes="**/CVS"/> </copy> <copy todir="${build.home}/webapps/${webappname}/WEB-INF/lib"> |
|
From: Michael K. <ko...@us...> - 2005-11-29 07:22:41
|
Update of /cvsroot/cobricks/cobricks2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2956 Modified Files: build.xml Log Message: Index: build.xml =================================================================== RCS file: /cvsroot/cobricks/cobricks2/build.xml,v retrieving revision 1.50 retrieving revision 1.51 diff -u -d -r1.50 -r1.51 --- build.xml 22 Nov 2005 12:43:28 -0000 1.50 +++ build.xml 29 Nov 2005 07:22:34 -0000 1.51 @@ -19,6 +19,7 @@ <property name="build.home" value="${basedir}/build"/> <property name="java.home.dir" value="/usr/local/java"/> <property name="catalina.home" value="/usr/proj/java/jakarta-tomcat-5.0.28"/> +<!-- we currently support tomcat version 5.0 and 5.5 --> <property name="catalina.version" value="5.0"/> <property name="axis.home" value="/usr/proj/java/axis-1.2"/> <property name="dist.home" value="${basedir}/dist"/> |
|
From: lochmann <loc...@us...> - 2006-02-26 15:51:24
|
Update of /cvsroot/cobricks/cobricks2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3768 Modified Files: build.xml Log Message: Social Networks (Floyd-Warshall-Algorithm) Index: build.xml =================================================================== RCS file: /cvsroot/cobricks/cobricks2/build.xml,v retrieving revision 1.53 retrieving revision 1.54 diff -u -d -r1.53 -r1.54 --- build.xml 16 Feb 2006 15:18:18 -0000 1.53 +++ build.xml 26 Feb 2006 15:51:14 -0000 1.54 @@ -17,11 +17,11 @@ <property name="app.path" value=""/> <property name="app.version" value="0.9"/> <property name="build.home" value="${basedir}/build"/> -<property name="java.home.dir" value="/usr/local/java"/> -<property name="catalina.home" value="/usr/proj/java/jakarta-tomcat-5.0.28"/> +<property name="java.home.dir" value="C:\Sun\AppServer\jdk"/> +<property name="catalina.home" value="C:\Programme\tomcat5.0.28\jakarta-tomcat-5.0.28"/> <!-- we currently support tomcat version 5.0 and 5.5 --> <property name="catalina.version" value="5.0"/> -<property name="axis.home" value="/usr/proj/java/axis-1.3"/> +<property name="axis.home" value="C:\Programme\axis13\axis-1_3"/> <property name="dist.home" value="${basedir}/dist"/> <property name="distbin" value="${basedir}/dist/cobricks2-v0.36"/> <property name="distsrc" value="${basedir}/dist/cobricks2-v0.36-src"/> |
|
From: Michael K. <ko...@us...> - 2006-11-03 07:22:58
|
Update of /cvsroot/cobricks/cobricks2 In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv11864 Modified Files: build.xml Log Message: Index: build.xml =================================================================== RCS file: /cvsroot/cobricks/cobricks2/build.xml,v retrieving revision 1.56 retrieving revision 1.57 diff -u -d -r1.56 -r1.57 --- build.xml 11 Jul 2006 10:27:02 -0000 1.56 +++ build.xml 3 Nov 2006 07:22:55 -0000 1.57 @@ -131,31 +131,11 @@ <fileset dir="${src.home}" excludes="**/*.java"/> </copy> - <antcall target="compilexindice"/> <antcall target="compilejetspeed"/> <antcall target="compilerfid"/> </target> -<target name="compilexindice" depends="prepare" - description="Compile Java sources for Xindice wrapper" - if="xindice.home"> - <javac srcdir="${src.home}" - destdir="${build.home}/webapps/${webappname}/WEB-INF/classes" - debug="${compile.debug}" - deprecation="${compile.deprecation}" - optimize="${compile.optimize}"> - <classpath> - <path refid="compile.classpath"/> - <fileset dir="${xindice.home}"> - <include name="lib/xml*.jar"/> - <exclude name="lib/xmldb-api-sdk*.jar"/> - </fileset> - </classpath> - <include name="org/cobricks/item/xmldb/**/*.java"/> - </javac> -</target> - <target name="compilejetspeed" depends="prepare" description="Compile Java sources for Jetspeed portlet support" if="jetspeed.home"> @@ -247,6 +227,8 @@ <fileset dir="${build.home}/webapps/${webappname}/WEB-INF/classes" includes="org/cobricks/core/**" /> <fileset dir="${build.home}/webapps/${webappname}/WEB-INF/classes" + includes="org/cobricks/util/**" /> + <fileset dir="${build.home}/webapps/${webappname}/WEB-INF/classes" includes="org/cobricks/user/**" /> <fileset dir="${build.home}/webapps/${webappname}/WEB-INF/classes" includes="org/cobricks/item/**" /> @@ -258,16 +240,14 @@ includes="org/cobricks/message/**" /> <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/${webappname}/WEB-INF/classes" includes="org/cobricks/voting/**" /> - </jar> - - <jar jarfile="${distbin}/web/WEB-INF/lib/cobricksCourse.jar"> <fileset dir="${build.home}/webapps/${webappname}/WEB-INF/classes" includes="org/cobricks/course/**" /> + <fileset dir="${build.home}/webapps/${webappname}/WEB-INF/classes" + includes="org/cobricks/agent/**" /> + <fileset dir="${build.home}/webapps/${webappname}/WEB-INF/classes" + includes="org/cobricks/discussion/**" /> </jar> <jar jarfile="${distbin}/web/WEB-INF/lib/cobricksCwall.jar"> @@ -485,23 +465,11 @@ </fileset> </copy> - <!-- copy xindice libraries --> - <antcall target="copyxindice"/> - <!-- copy rfid libraries --> <antcall target="copyrfid"/> </target> -<target name="copyxindice" if="xindice.home"> - <copy todir="${build.home}/webapps/${webappname}/WEB-INF/lib"> - <fileset dir="${xindice.home}/lib"> - <include name="xml*.jar"/> - <exclude name="xmldb-api-sdk*"/> - </fileset> - </copy> -</target> - <target name="copyrfid" if="rfid.home"> <copy todir="${build.home}/webapps/${webappname}/WEB-INF/lib"> <fileset dir="${rfid.home}"> @@ -784,6 +752,20 @@ </java> </target> +<target name="doit" depends="compile"> + <java fork="yes" classname="org.cobricks.util.doIt" + classpathref="exec.classpath"> + <arg line="-c conf"/> + </java> +</target> + +<target name="addrole" depends="compile"> + <java fork="yes" classname="org.cobricks.util.assignUserRole" + classpathref="exec.classpath"> + <arg line="-c conf -u kochm -r admin"/> + </java> +</target> + <target name="updateweb"> <!-- Create build directories as needed --> <mkdir dir="${build.home}"/> |
|
From: Michael K. <ko...@us...> - 2006-12-07 06:06:01
|
Update of /cvsroot/cobricks/cobricks2 In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv30151 Modified Files: build.xml Log Message: Index: build.xml =================================================================== RCS file: /cvsroot/cobricks/cobricks2/build.xml,v retrieving revision 1.58 retrieving revision 1.59 diff -u -d -r1.58 -r1.59 --- build.xml 24 Nov 2006 08:05:56 -0000 1.58 +++ build.xml 7 Dec 2006 06:05:58 -0000 1.59 @@ -280,6 +280,7 @@ <include name="portal/**" /> <include name="course/**" /> <include name="ADMIN/**" /> + <include name="images/**" /> <include name="notfound.html.de" /> <include name="noaccess.html.de" /> <include name="noaccess-expired.html.de" /> |
|
From: Michael K. <ko...@us...> - 2006-12-07 11:54:47
|
Update of /cvsroot/cobricks/cobricks2 In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv6800 Modified Files: build.xml Log Message: Index: build.xml =================================================================== RCS file: /cvsroot/cobricks/cobricks2/build.xml,v retrieving revision 1.59 retrieving revision 1.60 diff -u -d -r1.59 -r1.60 --- build.xml 7 Dec 2006 06:05:58 -0000 1.59 +++ build.xml 7 Dec 2006 11:54:44 -0000 1.60 @@ -21,15 +21,18 @@ <property name="catalina.home" value=""/> <property name="catalina.version" value="5.5"/> <property name="axis.home" value=""/> + <property name="dist.home" value="${basedir}/dist"/> -<property name="distbin" value="${basedir}/dist/cobricks2-v0.37"/> -<property name="distsrc" value="${basedir}/dist/cobricks2-v0.37-src"/> +<property name="distbin" value="${basedir}/dist/cobricks2-v0.90"/> +<property name="distsrc" value="${basedir}/dist/cobricks2-v0.90-src"/> <property name="docs.home" value="${basedir}/docs"/> <property name="src.home" value="${basedir}/src"/> -<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="web.home" value="${basedir}/web"/> + +<property name="weblib.home" value="${web.home}/WEB-INF/lib"/> +<property name="conf.home" value="${web.home}/WEB-INF/conf"/> <property name="catalina.serverport" value="8005"/> <property name="catalina.httpport" value="8080"/> @@ -295,6 +298,12 @@ <include name="navigation.html.en" /> </jar> + <!-- Create JAR file for ADMIN webspace only --> + <jar destfile="${dist.home}/webappADMIN.jar" + basedir="${build.home}/webapps/${webappname}"> + <include name="ADMIN/**" /> + </jar> + </target> <target name="distsrc" depends="" @@ -784,14 +793,14 @@ <target name="doit" depends="compile"> <java fork="yes" classname="org.cobricks.util.doIt" classpathref="exec.classpath"> - <arg line="-c conf"/> + <arg line="-c ${web.home}/WEB-INF/conf"/> </java> </target> <target name="addrole" depends="compile"> <java fork="yes" classname="org.cobricks.util.assignUserRole" classpathref="exec.classpath"> - <arg line="-c conf -u kochm -r admin"/> + <arg line="-c ${web.home}/WEB-INF/conf -u kochm -r admin"/> </java> </target> |