• 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 2560

Show
Ignore:
Timestamp:
06/30/08 20:23:05 (5 months ago)
Author:
jmoore
Message:

ticket:766 Adding sensible "conf" attributes to Ivy for OmeroBuild

  • Cleaned up server/client separation
  • Removed extensions (no more "core")
  • Remoed qdox and related dsl tasks
  • Also now printing slice2java messages to standard-out
  • Missing: publication of OmeroImporter dependencies to dist/client
Location:
trunk
Files:
3 removed
21 modified

  • build.xml (modified) (3 diffs)
  • components/antlib/resources/lifecycle.xml (modified) (3 diffs)
  • components/antlib/resources/omero.ivy (modified) (1 diff)
  • components/app/ivy.xml (modified) (1 diff)
  • components/blitz/build.xml (modified) (1 diff)
  • components/blitz/ivy.xml (modified) (1 diff)
  • components/client/ivy.xml (modified) (1 diff)
  • components/common/ivy.xml (modified) (1 diff)
  • components/dsl/ivy.xml (modified) (1 diff)
  • components/dsl/src/ome/dsl/APITask.java (deleted)
  • components/dsl/test/ome/dsl/utests/AntTasksTest.java (deleted)
  • components/importer/ivy.xml (modified) (1 diff)
  • components/model/ivy.xml (modified) (1 diff)
  • components/rendering/ivy.xml (modified) (1 diff)
  • components/romio/ivy.xml (modified) (1 diff)
  • components/server/ivy.xml (modified) (1 diff)
  • components/testing/ivy.xml (modified) (1 diff)
  • components/tools/OmeroImporter/build.xml (modified) (2 diffs)
  • components/tools/OmeroImporter/ivy.xml (modified) (1 diff)
  • components/tools/OmeroJava/ivy.xml (modified) (1 diff)
  • components/tools/WebAdmin/ivy.xml (modified) (1 diff)
  • components/tools/licenses/ivy.xml (modified) (1 diff)
  • ivy.xml (modified) (2 diffs)
  • lib/repository/qdox/qdox/1.5/qdox-1.5.jar (deleted)

Legend:

Unmodified
Added
Removed

  • trunk/build.xml

    r2556 r2560  
    3737    </ivy:buildlist> 
    3838    <ivy:buildlist reference="blitzserver.buildpath" settingsRef="ivy.toplevel"> 
    39         <fileset dir="${deps.buildlist.dir}" includes="*/build.xml" excludes="**/app/**,**/bioformats-omero/**,**/policy/**,**/tools/**"/> 
     39        <fileset dir="${deps.buildlist.dir}" includes="*/build.xml" excludes="**/app/**,**/policy/**,**/tools/**"/> 
    4040    </ivy:buildlist> 
    4141    <ivy:buildlist reference="appserver.buildpath" settingsRef="ivy.toplevel"> 
    … …  
    6363        <antcall target="build-py" inheritRefs="true" inheritAll="true"/> 
    6464        <antcall target="build-importer" inheritRefs="true" inheritAll="true"/> 
     65        <antcall target="build-webadmin" inheritRefs="true" inheritAll="true"/> 
    6566    </target> 
    6667 
    … …  
    144145 
    145146            <mkdir dir="${dist.dir}/client"/> 
    146             <ivy:resolve file="${import.dir}/omero.ivy" type="jar" conf="client" transitive="false" settingsRef="ivy.toplevel"/> 
     147            <ivy:resolve file="${import.dir}/omero.ivy" type="jar" conf="client" settingsRef="ivy.toplevel"/> 
    147148            <ivy:retrieve conf="client" pattern="${dist.dir}/client/[module]-[revision].[ext]" sync="true" log="quiet" settingsRef="ivy.toplevel"/> 
    148149            <mkdir dir="${dist.dir}/lib/repository"/> 
    149             <ivy:resolve file="${import.dir}/omero.ivy" type="jar" conf="server" transitive="true" settingsRef="ivy.toplevel"/> 
     150            <ivy:resolve file="${import.dir}/omero.ivy" type="jar" conf="server" settingsRef="ivy.toplevel"/> 
    150151            <ivy:retrieve conf="server" pattern="${dist.dir}/lib/repository/[module]-[revision].[ext]" sync="true" log="quiet" settingsRef="ivy.toplevel"/> 
    151152 

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

    r2542 r2560  
    11<?xml version="1.0" encoding="utf-8"?> 
    2 <project name="lifecycle" default="help" basedir="."> 
     2<project name="lifecycle" default="help" basedir="." xmlns:ivy="antlib:org.apache.ivy.ant"> 
    33<!-- 
    44#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
    … …  
    173173                 <mkdir dir="@{output}"/> 
    174174                 <exec executable="slice2@{lang}"  
    175                     failonerror="true" failifexecutionfails="true" 
    176                     output="@{output}/.output.log"> 
     175                    failonerror="true" failifexecutionfails="true"> 
    177176                        <arg value="--tie"/> 
    178177                        <arg value="--output-dir"/> 
    … …  
    428427                <eclipse.refreshLocal resource="omero-client" depth="infinite"/> 
    429428                <eclipse.refreshLocal resource="omero-shoola-adapter" depth="infinite"/> 
    430                 <eclipse.refreshLocal resource="missing" depth="infinite"/>              
    431         </target> 
    432  
    433   <target name="standalone"> 
    434     <copy todir="${target.dir}/standalone"> 
    435       <fileset dir="${deps.lib.dir}" includes="**/*"/> 
    436       <fileset dir="${target.dir}" includes="*.jar"/> 
    437     </copy> 
    438     <jar update="true" destfile="${target.dir}/standalone/${ivy.module}.jar"> 
    439       <fileset dir="${resrc.dir}"> 
    440         <include name="**/config.*"/> 
    441         <include name="**/*.config"/> 
    442         <include name="**/*.xml"/> 
    443       </fileset> 
    444       <fileset dir="${resrc.dest}"> 
    445         <include name="**/*.properties"/> 
    446       </fileset> 
    447     </jar> 
    448   </target> 
     429                <eclipse.refreshLocal resource="missing" depth="infinite"/> 
     430        </target> 
    449431 
    450432    <!-- MACROS --> 
     433 
     434    <macrodef name="standalone"> 
     435        <attribute name="conf"/> 
     436        <attribute name="dir" default="${basedir}/target/standalone/"/> 
     437        <attribute name="pattern" default="[module].[ext]"/> 
     438        <attribute name="jar" default="@{dir}/${ivy.module}.jar"/> 
     439        <sequential> 
     440            <ivy:retrieve conf="@{conf}" pattern="@{dir}/@{pattern}" log="quiet"/> 
     441            <copy file="${target.dir}/${ivy.module}.jar" tofile="@{jar}"/> 
     442            <jar update="true" destfile="@{jar}"> 
     443                <fileset dir="${resrc.dir}"> 
     444                    <include name="**/config.*"/> 
     445                    <include name="**/*.config"/> 
     446                    <include name="**/*.xml"/> 
     447                </fileset> 
     448                <fileset dir="${resrc.dest}"> 
     449                    <include name="**/*.properties"/> 
     450                </fileset> 
     451            </jar> 
     452        </sequential> 
     453  </macrodef> 
    451454 
    452455    <macrodef name="copyResource"> 

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

    r2237 r2560  
    55      status="integration"/> 
    66  <configurations> 
    7     <conf name="core"/> 
    8     <conf name="client"  extends="core"/> 
    9     <conf name="server"  extends="core"/> 
     7    <conf name="client"/> 
     8    <conf name="server"/> 
    109  </configurations> 
    1110  <publications> 
    12     <artifact name="server" type="jar" conf="core" /> 
     11    <artifact name="server" type="jar" conf="server" /> 
    1312  </publications> 
    1413  <dependencies> 
    1514    <!-- NOTE: Jars from lib/tools will be copied separately --> 
    1615    <!-- Internal --> 
    17     <dependency name="model-${omero.db.profile}" rev="${omero.version}" changing="true" conf="core->core" /> 
    18     <dependency name="common" rev="${omero.version}" changing="true" conf="core->core" /> 
    19     <dependency name="client" rev="${omero.version}" changing="true" conf="core->core" /> 
    20     <dependency name="server" rev="${omero.version}" changing="true" conf="server->core" /> 
    21     <dependency name="blitz" rev="${omero.version}" changing="true" conf="client->core" /> 
    22     <dependency name="importer" rev="${omero.version}" changing="true" conf="client->core" /> 
    23     <!-- Ant --> 
    24     <dependency org="ant" name="ant" rev="1.6.5" conf="server->default"/> 
    25     <dependency org="ant" name="ant-launcher" rev="1.6.5" conf="server->default"/> 
    26     <!-- Postgres --> 
    27     <dependency org="omero" name="postgresql" rev="${versions.postgresql}" conf="server->default"/> 
    28     <!-- JBoss --> 
    29     <dependency org="omero" name="jbossall-client" rev="${versions.jboss}" conf="core->default"/> 
    30     <dependency org="omero" name="jboss-annotations-ejb3" rev="${versions.jboss}" conf="client->default"/> 
    31     <dependency org="omero" name="jboss-ejb3x" rev="${versions.jboss}" conf="client->default"/> 
    32     <dependency org="omero" name="jboss-ejb3" rev="${versions.jboss}" conf="client->default"/> 
    33     <dependency org="omero" name="jbosssx" rev="${versions.jboss}" conf="core->default"/> 
    34     <dependency org="omero" name="persistence-api" rev="${versions.persistence-api}" conf="client->default"/> 
    35     <!-- Hibernate unfortunately --> 
    36     <dependency org="hibernate" name="hibernate-annotations" rev="${versions.hibernate-annotations}" conf="client->default"/>  
    37     <dependency org="hibernate" name="hibernate-search" rev="${versions.hibernate-search}" conf="client->default"/>  
    38     <!-- Other --> 
    39     <dependency org="org/springframework" name="spring" rev="${versions.spring}" conf="client->default"/> 
    40     <dependency org="commons-logging" name="commons-logging" rev="${versions.commons-logging}" conf="client->default"/> 
    41     <dependency org="log4j" name="log4j" rev="${versions.log4j}" conf="client->default"/> 
    42     <dependency org="omero" name="ice" rev="${versions.ice}" conf="client->default"/> 
    43     <dependency org="omero" name="ome-java" rev="${versions.ome-java}" conf="client->default"/> 
    44     <dependency org="omero" name="bio-formats" rev="${versions.bio-formats}" conf="client->default"/> 
    45     <!-- Testing --> 
    46     <dependency org="groovy" name="groovy" rev="${versions.groovy}" conf="server->default"/> 
    47     <dependency org="testng" name="testng" rev="${versions.testng}" conf="server->default"/> 
    48   </dependencies> 
     16    <dependency name="client" rev="${omero.version}" changing="true" conf="client->client"/> 
     17    <dependency name="server" rev="${omero.version}" changing="true" conf="server->server"/> 
     18    <dependency name="blitz" rev="${omero.version}" changing="true" conf="server->server;client->client"/> 
     19 </dependencies> 
    4920</ivy-module> 

  • trunk/components/app/ivy.xml

    r1731 r2560  
    55      status="integration"/> 
    66  <configurations> 
    7     <conf name="core"/> 
    8     <conf name="build" extends="core"/> 
    9     <conf name="test"  extends="core"/> 
     7    <conf name="build"/> 
     8    <conf name="test"/> 
     9    <conf name="server"/> 
    1010  </configurations> 
    1111  <publications> 
    12     <artifact name="app" type="ear" conf="core" /> 
     12    <artifact name="app" type="ear"/> 
    1313  </publications> 
    1414  <dependencies> 
    1515    <!-- Internal --> 
    16     <dependency name="common" rev="${omero.version}" changing="true" /> 
    17     <dependency name="importer" rev="${omero.version}" changing="true" /> 
    18     <dependency name="romio" rev="${omero.version}" changing="true" /> 
    19     <dependency name="rendering" rev="${omero.version}" changing="true" /> 
    20     <dependency name="server" rev="${omero.version}" changing="true" /> 
    21     <dependency name="blitz" rev="${omero.version}" changing="true" /> 
     16    <dependency name="server" rev="${omero.version}" changing="true" conf="build->build;test->test;server->server"/> 
    2217  </dependencies> 
    2318</ivy-module> 

  • trunk/components/blitz/build.xml

    r2185 r2560  
    3232        </target> 
    3333 
    34         <target name="install" depends="lifecycle.install,standalone"> 
     34        <target name="install" depends="lifecycle.install"> 
     35                <standalone conf="server"/> 
    3536                <useServices dir="${target.dir}/standalone"/> 
    3637                <copy todir="${target.dir}/standalone"> 

  • trunk/components/blitz/ivy.xml

    r2499 r2560  
    55      status="integration"/> 
    66  <configurations> 
    7     <conf name="core"/> 
    8     <conf name="build" extends="core"/> 
    9     <conf name="server" extends="core"/> 
    10     <conf name="client" extends="core"/> 
    11     <conf name="test"  extends="core"/> 
     7    <conf name="build"/> 
     8    <conf name="test"/> 
     9    <conf name="client"/> 
     10    <conf name="server"/> 
    1211  </configurations> 
    1312  <publications> 
    14     <artifact name="blitz" type="jar" conf="core" /> 
     13    <artifact name="blitz" type="jar"/> 
    1514  </publications> 
    1615  <dependencies> 
    1716    <!-- Internal --> 
    18     <dependency name="common" rev="${omero.version}" changing="true" /> 
    19     <dependency name="importer" rev="${omero.version}" changing="true" /> 
    20     <dependency name="romio" rev="${omero.version}" changing="true" /> 
    21     <dependency name="rendering" rev="${omero.version}" changing="true" /> 
    22     <dependency name="server" rev="${omero.version}" changing="true"/> 
    23     <dependency name="client" rev="${omero.version}" changing="true" conf="client,test->core"/> 
     17    <dependency name="server" rev="${omero.version}" changing="true" conf="build->build;test->test;server->server"/> 
     18    <dependency name="client" rev="${omero.version}" changing="true" conf="build->build;test->test;client->client"/> 
    2419    <!-- Public --> 
    25     <dependency org="omero" name="ice" rev="${versions.ice}" conf="core->default"/> 
     20    <dependency org="omero" name="ice" rev="${versions.ice}" conf="build,test,client,server->default"/> 
    2621  </dependencies> 
    2722</ivy-module> 

  • trunk/components/client/ivy.xml

    r2289 r2560  
    55      status="integration"/> 
    66  <configurations> 
    7     <conf name="core"/> 
    8     <conf name="build" extends="core"/> 
    9     <conf name="test"  extends="core"/> 
     7    <conf name="build"/> 
     8    <conf name="test" /> 
     9    <conf name="client"/> 
    1010  </configurations> 
    1111  <publications> 
    12     <artifact name="client" type="jar" conf="core" /> 
     12    <artifact name="client" type="jar"/> 
    1313  </publications> 
    14   <dependencies> 
     14  <dependencies defaultconfmapping="build,test,client->default"> 
    1515    <!-- Internal --> 
    16     <dependency name="common" rev="${omero.version}" changing="true" /> 
     16    <dependency name="common" rev="${omero.version}" changing="true" conf="build->build;test->test;client->client"/> 
    1717    <dependency name="testing" rev="${omero.version}" changing="true" conf="test->test"/> 
    1818    <!-- Not included above --> 
    19     <dependency org="omero" name="jbossall-client" rev="${versions.jboss}" conf="build->default"/> 
    20     <dependency org="commons-validator" name="commons-validator" rev="${versions.commons-validator}" conf="build->default"/> 
    21     <dependency org="commons-beanutils" name="commons-beanutils" rev="${versions.commons-beanutils}" conf="build->default"/> 
    22     <dependency org="commons-digester" name="commons-digester" rev="${versions.commons-digester}" conf="build->default"/> 
    23     <dependency org="jakarta-oro" name="jakarta-oro" rev="${versions.jakarta-oro}" conf="build->default"/> 
     19    <dependency org="omero" name="jbossall-client" rev="${versions.jboss}"/> 
     20    <dependency org="commons-validator" name="commons-validator" rev="${versions.commons-validator}"/> 
     21    <dependency org="commons-beanutils" name="commons-beanutils" rev="${versions.commons-beanutils}"/> 
     22    <dependency org="commons-digester" name="commons-digester" rev="${versions.commons-digester}"/> 
     23    <dependency org="jakarta-oro" name="jakarta-oro" rev="${versions.jakarta-oro}"/> 
    2424  </dependencies> 
    2525</ivy-module> 

  • trunk/components/common/ivy.xml

    r2039 r2560  
    55      status="integration"/> 
    66  <configurations> 
    7     <conf name="core"/> 
    8     <conf name="build" extends="core"/> 
    9     <conf name="test"  extends="core"/> 
     7    <conf name="build"/> 
     8    <conf name="test"/> 
     9    <conf name="client"/> 
     10    <conf name="server"/> 
    1011  </configurations> 
    1112  <publications> 
    12     <artifact name="common" type="jar" conf="core" /> 
     13    <artifact name="common" type="jar"/> 
    1314  </publications> 
    1415  <dependencies> 
    1516    <!-- Internal --> 
    16     <dependency name="model-${omero.db.profile}" rev="${omero.version}" changing="true" /> 
     17    <dependency name="model-${omero.db.profile}" rev="${omero.version}" changing="true" conf="build->build;test->test;client->client;server->server"/> 
    1718    <!-- Public --> 
    18     <dependency org="jamon" name="jamon" rev="${versions.jamon}" conf="test->default"/>  
    19     <dependency org="net/sf/ehcache" name="ehcache" rev="${versions.ehcache}" conf="build->default"/> 
     19    <dependency org="jamon" name="jamon" rev="${versions.jamon}" conf="test->default"/> 
    2020  </dependencies> 
    2121</ivy-module> 

  • trunk/components/dsl/ivy.xml

    r1923 r2560  
    55      status="integration"/> 
    66  <configurations> 
    7     <conf name="core"/> 
    8     <conf name="build" extends="core"/> 
    9     <conf name="test"  extends="core"/> 
     7    <conf name="build"/> 
     8    <conf name="test"/> 
     9    <conf name="runtime"/> 
    1010  </configurations> 
    1111  <publications> 
    12     <artifact name="dsl" type="jar" conf="core" /> 
     12    <artifact name="dsl" type="jar"/> 
    1313  </publications> 
    14   <dependencies> 
    15     <dependency org="ant" name="ant" rev="1.6.5" conf="build->default"/> 
    16     <dependency org="commons-collections" name="commons-collections" rev="${versions.commons-collections}" conf="build->default"/> 
    17     <dependency org="commons-logging" name="commons-logging" rev="${versions.commons-logging}" conf="build->default"/> 
    18     <dependency org="groovy" name="groovy" rev="${versions.groovy}" conf="build->default"/> 
    19     <dependency org="jmock" name="jmock" rev="1.0.1" conf="build->default"/> 
    20     <dependency org="junit" name="junit" rev="3.8.1" conf="build->default"/> 
    21     <dependency org="log4j" name="log4j" rev="1.2.14" conf="build->default"/> 
    22     <dependency org="omero" name="postgresql" rev="${versions.postgresql}" conf="build->default"/>  
    23     <dependency org="org/springframework" name="spring-mock" rev="${versions.spring}" conf="build->default"/> 
    24     <dependency org="org/springframework" name="spring" rev="${versions.spring}" conf="build->default"/>  
    25     <dependency org="qdox" name="qdox" rev="1.5" conf="build->default"/> 
    26     <dependency org="testng" name="testng" rev="${versions.testng}" conf="build->default"/> 
    27     <dependency org="velocity-tools" name="velocity-tools-generic" rev="1.1" conf="build->default"/> 
    28     <dependency org="velocity" name="velocity" rev="1.4" conf="build->default"/> 
    29     <!-- test --> 
     14  <dependencies defaultconfmapping="build,test->default"> 
     15    <!-- runtime dependencies for all modules, since dsl is the base of our DAG --> 
     16    <dependency org="log4j" name="log4j" rev="1.2.14" conf="runtime->default"/> 
     17    <dependency org="omero" name="postgresql" rev="${versions.postgresql}" conf="test,runtime->default"/> 
     18    <dependency org="org/springframework" name="spring" rev="${versions.spring}" conf="build,test,runtime->default"/> 
     19    <dependency org="commons-logging" name="commons-logging" rev="${versions.commons-logging}" conf="build,test,runtime->default"/> 
     20    <dependency org="commons-collections" name="commons-collections" rev="${versions.commons-collections}" conf="build,test,runtime->default"/> 
     21    <!-- build requirements --> 
     22    <dependency org="ant" name="ant" rev="1.6.5"/> 
     23    <dependency org="velocity-tools" name="velocity-tools-generic" rev="1.1"/> 
     24    <dependency org="velocity" name="velocity" rev="1.4"/> 
     25    <dependency org="emma" name="emma" rev="${versions.emma}"/> 
     26    <dependency org="emma" name="emma_ant" rev="${versions.emma}"/> 
     27    <dependency org="checkstyle" name="checkstyle" rev="${versions.checkstyle}"/> 
     28    <!-- test requirements for all modules--> 
     29    <dependency org="groovy" name="groovy" rev="${versions.groovy}" conf="test->default"/> 
     30    <dependency org="jmock" name="jmock" rev="1.0.1" conf="test->default"/> 
     31    <dependency org="junit" name="junit" rev="3.8.1" conf="test->default"/> 
     32    <dependency org="org/springframework" name="spring-mock" rev="${versions.spring}" conf="test->default"/> 
     33    <dependency org="testng" name="testng" rev="${versions.testng}" conf="test->default"/> 
    3034    <dependency org="findbugs" name="findbugs-ant" rev="${versions.findbugs}" conf="test->default"/> 
    31     <dependency org="emma" name="emma" rev="${versions.emma}" conf="test->default"/> 
    32     <dependency org="emma" name="emma_ant" rev="${versions.emma}" conf="test->default"/> 
    33     <dependency org="checkstyle" name="checkstyle" rev="${versions.checkstyle}" conf="test->default"/> 
    3435    <dependency org="commons-beanutils" name="commons-beanutils" rev="${versions.commons-beanutils}" conf="test->default"/> 
    3536    <dependency org="antlr" name="antlr" rev="2.7.6" conf="test->default"/> 

  • trunk/components/importer/ivy.xml

    r2371 r2560  
    55      status="integration"/> 
    66  <configurations> 
    7     <conf name="core"/> 
    8     <conf name="build" extends="core"/> 
    9     <conf name="test"  extends="core"/> 
     7    <conf name="build"/> 
     8    <conf name="test"/> 
     9    <conf name="client"/> 
     10    <conf name="server"/> 
    1011  </configurations> 
    1112  <publications> 
    12     <artifact name="importer" type="jar" conf="core" /> 
     13    <artifact name="importer" type="jar"/> 
    1314  </publications> 
    14   <dependencies> 
     15  <dependencies defaultconfmapping="build,test,client->default"> 
    1516    <!-- Internal --> 
    16     <dependency name="common" rev="${omero.version}" changing="true" /> 
    17     <dependency org="OME" name="bio-formats" rev="${versions.bio-formats}" conf="build->default"/> 
    18     <dependency org="OME" name="ome-java" rev="${versions.ome-java}" conf="build->default"/> 
     17    <dependency name="common" rev="${omero.version}" changing="true" conf="build->build;test->test;client->client;server->server"/> 
     18    <dependency org="OME" name="bio-formats" rev="${versions.bio-formats}"/> 
     19    <dependency org="OME" name="ome-java" rev="${versions.ome-java}"/> 
    1920    <!-- Loci --> 
    20     <dependency org="loci" name="bufr" rev="1.1.00" conf="build->default"/> 
    21     <dependency org="loci" name="grib" rev="5.1.03" conf="build->default"/> 
    22     <dependency org="loci" name="ij" rev="unknown" conf="build->default"/> 
    23     <dependency org="loci" name="netcdf" rev="4.0" conf="build->default"/> 
    24     <dependency org="loci" name="poi" rev="${versions.poi}" conf="build->default"/> 
    25     <dependency org="loci" name="slf4j-jdk14" rev="1.0" conf="build->default"/> 
     21    <dependency org="loci" name="bufr" rev="1.1.00"/> 
     22    <dependency org="loci" name="grib" rev="5.1.03"/> 
     23    <dependency org="loci" name="ij" rev="unknown"/> 
     24    <dependency org="loci" name="netcdf" rev="4.0"/> 
     25    <dependency org="loci" name="poi" rev="${versions.poi}"/> 
     26    <dependency org="loci" name="slf4j-jdk14" rev="1.0"/> 
    2627  </dependencies> 
    2728</ivy-module> 

  • trunk/components/model/ivy.xml

    r2039 r2560  
    55      status="integration"/> 
    66  <configurations> 
    7     <conf name="core"/> 
    8     <conf name="build" extends="core"/> 
    9     <conf name="test"  extends="core"/> 
     7    <conf name="build"/> 
     8    <conf name="test"/> 
     9    <conf name="client"/> 
     10    <conf name="server"/> 
    1011  </configurations> 
    1112  <publications> 
    12     <artifact name="model-${omero.db.profile}" type="jar" conf="core" /> 
     13    <artifact name="model-${omero.db.profile}" type="jar"/> 
    1314  </publications> 
    14   <dependencies> 
     15  <dependencies defaultconfmapping="build,test,client,server->default"> 
    1516    <!-- Internal --> 
    16     <dependency name="dsl" rev="${omero.version}" changing="true" conf="build->build,test"/> 
     17    <dependency name="dsl" rev="${omero.version}" changing="true" conf="build->build;test->test;client->runtime;server->runtime"/> 
    1718    <!-- Public --> 
    18     <dependency org="jboss" name="jboss-j2ee" rev="${versions.jboss}" conf="build->default"/> 
    19     <dependency org="jboss" name="jboss-ejb3x" rev="${versions.jboss}" conf="build->default"/>  
     19    <dependency org="jboss" name="jboss-j2ee" rev="${versions.jboss}"/> 
     20    <dependency org="jboss" name="jboss-ejb3x" rev="${versions.jboss}"/> 
     21    <!-- Hibernate server --> 
     22    <dependency org="antlr" name="antlr" rev="${versions.antlr}" conf="server->default"/> 
     23    <dependency org="asm" name="asm-attrs" rev="${versions.asm}" conf="server->default"/> 
     24    <dependency org="asm" name="asm" rev="${versions.asm}" conf="server->default"/> 
     25    <dependency org="cglib" name="cglib" rev="${versions.cglib}" conf="server->default"/> 
     26    <dependency org="dom4j" name="dom4j" rev="${versions.dom4j}" conf="server->default"/> 
    2027    <!-- Hibernate --> 
    21     <dependency org="antlr" name="antlr" rev="${versions.antlr}" conf="build->default"/> 
    22     <dependency org="asm" name="asm-attrs" rev="${versions.asm}" conf="build->default"/> 
    23     <dependency org="asm" name="asm" rev="${versions.asm}" conf="build->default"/> 
    24     <dependency org="cglib" name="cglib" rev="${versions.cglib}" conf="build->default"/> 
    25     <dependency org="dom4j" name="dom4j" rev="${versions.dom4j}" conf="build->default"/> 
    26     <dependency org="org/hibernate" name="hibernate" rev="${versions.hibernate}" conf="build->default"/>  
    27     <dependency org="org/hibernate" name="hibernate-tools" rev="${versions.hibernate-tools}" conf="build->default"/>  
    28     <dependency org="org/hibernate" name="freemarker" rev="${versions.hibernate-tools}" conf="build->default"/>  
    29     <dependency org="org/hibernate" name="jtidy" rev="${versions.hibernate-tools}" conf="build->default"/>  
    30     <dependency org="hibernate" name="hibernate-annotations" rev="${versions.hibernate-annotations}" conf="build->default"/>  
    31     <dependency org="hibernate" name="hibernate-search" rev="${versions.hibernate-search}" conf="build->default"/>  
    32     <dependency org="hibernate" name="hibernate-validator" rev="${versions.hibernate-validator}" conf="build->default"/>  
    33     <dependency org="hibernate" name="hibernate-commons-annotations" rev="${versions.hibernate-commons-annotations}" conf="build->default"/>  
    34     <dependency org="javax/persistence" name="persistence-api" rev="${versions.persistence-api}" conf="build->default"/> 
    35     <dependency org="org/apache/lucene" name="lucene-core" rev="${versions.lucene}" conf="build->default"/> 
     28    <dependency org="org/hibernate" name="hibernate" rev="${versions.hibernate}" conf="server->default"/> 
     29    <dependency org="org/hibernate" name="hibernate-tools" rev="${versions.hibernate-tools}" conf="build->default"/> 
     30    <dependency org="org/hibernate" name="freemarker" rev="${versions.hibernate-tools}" conf="build->default"/> 
     31    <dependency org="org/hibernate" name="jtidy" rev="${versions.hibernate-tools}" conf="build->default"/> 
     32    <dependency org="hibernate" name="hibernate-annotations" rev="${versions.hibernate-annotations}"/> 
     33    <dependency org="hibernate" name="hibernate-search" rev="${versions.hibernate-search}"/> 
     34    <dependency org="hibernate" name="hibernate-validator" rev="${versions.hibernate-validator}"/> 
     35    <dependency org="hibernate" name="hibernate-commons-annotations" rev="${versions.hibernate-commons-annotations}"/> 
     36    <dependency org="javax/persistence" name="persistence-api" rev="${versions.persistence-api}"/> 
     37    <dependency org="org/apache/lucene" name="lucene-core" rev="${versions.lucene}"/> 
    3638  </dependencies> 
    3739</ivy-module> 

  • trunk/components/rendering/ivy.xml

    r1731 r2560  
    55      status="integration"/> 
    66  <configurations> 
    7     <conf name="core"/> 
    8     <conf name="build" extends="core"/> 
    9     <conf name="test"  extends="core"/> 
     7    <conf name="build"/> 
     8    <conf name="test"/> 
     9    <conf name="client"/> 
     10    <conf name="server"/> 
    1011  </configurations> 
    1112  <publications> 
    12     <artifact name="rendering" type="jar" conf="core" /> 
     13    <artifact name="rendering" type="jar"/> 
    1314  </publications> 
    1415  <dependencies> 
    1516    <!-- Internal --> 
    16     <dependency name="common" rev="${omero.version}" changing="true" /> 
    17     <dependency name="romio" rev="${omero.version}" changing="true" /> 
     17    <dependency name="common" rev="${omero.version}" changing="true" conf="build->build;test->test;client->client;server->server"/> 
     18    <dependency name="romio" rev="${omero.version}" changing="true" conf="build->build;test->test;client->client;server->server"/> 
    1819  </dependencies> 
    1920</ivy-module> 

  • trunk/components/romio/ivy.xml

    r1731 r2560  
    55      status="integration"/> 
    66  <configurations> 
    7     <conf name="core"/> 
    8     <conf name="build" extends="core"/> 
    9     <conf name="test"  extends="core"/> 
     7    <conf name="build"/> 
     8    <conf name="test"/> 
     9    <conf name="client"/> 
     10    <conf name="server"/> 
    1011  </configurations> 
    1112  <publications> 
    12     <artifact name="romio" type="jar" conf="core" /> 
     13    <artifact name="romio" type="jar"/> 
    1314  </publications> 
    1415  <dependencies> 
    1516    <!-- Internal --> 
    16     <dependency name="common" rev="${omero.version}" changing="true" /> 
     17    <dependency name="common" rev="${omero.version}" changing="true" conf="build->build;test->test;server->server;client->client"/> 
    1718  </dependencies> 
    1819</ivy-module> 

  • trunk/components/server/ivy.xml

    r2542 r2560  
    55      status="integration"/> 
    66  <configurations> 
    7     <conf name="core"/> 
    8     <conf name="build" extends="core"/> 
    9     <conf name="test"  extends="core"/> 
     7    <conf name="build"/> 
     8    <conf name="test"/> 
     9    <conf name="server"/> 
    1010  </configurations> 
    1111  <publications> 
    12     <artifact name="server" type="jar" conf="core" /> 
     12    <artifact name="server" type="jar"/> 
    1313  </publications> 
    14   <dependencies> 
     14  <dependencies defaultconfmapping="build,test,server->default"> 
    1515    <!-- Internal --> 
    16     <dependency name="common" rev="${omero.version}" changing="true" /> 
     16    <dependency name="common" rev="${omero.version}" changing="true" conf="build->build;test->test;server->server"/> 
     17    <dependency name="importer" rev="${omero.version}" changing="true" conf="build->build;test->test;server->server"/> 
     18    <dependency name="romio" rev="${omero.version}" changing="true" conf="build->build;test->test;server->server"/> 
     19    <dependency name="rendering" rev="${omero.version}" changing="true" conf="build->build;test->test;server->server"/><