• 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 Change
  • Next Change →

Changeset 1321 for branches/icy_omero

Show
Ignore:
Timestamp:
03/06/07 09:10:55 (21 months ago)
Author:
jmoore
Message:

#613 Reverting ICY -> TRUNK to merge into trunk (take 2)

Location:
branches/icy_omero
Files:
53 modified

  • components/antlib/.project (modified) (1 diff)
  • components/antlib/pom.xml (modified) (1 diff)
  • components/antlib/resources/release.xml (modified) (2 diffs)
  • components/antlib/resources/server.xml (modified) (1 diff)
  • components/app/.classpath (modified) (1 diff)
  • components/app/.project (modified) (1 diff)
  • components/app/classpath.xml (modified) (5 diffs)
  • components/app/pom.xml (modified) (2 diffs)
  • components/app/product.properties (modified) (1 diff)
  • components/app/resources/application.xml (modified) (1 diff)
  • components/bioformats-omero/.classpath (modified) (3 diffs)
  • components/bioformats-omero/classpath.xml (modified) (5 diffs)
  • components/bioformats-omero/pom.xml (modified) (2 diffs)
  • components/blitz/.classpath (modified) (1 diff)
  • components/blitz/.project (modified) (1 diff)
  • components/blitz/classpath.xml (modified) (9 diffs)
  • components/blitz/pom.xml (modified) (1 diff)
  • components/client/.classpath (modified) (1 diff)
  • components/client/.project (modified) (1 diff)
  • components/client/classpath.xml (modified) (5 diffs)
  • components/client/pom.xml (modified) (2 diffs)
  • components/common/.classpath (modified) (1 diff)
  • components/common/.project (modified) (1 diff)
  • components/common/classpath.xml (modified) (5 diffs)
  • components/common/pom.xml (modified) (2 diffs)
  • components/common/src/ome/system/Version.java (modified) (1 diff)
  • components/dsl/.project (modified) (1 diff)
  • components/dsl/classpath.xml (modified) (1 diff)
  • components/dsl/pom.xml (modified) (1 diff)
  • components/policy/.project (modified) (1 diff)
  • components/policy/pom.xml (modified) (2 diffs)
  • components/rendering/.classpath (modified) (1 diff)
  • components/rendering/.project (modified) (1 diff)
  • components/rendering/classpath.xml (modified) (5 diffs)
  • components/rendering/pom.xml (modified) (2 diffs)
  • components/resurrect/.project (modified) (1 diff)
  • components/romio/.classpath (modified) (1 diff)
  • components/romio/.project (modified) (1 diff)
  • components/romio/classpath.xml (modified) (5 diffs)
  • components/romio/pom.xml (modified) (2 diffs)
  • components/server/.classpath (modified) (1 diff)
  • components/server/.project (modified) (1 diff)
  • components/server/classpath.xml (modified) (9 diffs)
  • components/server/pom.xml (modified) (2 diffs)
  • components/tools/admin/.classpath (modified) (2 diffs)
  • components/tools/admin/.project (modified) (1 diff)
  • components/tools/licenses/.classpath (modified) (1 diff)
  • components/tools/licenses/.project (modified) (1 diff)
  • components/tools/licenses/classpath.xml (modified) (9 diffs)
  • components/tools/licenses/pom.xml (modified) (2 diffs)
  • etc/local.properties.example (modified) (1 diff)
  • etc/omero.properties (modified) (1 diff)
  • pom.xml (modified) (1 diff)

Legend:

Unmodified
Added
Removed

  • branches/icy_omero/components/antlib/.project

    r1320 r1321  
    11<projectDescription> 
    2   <name>omero-antlib-trunk</name> 
     2  <name>omero-antlib-3.0-TRUNK</name> 
    33  <comment/> 
    44  <projects/> 

  • branches/icy_omero/components/antlib/pom.xml

    r1320 r1321  
    44    <groupId>omero</groupId> 
    55    <artifactId>main</artifactId> 
    6     <version>trunk</version> 
     6    <version>3.0-TRUNK</version> 
    77    <relativePath>../../pom.xml</relativePath> 
    88  </parent> 

  • branches/icy_omero/components/antlib/resources/release.xml

    r1320 r1321  
    2424  run() { 
    2525        find -name $1 
    26         find -name $1 -exec perl -i -pe 's/trunk/3.0-Beta1/g' {} \; 
     26        find -name $1 -exec perl -i -pe 's/3.0-TRUNK/3.0-Beta1/g' {} \; 
    2727  }  
    2828  run pom.xml  
    … …  
    3535 
    3636  <target name="update-version"> 
    37     <property name="currentVersion" value="trunk"/> 
     37    <property name="currentVersion" value="3.0-TRUNK"/> 
    3838    <property name="updatedVersion" value="3.0-Beta1"/> 
    3939 

  • branches/icy_omero/components/antlib/resources/server.xml

    r1320 r1321  
    114114                <groovy> 
    115115                        jboss_home = properties["env.JBOSS_HOME"] 
    116                         status = ["${jboss_home}/bin/twiddle.sh","query","jboss.j2ee:ear=app-trunk.ear,jar=server-trunk.jar,name=QueryImpl,service=EJB3"] 
     116                        status = ["${jboss_home}/bin/twiddle.sh","query","jboss.j2ee:ear=app-3.0-TRUNK.ear,jar=server-3.0-TRUNK.jar,name=QueryImpl,service=EJB3"] 
    117117                        int ret = -1; 
    118118                        [2,4,8,16,32].each { |i| 

  • branches/icy_omero/components/app/.classpath

    r1320 r1321  
    2626        <classpathentry kind="var" path="M2_REPO/lucene/lucene/1.4.3/lucene-1.4.3.jar"/> 
    2727        <classpathentry kind="var" path="M2_REPO/net/sf/ehcache/ehcache/1.2/ehcache-1.2.jar"/> 
    28         <classpathentry sourcepath="/OMERO_COMMON_GENSRC" kind="var" path="M2_REPO/omero/common/trunk/common-trunk.jar"/> 
    29         <classpathentry kind="var" path="M2_REPO/omero/dsl/trunk/dsl-trunk.jar"/> 
     28        <classpathentry sourcepath="/OMERO_COMMON_GENSRC" kind="var" path="M2_REPO/omero/common/3.0-TRUNK/common-3.0-TRUNK.jar"/> 
     29        <classpathentry kind="var" path="M2_REPO/omero/dsl/3.0-TRUNK/dsl-3.0-TRUNK.jar"/> 
    3030        <classpathentry kind="var" path="M2_REPO/omero/jboss-annotations-ejb3/4.0.4.GA/jboss-annotations-ejb3-4.0.4.GA.jar"/> 
    3131        <classpathentry kind="var" path="M2_REPO/omero/jboss-ejb3x/4.0.4.GA/jboss-ejb3x-4.0.4.GA.jar"/> 
    3232        <classpathentry kind="var" path="M2_REPO/omero/postgresql/8.1-405.jdbc3/postgresql-8.1-405.jdbc3.jar"/> 
    33         <classpathentry kind="var" path="M2_REPO/omero/rendering/trunk/rendering-trunk.jar"/> 
    34         <classpathentry sourcepath="/OMERO_HOME/components/romio/src" kind="var" path="M2_REPO/omero/romio/trunk/romio-trunk.jar"/> 
    35         <classpathentry kind="var" path="M2_REPO/omero/server/trunk/server-trunk.jar"/> 
     33        <classpathentry kind="var" path="M2_REPO/omero/rendering/3.0-TRUNK/rendering-3.0-TRUNK.jar"/> 
     34        <classpathentry sourcepath="/OMERO_HOME/components/romio/src" kind="var" path="M2_REPO/omero/romio/3.0-TRUNK/romio-3.0-TRUNK.jar"/> 
     35        <classpathentry kind="var" path="M2_REPO/omero/server/3.0-TRUNK/server-3.0-TRUNK.jar"/> 
    3636        <classpathentry kind="var" path="M2_REPO/org/acegisecurity/acegi-security/1.0.0-RC1/acegi-security-1.0.0-RC1.jar"/> 
    3737        <classpathentry sourcepath="/HIBERNATE_SVN/src" kind="var" path="M2_REPO/org/hibernate/hibernate/3.2.2.GA/hibernate-3.2.2.GA.jar"/> 

  • branches/icy_omero/components/app/.project

    r1320 r1321  
    11<projectDescription> 
    2   <name>omero-app-trunk</name> 
     2  <name>omero-app-3.0-TRUNK</name> 
    33  <comment/> 
    44  <projects> 

  • branches/icy_omero/components/app/classpath.xml

    r1320 r1321  
    2121  <property name="artifact.name" value="app"/> 
    2222  <property name="artifact.group" value="omero"/> 
    23   <property name="artifact.version" value="trunk"/> 
     23  <property name="artifact.version" value="3.0-TRUNK"/> 
    2424  <property name="artifact.packaging" value="jar"/><!-- Default; override in component/build.xml --> 
    25   <property name="artifact.final.name" value="app-trunk.${artifact.packaging}"/> 
    26   <property name="artifact.path" value="omero/app/trunk/${artifact.final.name}"/> 
     25  <property name="artifact.final.name" value="app-3.0-TRUNK.${artifact.packaging}"/> 
     26  <property name="artifact.path" value="omero/app/3.0-TRUNK/${artifact.final.name}"/> 
    2727 
    2828  <filelist id="generated.compile.filelist" dir="${omero.repo.local}"> 
    … …  
    4646        <file name="lucene/lucene/1.4.3/lucene-1.4.3.jar"/> 
    4747        <file name="net/sf/ehcache/ehcache/1.2/ehcache-1.2.jar"/> 
    48         <file name="omero/common/trunk/common-trunk.jar"/> 
    49         <file name="omero/dsl/trunk/dsl-trunk.jar"/> 
    50         <file name="omero/ejb/trunk/ejb-trunk.jar"/> 
     48        <file name="omero/common/3.0-TRUNK/common-3.0-TRUNK.jar"/> 
     49        <file name="omero/dsl/3.0-TRUNK/dsl-3.0-TRUNK.jar"/> 
     50        <file name="omero/ejb/3.0-TRUNK/ejb-3.0-TRUNK.jar"/> 
    5151        <file name="omero/jboss-annotations-ejb3/4.0.4.GA/jboss-annotations-ejb3-4.0.4.GA.jar"/> 
    5252        <file name="omero/jboss-ejb3x/4.0.4.GA/jboss-ejb3x-4.0.4.GA.jar"/> 
    5353        <file name="omero/postgresql/8.1-405.jdbc3/postgresql-8.1-405.jdbc3.jar"/> 
    54         <file name="omero/rendering/trunk/rendering-trunk.jar"/> 
    55         <file name="omero/romio/trunk/romio-trunk.jar"/> 
    56         <file name="omero/server/trunk/server-trunk.jar"/> 
     54        <file name="omero/rendering/3.0-TRUNK/rendering-3.0-TRUNK.jar"/> 
     55        <file name="omero/romio/3.0-TRUNK/romio-3.0-TRUNK.jar"/> 
     56        <file name="omero/server/3.0-TRUNK/server-3.0-TRUNK.jar"/> 
    5757        <file name="omero/ice/3.1.1/ice-3.1.1.jar"/> 
    5858        <file name="org/acegisecurity/acegi-security/1.0.0-RC1/acegi-security-1.0.0-RC1.jar"/> 
    … …  
    8484        <include name="lucene/lucene/1.4.3/lucene-1.4.3.jar"/> 
    8585        <include name="net/sf/ehcache/ehcache/1.2/ehcache-1.2.jar"/> 
    86         <include name="omero/common/trunk/common-trunk.jar"/> 
    87         <include name="omero/dsl/trunk/dsl-trunk.jar"/> 
    88         <include name="omero/ejb/trunk/ejb-trunk.jar"/> 
     86        <include name="omero/common/3.0-TRUNK/common-3.0-TRUNK.jar"/> 
     87        <include name="omero/dsl/3.0-TRUNK/dsl-3.0-TRUNK.jar"/> 
     88        <include name="omero/ejb/3.0-TRUNK/ejb-3.0-TRUNK.jar"/> 
    8989        <include name="omero/jboss-annotations-ejb3/4.0.4.GA/jboss-annotations-ejb3-4.0.4.GA.jar"/> 
    9090        <include name="omero/jboss-ejb3x/4.0.4.GA/jboss-ejb3x-4.0.4.GA.jar"/> 
    9191        <include name="omero/postgresql/8.1-405.jdbc3/postgresql-8.1-405.jdbc3.jar"/> 
    92         <include name="omero/rendering/trunk/rendering-trunk.jar"/> 
    93         <include name="omero/romio/trunk/romio-trunk.jar"/> 
    94         <include name="omero/server/trunk/server-trunk.jar"/> 
    95         <include name="omero/icy-model/trunk/icy-model-trunk.jar"/> 
     92        <include name="omero/rendering/3.0-TRUNK/rendering-3.0-TRUNK.jar"/> 
     93        <include name="omero/romio/3.0-TRUNK/romio-3.0-TRUNK.jar"/> 
     94        <include name="omero/server/3.0-TRUNK/server-3.0-TRUNK.jar"/> 
     95        <include name="omero/icy-model/3.0-TRUNK/icy-model-3.0-TRUNK.jar"/> 
    9696        <include name="omero/ice/3.1.1/ice-3.1.1.jar"/> 
    9797        <include name="org/acegisecurity/acegi-security/1.0.0-RC1/acegi-security-1.0.0-RC1.jar"/> 
    … …  
    125125        <file name="lucene/lucene/1.4.3/lucene-1.4.3.jar"/> 
    126126        <file name="net/sf/ehcache/ehcache/1.2/ehcache-1.2.jar"/> 
    127         <file name="omero/common/trunk/common-trunk.jar"/> 
    128         <file name="omero/dsl/trunk/dsl-trunk.jar"/> 
    129         <file name="omero/ejb/trunk/ejb-trunk.jar"/> 
     127        <file name="omero/common/3.0-TRUNK/common-3.0-TRUNK.jar"/> 
     128        <file name="omero/dsl/3.0-TRUNK/dsl-3.0-TRUNK.jar"/> 
     129        <file name="omero/ejb/3.0-TRUNK/ejb-3.0-TRUNK.jar"/> 
    130130        <file name="omero/jboss-annotations-ejb3/4.0.4.GA/jboss-annotations-ejb3-4.0.4.GA.jar"/> 
    131131        <file name="omero/jboss-ejb3x/4.0.4.GA/jboss-ejb3x-4.0.4.GA.jar"/> 
    132132        <file name="omero/postgresql/8.1-405.jdbc3/postgresql-8.1-405.jdbc3.jar"/> 
    133         <file name="omero/rendering/trunk/rendering-trunk.jar"/> 
    134         <file name="omero/romio/trunk/romio-trunk.jar"/> 
    135         <file name="omero/server/trunk/server-trunk.jar"/> 
    136         <file name="omero/icy-model/trunk/icy-model-trunk.jar"/> 
     133        <file name="omero/rendering/3.0-TRUNK/rendering-3.0-TRUNK.jar"/> 
     134        <file name="omero/romio/3.0-TRUNK/romio-3.0-TRUNK.jar"/> 
     135        <file name="omero/server/3.0-TRUNK/server-3.0-TRUNK.jar"/> 
     136        <file name="omero/icy-model/3.0-TRUNK/icy-model-3.0-TRUNK.jar"/> 
    137137        <file name="omero/ice/3.1.1/ice-3.1.1.jar"/> 
    138138        <file name="org/acegisecurity/acegi-security/1.0.0-RC1/acegi-security-1.0.0-RC1.jar"/> 
    … …  
    168168        <include name="lucene/lucene/1.4.3/lucene-1.4.3.jar"/> 
    169169        <include name="net/sf/ehcache/ehcache/1.2/ehcache-1.2.jar"/> 
    170         <include name="omero/common/trunk/common-trunk.jar"/> 
    171         <include name="omero/dsl/trunk/dsl-trunk.jar"/> 
    172         <include name="omero/ejb/trunk/ejb-trunk.jar"/> 
     170        <include name="omero/common/3.0-TRUNK/common-3.0-TRUNK.jar"/> 
     171        <include name="omero/dsl/3.0-TRUNK/dsl-3.0-TRUNK.jar"/> 
     172        <include name="omero/ejb/3.0-TRUNK/ejb-3.0-TRUNK.jar"/> 
    173173        <include name="omero/jboss-annotations-ejb3/4.0.4.GA/jboss-annotations-ejb3-4.0.4.GA.jar"/> 
    174174        <include name="omero/jboss-ejb3x/4.0.4.GA/jboss-ejb3x-4.0.4.GA.jar"/> 
    175175        <include name="omero/postgresql/8.1-405.jdbc3/postgresql-8.1-405.jdbc3.jar"/> 
    176         <include name="omero/rendering/trunk/rendering-trunk.jar"/> 
    177         <include name="omero/romio/trunk/romio-trunk.jar"/> 
    178         <include name="omero/server/trunk/server-trunk.jar"/> 
    179         <include name="omero/icy-model/trunk/icy-model-trunk.jar"/> 
     176        <include name="omero/rendering/3.0-TRUNK/rendering-3.0-TRUNK.jar"/> 
     177        <include name="omero/romio/3.0-TRUNK/romio-3.0-TRUNK.jar"/> 
     178        <include name="omero/server/3.0-TRUNK/server-3.0-TRUNK.jar"/> 
     179        <include name="omero/icy-model/3.0-TRUNK/icy-model-3.0-TRUNK.jar"/> 
    180180        <include name="omero/ice/3.1.1/ice-3.1.1.jar"/> 
    181181        <include name="org/acegisecurity/acegi-security/1.0.0-RC1/acegi-security-1.0.0-RC1.jar"/> 

  • branches/icy_omero/components/app/pom.xml

    r1320 r1321  
    55    <groupId>omero</groupId> 
    66    <artifactId>main</artifactId> 
    7     <version>trunk</version> 
     7    <version>3.0-TRUNK</version> 
    88  </parent> 
    99  <modelVersion>4.0.0</modelVersion> 
    … …  
    2020      <groupId>omero</groupId> 
    2121      <artifactId>server</artifactId> 
    22       <version>trunk</version> 
     22      <version>3.0-TRUNK</version> 
    2323      <type>ejb</type> 
    2424      <exclusions> 

  • branches/icy_omero/components/app/product.properties

    r1320 r1321  
    11product.name="Omero Server" 
    2 product.version=trunk 
     2product.version=3.0-TRUNK 
    33product.license="GNU GPL, version 2" 
    44artifact.final.name=omero.ear 

  • branches/icy_omero/components/app/resources/application.xml

    r1320 r1321  
    88 
    99    <module> 
    10       <ejb>server-trunk.jar</ejb> 
     10      <ejb>server-3.0-TRUNK.jar</ejb> 
    1111    </module> 
    1212 
    1313    <module> 
    14       <ejb>icy-model-trunk.jar</ejb> 
     14      <ejb>icy-model-3.0-TRUNK.jar</ejb> 
    1515    </module> 
    1616 

  • branches/icy_omero/components/bioformats-omero/.classpath

    r1320 r1321  
    44        <classpathentry kind="src" path="src"/> 
    55        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> 
    6         <classpathentry kind="var" path="M2_REPO/omero/common/trunk/common-trunk.jar"/> 
     6        <classpathentry kind="var" path="M2_REPO/omero/common/3.0-TRUNK/common-3.0-TRUNK.jar"/> 
    77        <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/> 
    88        <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar"/> 
    … …  
    1414        <classpathentry kind="var" path="M2_REPO/org/springframework/spring-mock/2.0/spring-mock-2.0.jar"/> 
    1515        <classpathentry sourcepath="/SPRING_HOME" kind="var" path="M2_REPO/org/springframework/spring/2.0/spring-2.0.jar"/> 
    16         <classpathentry kind="var" path="M2_REPO/omero/client/trunk/client-trunk.jar"/> 
     16        <classpathentry kind="var" path="M2_REPO/omero/client/3.0-TRUNK/client-3.0-TRUNK.jar"/> 
    1717        <classpathentry kind="src" path="resources"/> 
    1818        <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.8/log4j-1.2.8.jar"/> 
    … …  
    3636        <classpathentry kind="lib" path="lib/commons-logging-1.0.4.jar"/> 
    3737        <classpathentry kind="lib" path="lib/commons-httpclient-3.0.1.jar"/> 
    38         <classpathentry kind="var" path="M2_REPO/omero/client/trunk/client-trunk.jar"/> 
    39         <classpathentry kind="var" path="M2_REPO/omero/common/trunk/common-trunk.jar"/> 
     38        <classpathentry kind="var" path="M2_REPO/omero/client/3.0-TRUNK/client-3.0-TRUNK.jar"/> 
     39        <classpathentry kind="var" path="M2_REPO/omero/common/3.0-TRUNK/common-3.0-TRUNK.jar"/> 
    4040        <classpathentry kind="output" path="bin"/> 
    4141</classpath> 

  • branches/icy_omero/components/bioformats-omero/classpath.xml

    r1320 r1321  
    2121  <property name="artifact.name" value="bioformats-omero"/> 
    2222  <property name="artifact.group" value="omero"/> 
    23   <property name="artifact.version" value="trunk"/> 
     23  <property name="artifact.version" value="3.0-TRUNK"/> 
    2424  <property name="artifact.packaging" value="jar"/><!-- Default; override in component/build.xml --> 
    25   <property name="artifact.final.name" value="bioformats-omero-trunk.${artifact.packaging}"/> 
    26   <property name="artifact.path" value="omero/bioformats-omero/trunk/${artifact.final.name}"/> 
     25  <property name="artifact.final.name" value="bioformats-omero-3.0-TRUNK.${artifact.packaging}"/> 
     26  <property name="artifact.path" value="omero/bioformats-omero/3.0-TRUNK/${artifact.final.name}"/> 
    2727 
    2828  <filelist id="generated.compile.filelist" dir="${omero.repo.local}"> 
    … …  
    3333        <file name="log4j/log4j/1.2.8/log4j-1.2.8.jar"/> 
    3434        <file name="omero/omejava/unknown/omejava-unknown.jar"/> 
    35         <file name="omero/common/trunk/common-trunk.jar"/> 
    36         <file name="omero/client/trunk/client-trunk.jar"/> 
    37         <file name="omero/dsl/trunk/dsl-trunk.jar"/> 
     35        <file name="omero/common/3.0-TRUNK/common-3.0-TRUNK.jar"/> 
     36        <file name="omero/client/3.0-TRUNK/client-3.0-TRUNK.jar"/> 
     37        <file name="omero/dsl/3.0-TRUNK/dsl-3.0-TRUNK.jar"/> 
    3838        <file name="omero/jboss-aop-jdk50-client/4.0.4.GA/jboss-aop-jdk50-client-4.0.4.GA.jar"/> 
    3939        <file name="omero/jboss-aspect-library-jdk50/4.0.4.GA/jboss-aspect-library-jdk50-4.0.4.GA.jar"/> 
    … …  
    5454        <include name="log4j/log4j/1.2.8/log4j-1.2.8.jar"/> 
    5555        <include name="omero/omejava/unknown/omejava-unknown.jar"/> 
    56         <include name="omero/common/trunk/common-trunk.jar"/> 
    57         <include name="omero/client/trunk/client-trunk.jar"/> 
    58         <include name="omero/dsl/trunk/dsl-trunk.jar"/> 
     56        <include name="omero/common/3.0-TRUNK/common-3.0-TRUNK.jar"/> 
     57        <include name="omero/client/3.0-TRUNK/client-3.0-TRUNK.jar"/> 
     58        <include name="omero/dsl/3.0-TRUNK/dsl-3.0-TRUNK.jar"/> 
    5959        <include name="omero/jboss-aop-jdk50-client/4.0.4.GA/jboss-aop-jdk50-client-4.0.4.GA.jar"/> 
    6060        <include name="omero/jboss-aspect-library-jdk50/4.0.4.GA/jboss-aspect-library-jdk50-4.0.4.GA.jar"/> 
    … …  
    7777        <file name="log4j/log4j/1.2.8/log4j-1.2.8.jar"/> 
    7878        <file name="omero/omejava/unknown/omejava-unknown.jar"/> 
    79         <file name="omero/common/trunk/common-trunk.jar"/> 
    80         <file name="omero/client/trunk/client-trunk.jar"/> 
    81         <file name="omero/dsl/trunk/dsl-trunk.jar"/> 
     79        <file name="omero/common/3.0-TRUNK/common-3.0-TRUNK.jar"/> 
     80        <file name="omero/client/3.0-TRUNK/client-3.0-TRUNK.jar"/> 
     81        <file name="omero/dsl/3.0-TRUNK/dsl-3.0-TRUNK.jar"/> 
    8282        <file name="omero/jboss-aop-jdk50-client/4.0.4.GA/jboss-aop-jdk50-client-4.0.4.GA.jar"/> 
    8383        <file name="omero/jboss-aspect-library-jdk50/4.0.4.GA/jboss-aspect-library-jdk50-4.0.4.GA.jar"/> 
    … …  
    103103        <include name="log4j/log4j/1.2.8/log4j-1.2.8.jar"/> 
    104104        <include name="omero/omejava/unknown/omejava-unknown.jar"/> 
    105         <include name="omero/common/trunk/common-trunk.jar"/> 
    106         <include name="omero/client/trunk/common-trunk.jar"/> 
    107         <include name="omero/dsl/trunk/dsl-trunk.jar"/> 
     105        <include name="omero/common/3.0-TRUNK/common-3.0-TRUNK.jar"/> 
     106        <include name="omero/client/3.0-TRUNK/common-3.0-TRUNK.jar"/> 
     107        <include name="omero/dsl/3.0-TRUNK/dsl-3.0-TRUNK.jar"/> 
    108108        <include name="omero/jboss-aop-jdk50-client/4.0.4.GA/jboss-aop-jdk50-client-4.0.4.GA.jar"/> 
    109109        <include name="omero/jboss-aspect-library-jdk50/4.0.4.GA/jboss-aspect-library-jdk50-4.0.4.GA.jar"/> 

  • branches/icy_omero/components/bioformats-omero/pom.xml

    r1320 r1321  
    66    <groupId>omero</groupId> 
    77    <artifactId>main</artifactId> 
    8     <version>trunk</version> 
     8    <version>3.0-TRUNK</version> 
    99  </parent> 
    1010  <name>BioFormats Extension for Omero</name> 
    … …  
    1515      <groupId>omero</groupId> 
    1616      <artifactId>client</artifactId> 
    17       <version>trunk</version> 
     17      <version>3.0-TRUNK</version> 
    1818    </dependency> 
    1919  </dependencies> 

  • branches/icy_omero/components/blitz/.classpath

    r1320 r1321  
    3939        <classpathentry exported="true" kind="var" path="M2_REPO/omero/jboss-aop-jdk50-client/4.0.4.GA/jboss-aop-jdk50-client-4.0.4.GA.jar"/> 
    4040        <classpathentry exported="true" kind="var" path="M2_REPO/omero/jboss-aspect-library-jdk50/4.0.4.GA/jboss-aspect-library-jdk50-4.0.4.GA.jar"/> 
    41         <classpathentry exported="true" kind="var" path="M2_REPO/omero/common/trunk/common-trunk.jar" sourcepath="/OMERO_COMMON"/> 
    42         <classpathentry exported="true" kind="var" path="M2_REPO/omero/dsl/trunk/dsl-trunk.jar"/> 
     41        <classpathentry exported="true" kind="var" path="M2_REPO/omero/common/3.0-TRUNK/common-3.0-TRUNK.jar" sourcepath="/OMERO_COMMON"/> 
     42        <classpathentry exported="true" kind="var" path="M2_REPO/omero/dsl/3.0-TRUNK/dsl-3.0-TRUNK.jar"/> 
    4343        <classpathentry kind="var" path="M2_REPO/omero/ice/3.1.1/ice-3.1.1.jar" sourcepath="/USER_HOME/code/ice/IceJ-3.1.1-java5"/> 
    4444        <classpathentry exported="true" kind="var" path="M2_REPO/omero/postgresql/8.1-405.jdbc3/postgresql-8.1-405.jdbc3.jar"/> 
    45         <classpathentry exported="true" kind="var" path="M2_REPO/omero/rendering/trunk/rendering-trunk.jar"/> 
    46         <classpathentry exported="true" kind="var" path="M2_REPO/omero/romio/trunk/romio-trunk.jar"/> 
    47         <classpathentry exported="true" kind="var" path="M2_REPO/omero/server/trunk/server-trunk.jar"/> 
    48         <classpathentry exported="true" kind="var" path="M2_REPO/omero/client/trunk/client-trunk.jar"/> 
     45        <classpathentry exported="true" kind="var" path="M2_REPO/omero/rendering/3.0-TRUNK/rendering-3.0-TRUNK.jar"/> 
     46        <classpathentry exported="true" kind="var" path="M2_REPO/omero/romio/3.0-TRUNK/romio-3.0-TRUNK.jar"/> 
     47        <classpathentry exported="true" kind="var" path="M2_REPO/omero/server/3.0-TRUNK/server-3.0-TRUNK.jar"/> 
     48        <classpathentry exported="true" kind="var" path="M2_REPO/omero/client/3.0-TRUNK/client-3.0-TRUNK.jar"/> 
    4949        <classpathentry exported="true" kind="var" path="M2_REPO/org/acegisecurity/acegi-security/1.0.0-RC1/acegi-security-1.0.0-RC1.jar"/> 
    5050        <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-tools/3.1.0.beta4/hibernate-tools-3.1.0.beta4.jar"/> 

  • branches/icy_omero/components/blitz/.project

    r1320 r1321  
    11<projectDescription> 
    2   <name>omero-icy-model-trunk</name> 
     2  <name>omero-icy-model-3.0-TRUNK</name> 
    33  <comment/> 
    44  <projects/> 

  • branches/icy_omero/components/blitz/classpath.xml

    r1320 r1321  
    2121  <property name="artifact.name" value="blitz"/> 
    2222  <property name="artifact.group" value="omero"/> 
    23   <property name="artifact.version" value="trunk"/> 
     23  <property name="artifact.version" value="3.0-TRUNK"/> 
    2424  <property name="artifact.packaging" value="jar"/><!-- Default; override in component/build.xml --> 
    25   <property name="artifact.final.name" value="blitz-trunk.${artifact.packaging}"/> 
    26   <property name="artifact.path" value="omero/blitz/trunk/${artifact.final.name}"/> 
     25  <property name="artifact.final.name" value="blitz-3.0-TRUNK.${artifact.packaging}"/> 
     26  <property name="artifact.path" value="omero/blitz/3.0-TRUNK/${artifact.final.name}"/> 
    2727 
    2828  <filelist id="generated.compile.filelist" dir="${omero.repo.local}"> 
    … …  
    4646        <file name="lucene/lucene/1.4.3/lucene-1.4.3.jar"/> 
    4747        <file name="net/sf/ehcache/ehcache/1.2/ehcache-1.2.jar"/> 
    48         <file name="omero/common/trunk/common-trunk.jar"/> 
    49         <file name="omero/dsl/trunk/dsl-trunk.jar"/> 
     48        <file name="omero/common/3.0-TRUNK/common-3.0-TRUNK.jar"/> 
     49        <file name="omero/dsl/3.0-TRUNK/dsl-3.0-TRUNK.jar"/> 
    5050        <file name="omero/ice/3.1.1/ice-3.1.1.jar"/> 
    5151        <file name="omero/jbossall-client/4.0.4.GA/jbossall-client-4.0.4.GA.jar"/> 
    … …  
    5757        <file name="omero/jboss-aspect-library-jdk50/4.0.4.GA/jboss-aspect-library-jdk50-4.0.4.GA.jar"/> 
    5858        <file name="omero/postgresql/8.1-405.jdbc3/postgresql-8.1-405.jdbc3.jar"/> 
    59         <file name="omero/rendering/trunk/rendering-trunk.jar"/> 
    60         <file name="omero/romio/trunk/romio-trunk.jar"/> 
    61         <file name="omero/server/trunk/server-trunk.jar"/> 
    62         <file name="omero/client/trunk/client-trunk.jar"/> 
     59        <file name="omero/rendering/3.0-TRUNK/rendering-3.0-TRUNK.jar"/> 
     60        <file name="omero/romio/3.0-TRUNK/romio-3.0-TRUNK.jar"/> 
     61        <file name="omero/server/3.0-TRUNK/server-3.0-TRUNK.jar"/> 
     62        <file name="omero/client/3.0-TRUNK/client-3.0-TRUNK.jar"/> 
    6363        <file name="org/acegisecurity/acegi-security/1.0.0-RC1/acegi-security-1.0.0-RC1.jar"/> 
    6464        <file name="org/hibernate/hibernate-tools/3.1.0.beta4/hibernate-tools-3.1.0.beta4.jar"/> 
    … …  
    9393        <include name="lucene/lucene/1.4.3/lucene-1.4.3.jar"/> 
    9494        <include name="net/sf/ehcache/ehcache/1.2/ehcache-1.2.jar"/> 
    95         <include name="omero/common/trunk/common-trunk.jar"/> 
    96         <include name="omero/dsl/trunk/dsl-trunk.jar"/> 
     95        <include name="omero/common/3.0-TRUNK/common-3.0-TRUNK.jar"/> 
     96        <include name="omero/dsl/3.0-TRUNK/dsl-3.0-TRUNK.jar"/> 
    9797        <include name="omero/ice/3.1.1/ice-3.1.1.jar"/> 
    9898        <include name="omero/jbossall-client/4.0.4.GA/jbossall-client-4.0.4.GA.jar"/> 
    … …  
    104104        <include name="omero/jboss-aspect-library-jdk50/4.0.4.GA/jboss-aspect-library-jdk50-4.0.4.GA.jar"/> 
    105105        <include name="omero/postgresql/8.1-405.jdbc3/postgresql-8.1-405.jdbc3.jar"/> 
    106         <include name="omero/rendering/trunk/rendering-trunk.jar"/> 
    107         <include name="omero/romio/trunk/romio-trunk.jar"/> 
    108         <include name="omero/server/trunk/server-trunk.jar"/> 
    109         <include name="omero/client/trunk/client-trunk.jar"/> 
     106        <include name="omero/rendering/3.0-TRUNK/rendering-3.0-TRUNK.jar"/> 
     107        <include name="omero/romio/3.0-TRUNK/romio-3.0-TRUNK.jar"/> 
     108        <include name="omero/server/3.0-TRUNK/server-3.0-TRUNK.jar"/> 
     109        <include name="omero/client/3.0-TRUNK/client-3.0-TRUNK.jar"/> 
    110110        <include name="org/acegisecurity/acegi-security/1.0.0-RC1/acegi-security-1.0.0-RC1.jar"/> 
    111111        <include name="org/hibernate/hibernate-tools/3.1.0.beta4/hibernate-tools-3.1.0.beta4.jar"/> 
    … …  
    143143        <file name="lucene/lucene/1.4.3/lucene-1.4.3.jar"/> 
    144144        <file name="net/sf/ehcache/ehcache/1.2/ehcache-1.2.jar"/>