Changeset 1085

Timestamp:

11/20/06 11:26:32 (2 years ago)

Author:

jmoore

Message:

Renaming "3.0-TRUNK" to "3.0-M3" (with update-version)

Location:

branches/3.0-M3

Files:

• components/antlib/.project (modified) (1 diff)
• components/antlib/pom.xml (modified) (1 diff)
• 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/resources/application.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/dsl/.project (modified) (1 diff)
• components/dsl/classpath.xml (modified) (1 diff)
• components/dsl/pom.xml (modified) (1 diff)
• components/ice/.project (modified) (1 diff)
• components/ice/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)
• etc/omero.properties (modified) (1 diff)
• pom.xml (modified) (1 diff)

branches/3.0-M3/components/antlib/.project

@@ -1 +1 @@
 <projectDescription>
-  <name>omero-antlib-3.0-TRUNK</name>
+  <name>omero-antlib-3.0-M3</name>
   <comment/>
   <projects/>

branches/3.0-M3/components/antlib/pom.xml

@@ -4 +4 @@
     <groupId>omero</groupId>
     <artifactId>main</artifactId>
-    <version>3.0-TRUNK</version>
+    <version>3.0-M3</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>

branches/3.0-M3/components/antlib/resources/server.xml

@@ -92 +92 @@
                 <groovy>
                         jboss_home = properties["env.JBOSS_HOME"]
-                        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"]
+                        status = ["${jboss_home}/bin/twiddle.sh","query","jboss.j2ee:ear=app-3.0-M3.ear,jar=server-3.0-M3.jar,name=QueryImpl,service=EJB3"]
                         int ret = -1;
                         [2,4,8,16,32].each { |i|

branches/3.0-M3/components/app/.classpath

@@ -26 +26 @@
         <classpathentry kind="var" path="M2_REPO/lucene/lucene/1.4.3/lucene-1.4.3.jar"/>
         <classpathentry kind="var" path="M2_REPO/net/sf/ehcache/ehcache/1.2/ehcache-1.2.jar"/>
-        <classpathentry sourcepath="/OMERO_COMMON_GENSRC" kind="var" path="M2_REPO/omero/common/3.0-TRUNK/common-3.0-TRUNK.jar"/>
-        <classpathentry kind="var" path="M2_REPO/omero/dsl/3.0-TRUNK/dsl-3.0-TRUNK.jar"/>
+        <classpathentry sourcepath="/OMERO_COMMON_GENSRC" kind="var" path="M2_REPO/omero/common/3.0-M3/common-3.0-M3.jar"/>
+        <classpathentry kind="var" path="M2_REPO/omero/dsl/3.0-M3/dsl-3.0-M3.jar"/>
         <classpathentry kind="var" path="M2_REPO/omero/jboss-annotations-ejb3/4.0.4.GA/jboss-annotations-ejb3-4.0.4.GA.jar"/>
         <classpathentry kind="var" path="M2_REPO/omero/jboss-ejb3x/4.0.4.GA/jboss-ejb3x-4.0.4.GA.jar"/>
         <classpathentry kind="var" path="M2_REPO/omero/postgresql/8.1-405.jdbc3/postgresql-8.1-405.jdbc3.jar"/>
-        <classpathentry kind="var" path="M2_REPO/omero/rendering/3.0-TRUNK/rendering-3.0-TRUNK.jar"/>
-        <classpathentry sourcepath="/OMERO_HOME/components/romio/src" kind="var" path="M2_REPO/omero/romio/3.0-TRUNK/romio-3.0-TRUNK.jar"/>
-        <classpathentry kind="var" path="M2_REPO/omero/server/3.0-TRUNK/server-3.0-TRUNK.jar"/>
+        <classpathentry kind="var" path="M2_REPO/omero/rendering/3.0-M3/rendering-3.0-M3.jar"/>
+        <classpathentry sourcepath="/OMERO_HOME/components/romio/src" kind="var" path="M2_REPO/omero/romio/3.0-M3/romio-3.0-M3.jar"/>
+        <classpathentry kind="var" path="M2_REPO/omero/server/3.0-M3/server-3.0-M3.jar"/>
         <classpathentry kind="var" path="M2_REPO/org/acegisecurity/acegi-security/1.0.0-RC1/acegi-security-1.0.0-RC1.jar"/>
         <classpathentry sourcepath="/HIBERNATE_SVN/src" kind="var" path="M2_REPO/org/hibernate/hibernate/3.2.0.cr2/hibernate-3.2.0.cr2.jar"/>

branches/3.0-M3/components/app/.project

@@ -1 +1 @@
 <projectDescription>
-  <name>omero-app-3.0-TRUNK</name>
+  <name>omero-app-3.0-M3</name>
   <comment/>
   <projects>

branches/3.0-M3/components/app/classpath.xml

@@ -21 +21 @@
   <property name="artifact.name" value="app"/>
   <property name="artifact.group" value="omero"/>
-  <property name="artifact.version" value="3.0-TRUNK"/>
+  <property name="artifact.version" value="3.0-M3"/>
   <property name="artifact.packaging" value="jar"/><!-- Default; override in component/build.xml -->
-  <property name="artifact.final.name" value="app-3.0-TRUNK.${artifact.packaging}"/>
-  <property name="artifact.path" value="omero/app/3.0-TRUNK/${artifact.final.name}"/>
+  <property name="artifact.final.name" value="app-3.0-M3.${artifact.packaging}"/>
+  <property name="artifact.path" value="omero/app/3.0-M3/${artifact.final.name}"/>
 
   <filelist id="generated.compile.filelist" dir="${omero.repo.local}">
@@ -46 +46 @@
         <file name="lucene/lucene/1.4.3/lucene-1.4.3.jar"/>
         <file name="net/sf/ehcache/ehcache/1.2/ehcache-1.2.jar"/>
-        <file name="omero/common/3.0-TRUNK/common-3.0-TRUNK.jar"/>
-        <file name="omero/dsl/3.0-TRUNK/dsl-3.0-TRUNK.jar"/>
-        <file name="omero/ejb/3.0-TRUNK/ejb-3.0-TRUNK.jar"/>
+        <file name="omero/common/3.0-M3/common-3.0-M3.jar"/>
+        <file name="omero/dsl/3.0-M3/dsl-3.0-M3.jar"/>
+        <file name="omero/ejb/3.0-M3/ejb-3.0-M3.jar"/>
         <file name="omero/jboss-annotations-ejb3/4.0.4.GA/jboss-annotations-ejb3-4.0.4.GA.jar"/>
         <file name="omero/jboss-ejb3x/4.0.4.GA/jboss-ejb3x-4.0.4.GA.jar"/>
         <file name="omero/postgresql/8.1-405.jdbc3/postgresql-8.1-405.jdbc3.jar"/>
-        <file name="omero/rendering/3.0-TRUNK/rendering-3.0-TRUNK.jar"/>
-        <file name="omero/romio/3.0-TRUNK/romio-3.0-TRUNK.jar"/>
-        <file name="omero/server/3.0-TRUNK/server-3.0-TRUNK.jar"/>
+        <file name="omero/rendering/3.0-M3/rendering-3.0-M3.jar"/>
+        <file name="omero/romio/3.0-M3/romio-3.0-M3.jar"/>
+        <file name="omero/server/3.0-M3/server-3.0-M3.jar"/>
         <file name="org/acegisecurity/acegi-security/1.0.0-RC1/acegi-security-1.0.0-RC1.jar"/>
         <file name="org/hibernate/hibernate/3.2.0.cr2/hibernate-3.2.0.cr2.jar"/>
@@ -83 +83 @@
         <include name="lucene/lucene/1.4.3/lucene-1.4.3.jar"/>
         <include name="net/sf/ehcache/ehcache/1.2/ehcache-1.2.jar"/>
-        <include name="omero/common/3.0-TRUNK/common-3.0-TRUNK.jar"/>
-        <include name="omero/dsl/3.0-TRUNK/dsl-3.0-TRUNK.jar"/>
-        <include name="omero/ejb/3.0-TRUNK/ejb-3.0-TRUNK.jar"/>
+        <include name="omero/common/3.0-M3/common-3.0-M3.jar"/>
+        <include name="omero/dsl/3.0-M3/dsl-3.0-M3.jar"/>
+        <include name="omero/ejb/3.0-M3/ejb-3.0-M3.jar"/>
         <include name="omero/jboss-annotations-ejb3/4.0.4.GA/jboss-annotations-ejb3-4.0.4.GA.jar"/>
         <include name="omero/jboss-ejb3x/4.0.4.GA/jboss-ejb3x-4.0.4.GA.jar"/>
         <include name="omero/postgresql/8.1-405.jdbc3/postgresql-8.1-405.jdbc3.jar"/>
-        <include name="omero/rendering/3.0-TRUNK/rendering-3.0-TRUNK.jar"/>
-        <include name="omero/romio/3.0-TRUNK/romio-3.0-TRUNK.jar"/>
-        <include name="omero/server/3.0-TRUNK/server-3.0-TRUNK.jar"/>
+        <include name="omero/rendering/3.0-M3/rendering-3.0-M3.jar"/>
+        <include name="omero/romio/3.0-M3/romio-3.0-M3.jar"/>
+        <include name="omero/server/3.0-M3/server-3.0-M3.jar"/>
         <include name="org/acegisecurity/acegi-security/1.0.0-RC1/acegi-security-1.0.0-RC1.jar"/>
         <include name="org/hibernate/hibernate/3.2.0.cr2/hibernate-3.2.0.cr2.jar"/>
@@ -122 +122 @@
         <file name="lucene/lucene/1.4.3/lucene-1.4.3.jar"/>
         <file name="net/sf/ehcache/ehcache/1.2/ehcache-1.2.jar"/>
-        <file name="omero/common/3.0-TRUNK/common-3.0-TRUNK.jar"/>
-        <file name="omero/dsl/3.0-TRUNK/dsl-3.0-TRUNK.jar"/>
-        <file name="omero/ejb/3.0-TRUNK/ejb-3.0-TRUNK.jar"/>
+        <file name="omero/common/3.0-M3/common-3.0-M3.jar"/>
+        <file name="omero/dsl/3.0-M3/dsl-3.0-M3.jar"/>
+        <file name="omero/ejb/3.0-M3/ejb-3.0-M3.jar"/>
         <file name="omero/jboss-annotations-ejb3/4.0.4.GA/jboss-annotations-ejb3-4.0.4.GA.jar"/>
         <file name="omero/jboss-ejb3x/4.0.4.GA/jboss-ejb3x-4.0.4.GA.jar"/>
         <file name="omero/postgresql/8.1-405.jdbc3/postgresql-8.1-405.jdbc3.jar"/>
-        <file name="omero/rendering/3.0-TRUNK/rendering-3.0-TRUNK.jar"/>
-        <file name="omero/romio/3.0-TRUNK/romio-3.0-TRUNK.jar"/>
-        <file name="omero/server/3.0-TRUNK/server-3.0-TRUNK.jar"/>
+        <file name="omero/rendering/3.0-M3/rendering-3.0-M3.jar"/>
+        <file name="omero/romio/3.0-M3/romio-3.0-M3.jar"/>
+        <file name="omero/server/3.0-M3/server-3.0-M3.jar"/>
         <file name="org/acegisecurity/acegi-security/1.0.0-RC1/acegi-security-1.0.0-RC1.jar"/>
         <file name="org/hibernate/hibernate/3.2.0.cr2/hibernate-3.2.0.cr2.jar"/>
@@ -163 +163 @@
         <include name="lucene/lucene/1.4.3/lucene-1.4.3.jar"/>
         <include name="net/sf/ehcache/ehcache/1.2/ehcache-1.2.jar"/>
-        <include name="omero/common/3.0-TRUNK/common-3.0-TRUNK.jar"/>
-        <include name="omero/dsl/3.0-TRUNK/dsl-3.0-TRUNK.jar"/>
-        <include name="omero/ejb/3.0-TRUNK/ejb-3.0-TRUNK.jar"/>
+        <include name="omero/common/3.0-M3/common-3.0-M3.jar"/>
+        <include name="omero/dsl/3.0-M3/dsl-3.0-M3.jar"/>
+        <include name="omero/ejb/3.0-M3/ejb-3.0-M3.jar"/>
         <include name="omero/jboss-annotations-ejb3/4.0.4.GA/jboss-annotations-ejb3-4.0.4.GA.jar"/>
         <include name="omero/jboss-ejb3x/4.0.4.GA/jboss-ejb3x-4.0.4.GA.jar"/>
         <include name="omero/postgresql/8.1-405.jdbc3/postgresql-8.1-405.jdbc3.jar"/>
-        <include name="omero/rendering/3.0-TRUNK/rendering-3.0-TRUNK.jar"/>
-        <include name="omero/romio/3.0-TRUNK/romio-3.0-TRUNK.jar"/>
-        <include name="omero/server/3.0-TRUNK/server-3.0-TRUNK.jar"/>
+        <include name="omero/rendering/3.0-M3/rendering-3.0-M3.jar"/>
+        <include name="omero/romio/3.0-M3/romio-3.0-M3.jar"/>
+        <include name="omero/server/3.0-M3/server-3.0-M3.jar"/>
         <include name="org/acegisecurity/acegi-security/1.0.0-RC1/acegi-security-1.0.0-RC1.jar"/>
         <include name="org/hibernate/hibernate/3.2.0.cr2/hibernate-3.2.0.cr2.jar"/>

branches/3.0-M3/components/app/pom.xml

@@ -5 +5 @@
     <groupId>omero</groupId>
     <artifactId>main</artifactId>
-    <version>3.0-TRUNK</version>
+    <version>3.0-M3</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -20 +20 @@
       <groupId>omero</groupId>
       <artifactId>ejb</artifactId>
-      <version>3.0-TRUNK</version>
+      <version>3.0-M3</version>
       <type>ejb</type>
       <exclusions>

branches/3.0-M3/components/app/resources/application.xml

@@ -7 +7 @@
 
     <module>
-      <ejb>server-3.0-TRUNK.jar</ejb>
+      <ejb>server-3.0-M3.jar</ejb>
     </module>
 

branches/3.0-M3/components/client/.classpath

@@ -14 +14 @@
         <classpathentry exported="true" kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
         <classpathentry exported="true" kind="var" path="M2_REPO/log4j/log4j/1.2.8/log4j-1.2.8.jar"/>
-        <classpathentry exported="true" kind="var" path="M2_REPO/omero/common/3.0-TRUNK/common-3.0-TRUNK.jar" sourcepath="/OMERO_COMMON"/>
-        <classpathentry exported="true" kind="var" path="M2_REPO/omero/dsl/3.0-TRUNK/dsl-3.0-TRUNK.jar"/>
+        <classpathentry exported="true" kind="var" path="M2_REPO/omero/common/3.0-M3/common-3.0-M3.jar" sourcepath="/OMERO_COMMON"/>
+        <classpathentry exported="true" kind="var" path="M2_REPO/omero/dsl/3.0-M3/dsl-3.0-M3.jar"/>
         <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"/>
         <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"/>

branches/3.0-M3/components/client/.project

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-  <name>omero-client-3.0-TRUNK</name>
+  <name>omero-client-3.0-M3</name>
   <comment>Client code</comment>
   <projects>

branches/3.0-M3/components/client/classpath.xml

@@ -21 +21 @@
   <property name="artifact.name" value="client"/>
   <property name="artifact.group" value="omero"/>
-  <property name="artifact.version" value="3.0-TRUNK"/>
+  <property name="artifact.version" value="3.0-M3"/>
   <property name="artifact.packaging" value="jar"/><!-- Default; override in component/build.xml -->
-  <property name="artifact.final.name" value="client-3.0-TRUNK.${artifact.packaging}"/>
-  <property name="artifact.path" value="omero/client/3.0-TRUNK/${artifact.final.name}"/>
+  <property name="artifact.final.name" value="client-3.0-M3.${artifact.packaging}"/>
+  <property name="artifact.path" value="omero/client/3.0-M3/${artifact.final.name}"/>
 
   <filelist id="generated.compile.filelist" dir="${omero.repo.local}">
@@ -32 +32 @@
         <file name="groovy/groovy-all-1.0-jsr/05/groovy-all-1.0-jsr-05.jar"/>
         <file name="log4j/log4j/1.2.8/log4j-1.2.8.jar"/>
-        <file name="omero/common/3.0-TRUNK/common-3.0-TRUNK.jar"/>
-        <file name="omero/dsl/3.0-TRUNK/dsl-3.0-TRUNK.jar"/>
+        <file name="omero/common/3.0-M3/common-3.0-M3.jar"/>
+        <file name="omero/dsl/3.0-M3/dsl-3.0-M3.jar"/>
         <file name="omero/jboss-aop-jdk50-client/4.0.4.GA/jboss-aop-jdk50-client-4.0.4.GA.jar"/>
         <file name="omero/jboss-aspect-library-jdk50/4.0.4.GA/jboss-aspect-library-jdk50-4.0.4.GA.jar"/>
@@ -51 +51 @@
         <include name="groovy/groovy-all-1.0-jsr/05/groovy-all-1.0-jsr-05.jar"/>
         <include name="log4j/log4j/1.2.8/log4j-1.2.8.jar"/>
-        <include name="omero/common/3.0-TRUNK/common-3.0-TRUNK.jar"/>
-        <include name="omero/dsl/3.0-TRUNK/dsl-3.0-TRUNK.jar"/>
+        <include name="omero/common/3.0-M3/common-3.0-M3.jar"/>
+        <include name="omero/dsl/3.0-M3/dsl-3.0-M3.jar"/>
         <include name="omero/jboss-aop-jdk50-client/4.0.4.GA/jboss-aop-jdk50-client-4.0.4.GA.jar"/>
         <include name="omero/jboss-aspect-library-jdk50/4.0.4.GA/jboss-aspect-library-jdk50-4.0.4.GA.jar"/>
@@ -72 +72 @@
         <file name="junit/junit/3.8.1/junit-3.8.1.jar"/>
         <file name="log4j/log4j/1.2.8/log4j-1.2.8.jar"/>
-        <file name="omero/common/3.0-TRUNK/common-3.0-TRUNK.jar"/>
-        <file name="omero/dsl/3.0-TRUNK/dsl-3.0-TRUNK.jar"/>
+        <file name="omero/common/3.0-M3/common-3.0-M3.jar"/>
+        <file name="omero/dsl/3.0-M3/dsl-3.0-M3.jar"/>
         <file name="omero/jboss-aop-jdk50-client/4.0.4.GA/jboss-aop-jdk50-client-4.0.4.GA.jar"/>
         <file name="omero/jboss-aspect-library-jdk50/4.0.4.GA/jboss-aspect-library-jdk50-4.0.4.GA.jar"/>
@@ -96 +96 @@
         <include name="junit/junit/3.8.1/junit-3.8.1.jar"/>
         <include name="log4j/log4j/1.2.8/log4j-1.2.8.jar"/>
-        <include name="omero/common/3.0-TRUNK/common-3.0-TRUNK.jar"/>
-        <include name="omero/dsl/3.0-TRUNK/dsl-3.0-TRUNK.jar"/>
+        <include name="omero/common/3.0-M3/common-3.0-M3.jar"/>
+        <include name="omero/dsl/3.0-M3/dsl-3.0-M3.jar"/>
         <include name="omero/jboss-aop-jdk50-client/4.0.4.GA/jboss-aop-jdk50-client-4.0.4.GA.jar"/>
         <include name="omero/jboss-aspect-library-jdk50/4.0.4.GA/jboss-aspect-library-jdk50-4.0.4.GA.jar"/>

branches/3.0-M3/components/client/pom.xml

@@ -6 +6 @@
     <groupId>omero</groupId>
     <artifactId>main</artifactId>
-    <version>3.0-TRUNK</version>
+    <version>3.0-M3</version>
   </parent>
   <name>Ome Client Library</name>
@@ -15 +15 @@
       <groupId>omero</groupId>
       <artifactId>common</artifactId>
-      <version>3.0-TRUNK</version>
+      <version>3.0-M3</version>
     </dependency>
     <dependency>

branches/3.0-M3/components/common/.classpath

@@ -21 +21 @@
         <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.8/log4j-1.2.8.jar"/>
         <classpathentry kind="var" path="M2_REPO/net/sf/ehcache/ehcache/1.2/ehcache-1.2.jar"/>
-        <classpathentry kind="var" path="M2_REPO/omero/dsl/3.0-TRUNK/dsl-3.0-TRUNK.jar"/>
+        <classpathentry kind="var" path="M2_REPO/omero/dsl/3.0-M3/dsl-3.0-M3.jar"/>
         <classpathentry kind="var" path="M2_REPO/omero/jboss-ejb3x/4.0.4.GA/jboss-ejb3x-4.0.4.GA.jar"/>
         <classpathentry kind="var" path="M2_REPO/omero/postgresql/8.1-405.jdbc3/postgresql-8.1-405.jdbc3.jar"/>

branches/3.0-M3/components/common/.project

@@ -1 +1 @@
 <projectDescription>
-  <name>omero-common-3.0-TRUNK</name>
+  <name>omero-common-3.0-M3</name>
   <comment/>
   <projects/>

branches/3.0-M3/components/common/classpath.xml

@@ -21 +21 @@
   <property name="artifact.name" value="common"/>
   <property name="artifact.group" value="omero"/>
-  <property name="artifact.version" value="3.0-TRUNK"/>
+  <property name="artifact.version" value="3.0-M3"/>
   <property name="artifact.packaging" value="jar"/><!-- Default; override in component/build.xml -->
-  <property name="artifact.final.name" value="common-3.0-TRUNK.${artifact.packaging}"/>
-  <property name="artifact.path" value="omero/common/3.0-TRUNK/${artifact.final.name}"/>
+  <property name="artifact.final.name" value="common-3.0-M3.${artifact.packaging}"/>
+  <property name="artifact.path" value="omero/common/3.0-M3/${artifact.final.name}"/>
 
   <filelist id="generated.compile.filelist" dir="${omero.repo.local}">
@@ -39 +39 @@
         <file name="log4j/log4j/1.2.8/log4j-1.2.8.jar"/>
         <file name="net/sf/ehcache/ehcache/1.2/ehcache-1.2.jar"/>
-        <file name="omero/dsl/3.0-TRUNK/dsl-3.0-TRUNK.jar"/>
+        <file name="omero/dsl/3.0-M3/dsl-3.0-M3.jar"/>
         <file name="omero/jboss-ejb3x/4.0.4.GA/jboss-ejb3x-4.0.4.GA.jar"/>
         <file name="org/hibernate/hibernate-tools/3.1.0.beta4/hibernate-tools-3.1.0.beta4.jar"/>
@@ -63 +63 @@
         <include name="log4j/log4j/1.2.8/log4j-1.2.8.jar"/>
         <include name="net/sf/ehcache/ehcache/1.2/ehcache-1.2.jar"/>
-        <include name="omero/dsl/3.0-TRUNK/dsl-3.0-TRUNK.jar"/>
+        <include name="omero/dsl/3.0-M3/dsl-3.0-M3.jar"/>
         <include name="omero/jboss-ejb3x/4.0.4.GA/jboss-ejb3x-4.0.4.GA.jar"/>
         <include name="org/hibernate/hibernate-tools/3.1.0.beta4/hibernate-tools-3.1.0.beta4.jar"/>
@@ -89 +89 @@
         <file name="log4j/log4j/1.2.8/log4j-1.2.8.jar"/>
         <file name="net/sf/ehcache/ehcache/1.2/ehcache-1.2.jar"/>
-        <file name="omero/dsl/3.0-TRUNK/dsl-3.0-TRUNK.jar"/>
+        <file name="omero/dsl/3.0-M3/dsl-3.0-M3.jar"/>
         <file name="omero/jboss-ejb3x/4.0.4.GA/jboss-ejb3x-4.0.4.GA.jar"/>
         <file name="omero/postgresql/8.1-405.jdbc3/postgresql-8.1-405.jdbc3.jar"/>
@@ -118 +118 @@
         <include name="log4j/log4j/1.2.8/log4j-1.2.8.jar"/>
         <include name="net/sf/ehcache/ehcache/1.2/ehcache-1.2.jar"/>
-        <include name="omero/dsl/3.0-TRUNK/dsl-3.0-TRUNK.jar"/>
+        <include name="omero/dsl/3.0-M3/dsl-3.0-M3.jar"/>
         <include name="omero/jboss-ejb3x/4.0.4.GA/jboss-ejb3x-4.0.4.GA.jar"/>
         <include name="omero/postgresql/8.1-405.jdbc3/postgresql-8.1-405.jdbc3.jar"/>

branches/3.0-M3/components/common/pom.xml

@@ -4 +4 @@
     <groupId>omero</groupId>
     <artifactId>main</artifactId>
-    <version>3.0-TRUNK</version>
+    <version>3.0-M3</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
@@ -15 +15 @@
       <groupId>omero</groupId>
       <artifactId>dsl</artifactId>
-      <version>3.0-TRUNK</version>
+      <version>3.0-M3</version>
     </dependency>
     <dependency>

branches/3.0-M3/components/dsl/.project

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-        <name>omero-dsl-3.0-TRUNK</name>
+        <name>omero-dsl-3.0-M3</name>
         <comment></comment>
         <projects>

branches/3.0-M3/components/dsl/classpath.xml

@@ -21 +21 @@
   <property name="artifact.name" value="dsl"/>
   <property name="artifact.group" value="omero"/>
-  <property name="artifact.version" value="3.0-TRUNK"/>
+  <property name="artifact.version" value="3.0-M3"/>
   <property name="artifact.packaging" value="jar"/><!-- Default; override in component/build.xml -->
-  <property name="artifact.final.name" value="dsl-3.0-TRUNK.${artifact.packaging}"/>
-  <property name="artifact.path" value="omero/dsl/3.0-TRUNK/${artifact.final.name}"/>
+  <property name="artifact.final.name" value="dsl-3.0-M3.${artifact.packaging}"/>
+  <property name="artifact.path" value="omero/dsl/3.0-M3/${artifact.final.name}"/>
 
   <filelist id="generated.compile.filelist" dir="${omero.repo.local}">

branches/3.0-M3/components/dsl/pom.xml

@@ -4 +4 @@
     <groupId>omero</groupId>
     <artifactId>main</artifactId>
-    <version>3.0-TRUNK</version>
+    <version>3.0-M3</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>

branches/3.0-M3/components/ice/.project

@@ -1 +1 @@
 <projectDescription>
-  <name>omero-ice-3.0-TRUNK</name>
+  <name>omero-ice-3.0-M3</name>
   <comment/>
   <projects/>

branches/3.0-M3/components/ice/pom.xml

@@ -4 +4 @@
     <groupId>omero</groupId>
     <artifactId>main</artifactId>
-    <version>3.0-TRUNK</version>
+    <version>3.0-M3</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>

branches/3.0-M3/components/policy/.project

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-        <name>omero-policy-3.0-TRUNK</name>
+        <name>omero-policy-3.0-M3</name>
         <comment></comment>
         <projects>

branches/3.0-M3/components/policy/pom.xml

@@ -4 +4 @@
     <groupId>omero</groupId>
     <artifactId>main</artifactId>
-    <version>3.0-TRUNK</version>
+    <version>3.0-M3</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
@@ -13 +13 @@
   <dependencies>
     <!-- ALL other JAR components from Omero -->
-    <dependency><groupId>omero</groupId><artifactId>client</artifactId><version>3.0-TRUNK</version></dependency>
-    <dependency><groupId>omero</groupId><artifactId>common</artifactId><version>3.0-TRUNK</version></dependency>
-    <dependency><groupId>omero</groupId><artifactId>dsl</artifactId><version>3.0-TRUNK</version></dependency>
-    <dependency><groupId>omero</groupId><artifactId>romio</artifactId><version>3.0-TRUNK</version></dependency>
-    <dependency><groupId>omero</groupId><artifactId>ejb</artifactId><version>3.0-TRUNK</version></dependency>
-    <dependency><groupId>omero</groupId><artifactId>rendering</artifactId><version>3.0-TRUNK</version></dependency>
-    <dependency><groupId>omero</groupId><artifactId>sandbox</artifactId><version>3.0-TRUNK</version></dependency>
-    <dependency><groupId>omero</groupId><artifactId>server</artifactId><version>3.0-TRUNK</version></dependency>
+    <dependency><groupId>omero</groupId><artifactId>client</artifactId><version>3.0-M3</version></dependency>
+    <dependency><groupId>omero</groupId><artifactId>common</artifactId><version>3.0-M3</version></dependency>
+    <dependency><groupId>omero</groupId><artifactId>dsl</artifactId><version>3.0-M3</version></dependency>
+    <dependency><groupId>omero</groupId><artifactId>romio</artifactId><version>3.0-M3</version></dependency>
+    <dependency><groupId>omero</groupId><artifactId>ejb</artifactId><version>3.0-M3</version></dependency>
+    <dependency><groupId>omero</groupId><artifact