Changeset 1063 for branches/omero_ds_fix

Timestamp:

11/02/06 18:05:42 (2 years ago)

Author:

jmoore

Message:

First try at a fix. Moves omero-ds.xml to /etc

Location:

branches/omero_ds_fix

Files:

• build.xml (modified) (1 diff)
• components/antlib/resources/omero.xml (modified) (2 diffs)
• components/app/build.xml (modified) (4 diffs)
• components/app/product.properties (added)
• components/app/resources/omero-ds.xml (deleted)
• etc/omero-ds.xml (copied) (copied from trunk/components/app/resources/omero-ds.xml)
• etc/omero.properties (modified) (2 diffs)

branches/omero_ds_fix/build.xml

@@ -123 +123 @@
                         for use by the user to configure the install.
                 -->
-                <copy todir="${dist.dir}/etc">
+                <copy todir="${dist.dir}/etc" overwrite="true">
                         <fileset dir="${omero.home}/etc">
                                 <exclude name="local.properties"/>
                         </fileset>
                 </copy>
+                <concat destfile="${dist.dir}/etc/omero.properties" append="true">
+                        <filelist dir="${app.comp}" files="product.properties"/>
+                </concat>
 
                 <!-- 

branches/omero_ds_fix/components/antlib/resources/omero.xml

@@ -42 +42 @@
 
         <!-- This overrides the classpath.file properties of all the components. -->
-        <property name="ant.resources"     value="${basedir}/components/antlib/resources/"/>
-        <property name="classpath.file" value="${ant.resources}/dist-classpath.xml"/>
+        <property name="ant.resources"       value="${basedir}/components/antlib/resources/"/>
+        <property name="classpath.file"      value="${ant.resources}/dist-classpath.xml"/>
         <import file="${classpath.file}"/> <!-- imports global.xml -->
 
@@ -60 +60 @@
 
         <target name="update">
+
+                <!-- copied from app/build.xml refactor -->
+      <tempfile property="temp.dir"/>
+      <mkdir dir="${temp.dir}"/>
+      <copy file="${etc.dir}/omero-ds.xml" todir="${temp.dir}" />
+      <replace file="${temp.dir}/omero-ds.xml">
+         <replacefilter token="@@@JDBC.URL@@@" value="${hibernate.connection.url}"/>
+         <replacefilter token="@@@JDBC.DRIVER@@@" value="${hibernate.connection.driver_class}"/>
+         <replacefilter token="@@@JDBC.USERNAME@@@" value="${hibernate.connection.username}"/>
+         <replacefilter token="@@@JDBC.PASSWORD@@@" value="${hibernate.connection.password}"/>
+      </replace>
+
                 <jar update="true"
-                  destfile="${omero.home}/omero-app-${omero.version}.ear">
-                        <fileset dir="${etc.dir}">
-                                <include name="omero.properties"/>
-                                <include name="hibernate.properties"/>
+                  destfile="${artifact.final.name}.ear">
+                        <fileset dir="${basedir}">
+                                <include name="etc/local.properties"/>
+                                <include name="etc/local.properties.example"/>
+                                <include name="etc/omero.properties"/>
+                                <include name="etc/hibernate.properties"/>
+                        </fileset>
+                        <fileset dir="${temp.dir}">
+                                <include name="omero-ds.xml"/>
                         </fileset>
                 </jar>
+                <delete dir="${temp.dir}"/>
         </target>
 
-        <target name="setup-db">
+        <target name="setup-db" depends="classpath-define">
                 <sql_run>
                         <transaction src="sql/ddl.sql"/>

branches/omero_ds_fix/components/app/build.xml

@@ -7 +7 @@
 <project name="app" default="help" basedir=".">
 
-        <property name="artifact.packaging" value="ear"/>
+        <property name="artifact.packaging"  value="ear"/>
+        <property file="product.properties"/>
 
         <property name="classpath.file" value="classpath.xml"/>
         <import file="${classpath.file}"/>
-
-        <property name="product.name"     value="Omero Server"/>
-        <property name="product.version"  value="3.0" />
 
    <!--
@@ -36 +34 @@
       
       <!-- DataSource with replacement. -->
-      <copy file="${resrc.dir}/omero-ds.xml" todir="${target.dir}" />
-      <replace file="${target.dir}/omero-ds.xml">
+      <tempfile property="temp.file"/>
+      <copy file="${etc.dir}/omero-ds.xml" tofile="${temp.file}" />
+      <replace file="${temp.file}">
          <replacefilter token="@@@JDBC.URL@@@" value="${hibernate.connection.url}"/>
          <replacefilter token="@@@JDBC.DRIVER@@@" value="${hibernate.connection.driver_class}"/>
@@ -54 +53 @@
          <fileset dir="${resrc.dir}" includes="ejb.properties"/>
          <fileset dir="${resrc.dir}" includes="jboss-service.xml"/>
-         <fileset dir="${target.dir}" includes="omero-ds.xml" />
          <fileset dir="${target.dir}/libs" includes="*.jar" />
+         <fileset file="${temp.file}"/>
          <manifest>
             <attribute name="Product-Name"      value="${product.name}"/>
@@ -70 +69 @@
       </jar>
 
-      <delete file="${target.dir}/omero-ds.xml" />
+      <delete file="${temp.file}" />
 
    </target>

branches/omero_ds_fix/etc/omero.properties

@@ -5 +5 @@
 # build-time and run-time
 #
+# To override the name of the application, 
+# uncomment the below.
+omero.product=GlencoeDME
 omero.version=3.0-TRUNK
 omero.repo.local=${omero.home}/lib/repository
@@ -31 +34 @@
 #omero.repo.local=${user.home}/.m2/repository/
 #omero.repo.remote=file://${omero.home}/lib/repository/
-