• 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 1586 for branches/3.0-Beta2/components

Show
Ignore:
Timestamp:
06/03/07 21:02:17 (15 months ago)
Author:
jmoore
Message:

s/3.0-TRUNK/3.0-Beta2/g

Location:
branches/3.0-Beta2/components
Files:
58 modified

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

Legend:

Unmodified
Added
Removed
  • branches/3.0-Beta2/components/antlib/.project

    r638 r1586  
    11<projectDescription> 
    2   <name>omero-antlib-3.0-TRUNK</name> 
     2  <name>omero-antlib-3.0-Beta2</name> 
    33  <comment/> 
    44  <projects/> 
  • branches/3.0-Beta2/components/antlib/pom.xml

    r1167 r1586  
    44    <groupId>omero</groupId> 
    55    <artifactId>main</artifactId> 
    6     <version>3.0-TRUNK</version> 
     6    <version>3.0-Beta2</version> 
    77    <relativePath>../../pom.xml</relativePath> 
    88  </parent> 
  • branches/3.0-Beta2/components/antlib/resources/release.xml

    r1568 r1586  
    2424  run() { 
    2525        find -name $1 
    26         find -name $1 -exec perl -i -pe 's/3.0-TRUNK/3.0-RC1/g' {} \; 
     26        find -name $1 -exec perl -i -pe 's/3.0-Beta2/3.0-RC1/g' {} \; 
    2727  }  
    2828  run pom.xml  
    … …  
    3535 
    3636  <target name="update-version"> 
    37     <property name="currentVersion" value="3.0-TRUNK"/> 
     37    <property name="currentVersion" value="3.0-Beta2"/> 
    3838    <property name="updatedVersion" value="3.0-RC1"/> 
    3939 
  • branches/3.0-Beta2/components/antlib/resources/server.xml

    r1370 r1586  
    114114                <groovy> 
    115115                        jboss_home = properties["env.JBOSS_HOME"] 
    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"] 
     116                        status = ["${jboss_home}/bin/twiddle.sh","query","jboss.j2ee:ear=app-3.0-Beta2.ear,jar=server-3.0-Beta2.jar,name=QueryImpl,service=EJB3"] 
    117117                        int ret = -1; 
    118118                        [2,4,8,16,32].each { i-> 
  • branches/3.0-Beta2/components/app/.classpath

    r1383 r1586  
    2727        <classpathentry kind="var" path="M2_REPO/lucene/lucene/1.4.3/lucene-1.4.3.jar"/> 
    2828        <classpathentry kind="var" path="M2_REPO/net/sf/ehcache/ehcache/1.2/ehcache-1.2.jar"/> 
    29         <classpathentry kind="var" path="M2_REPO/omero/common/3.0-TRUNK/common-3.0-TRUNK.jar" sourcepath="/OMERO_COMMON_GENSRC"/> 
    30         <classpathentry kind="var" path="M2_REPO/omero/dsl/3.0-TRUNK/dsl-3.0-TRUNK.jar"/> 
     29        <classpathentry kind="var" path="M2_REPO/omero/common/3.0-Beta2/common-3.0-Beta2.jar" sourcepath="/OMERO_COMMON_GENSRC"/> 
     30        <classpathentry kind="var" path="M2_REPO/omero/dsl/3.0-Beta2/dsl-3.0-Beta2.jar"/> 
    3131        <classpathentry kind="var" path="M2_REPO/omero/jboss-annotations-ejb3/4.0.4.GA/jboss-annotations-ejb3-4.0.4.GA.jar"/> 
    3232        <classpathentry kind="var" path="M2_REPO/omero/jboss-ejb3x/4.0.4.GA/jboss-ejb3x-4.0.4.GA.jar"/> 
    3333        <classpathentry kind="var" path="M2_REPO/omero/postgresql/8.1-405.jdbc3/postgresql-8.1-405.jdbc3.jar"/> 
    34         <classpathentry kind="var" path="M2_REPO/omero/rendering/3.0-TRUNK/rendering-3.0-TRUNK.jar"/> 
    35         <classpathentry kind="var" path="M2_REPO/omero/romio/3.0-TRUNK/romio-3.0-TRUNK.jar" sourcepath="/OMERO_HOME/components/romio/src"/> 
    36         <classpathentry kind="var" path="M2_REPO/omero/server/3.0-TRUNK/server-3.0-TRUNK.jar" sourcepath="/OMERO_HOME/components/server"/> 
     34        <classpathentry kind="var" path="M2_REPO/omero/rendering/3.0-Beta2/rendering-3.0-Beta2.jar"/> 
     35        <classpathentry kind="var" path="M2_REPO/omero/romio/3.0-Beta2/romio-3.0-Beta2.jar" sourcepath="/OMERO_HOME/components/romio/src"/> 
     36        <classpathentry kind="var" path="M2_REPO/omero/server/3.0-Beta2/server-3.0-Beta2.jar" sourcepath="/OMERO_HOME/components/server"/> 
    3737        <classpathentry kind="var" path="M2_REPO/org/acegisecurity/acegi-security/1.0.0-RC1/acegi-security-1.0.0-RC1.jar"/> 
    3838        <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate/3.2.2.GA/hibernate-3.2.2.GA.jar" sourcepath="/HIBERNATE_SVN/src"/> 
  • branches/3.0-Beta2/components/app/.project

    r638 r1586  
    11<projectDescription> 
    2   <name>omero-app-3.0-TRUNK</name> 
     2  <name>omero-app-3.0-Beta2</name> 
    33  <comment/> 
    44  <projects> 
  • branches/3.0-Beta2/components/app/classpath.xml

    r1493 r1586  
    2121  <property name="artifact.name" value="app"/> 
    2222  <property name="artifact.group" value="omero"/> 
    23   <property name="artifact.version" value="3.0-TRUNK"/> 
     23  <property name="artifact.version" value="3.0-Beta2"/> 
    2424  <property name="artifact.packaging" value="jar"/><!-- Default; override in component/build.xml --> 
    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}"/> 
     25  <property name="artifact.final.name" value="app-3.0-Beta2.${artifact.packaging}"/> 
     26  <property name="artifact.path" value="omero/app/3.0-Beta2/${artifact.final.name}"/> 
    2727 
    2828  <filelist id="generated.compile.filelist" dir="${omero.repo.local}"> 
    … …  
    4848        <file name="lucene/lucene/1.4.3/lucene-1.4.3.jar"/> 
    4949        <file name="net/sf/ehcache/ehcache/1.2/ehcache-1.2.jar"/> 
    50         <file name="omero/importer/3.0-TRUNK/importer-3.0-TRUNK.jar"/> 
    51         <file name="omero/common/3.0-TRUNK/common-3.0-TRUNK.jar"/> 
    52         <file name="omero/dsl/3.0-TRUNK/dsl-3.0-TRUNK.jar"/> 
    53         <file name="omero/ejb/3.0-TRUNK/ejb-3.0-TRUNK.jar"/> 
     50        <file name="omero/importer/3.0-Beta2/importer-3.0-Beta2.jar"/> 
     51        <file name="omero/common/3.0-Beta2/common-3.0-Beta2.jar"/> 
     52        <file name="omero/dsl/3.0-Beta2/dsl-3.0-Beta2.jar"/> 
     53        <file name="omero/ejb/3.0-Beta2/ejb-3.0-Beta2.jar"/> 
    5454        <file name="omero/jboss-annotations-ejb3/4.0.4.GA/jboss-annotations-ejb3-4.0.4.GA.jar"/> 
    5555        <file name="omero/jboss-ejb3x/4.0.4.GA/jboss-ejb3x-4.0.4.GA.jar"/> 
    5656        <file name="omero/postgresql/8.1-405.jdbc3/postgresql-8.1-405.jdbc3.jar"/> 
    57         <file name="omero/rendering/3.0-TRUNK/rendering-3.0-TRUNK.jar"/> 
    58         <file name="omero/romio/3.0-TRUNK/romio-3.0-TRUNK.jar"/> 
    59         <file name="omero/server/3.0-TRUNK/server-3.0-TRUNK.jar"/> 
    60         <file name="omero/blitz/3.0-TRUNK/blitz-3.0-TRUNK.jar"/> 
     57        <file name="omero/rendering/3.0-Beta2/rendering-3.0-Beta2.jar"/> 
     58        <file name="omero/romio/3.0-Beta2/romio-3.0-Beta2.jar"/> 
     59        <file name="omero/server/3.0-Beta2/server-3.0-Beta2.jar"/> 
     60        <file name="omero/blitz/3.0-Beta2/blitz-3.0-Beta2.jar"/> 
    6161        <file name="omero/ice/3.2.0/ice-3.2.0.jar"/> 
    6262        <file name="org/acegisecurity/acegi-security/1.0.0-RC1/acegi-security-1.0.0-RC1.jar"/> 
    … …  
    9191        <include name="lucene/lucene/1.4.3/lucene-1.4.3.jar"/> 
    9292        <include name="net/sf/ehcache/ehcache/1.2/ehcache-1.2.jar"/> 
    93         <include name="omero/common/3.0-TRUNK/common-3.0-TRUNK.jar"/> 
    94         <include name="omero/importer/3.0-TRUNK/importer-3.0-TRUNK.jar"/> 
    95         <include name="omero/dsl/3.0-TRUNK/dsl-3.0-TRUNK.jar"/> 
    96         <include name="omero/ejb/3.0-TRUNK/ejb-3.0-TRUNK.jar"/> 
     93        <include name="omero/common/3.0-Beta2/common-3.0-Beta2.jar"/> 
     94        <include name="omero/importer/3.0-Beta2/importer-3.0-Beta2.jar"/> 
     95        <include name="omero/dsl/3.0-Beta2/dsl-3.0-Beta2.jar"/> 
     96        <include name="omero/ejb/3.0-Beta2/ejb-3.0-Beta2.jar"/> 
    9797        <include name="omero/jboss-annotations-ejb3/4.0.4.GA/jboss-annotations-ejb3-4.0.4.GA.jar"/> 
    9898        <include name="omero/jboss-ejb3x/4.0.4.GA/jboss-ejb3x-4.0.4.GA.jar"/> 
    9999        <include name="omero/postgresql/8.1-405.jdbc3/postgresql-8.1-405.jdbc3.jar"/> 
    100         <include name="omero/rendering/3.0-TRUNK/rendering-3.0-TRUNK.jar"/> 
    101         <include name="omero/romio/3.0-TRUNK/romio-3.0-TRUNK.jar"/> 
    102         <include name="omero/server/3.0-TRUNK/server-3.0-TRUNK.jar"/> 
    103         <include name="omero/blitz/3.0-TRUNK/blitz-3.0-TRUNK.jar"/> 
     100        <include name="omero/rendering/3.0-Beta2/rendering-3.0-Beta2.jar"/> 
     101        <include name="omero/romio/3.0-Beta2/romio-3.0-Beta2.jar"/> 
     102        <include name="omero/server/3.0-Beta2/server-3.0-Beta2.jar"/> 
     103        <include name="omero/blitz/3.0-Beta2/blitz-3.0-Beta2.jar"/> 
    104104        <include name="omero/ice/3.2.0/ice-3.2.0.jar"/> 
    105105        <include name="org/acegisecurity/acegi-security/1.0.0-RC1/acegi-security-1.0.0-RC1.jar"/> 
    … …  
    136136        <file name="lucene/lucene/1.4.3/lucene-1.4.3.jar"/> 
    137137        <file name="net/sf/ehcache/ehcache/1.2/ehcache-1.2.jar"/> 
    138         <file name="omero/importer/3.0-TRUNK/importer-3.0-TRUNK.jar"/> 
    139         <file name="omero/common/3.0-TRUNK/common-3.0-TRUNK.jar"/> 
    140         <file name="omero/dsl/3.0-TRUNK/dsl-3.0-TRUNK.jar"/> 
    141         <file name="omero/ejb/3.0-TRUNK/ejb-3.0-TRUNK.jar"/> 
     138        <file name="omero/importer/3.0-Beta2/importer-3.0-Beta2.jar"/> 
     139        <file name="omero/common/3.0-Beta2/common-3.0-Beta2.jar"/> 
     140        <file name="omero/dsl/3.0-Beta2/dsl-3.0-Beta2.jar"/> 
     141        <file name="omero/ejb/3.0-Beta2/ejb-3.0-Beta2.jar"/> 
    142142        <file name="omero/jboss-annotations-ejb3/4.0.4.GA/jboss-annotations-ejb3-4.0.4.GA.jar"/> 
    143143        <file name="omero/jboss-ejb3x/4.0.4.GA/jboss-ejb3x-4.0.4.GA.jar"/> 
    144144        <file name="omero/postgresql/8.1-405.jdbc3/postgresql-8.1-405.jdbc3.jar"/> 
    145         <file name="omero/rendering/3.0-TRUNK/rendering-3.0-TRUNK.jar"/> 
    146         <file name="omero/romio/3.0-TRUNK/romio-3.0-TRUNK.jar"/> 
    147         <file name="omero/server/3.0-TRUNK/server-3.0-TRUNK.jar"/> 
    148         <file name="omero/blitz/3.0-TRUNK/blitz-3.0-TRUNK.jar"/> 
     145        <file name="omero/rendering/3.0-Beta2/rendering-3.0-Beta2.jar"/> 
     146        <file name="omero/romio/3.0-Beta2/romio-3.0-Beta2.jar"/> 
     147        <file name="omero/server/3.0-Beta2/server-3.0-Beta2.jar"/> 
     148        <file name="omero/blitz/3.0-Beta2/blitz-3.0-Beta2.jar"/> 
    149149        <file name="omero/ice/3.2.0/ice-3.2.0.jar"/> 
    150150        <file name="org/acegisecurity/acegi-security/1.0.0-RC1/acegi-security-1.0.0-RC1.jar"/> 
    … …  
    183183        <include name="lucene/lucene/1.4.3/lucene-1.4.3.jar"/> 
    184184        <include name="net/sf/ehcache/ehcache/1.2/ehcache-1.2.jar"/> 
    185         <include name="omero/importer/3.0-TRUNK/importer-3.0-TRUNK.jar"/> 
    186         <include name="omero/common/3.0-TRUNK/common-3.0-TRUNK.jar"/> 
    187         <include name="omero/dsl/3.0-TRUNK/dsl-3.0-TRUNK.jar"/> 
    188         <include name="omero/ejb/3.0-TRUNK/ejb-3.0-TRUNK.jar"/> 
     185        <include name="omero/importer/3.0-Beta2/importer-3.0-Beta2.jar"/> 
     186        <include name="omero/common/3.0-Beta2/common-3.0-Beta2.jar"/> 
     187        <include name="omero/dsl/3.0-Beta2/dsl-3.0-Beta2.jar"/> 
     188        <include name="omero/ejb/3.0-Beta2/ejb-3.0-Beta2.jar"/> 
    189189        <include name="omero/jboss-annotations-ejb3/4.0.4.GA/jboss-annotations-ejb3-4.0.4.GA.jar"/> 
    190190        <include name="omero/jboss-ejb3x/4.0.4.GA/jboss-ejb3x-4.0.4.GA.jar"/> 
    191191        <include name="omero/postgresql/8.1-405.jdbc3/postgresql-8.1-405.jdbc3.jar"/> 
    192         <include name="omero/rendering/3.0-TRUNK/rendering-3.0-TRUNK.jar"/> 
    193         <include name="omero/romio/3.0-TRUNK/romio-3.0-TRUNK.jar"/> 
    194         <include name="omero/server/3.0-TRUNK/server-3.0-TRUNK.jar"/> 
    195         <include name="omero/blitz/3.0-TRUNK/blitz-3.0-TRUNK.jar"/> 
     192        <include name="omero/rendering/3.0-Beta2/rendering-3.0-Beta2.jar"/> 
     193        <include name="omero/romio/3.0-Beta2/romio-3.0-Beta2.jar"/> 
     194        <include name="omero/server/3.0-Beta2/server-3.0-Beta2.jar"/> 
     195        <include name="omero/blitz/3.0-Beta2/blitz-3.0-Beta2.jar"/> 
    196196        <include name="omero/ice/3.2.0/ice-3.2.0.jar"/> 
    197197        <include name="org/acegisecurity/acegi-security/1.0.0-RC1/acegi-security-1.0.0-RC1.jar"/> 
  • branches/3.0-Beta2/components/app/pom.xml

    r1214 r1586  
    55    <groupId>omero</groupId> 
    66    <artifactId>main</artifactId> 
    7     <version>3.0-TRUNK</version> 
     7    <version>3.0-Beta2</version> 
    88  </parent> 
    99  <modelVersion>4.0.0</modelVersion> 
    … …  
    2020      <groupId>omero</groupId> 
    2121      <artifactId>server</artifactId> 
    22       <version>3.0-TRUNK</version> 
     22      <version>3.0-Beta2</version> 
    2323      <type>ejb</type> 
    2424      <exclusions> 
  • branches/3.0-Beta2/components/app/product.properties

    r1391 r1586  
    11product.name="Omero Server" 
    2 product.version=3.0-TRUNK 
     2product.version=3.0-Beta2 
    33product.license="GNU GPL, version 2" 
    44artifact.final.name=omero.ear 
  • branches/3.0-Beta2/components/app/resources/application.xml

    r1322 r1586  
    88 
    99    <module> 
    10       <ejb>server-3.0-TRUNK.jar</ejb> 
     10      <ejb>server-3.0-Beta2.jar</ejb> 
    1111    </module> 
    1212 
    1313    <module> 
    14       <ejb>blitz-3.0-TRUNK.jar</ejb> 
     14      <ejb>blitz-3.0-Beta2.jar</ejb> 
    1515    </module> 
    1616 
  • branches/3.0-Beta2/components/bioformats-omero/.classpath

    r1388 r1586  
    1919        <classpathentry kind="lib" path="lib/commons-logging-1.0.4.jar"/> 
    2020        <classpathentry kind="lib" path="lib/commons-httpclient-3.0.1.jar"/> 
    21         <classpathentry kind="lib" path="lib/common-3.0-TRUNK.jar"/> 
    22         <classpathentry kind="lib" path="lib/client-3.0-TRUNK.jar"/> 
     21        <classpathentry kind="lib" path="lib/common-3.0-Beta2.jar"/> 
     22        <classpathentry kind="lib" path="lib/client-3.0-Beta2.jar"/> 
    2323        <classpathentry kind="var" path="M2_REPO/omero/omejava/loci-tools-2007-Feb-26/omejava-loci-tools-2007-Feb-26.jar"/> 
    2424        <classpathentry kind="var" path="M2_REPO/testng/testng/5.2-jdk15/testng-5.2-jdk15.jar"/> 
  • branches/3.0-Beta2/components/bioformats-omero/.project

    r1324 r1586  
    11<?xml version="1.0" encoding="UTF-8"?> 
    22<projectDescription> 
    3         <name>omero-bioformats-omero-3.0-TRUNK</name> 
     3        <name>omero-bioformats-omero-3.0-Beta2</name> 
    44        <comment></comment> 
    55        <projects> 
  • branches/3.0-Beta2/components/bioformats-omero/classpath.xml

    r1298 r1586  
    2121  <property name="artifact.name" value="bioformats-omero"/> 
    2222  <property name="artifact.group" value="omero"/> 
    23   <property name="artifact.version" value="3.0-TRUNK"/> 
     23  <property name="artifact.version" value="3.0-Beta2"/> 
    2424  <property name="artifact.packaging" value="jar"/><!-- Default; override in component/build.xml --> 
    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}"/> 
     25  <property name="artifact.final.name" value="bioformats-omero-3.0-Beta2.${artifact.packaging}"/> 
     26  <property name="artifact.path" value="omero/bioformats-omero/3.0-Beta2/${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/loci-tools-2007-Feb-26/omejava-loci-tools-2007-Feb-26.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"/> 
     35        <file name="omero/common/3.0-Beta2/common-3.0-Beta2.jar"/> 
     36        <file name="omero/client/3.0-Beta2/client-3.0-Beta2.jar"/> 
     37        <file name="omero/dsl/3.0-Beta2/dsl-3.0-Beta2.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/loci-tools-2007-Feb-26/omejava-loci-tools-2007-Feb-26.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"/> 
     56        <include name="omero/common/3.0-Beta2/common-3.0-Beta2.jar"/> 
     57        <include name="omero/client/3.0-Beta2/client-3.0-Beta2.jar"/> 
     58        <include name="omero/dsl/3.0-Beta2/dsl-3.0-Beta2.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/loci-tools-2007-Feb-26/omejava-loci-tools-2007-Feb-26.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"/> 
     79        <file name="omero/common/3.0-Beta2/common-3.0-Beta2.jar"/> 
     80        <file name="omero/client/3.0-Beta2/client-3.0-Beta2.jar"/> 
     81        <file name="omero/dsl/3.0-Beta2/dsl-3.0-Beta2.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/loci-tools-2007-Feb-26/omejava-loci-tools-2007-Feb-26.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"/> 
     105        <include name="omero/common/3.0-Beta2/common-3.0-Beta2.jar"/> 
     106        <include name="omero/client/3.0-Beta2/common-3.0-Beta2.jar"/> 
     107        <include name="omero/dsl/3.0-Beta2/dsl-3.0-Beta2.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/3.0-Beta2/components/bioformats-omero/pom.xml

    r1195 r1586  
    66    <groupId>omero</groupId> 
    77    <artifactId>main</artifactId> 
    8     <version>3.0-TRUNK</version> 
     8    <version>3.0-Beta2</version> 
    99  </parent> 
    1010  <name>BioFormats Extension for Omero</name> 
    … …  
    1515      <groupId>omero</groupId> 
    1616      <artifactId>client</artifactId> 
    17       <version>3.0-TRUNK</version> 
     17      <version>3.0-Beta2</version> 
    1818    </dependency> 
    1919  </dependencies> 
  • branches/3.0-Beta2/components/blitz/.classpath

    r1568 r1586  
    4040        <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"/> 
    4141        <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"/> 
    42         <classpathentry exported="true" kind="var" path="M2_REPO/omero/common/3.0-TRUNK/common-3.0-TRUNK.jar" sourcepath="/OMERO_HOME/components/common"/> 
    43         <classpathentry exported="true" kind="var" path="M2_REPO/omero/dsl/3.0-TRUNK/dsl-3.0-TRUNK.jar"/> 
     42        <classpathentry exported="true" kind="var" path="M2_REPO/omero/common/3.0-Beta2/common-3.0-Beta2.jar" sourcepath="/OMERO_HOME/components/common"/> 
     43        <classpathentry exported="true" kind="var" path="M2_REPO/omero/dsl/3.0-Beta2/dsl-3.0-Beta2.jar"/> 
    4444        <classpathentry kind="var" path="M2_REPO/omero/ice/3.2.0/ice-3.2.0.jar" sourcepath="/USER_HOME/code/ice/IceJ-3.2.0-java5"/> 
    45         <classpathentry exported="true" kind="var" path="M2_REPO/omero/importer/3.0-TRUNK/importer-3.0-TRUNK.jar"/> 
     45        <classpathentry exported="true" kind="var" path="M2_REPO/omero/importer/3.0-Beta2/importer-3.0-Beta2.jar"/> 
    4646        <classpathentry exported="true" kind="var" path="M2_REPO/omero/postgresql/8.1-405.jdbc3/postgresql-8.1-405.jdbc3.jar"/> 
    47         <classpathentry exported="true" kind="var" path="M2_REPO/omero/rendering/3.0-TRUNK/rendering-3.0-TRUNK.jar"/> 
    48         <classpathentry exported="true" kind="var" path="M2_REPO/omero/romio/3.0-TRUNK/romio-3.0-TRUNK.jar"/> 
    49         <classpathentry exported="true" kind="var" path="M2_REPO/omero/server/3.0-TRUNK/server-3.0-TRUNK.jar" sourcepath="/OMERO_TRUNK_HOME/components/server"/> 
    50         <classpathentry exported="true" kind="var" path="M2_REPO/omero/client/3.0-TRUNK/client-3.0-TRUNK.jar"/> 
     47        <classpathentry exported="true" kind="var" path="M2_REPO/omero/rendering/3.0-Beta2/rendering-3.0-Beta2.jar"/> 
     48        <classpathentry exported="true" kind="var" path="M2_REPO/omero/romio/3.0-Beta2/romio-3.0-Beta2.jar"/> 
     49        <classpathentry exported="true" kind="var" path="M2_REPO/omero/server/3.0-Beta2/server-3.0-Beta2.jar" sourcepath="/OMERO_TRUNK_HOME/components/server"/> 
     50        <classpathentry exported="true" kind="var" path="M2_REPO/omero/client/3.0-Beta2/client-3.0-Beta2.jar"/> 
    5151        <classpathentry exported="true" kind="var" path="M2_REPO/org/acegisecurity/acegi-security/1.0.0-RC1/acegi-security-1.0.0-RC1.jar"/> 
    5252        <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-tools/3.1.0.beta4/hibernate-tools-3.1.0.beta4.jar"/> 
  • branches/3.0-Beta2/components/blitz/.project

    r1324 r1586  
    11<projectDescription> 
    2   <name>omero-blitz-3.0-TRUNK</name> 
     2  <name>omero-blitz-3.0-Beta2</name> 
    33  <comment/> 
    44  <projects/> 
  • branches/3.0-Beta2/components/blitz/classpath.xml

    r1493 r1586  
    2121  <property name="artifact.name" value="blitz"/> 
    2222  <property name="artifact.group" value="omero"/> 
    23   <property name="artifact.version" value="3.0-TRUNK"/> 
     23  <property name="artifact.version" value="3.0-Beta2"/> 
    2424  <property name="artifact.packaging" value="jar"/><!-- Default; override in component/build.xml --> 
    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}"/> 
     25  <property name="artifact.final.name" value="blitz-3.0-Beta2.${artifact.packaging}"/> 
     26  <property name="artifact.path" value="omero/blitz/3.0-Beta2/${artifact.final.name}"/> 
    2727 
    2828  <filelist id="generated.compile.filelist" dir="${omero.repo.local}"> 
    … …  
    4848        <file name="lucene/lucene/1.4.3/lucene-1.4.3.jar"/> 
    4949        <file name="net/sf/ehcache/ehcache/1.2/ehcache-1.2.jar"/> 
    50         <file name="omero/importer/3.0-TRUNK/importer-3.0-TRUNK.jar"/> 
    51         <file name="omero/common/3.0-TRUNK/common-3.0-TRUNK.jar"/> 
    52         <file name="omero/dsl/3.0-TRUNK/dsl-3.0-TRUNK.jar"/> 
     50        <file name="omero/importer/3.0-Beta2/importer-3.0-Beta2.jar"/> 
     51        <file name="omero/common/3.0-Beta2/common-3.0-Beta2.jar"/> 
     52        <file name="omero/dsl/3.0-Beta2/dsl-3.0-Beta2.jar"/> 
    5353        <file name="omero/ice/3.2.0/ice-3.2.0.jar"/> 
    5454        <file name="omero/jbossall-client/4.0.4.GA/jbossall-client-4.0.4.GA.jar"/> 
    … …  
    6060        <file name="omero/jboss-aspect-library-jdk50/4.0.4.GA/jboss-aspect-library-jdk50-4.0.4.GA.jar"/> 
    6161        <file name="omero/postgresql/8.1-405.jdbc3/postgresql-8.1-405.jdbc3.jar"/> 
    62         <file name="omero/rendering/3.0-TRUNK/rendering-3.0-TRUNK.jar"/> 
    63         <file name="omero/romio/3.0-TRUNK/romio-3.0-TRUNK.jar"/> 
    64         <file name="omero/server/3.0-TRUNK/server-3.0-TRUNK.jar"/> 
    65         <file name="omero/client/3.0-TRUNK/client-3.0-TRUNK.jar"/> 
     62        <file name="omero/rendering/3.0-Beta2/rendering-3.0-Beta2.jar"/> 
     63        <file name="omero/romio/3.0-Beta2/romio-3.0-Beta2.jar"/> 
     64        <file name="omero/server/3.0-Beta2/server-3.0-Beta2.jar"/> 
     65        <file name="omero/client/3.0-Beta2/client-3.0-Beta2.jar"/> 
    6666        <file name="org/acegisecurity/acegi-security/1.0.0-RC1/acegi-security-1.0.0-RC1.jar"/> 
    6767        <file name="org/hibernate/hibernate-tools/3.1.0.beta4/hibernate-tools-3.1.0.beta4.jar"/> 
    … …  
    9999        <include name="lucene/lucene/1.4.3/lucene-1.4.3.jar"/> 
    100100        <include name="net/sf/ehcache/ehcache/1.2/ehcache-1.2.jar"/> 
    101         <include name="omero/common/3.0-TRUNK/common-3.0-TRUNK.jar"/> 
    102         <include name="omero/importer/3.0-TRUNK/importer-3.0-TRUNK.jar"/> 
    103         <include name="omero/dsl/3.0-TRUNK/dsl-3.0-TRUNK.jar"/> 
     101        <include name="omero/common/3.0-Beta2/common-3.0-Beta2.jar"/> 
     102        <include name="omero/importer/3.0-Beta2/importer-3.0-Beta2.jar"/> 
     103        <include name="omero/dsl/3.0-Beta2/dsl-3.0-Beta2.jar"/> 
    104104        <include name="omero/ice/3.2.0/ice-3.2.0.jar"/> 
    105105        <include name="omero/jbossall-client/4.0.4.GA/jbossall-client-4.0.4.GA.jar"/>