luetzkendorf    2005/01/10 10:24:54

  Modified:    .        build.xml
  Log:
  cosmetics (indention)
  
  Revision  Changes    Path
  1.254     +38 -38    jakarta-slide/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/build.xml,v
  retrieving revision 1.253
  retrieving revision 1.254
  diff -u -r1.253 -r1.254
  --- build.xml 5 Jan 2005 19:31:02 -0000       1.253
  +++ build.xml 10 Jan 2005 18:24:53 -0000      1.254
  @@ -143,7 +143,7 @@
           <pathelement location="${commons-transaction.jar}"/>
           <pathelement location="${commons-codec.jar}"/>
           <pathelement location="${commons-httpclient.jar}"/>
  -     <pathelement location="${jakarta-slide-webdavlib.jar}"/>
  +        <pathelement location="${jakarta-slide-webdavlib.jar}"/>
       </path>
       <path id="stores.classpath">
           <pathelement location="${xmlapi.jar}"/>
  @@ -187,16 +187,16 @@
           <pathelement location="${commons-collections.jar}"/>
           <pathelement location="${commons-logging.jar}"/>
           <pathelement location="${xdoclet.jar}"/>
  -     <pathelement location="${xjavadoc.jar}"/>
  -     <pathelement location="${xdoclet-ojb-module.jar}"/>
  +        <pathelement location="${xjavadoc.jar}"/>
  +        <pathelement location="${xdoclet-ojb-module.jar}"/>
       </path>
       <path id="torque.classpath">
           <pathelement location="${commons-collections.jar}"/>
           <pathelement location="${commons-logging.jar}"/>
           <pathelement location="${commons-lang.jar}"/>
           <pathelement location="${log4j.jar}"/>
  -     <pathelement location="${velocity.jar}"/>
  -     <pathelement location="${torque.jar}"/>
  +        <pathelement location="${velocity.jar}"/>
  +        <pathelement location="${torque.jar}"/>
       </path>
       <!-- =================================================================== 
-->
       <!-- Detect                                                              
-->
  @@ -527,7 +527,7 @@
       <!-- =================================================================== 
-->
       <!-- Build a Slide distribution                                          
-->
       <!-- =================================================================== 
-->
  -    <target name="dist" 
depends="main,ojbsql,prepare-dist,doc,javadoc,dist-xml,log4j-logger,jdk14-logging"
 description="Make distribution of core components">
  +    <target name="dist" 
depends="main,objsql,prepare-dist,doc,javadoc,dist-xml,log4j-logger,jdk14-logging"
 description="Make distribution of core components">
           <copy file="src/etc/MANIFEST.MF" 
tofile="${slide.build}/classes/MANIFEST.MF" overwrite="yes" />
           <replace file="${slide.build}/classes/MANIFEST.MF" 
token="$$VERSION$$" value="${version}"/>
           <echo message="Building Slide main JAR file"/>
  @@ -561,21 +561,21 @@
           <copy todir="${slide.dist}/slide/lib">
             <fileset dir="${slide.build}/lib">
               <exclude name="servlet*.jar"/>
  -         <exclude name="xdoclet*.jar"/>
  -         <exclude name="xjavadoc*.jar"/>
  -         <exclude name="ant-contrib*.jar"/>
  -         <exclude name="torque*.jar"/>
  -         <exclude name="velocity*.jar"/>
  +            <exclude name="xdoclet*.jar"/>
  +            <exclude name="xjavadoc*.jar"/>
  +            <exclude name="ant-contrib*.jar"/>
  +            <exclude name="torque*.jar"/>
  +            <exclude name="velocity*.jar"/>
             </fileset>
           </copy>
  -     <copy todir="${slide.dist}/slide/ojb-schema">
  -       <fileset dir="${slide.build}/ojb" includes="slide-schema-*.sql"/>
  -       <mapper type="glob" from="slide-schema-*" to="*"/>
  -     </copy>
  -     <copy todir="${slide.dist}/slide/conf">
  -       <fileset dir="src/conf/ojb" includes="repository.*,*.properties"/>
  -       <fileset dir="${slide.build}/ojb" includes="repository_*.xml"/>
  -     </copy>
  +        <copy todir="${slide.dist}/slide/ojb-schema">
  +          <fileset dir="${slide.build}/ojb" includes="slide-schema-*.sql"/>
  +          <mapper type="glob" from="slide-schema-*" to="*"/>
  +        </copy>
  +        <copy todir="${slide.dist}/slide/conf">
  +          <fileset dir="src/conf/ojb" includes="repository.*,*.properties"/>
  +          <fileset dir="${slide.build}/ojb" includes="repository_*.xml"/>
  +        </copy>
       </target>
       <target name="dist-xml" unless="jvm14.present">
           <copy todir="${slide.dist}/slide/lib" file="${jaxp.jar}"/>
  @@ -599,17 +599,17 @@
                   <include name="**/Domain.xml"/>
               </fileset>
               <lib dir="${slide.dist}/slide/lib"/>
  -         <classes dir="src/conf/ojb">
  -             <include name="*.properties"/>
  -             <include name="repository.*"/>
  -         </classes>
  -         <classes dir="${slide.build}/ojb">
  -             <include name="repository_*.xml"/>
  -         </classes>
  +            <classes dir="src/conf/ojb">
  +                <include name="*.properties"/>
  +                <include name="repository.*"/>
  +            </classes>
  +            <classes dir="${slide.build}/ojb">
  +                <include name="repository_*.xml"/>
  +            </classes>
           </war>
           <war warfile="${webapp.dist}/slide-doc.war" 
webxml="src/conf/webapp/webdoc.xml">
               <fileset dir="${slide.dist}/doc">
  -      </fileset>
  +            </fileset>
           </war>
       </target>
       <!-- =================================================================== 
-->
  @@ -636,14 +636,14 @@
                   <include name="${release-notes}"/>
               </fileset>
               <zipfileset dir="src/conf/schema" prefix="db-schema" />
  -         <classes dir="src/conf/ojb">
  -             <include name="*.properties"/>
  -             <include name="repository.*"/>
  -         </classes>
  -         <classes dir="${slide.build}/ojb">
  -             <include name="repository_*.xml"/>
  -         </classes>
  -         <zipfileset dir="${slide.dist}/slide/ojb-schema" 
prefix="ojb-schema"/>
  +            <classes dir="src/conf/ojb">
  +                <include name="*.properties"/>
  +                <include name="repository.*"/>
  +            </classes>
  +            <classes dir="${slide.build}/ojb">
  +                <include name="repository_*.xml"/>
  +            </classes>
  +            <zipfileset dir="${slide.dist}/slide/ojb-schema" 
prefix="ojb-schema"/>
           </war>
           <war warfile="${webapp.dist}/slide-doc.war" 
webxml="src/conf/webapp/webdoc.xml">
               <fileset dir="${slide.dist}/doc">
  @@ -751,7 +751,7 @@
               <fileset dir="src/conf/schema"/>
           </copy>
   
  -             <!-- also copy general information into Slide directory -->
  +        <!-- also copy general information into Slide directory -->
           <copy todir="${catalina.dist}/slide" overwrite="yes">
               <fileset dir=".">
                   <include name="README"/>
  @@ -789,10 +789,10 @@
           <!-- install wrapper in server lib -->
           <copy todir="${catalina.dist}/server/lib">
               <fileset dir="${slide.dist}/slide/wrappers"/>
  -             </copy>
  +        </copy>
   
           <copy file="${slide.dist}/slide/webapp/slide-doc.war" 
tofile="${catalina.dist}/webapps/slide-doc.war"/>
  -             <ant antfile="build.xml" dir="projector" 
target="tomcat-install"/>
  +        <ant antfile="build.xml" dir="projector" target="tomcat-install"/>
       </target>
       <!-- =================================================================== 
-->
       <!-- Testsuite build, distribution & package                             
-->
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to