[Babeldoc-devel] babeldoc/modules/web build.xml,1.17,1.18

[Santi B. <san...@us...>]

Update of /cvsroot/babeldoc/babeldoc/modules/web
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv18033/modules/web

Modified Files:
	build.xml 
Log Message:
Minor update

Index: build.xml
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/web/build.xml,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** build.xml	4 Aug 2007 11:37:20 -0000	1.17
--- build.xml	9 Dec 2007 23:35:46 -0000	1.18
***************
*** 1,162 ****
  <project name="web" basedir="." default="setup">
!   <property file="build.properties"/>
!   <property file="${base_dir}/local.properties"/>
  
!   <property name="module_name" value="babeldoc_${Module}"/>
!   <property name="module_path" value="${build}"/>
  
!   <target
!     name="setup"/>
  
!   <target
!     name="clean">
!     <echo message="Cleaning ${Module}"/>
!     <delete dir="${build}"/>
!   </target>
  
!   <target
!     name="build">
!     <echo message="Building ${Module}"/>
!     <mkdir dir="${module_path}"/>
!     <javac
!       destdir="${module_path}"
!       srcdir="./src"
!       deprecation="${compile.deprecation}"
!       debug="${compile.debug}">
!       <classpath>
!         <fileset dir="lib">
!           <include name="*.jar"/>
!         </fileset>
!         <fileset dir="${base_dir}/build/lib">
!           <include name="*.jar"/>
!         </fileset>
!         <pathelement location="${base_dir}/support/ant/lib/junit.jar"/>
!       </classpath>
!     </javac>
  
!     <!-- Copy the configuration files to build/core/... -->
!     <mkdir dir="${module_path}/${Module}"/>
!     <copy toDir="${module_path}/${Module}">
!       <fileset dir="config">
!         <include name="*/**"/>
!       </fileset>
!     </copy>
  
!     <!-- copy over the services file -->
!     <mkdir dir="${module_path}/META-INF/services"/>
!     <copy toDir="${module_path}/META-INF/services">
!       <fileset dir="services"/>
!     </copy>
  
!     <!-- Build the jar and place in the build/lib directory -->
!     <jar
!       jarfile="${base_dir}/build/lib/${Jarfile}"
!       basedir="${module_path}">
!       <manifest>
!         <attribute name="Built-By" value="${user.name}"/>
!         <section name="Babeldoc">
!           <attribute name="Module" value="${Module}"/>
!           <attribute name="Depends" value="${Depends}"/>
!           <attribute name="ModuleClass" value="${ModuleClass}"/>
!         </section>
!       </manifest>
!     </jar>
  
!     <!--
      Copy the library files and the examples to the build directory
      -->
!     <copy toDir="${base_dir}/build">
!       <fileset dir=".">
!         <include name="examples/**"/>
!         <include name="lib/**"/>
!       </fileset>
!     </copy>
  
!     <!--
      Make the console servlet
      -->
!     <mkdir dir="build/console/"/>
!     <copy toDir="build/console/">
!       <fileset dir="servlet/console"/>
!       <fileset dir="docs">
!         <include name="**/*.vm"/>
!         <include name="**/*.png"/>
!         <include name="**/*.html"/>
!         <include name="**/*.css"/>
!       </fileset>
!     </copy>
!     <copy toDir="build/console/WEB-INF/classes">
!       <fileset dir="build">
!         <include name="com/**"/>
!       </fileset>
!     </copy>
!     <copy toDir="build/console/WEB-INF/lib" file="${base_dir}/build/lib/velocity.jar"/>
!     <jar
!       jarfile="${base_dir}/build/lib/${web_console_warfile}"
!       basedir="build/console"/>
  
!     <!--
      Make the http feed servlet
      -->
!     <mkdir dir="build/httpfeed/"/>
!     <copy toDir="build/httpfeed/">
!       <fileset dir="servlet/httpfeed"/>
!     </copy>
!     <copy toDir="build/httpfeed/WEB-INF">
!       <fileset dir="build">
!         <include name="com/**"/>
!       </fileset>
!     </copy>
!     <jar
!       jarfile="${base_dir}/build/lib/${web_httpfeed_warfile}"
!       basedir="build/httpfeed"/>
  
!   </target>
  
!   <target
!     name="deploy">
!     <echo message="Deploying ${Module}"/>
!     <echo message="Copying library files to ${web_server_libs}"/>
!     <copy toDir="${web_server_libs}">
!       <fileset dir="${base_dir}/build/lib">
!         <include name="*.jar"/>
!         <include name="*.zip"/>
!       </fileset>
!     </copy>
  
!     <echo message="Copying war files to ${web_server_libs}"/>
!     <copy toDir="${web_server_webapps}">
!       <fileset dir="${base_dir}/build/lib">
!         <include name="*.war"/>
!       </fileset>
!     </copy>
  
!     <echo message="Copying over the babeldoc special sauce"/>
!     <filter token="web_server_home" value="${web_server_home}"/>
!     <filter token="web_server_libs" value="${web_server_libs}"/>
!     <filter token="web_server_opts" value="${web_server_opts}"/>
!     <filter token="web_server_cmd" value="${web_server_cmd}"/>
!     <filter token="babeldoc_home" value="${base_dir}/build"/>
!     <filter token="web_server_startup" value="${web_server_startup}"/>
!     <copy toDir="${web_server_bin}" filtering="true">
!       <fileset dir="bin">
!         <include name="babeldoc_webrun*"/>
!       </fileset>
!     </copy>
!     <chmod file="${web_server_bin}/babeldoc_webrun" perm="ugo+rx"/>
  
!     <echo message="Your webserver should be ready to go.  Please run the script file"/>
!     <echo message="babeldoc_webrun with whatever commandline arguments your server"/>
!     <echo message="expects on its command line (catalina wants run).  Please ensure"/>
!     <echo message="that your BABELDOC_USER environment variable is correctly set."/>
!   </target>
  
!   <target
!     name="test">
!     <echo message="Testing ${Module}"/>
!   </target>
! 	
!   <target name="format">
!     <!--
      <echo message="Formatting ${Module}"/>
      <jalopy fileformat="${jalopy.fileformat}"
--- 1,149 ----
  <project name="web" basedir="." default="setup">
! 	<property name="base_dir" value="../.." />
! 	<property file="${base_dir}/build.properties"/>
! 	<property file="build.properties" />
! 	<property file="${base_dir}/local.properties" />
  
! 	<property name="module_name" value="babeldoc_${Module}" />
! 	<property name="module_path" value="${build}" />
  
! 	<target name="setup" />
  
! 	<target name="clean">
! 		<echo message="Cleaning ${Module}" />
! 		<delete dir="${build}" />
! 	</target>
  
! 	<target name="build">
! 		<echo message="Building ${Module}" />
! 		<mkdir dir="${module_path}" />
! 		<javac destdir="${module_path}" srcdir="./src" deprecation="${compile.deprecation}" debug="${compile.debug}">
! 			<classpath>
! 				<fileset dir="lib">
! 					<include name="*.jar" />
! 				</fileset>
! 				<fileset dir="${base_dir}/build/lib">
! 					<include name="*.jar" />
! 				</fileset>
! 				<pathelement location="${base_dir}/support/ant/lib/junit.jar" />
! 			</classpath>
! 		</javac>
  
! 		<!-- Copy the configuration files to build/core/... -->
! 		<mkdir dir="${module_path}/${Module}" />
! 		<copy toDir="${module_path}/${Module}">
! 			<fileset dir="config">
! 				<include name="*/**" />
! 			</fileset>
! 		</copy>
  
! 		<!-- copy over the services file -->
! 		<mkdir dir="${module_path}/META-INF/services" />
! 		<copy toDir="${module_path}/META-INF/services">
! 			<fileset dir="services" />
! 		</copy>
  
! 		<!-- Build the jar and place in the build/lib directory -->
! 		<jar jarfile="${base_dir}/build/lib/${Jarfile}" basedir="${module_path}">
! 			<manifest>
! 				<attribute name="Built-By" value="${user.name}" />
! 				<section name="Babeldoc">
! 					<attribute name="Module" value="${Module}" />
! 					<attribute name="Depends" value="${Depends}" />
! 					<attribute name="ModuleClass" value="${ModuleClass}" />
! 				</section>
! 			</manifest>
! 		</jar>
  
! 		<!--
      Copy the library files and the examples to the build directory
      -->
! 		<copy toDir="${base_dir}/build">
! 			<fileset dir=".">
! 				<include name="examples/**" />
! 				<include name="lib/**" />
! 			</fileset>
! 		</copy>
  
! 		<!--
      Make the console servlet
      -->
! 		<mkdir dir="build/console/" />
! 		<copy toDir="build/console/">
! 			<fileset dir="servlet/console" />
! 			<fileset dir="docs">
! 				<include name="**/*.vm" />
! 				<include name="**/*.png" />
! 				<include name="**/*.html" />
! 				<include name="**/*.css" />
! 			</fileset>
! 		</copy>
! 		<copy toDir="build/console/WEB-INF/classes">
! 			<fileset dir="build">
! 				<include name="com/**" />
! 			</fileset>
! 		</copy>
! 		<copy toDir="build/console/WEB-INF/lib" file="${base_dir}/build/lib/velocity.jar" />
! 		<jar jarfile="${base_dir}/build/lib/${web_console_warfile}" basedir="build/console" />
  
! 		<!--
      Make the http feed servlet
      -->
! 		<mkdir dir="build/httpfeed/" />
! 		<copy toDir="build/httpfeed/">
! 			<fileset dir="servlet/httpfeed" />
! 		</copy>
! 		<copy toDir="build/httpfeed/WEB-INF">
! 			<fileset dir="build">
! 				<include name="com/**" />
! 			</fileset>
! 		</copy>
! 		<jar jarfile="${base_dir}/build/lib/${web_httpfeed_warfile}" basedir="build/httpfeed" />
  
! 	</target>
  
! 	<target name="deploy" depends="build">
! 		<echo message="Deploying ${Module}" />
! 		<echo message="Copying library files to ${web_server_libs}" />
! 		<copy toDir="${web_server_libs}">
! 			<fileset dir="${base_dir}/build/lib">
! 				<include name="*.jar" />
! 				<include name="*.zip" />
! 			</fileset>
! 		</copy>
  
! 		<echo message="Copying war files to ${web_server_libs}" />
! 		<copy toDir="${web_server_webapps}">
! 			<fileset dir="${base_dir}/build/lib">
! 				<include name="*.war" />
! 			</fileset>
! 		</copy>
  
! 		<echo message="Copying over the babeldoc special sauce" />
! 		<filter token="web_server_home" value="${web_server_home}" />
! 		<filter token="web_server_libs" value="${web_server_libs}" />
! 		<filter token="web_server_opts" value="${web_server_opts}" />
! 		<filter token="web_server_cmd" value="${web_server_cmd}" />
! 		<filter token="babeldoc_home" value="${base_dir}/build" />
! 		<filter token="web_server_startup" value="${web_server_startup}" />
! 		<copy toDir="${web_server_bin}" filtering="true">
! 			<fileset dir="bin">
! 				<include name="babeldoc_webrun*" />
! 			</fileset>
! 		</copy>
! 		<chmod file="${web_server_bin}/babeldoc_webrun" perm="ugo+rx" />
  
! 		<echo message="Your webserver should be ready to go.  Please run the script file" />
! 		<echo message="babeldoc_webrun with whatever commandline arguments your server" />
! 		<echo message="expects on its command line (catalina wants run).  Please ensure" />
! 		<echo message="that your BABELDOC_USER environment variable is correctly set." />
! 	</target>
  
! 	<target name="test">
! 		<echo message="Testing ${Module}" />
! 	</target>
! 
! 	<target name="format">
! 		<!--
      <echo message="Formatting ${Module}"/>
      <jalopy fileformat="${jalopy.fileformat}"
***************
*** 170,173 ****
      </jalopy>
      -->
!   </target>
  </project>
--- 157,160 ----
      </jalopy>
      -->
! 	</target>
  </project>