• Views
  • Iteration Report
  • My Iteration Report
  •  
OMERO.server
  • Login
  • Help/Guide
  • About Trac
  • Preferences
  • Wiki
  • Timeline
  • Roadmap
  • Browse Source
  • View Tickets
  • Search

Context Navigation

  • ← Previous Changeset
  • Next Changeset →

Changeset 1057

Show
Ignore:
Timestamp:
11/01/06 12:12:02 (2 years ago)
Author:
jmoore
Message:

#443 Fixed/checked distribution tasks: setup, setup-db, add{group/user}, deploy, update

Location:
trunk
Files:
1 added
13 modified

  • build.xml (modified) (3 diffs)
  • components/antlib/resources/dist-classpath.xml (added)
  • components/antlib/resources/macros.xml (modified) (1 diff)
  • components/antlib/resources/omero.xml (modified) (1 diff)
  • components/antlib/resources/usage-omero.txt (modified) (1 diff)
  • components/app/build.xml (modified) (1 diff)
  • components/client/build.xml (modified) (3 diffs)
  • components/common/build.xml (modified) (1 diff)
  • components/dsl/build.xml (modified) (1 diff)
  • components/ice/build.xml (modified) (1 diff)
  • components/policy/build.xml (modified) (1 diff)
  • components/rendering/build.xml (modified) (1 diff)
  • components/romio/build.xml (modified) (1 diff)
  • components/server/build.xml (modified) (1 diff)

Legend:

Unmodified
Added
Removed

  • trunk/build.xml

    r904 r1057  
    113113        </target> 
    114114 
    115         <target name="dist" depends="integration"> 
     115        <target name="dist"> 
    116116                <mkdir dir="${dist.dir}"/> 
    117117                <echo>javadoc needs to copy images</echo> 
    … …  
    144144                                <include name="lib/repository/groovy/**"/> 
    145145                                <include name="lib/repository/testng/**"/> 
     146                                <!-- deploy --> 
     147                                <include name="components/common/build.xml"/> 
     148                                <!-- reload-db --> 
     149                                <include name="components/server/build.xml"/> 
     150                                <!-- usermgmt --> 
     151                                <include name="components/client/build.xml"/> 
    146152                        </fileset> 
    147153                </copy> 
    … …  
    169175                        <fileset dir="${common.comp}/${target.rel}" includes="*.jar"/> 
    170176                        <fileset dir="${client.comp}/${target.rel}" includes="*.jar"/> 
     177                        <fileset dir="${import.comp}/${target.rel}" includes="*.jar"/> 
     178                        <fileset dir="${server.comp}/${target.rel}" includes="*.jar"/> 
    171179                        <fileset dir="${lib.dir}/repository"> 
    172180                                <include name="omero/jboss*/**/*.jar"/> 
    173181                                <include name="org/springframework/spring/**/*.jar"/> 
    174182                                <include name="commons-logging/commons-logging/**/*.jar"/> 
     183                                <include name="log4j/**/*.jar"/> 
     184                                <include name="omero/omejava/**/*.jar"/> 
    175185                        </fileset> 
    176186                        <flattenmapper/> 

  • trunk/components/antlib/resources/macros.xml

    r1013 r1057  
    8585                        <property name="multi.test.skip" value="${test.skip}"/> 
    8686                        <property name="multi.generate.skip" value="${generate.skip}"/> 
     87                        <property name="classpath.file" value="${classpath.file}"/> 
    8788                        <targets/> 
    8889                </ant> 

  • trunk/components/antlib/resources/omero.xml

    r593 r1057  
    4141--> 
    4242 
    43         <!-- TODO: need to get /etc working --> 
    44         <property name="omero.repo.local" value="lib/repository"/> 
    45         <property file="etc/omero.properties"/> 
    46         <property file="etc/hibernate.properties"/> 
     43        <!-- This overrides the classpath.file properties of all the components. --> 
     44        <property name="ant.resources"     value="${basedir}/components/antlib/resources/"/> 
     45        <property name="classpath.file" value="${ant.resources}/dist-classpath.xml"/> 
     46        <import file="${classpath.file}"/> <!-- imports global.xml --> 
    4747 
    48         <import file="components/antlib/resources/global.xml"/> 
    49  
    50         <path id="generated.compile.classpath"> 
    51                 <pathelement path="${omero.home}/etc"/> 
    52                 <fileset dir="${omero.home}"> 
    53                         <include name="client/*.jar"/> 
    54                         <include name="lib/repository/groovy/**/*.jar"/> 
    55                         <include name="lib/repository/omero/postgresql/**/*.jar"/> 
    56                 </fileset> 
    57         </path> 
    58  
    59         <path id="generated.test.classpath"> 
    60                 <path refid="generated.compile.classpath"/> 
    61         </path> 
    62  
    63         <path id="omero.classpath"> 
    64                 <path refid="generated.compile.classpath"/> 
    65         </path> 
    66  
     48        <target name="classpath-define"> 
     49                <path id="omero.classpath"> 
     50                        <path refid="generated.compile.classpath"/> 
     51                </path> 
     52        </target> 
     53         
    6754        <target name="usage" 
    6855                description="Usage information"> 

  • trunk/components/antlib/resources/usage-omero.txt

    r581 r1057  
    44 _                                       
    55| 
    6 + Configuration 
     6+ Configuration targets (files availble under /etc) 
    77| 
    8 |       /etc            contains ... 
    9 | 
     8|       setup           run the config target 
     9|  
    1010+ Deploy targets 
    1111| 
     12|       setup-db        load database schema to db 
    1213|       update          copy new properties to *.ear 
    1314|       deploy          copy *.ear to ${jboss.home} 

  • trunk/components/app/build.xml

    r903 r1057  
    99        <property name="artifact.packaging" value="ear"/> 
    1010 
    11         <import file="classpath.xml"/> 
     11        <property name="classpath.file" value="classpath.xml"/> 
     12        <import file="${classpath.file}"/> 
    1213 
    1314        <property name="product.name"     value="Omero Server"/> 

  • trunk/components/client/build.xml

    r1054 r1057  
    22<project name="client" default="install" basedir="."> 
    33    
    4         <import file="classpath.xml"/> 
     4        <property name="classpath.file" value="classpath.xml"/> 
     5        <import file="${classpath.file}"/> 
    56         
    67        <target name="package" depends="lifecycle.package"> 
    … …  
    1516        </target> 
    1617         
     18        <macrodef name="fail-if-empty"> 
     19          <attribute name="property"/> 
     20          <sequential> 
     21            <property name="string" value="${@{property}}"/> 
     22            <fail unless="@{property}" message="Argument is required."/> 
     23            <fail message="Argument cannot be empty"> 
     24                <condition><length string="${string}" trim="true" length="0"/></condition> 
     25            </fail> 
     26          </sequential> 
     27        </macrodef>  
     28 
    1729        <target name="addgroup" depends="prepare,load-groovy"> 
    1830                        <fail unless="omero.rootpass">No root password defined. See etc/local.properties</fail> 
    19                         <input message="Please enter group name:" addproperty="newgroup.name"/> 
     31                        <input message="Please enter group name:" addproperty="newgroup.name"/> 
     32                        <fail-if-empty property="newgroup.name"/> 
    2033                        <input message="Please enter group description: (optional)" addproperty="newgroup.description"/> 
    2134                        <input message="Please enter name of the group owner: (optional)" addproperty="newgroup.owner" 
    … …  
    5669                                defaultvalue="${user.name}"/> 
    5770                        <input message="Please enter user's first name:" addproperty="newuser.firstname"/> 
     71                        <fail-if-empty property="newuser.firstname"/> 
    5872                        <input message="Please enter user's middle name: (optional)" addproperty="newuser.middlename"/> 
    5973                        <input message="Please enter user's last name:" addproperty="newuser.lastname"/> 
     74                        <fail-if-empty property="newuser.lastname"/> 
    6075                        <input message="Please enter user's email: (optional)" addproperty="newuser.email"/> 
    6176                        <input message="Please enter user's institution: (optional)" addproperty="newuser.institution"/> 

  • trunk/components/common/build.xml

    r1054 r1057  
    22<!-- TODO add properties goal to update pref.properties --> 
    33<project name="common" default="install" basedir="."> 
    4      
    5         <import file="classpath.xml"/> 
     4 
     5        <property name="classpath.file" value="classpath.xml"/> 
     6        <import file="${classpath.file}"/> 
    67         
    78        <!-- Lifecycle Overrides --> 

  • trunk/components/dsl/build.xml

    r558 r1057  
    11<?xml version="1.0" encoding="utf-8"?> 
    22<project name="dsl" default="install" basedir="."> 
    3      
    4         <import file="classpath.xml"/> 
     3 
     4        <property name="classpath.file" value="classpath.xml"/> 
     5        <import file="${classpath.file}"/> 
    56         
    67</project> 

  • trunk/components/ice/build.xml

    r558 r1057  
    22<project name="omero-ice" default="slice-all" basedir="."> 
    33 
    4     <import file="classpath.xml"/> 
     4    <property name="classpath.file" value="classpath.xml"/> 
     5    <import file="${classpath.file}"/> 
    56                     
    67    <!-- Local properties --> 

  • trunk/components/policy/build.xml

    r558 r1057  
    22<!-- TODO add properties goal to update pref.properties --> 
    33<project name="policy" default="check-policy" basedir="."> 
    4      
    5         <import file="classpath.xml"/> 
     4 
     5        <property name="classpath.file" value="classpath.xml"/> 
     6        <import file="${classpath.file}"/> 
    67         
    78        <target name="prepare" depends="lifecycle.prepare,load-hibernate"/> 

  • trunk/components/rendering/build.xml

    r558 r1057  
    11<?xml version="1.0" encoding="utf-8"?> 
    22<project name="rendering" default="install" basedir="."> 
    3      
    4         <import file="classpath.xml"/> 
     3 
     4        <property name="classpath.file" value="classpath.xml"/> 
     5        <import file="${classpath.file}"/> 
    56         
    67</project> 

  • trunk/components/romio/build.xml

    r558 r1057  
    11<?xml version="1.0" encoding="utf-8"?> 
    22<project name="nio" default="install" basedir="."> 
    3      
    4         <import file="classpath.xml"/> 
     3 
     4        <property name="classpath.file" value="classpath.xml"/> 
     5        <import file="${classpath.file}"/> 
    56         
    67</project> 

  • trunk/components/server/build.xml

    r1011 r1057  
    11<?xml version="1.0" encoding="utf-8"?> 
    22<project name="services" default="install" basedir="."> 
    3      
    4         <import file="classpath.xml"/> 
     3 
     4        <property name="classpath.file" value="classpath.xml"/> 
     5        <import file="${classpath.file}"/> 
    56 
    67        <target name="reload-db" depends="prepare,load-groovy"> 

Download in other formats:

  • Unified Diff
  • Zip Archive
Trac Powered

Powered by Trac 0.11
By Edgewall Software.

Visit the Trac open source project at
http://trac.edgewall.org/