Changeset 1637 for branches

Timestamp:

06/13/07 20:10:59 (18 months ago)

Author:

jmoore

Message:

Fixing doubled omero.db.profile issue.

Location:

branches/3.0-Beta2/components

Files:

• antlib/resources/omero.xml (modified) (1 diff)
• server/build.xml (modified) (1 diff)

branches/3.0-Beta2/components/antlib/resources/omero.xml

@@ -83 +83 @@
         <target name="setup-db" depends="classpath-define">
                 <ant antfile="${server.comp}/build.xml" target="reload-db">
-                <property name="sql.dir" value="${basedir}/sql"/>
+                <property name="sql.dir" value="${basedir}/sql/${omero.db.profile}"/>
                 </ant>
         </target>

branches/3.0-Beta2/components/server/build.xml

@@ -9 +9 @@
             <arg value="${omero.rootpass}"/>
         </java>
-        <copy file="${sql.dir}/${omero.db.profile}/${omero.dbversion}__${omero.dbpatch}__schema.sql" tofile="${target.dir}/ddl.sql"/>
-        <copy file="${sql.dir}/${omero.db.profile}/${omero.dbversion}__${omero.dbpatch}__data.sql" tofile="${target.dir}/data.sql"/>
+        <copy file="${sql.dir}/${omero.dbversion}__${omero.dbpatch}__schema.sql" tofile="${target.dir}/ddl.sql"/>
+        <copy file="${sql.dir}/${omero.dbversion}__${omero.dbpatch}__data.sql" tofile="${target.dir}/data.sql"/>
         <replace file="${target.dir}/data.sql" token="@ROOTPASS@" value="${ROOTPASS}"/>
         <replace file="${target.dir}/data.sql" token="@DBPATCH@" value="${omero.dbpatch}"/>