[Cobricks-cvscommit] cobricks2 build.xml

[Michael K. <ko...@us...>]

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}"/>