Changeset 1586 for branches/3.0-Beta2
- Timestamp:
- 06/03/07 21:02:17 (17 months ago)
- Location:
- branches/3.0-Beta2
- Files:
-
- 61 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) (1 diff)
-
components/bioformats-omero/.project (modified) (1 diff)
-
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/importer/.classpath (modified) (1 diff)
-
components/importer/.project (modified) (1 diff)
-
components/importer/classpath.xml (modified) (5 diffs)
-
components/importer/pom.xml (modified) (2 diffs)
-
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/WebAdmin/.classpath (modified) (1 diff)
-
components/tools/WebAdmin/.project (modified) (1 diff)
-
components/tools/WebAdmin/pom.xml (modified) (1 diff)
-
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/3.0-Beta2/components/antlib/.project
r638 r1586 1 1 <projectDescription> 2 <name>omero-antlib-3.0- TRUNK</name>2 <name>omero-antlib-3.0-Beta2</name> 3 3 <comment/> 4 4 <projects/> -
branches/3.0-Beta2/components/antlib/pom.xml
r1167 r1586 4 4 <groupId>omero</groupId> 5 5 <artifactId>main</artifactId> 6 <version>3.0- TRUNK</version>6 <version>3.0-Beta2</version> 7 7 <relativePath>../../pom.xml</relativePath> 8 8 </parent> -
branches/3.0-Beta2/components/antlib/resources/release.xml
r1568 r1586 24 24 run() { 25 25 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' {} \; 27 27 } 28 28 run pom.xml … … 35 35 36 36 <target name="update-version"> 37 <property name="currentVersion" value="3.0- TRUNK"/>37 <property name="currentVersion" value="3.0-Beta2"/> 38 38 <property name="updatedVersion" value="3.0-RC1"/> 39 39 -
branches/3.0-Beta2/components/antlib/resources/server.xml
r1370 r1586 114 114 <groovy> 115 115 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"] 117 117 int ret = -1; 118 118 [2,4,8,16,32].each { i-> -
branches/3.0-Beta2/components/app/.classpath
r1383 r1586 27 27 <classpathentry kind="var" path="M2_REPO/lucene/lucene/1.4.3/lucene-1.4.3.jar"/> 28 28 <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"/> 31 31 <classpathentry kind="var" path="M2_REPO/omero/jboss-annotations-ejb3/4.0.4.GA/jboss-annotations-ejb3-4.0.4.GA.jar"/> 32 32 <classpathentry kind="var" path="M2_REPO/omero/jboss-ejb3x/4.0.4.GA/jboss-ejb3x-4.0.4.GA.jar"/> 33 33 <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"/> 37 37 <classpathentry kind="var" path="M2_REPO/org/acegisecurity/acegi-security/1.0.0-RC1/acegi-security-1.0.0-RC1.jar"/> 38 38 <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 1 1 <projectDescription> 2 <name>omero-app-3.0- TRUNK</name>2 <name>omero-app-3.0-Beta2</name> 3 3 <comment/> 4 4 <projects> -
branches/3.0-Beta2/components/app/classpath.xml
r1493 r1586 21 21 <property name="artifact.name" value="app"/> 22 22 <property name="artifact.group" value="omero"/> 23 <property name="artifact.version" value="3.0- TRUNK"/>23 <property name="artifact.version" value="3.0-Beta2"/> 24 24 <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}"/> 27 27 28 28 <filelist id="generated.compile.filelist" dir="${omero.repo.local}"> … … 48 48 <file name="lucene/lucene/1.4.3/lucene-1.4.3.jar"/> 49 49 <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"/> 54 54 <file name="omero/jboss-annotations-ejb3/4.0.4.GA/jboss-annotations-ejb3-4.0.4.GA.jar"/> 55 55 <file name="omero/jboss-ejb3x/4.0.4.GA/jboss-ejb3x-4.0.4.GA.jar"/> 56 56 <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"/> 61 61 <file name="omero/ice/3.2.0/ice-3.2.0.jar"/> 62 62 <file name="org/acegisecurity/acegi-security/1.0.0-RC1/acegi-security-1.0.0-RC1.jar"/> … … 91 91 <include name="lucene/lucene/1.4.3/lucene-1.4.3.jar"/> 92 92 <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"/> 97 97 <include name="omero/jboss-annotations-ejb3/4.0.4.GA/jboss-annotations-ejb3-4.0.4.GA.jar"/> 98 98 <include name="omero/jboss-ejb3x/4.0.4.GA/jboss-ejb3x-4.0.4.GA.jar"/> 99 99 <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"/> 104 104 <include name="omero/ice/3.2.0/ice-3.2.0.jar"/> 105 105 <include name="org/acegisecurity/acegi-security/1.0.0-RC1/acegi-security-1.0.0-RC1.jar"/> … … 136 136 <file name="lucene/lucene/1.4.3/lucene-1.4.3.jar"/> 137 137 <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"/> 142 142 <file name="omero/jboss-annotations-ejb3/4.0.4.GA/jboss-annotations-ejb3-4.0.4.GA.jar"/> 143 143 <file name="omero/jboss-ejb3x/4.0.4.GA/jboss-ejb3x-4.0.4.GA.jar"/> 144 144 <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"/> 149 149 <file name="omero/ice/3.2.0/ice-3.2.0.jar"/> 150 150 <file name="org/acegisecurity/acegi-security/1.0.0-RC1/acegi-security-1.0.0-RC1.jar"/> … … 183 183 <include name="lucene/lucene/1.4.3/lucene-1.4.3.jar"/> 184 184 <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"/> 189 189 <include name="omero/jboss-annotations-ejb3/4.0.4.GA/jboss-annotations-ejb3-4.0.4.GA.jar"/> 190 190 <include name="omero/jboss-ejb3x/4.0.4.GA/jboss-ejb3x-4.0.4.GA.jar"/> 191 191 <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"/> 196 196 <include name="omero/ice/3.2.0/ice-3.2.0.jar"/> 197 197 <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 5 5 <groupId>omero</groupId> 6 6 <artifactId>main</artifactId> 7 <version>3.0- TRUNK</version>7 <version>3.0-Beta2</version> 8 8 </parent> 9 9 <modelVersion>4.0.0</modelVersion> … … 20 20 <groupId>omero</groupId> 21 21 <artifactId>server</artifactId> 22 <version>3.0- TRUNK</version>22 <version>3.0-Beta2</version> 23 23 <type>ejb</type> 24 24 <exclusions> -
branches/3.0-Beta2/components/app/product.properties
r1391 r1586 1 1 product.name="Omero Server" 2 product.version=3.0- TRUNK2 product.version=3.0-Beta2 3 3 product.license="GNU GPL, version 2" 4 4 artifact.final.name=omero.ear -
branches/3.0-Beta2/components/app/resources/application.xml
r1322 r1586 8 8 9 9 <module> 10 <ejb>server-3.0- TRUNK.jar</ejb>10 <ejb>server-3.0-Beta2.jar</ejb> 11 11 </module> 12 12 13 13 <module> 14 <ejb>blitz-3.0- TRUNK.jar</ejb>14 <ejb>blitz-3.0-Beta2.jar</ejb> 15 15 </module> 16 16 -
branches/3.0-Beta2/components/bioformats-omero/.classpath
r1388 r1586 19 19 <classpathentry kind="lib" path="lib/commons-logging-1.0.4.jar"/> 20 20 <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"/> 23 23 <classpathentry kind="var" path="M2_REPO/omero/omejava/loci-tools-2007-Feb-26/omejava-loci-tools-2007-Feb-26.jar"/> 24 24 <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 1 1 <?xml version="1.0" encoding="UTF-8"?> 2 2 <projectDescription> 3 <name>omero-bioformats-omero-3.0- TRUNK</name>3 <name>omero-bioformats-omero-3.0-Beta2</name> 4 4 <comment></comment> 5 5 <projects> -
branches/3.0-Beta2/components/bioformats-omero/classpath.xml
r1298 r1586 21 21 <property name="artifact.name" value="bioformats-omero"/> 22 22 <property name="artifact.group" value="omero"/> 23 <property name="artifact.version" value="3.0- TRUNK"/>23 <property name="artifact.version" value="3.0-Beta2"/> 24 24 <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}"/> 27 27 28 28 <filelist id="generated.compile.filelist" dir="${omero.repo.local}"> … … 33 33 <file name="log4j/log4j/1.2.8/log4j-1.2.8.jar"/> 34 34 <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"/> 38 38 <file name="omero/jboss-aop-jdk50-client/4.0.4.GA/jboss-aop-jdk50-client-4.0.4.GA.jar"/> 39 39 <file name="omero/jboss-aspect-library-jdk50/4.0.4.GA/jboss-aspect-library-jdk50-4.0.4.GA.jar"/> … … 54 54 <include name="log4j/log4j/1.2.8/log4j-1.2.8.jar"/> 55 55 <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"/> 59 59 <include name="omero/jboss-aop-jdk50-client/4.0.4.GA/jboss-aop-jdk50-client-4.0.4.GA.jar"/> 60 60 <include name="omero/jboss-aspect-library-jdk50/4.0.4.GA/jboss-aspect-library-jdk50-4.0.4.GA.jar"/> … … 77 77 <file name="log4j/log4j/1.2.8/log4j-1.2.8.jar"/> 78 78 <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"/> 82 82 <file name="omero/jboss-aop-jdk50-client/4.0.4.GA/jboss-aop-jdk50-client-4.0.4.GA.jar"/> 83 83 <file name="omero/jboss-aspect-library-jdk50/4.0.4.GA/jboss-aspect-library-jdk50-4.0.4.GA.jar"/> … … 103 103 <include name="log4j/log4j/1.2.8/log4j-1.2.8.jar"/> 104 104 <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"/> 108 108 <include name="omero/jboss-aop-jdk50-client/4.0.4.GA/jboss-aop-jdk50-client-4.0.4.GA.jar"/> 109 109 <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 6 6 <groupId>omero</groupId> 7 7 <artifactId>main</artifactId> 8 <version>3.0- TRUNK</version>8 <version>3.0-Beta2</version> 9 9 </parent> 10 10 <name>BioFormats Extension for Omero</name> … … 15 15 <groupId>omero</groupId> 16 16 <artifactId>client</artifactId> 17 <version>3.0- TRUNK</version>17 <version>3.0-Beta2</version> 18 18 </dependency> 19 19 </dependencies> -
branches/3.0-Beta2/components/blitz/.classpath
r1568 r1586 40 40 <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"/> 41 41 <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"/> 44 44 <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"/> 46 46 <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"/> 51 51 <classpathentry exported="true" kind="var" path="M2_REPO/org/acegisecurity/acegi-security/1.0.0-RC1/acegi-security-1.0.0-RC1.jar"/> 52 52 <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 1 1 <projectDescription> 2 <name>omero-blitz-3.0- TRUNK</name>2 <name>omero-blitz-3.0-Beta2</name> 3 3 <comment/> 4 4 <projects/> -
branches/3.0-Beta2/components/blitz/classpath.xml
r1493 r1586 21 21 <property name="artifact.name" value="blitz"/> 22 22 <property name="artifact.group" value="omero"/> 23 <property name="artifact.version" value="3.0- TRUNK"/>23 <property name="artifact.version" value="3.0-Beta2"/> 24 24 <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}"/> 27 27 28 28 <filelist id="generated.compile.filelist" dir="${omero.repo.local}"> … … 48 48 <file name="lucene/lucene/1.4.3/lucene-1.4.3.jar"/> 49 49 <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"/> 53 53 <file name="omero/ice/3.2.0/ice-3.2.0.jar"/> 54 54 <file name="omero/jbossall-client/4.0.4.GA/jbossall-client-4.0.4.GA.jar"/> … … 60 60 <file name="omero/jboss-aspect-library-jdk50/4.0.4.GA/jboss-aspect-library-jdk50-4.0.4.GA.jar"/> 61 61 <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"/> 66 66 <file name="org/acegisecurity/acegi-security/1.0.0-RC1/acegi-security-1.0.0-RC1.jar"/> 67 67 <file name="org/hibernate/hibernate-tools/3.1.0.beta4/hibernate-tools-3.1.0.beta4.jar"/> … … 99 99 <include name="lucene/lucene/1.4.3/lucene-1.4.3.jar"/> 100 100 <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 <
