[Cobricks-cvscommit] cobricks2 build.xml

[wus <wu...@us...>]

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>