[Cobricks-cvscommit] cobricks2 build.xml

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

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>