luetzkendorf 2005/01/28 09:05:40
Modified: . build.xml
Log:
cosmetics (please no tabs)
Revision Changes Path
1.260 +41 -40 jakarta-slide/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/build.xml,v
retrieving revision 1.259
retrieving revision 1.260
diff -u -r1.259 -r1.260
--- build.xml 23 Jan 2005 14:33:24 -0000 1.259
+++ build.xml 28 Jan 2005 17:05:40 -0000 1.260
@@ -197,8 +197,9 @@
<!-- ===================================================================
-->
<!-- Detect
-->
<!-- ===================================================================
-->
- <target name="detect" depends="detect.display,detect.fail"
description="Display configuration and conditional compilation flags">
- </target>
+ <target name="detect" depends="detect.display,detect.fail"
+ description="Display configuration and conditional compilation flags">
+ </target>
<target name="detect.display">
<available property="jaxp.present"
classname="javax.xml.transform.TransformerFactory" classpath="${jaxp.jar}"/>
<available property="dom.present" classname="org.w3c.dom.Document"
classpath="${xmlapi.jar}"/>
@@ -351,34 +352,34 @@
<!-- Generates XML descriptors for OJB from sources and file templates
-->
<!-- ==================================================================
-->
<target name="ojb-xml"
- description="Generate XML descriptors for OJB from sources and
templates">
+ description="Generate XML descriptors for OJB from sources and
templates">
<taskdef name="ojbdoclet"
classname="xdoclet.modules.ojb.OjbDocletTask"
classpathref="ojbdoclet.classpath"/>
<copy todir="${slide.build}/ojb">
- <fileset dir="src/conf/ojb">
- <include name="ojbcore-schema.xml"/>
- <include name="repository_database.xml"/>
- <include name="repository_internal.xml"/>
- <include name="database_3_0_1.dtd"/>
- </fileset>
- <filterset>
- <filter token="DATABASE_DEFAULT" value="slide"/>
- <filter token="PREFIX" value="${table.prefix}"/>
- <filter token="DBMS_NAME" value="${ojb.platform}"/>
- <filter token="JDBC_LEVEL" value="${ojb.jdbc-level}"/>
- <filter token="DRIVER_NAME" value="${ojb.driver}"/>
- <filter token="URL_PROTOCOL" value="${ojb.protocol}"/>
- <filter token="URL_SUBPROTOCOL" value="${ojb.subprotocol}"/>
- <filter token="URL_DBALIAS" value="${ojb.dbalias}"/>
- <filter token="USER_NAME" value="${ojb.username}"/>
- <filter token="USER_PASSWD" value="${ojb.password}"/>
- </filterset>
- </copy>
+ <fileset dir="src/conf/ojb">
+ <include name="ojbcore-schema.xml"/>
+ <include name="repository_database.xml"/>
+ <include name="repository_internal.xml"/>
+ <include name="database_3_0_1.dtd"/>
+ </fileset>
+ <filterset>
+ <filter token="DATABASE_DEFAULT" value="slide"/>
+ <filter token="PREFIX" value="${table.prefix}"/>
+ <filter token="DBMS_NAME" value="${ojb.platform}"/>
+ <filter token="JDBC_LEVEL" value="${ojb.jdbc-level}"/>
+ <filter token="DRIVER_NAME" value="${ojb.driver}"/>
+ <filter token="URL_PROTOCOL" value="${ojb.protocol}"/>
+ <filter token="URL_SUBPROTOCOL" value="${ojb.subprotocol}"/>
+ <filter token="URL_DBALIAS" value="${ojb.dbalias}"/>
+ <filter token="USER_NAME" value="${ojb.username}"/>
+ <filter token="USER_PASSWD" value="${ojb.password}"/>
+ </filterset>
+ </copy>
<ojbdoclet destdir="${slide.build}/ojb">
<fileset dir="src/stores">
- <include name="**/*Peer.java"/>
- </fileset>
+ <include name="**/*Peer.java"/>
+ </fileset>
<ojbrepository destinationFile="repository_user.xml"/>
<torqueschema databaseName="slide"
dtdUrl="database_3_0_1.dtd"
@@ -390,21 +391,21 @@
<!-- ===================================================================
-->
<target name="ojb-sql" depends="ojb-xml,ojb-tools">
<taskdef name="sqlgen"
- classname="org.apache.slide.store.ojb.tools.DDLGeneratorTask"
- classpathref="ojbsql.classpath"/>
- <sqlgen
schema="${slide.build}/ojb/ojbcore-schema.xml,${slide.build}/ojb/slide-schema.xml"
- targetDatabases="${ojb.databases}"
-
outputPattern="${slide.build}/ojb/slide-schema-%{database}.sql"/>
+
classname="org.apache.slide.store.ojb.tools.DDLGeneratorTask"
+ classpathref="ojbsql.classpath"/>
+ <sqlgen
schema="${slide.build}/ojb/ojbcore-schema.xml,${slide.build}/ojb/slide-schema.xml"
+ targetDatabases="${ojb.databases}"
+
outputPattern="${slide.build}/ojb/slide-schema-%{database}.sql"/>
</target>
<target name="ojb-tools">
<javac srcdir="src/stores"
- destdir="${slide.build}/classes"
- debug="${compile.debug}"
- deprecation="${compile.deprecation}"
- optimize="${compile.optimize}"
- includes="**/ojb/tools/*.java"
- target="${compile.target}"
- classpathref="ojbsql.classpath"/>
+ destdir="${slide.build}/classes"
+ debug="${compile.debug}"
+ deprecation="${compile.deprecation}"
+ optimize="${compile.optimize}"
+ includes="**/ojb/tools/*.java"
+ target="${compile.target}"
+ classpathref="ojbsql.classpath"/>
</target>
<!-- ===================================================================
-->
<!-- Build documentation
-->
@@ -456,7 +457,7 @@
<delete dir="${slide.build}"/>
<delete dir="${slide.dist}"/>
<!-- Clean subprojects -->
- <ant antfile="build.xml" dir="projector" target="clean"/>
+ <ant antfile="build.xml" dir="projector" target="clean"/>
</target>
<!-- ===================================================================
-->
<!-- Build the Slide JavaDoc
-->
@@ -627,7 +628,7 @@
<!-- patch startup -->
<patch originalfile="${catalina.dist}/bin/startup.bat"
patchfile="src/conf/catalina/startup-jaas.bat.patch"/>
<patch originalfile="${catalina.dist}/bin/catalina.sh"
patchfile="src/conf/catalina/catalina-jaas.sh.patch"/>
- <ant antfile="build.xml" dir="projector" target="tomcat-install"/>
+ <ant antfile="build.xml" dir="projector"
target="tomcat-install"/>
</target>
<!-- ===================================================================
-->
<!-- Build Catalina related components
-->
@@ -770,8 +771,8 @@
</copy>
<copy todir="${testsuite.dist}">
<fileset dir="${slide.dist}">
- <include name="LICENSE"/>
- <include name="NOTICE"/>
+ <include name="LICENSE"/>
+ <include name="NOTICE"/>
</fileset>
</copy>
</target>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
