|
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> |