• Views
  • Iteration Report
  • My Iteration Report
  •  
OMERO.server
  • Login
  • Help/Guide
  • About Trac
  • Preferences
  • Wiki
  • Timeline
  • Roadmap
  • Browse Source
  • View Tickets
  • Search

Context Navigation

  • ← Previous Changeset
  • Next Changeset →

Changeset 1039

Show
Ignore:
Timestamp:
10/13/06 08:21:25 (2 years ago)
Author:
jmoore
Message:

#428 Fixing stateful flushing. (By moving to Spring 2.0 See #238)

Files:
5 added
3 removed
21 modified

  • branches/rebirth-wizard/.classpath (modified) (1 diff)
  • trunk/components/app/.classpath (modified) (2 diffs)
  • trunk/components/app/classpath.xml (modified) (4 diffs)
  • trunk/components/client/.classpath (modified) (2 diffs)
  • trunk/components/client/classpath.xml (modified) (4 diffs)
  • trunk/components/common/.classpath (modified) (1 diff)
  • trunk/components/common/classpath.xml (modified) (4 diffs)
  • trunk/components/common/test/ome/system/utests/ContextTest.java (modified) (1 diff)
  • trunk/components/dsl/.classpath (modified) (1 diff)
  • trunk/components/dsl/classpath.xml (modified) (4 diffs)
  • trunk/components/rendering/.classpath (modified) (1 diff)
  • trunk/components/rendering/classpath.xml (modified) (4 diffs)
  • trunk/components/romio/.classpath (modified) (1 diff)
  • trunk/components/romio/classpath.xml (modified) (4 diffs)
  • trunk/components/server/.classpath (modified) (1 diff)
  • trunk/components/server/classpath.xml (modified) (4 diffs)
  • trunk/components/server/pom.xml (modified) (1 diff)
  • trunk/components/server/src/ome/security/basic/BasicSecuritySystem.java (modified) (2 diffs)
  • trunk/components/server/src/ome/tools/hibernate/SessionHandler.java (modified) (6 diffs)
  • trunk/components/server/src/ome/tools/spring/ManualFlushHibernateTemplate.java (added)
  • trunk/components/server/test/ome/server/utests/handlers/SessionHandlerMockHibernateTest.java (modified) (7 diffs)
  • trunk/lib/repository/org/springframework/spring-hibernate3 (deleted)
  • trunk/lib/repository/org/springframework/spring-mock/2.0 (added)
  • trunk/lib/repository/org/springframework/spring-mock/2.0-rc1 (deleted)
  • trunk/lib/repository/org/springframework/spring-mock/2.0/spring-mock-2.0.jar (added)
  • trunk/lib/repository/org/springframework/spring/2.0 (added)
  • trunk/lib/repository/org/springframework/spring/2.0-rc1 (deleted)
  • trunk/lib/repository/org/springframework/spring/2.0/spring-2.0.jar (added)
  • trunk/pom.xml (modified) (2 diffs)

Legend:

Unmodified
Added
Removed

  • branches/rebirth-wizard/.classpath

    r754 r1039  
    77        <classpathentry kind="var" path="MAVEN_REPO/omero/jars/omero-server-2.5.jar"/> 
    88        <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate/3.2.0.cr2/hibernate-3.2.0.cr2.jar"/> 
    9         <classpathentry kind="var" path="M2_REPO/org/springframework/spring/2.0-rc1/spring-2.0-rc1.jar"/> 
    10         <classpathentry kind="var" path="M2_REPO/org/springframework/spring-hibernate3/2.0-rc1/spring-hibernate3-2.0-rc1.jar"/> 
     9        <classpathentry kind="var" path="M2_REPO/org/springframework/spring/2.0/spring-2.0.jar"/> 
    1110        <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar"/> 
    1211        <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar"/> 

  • trunk/components/app/.classpath

    r773 r1039  
    11<?xml version="1.0" encoding="UTF-8"?> 
    22<classpath> 
    3         <classpathentry sourcepath="JRE_SRC" kind="var" rootpath="JRE_SRCROOT" path="JRE_LIB"/> 
     3        <classpathentry sourcepath="JRE_SRC" kind="var" path="JRE_LIB"/> 
    44        <classpathentry excluding="**/.svn" kind="src" path="resources"/> 
    55        <classpathentry excluding="**/.svn" kind="src" path="target/generated/src"/> 
    … …  
    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 kind="var" path="M2_REPO/omero/common/3.0-TRUNK/common-3.0-TRUNK.jar"/> 
     28        <classpathentry sourcepath="/OMERO_COMMON_GENSRC" kind="var" path="M2_REPO/omero/common/3.0-TRUNK/common-3.0-TRUNK.jar"/> 
    2929        <classpathentry kind="var" path="M2_REPO/omero/dsl/3.0-TRUNK/dsl-3.0-TRUNK.jar"/> 
    30         <classpathentry kind="var" path="M2_REPO/omero/ejb/3.0-TRUNK/ejb-3.0-TRUNK.jar"/> 
    3130        <classpathentry kind="var" path="M2_REPO/omero/jboss-annotations-ejb3/4.0.4.GA/jboss-annotations-ejb3-4.0.4.GA.jar"/> 
    3231        <classpathentry kind="var" path="M2_REPO/omero/jboss-ejb3x/4.0.4.GA/jboss-ejb3x-4.0.4.GA.jar"/> 
    3332        <classpathentry kind="var" path="M2_REPO/omero/postgresql/8.1-405.jdbc3/postgresql-8.1-405.jdbc3.jar"/> 
    3433        <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"/> 
     34        <classpathentry sourcepath="/OMERO_HOME/components/romio/src" kind="var" path="M2_REPO/omero/romio/3.0-TRUNK/romio-3.0-TRUNK.jar"/> 
    3635        <classpathentry kind="var" path="M2_REPO/omero/server/3.0-TRUNK/server-3.0-TRUNK.jar"/> 
    3736        <classpathentry kind="var" path="M2_REPO/org/acegisecurity/acegi-security/1.0.0-RC1/acegi-security-1.0.0-RC1.jar"/> 
    38         <classpathentry sourcepath="/HIBERNATE_HOME/src" kind="var" path="M2_REPO/org/hibernate/hibernate/3.2.0.cr2/hibernate-3.2.0.cr2.jar"/> 
    39         <classpathentry kind="var" path="M2_REPO/org/springframework/spring-hibernate3/2.0-rc1/spring-hibernate3-2.0-rc1.jar"/> 
    40         <classpathentry kind="var" path="M2_REPO/org/springframework/spring-mock/2.0-rc1/spring-mock-2.0-rc1.jar"/> 
    41         <classpathentry kind="var" path="M2_REPO/org/springframework/spring/2.0-rc1/spring-2.0-rc1.jar"/> 
     37        <classpathentry sourcepath="/HIBERNATE_SVN/src" kind="var" path="M2_REPO/org/hibernate/hibernate/3.2.0.cr2/hibernate-3.2.0.cr2.jar"/> 
     38        <classpathentry kind="var" path="M2_REPO/org/springframework/spring-mock/2.0/spring-mock-2.0.jar"/> 
     39        <classpathentry kind="var" path="M2_REPO/org/springframework/spring/2.0/spring-2.0.jar"/> 
    4240        <classpathentry kind="var" path="M2_REPO/qdox/qdox/1.5/qdox-1.5.jar"/> 
    4341        <classpathentry kind="var" path="M2_REPO/testng/testng/4.7-jdk15/testng-4.7-jdk15.jar"/> 

  • trunk/components/app/classpath.xml

    r726 r1039  
    5757        <file name="org/acegisecurity/acegi-security/1.0.0-RC1/acegi-security-1.0.0-RC1.jar"/> 
    5858        <file name="org/hibernate/hibernate/3.2.0.cr2/hibernate-3.2.0.cr2.jar"/> 
    59         <file name="org/springframework/spring-hibernate3/2.0-rc1/spring-hibernate3-2.0-rc1.jar"/> 
    60         <file name="org/springframework/spring/2.0-rc1/spring-2.0-rc1.jar"/> 
     59        <file name="org/springframework/spring/2.0/spring-2.0.jar"/> 
    6160        <file name="qdox/qdox/1.5/qdox-1.5.jar"/> 
    6261        <file name="velocity-tools/velocity-tools-generic/1.1/velocity-tools-generic-1.1.jar"/> 
    … …  
    9594        <include name="org/acegisecurity/acegi-security/1.0.0-RC1/acegi-security-1.0.0-RC1.jar"/> 
    9695        <include name="org/hibernate/hibernate/3.2.0.cr2/hibernate-3.2.0.cr2.jar"/> 
    97         <include name="org/springframework/spring-hibernate3/2.0-rc1/spring-hibernate3-2.0-rc1.jar"/> 
    98         <include name="org/springframework/spring/2.0-rc1/spring-2.0-rc1.jar"/> 
     96        <include name="org/springframework/spring/2.0/spring-2.0.jar"/> 
    9997        <include name="qdox/qdox/1.5/qdox-1.5.jar"/> 
    10098        <include name="velocity-tools/velocity-tools-generic/1.1/velocity-tools-generic-1.1.jar"/> 
    … …  
    135133        <file name="org/acegisecurity/acegi-security/1.0.0-RC1/acegi-security-1.0.0-RC1.jar"/> 
    136134        <file name="org/hibernate/hibernate/3.2.0.cr2/hibernate-3.2.0.cr2.jar"/> 
    137         <file name="org/springframework/spring-hibernate3/2.0-rc1/spring-hibernate3-2.0-rc1.jar"/> 
    138         <file name="org/springframework/spring-mock/2.0-rc1/spring-mock-2.0-rc1.jar"/> 
    139         <file name="org/springframework/spring/2.0-rc1/spring-2.0-rc1.jar"/> 
     135        <file name="org/springframework/spring-mock/2.0/spring-mock-2.0.jar"/> 
     136        <file name="org/springframework/spring/2.0/spring-2.0.jar"/> 
    140137        <file name="qdox/qdox/1.5/qdox-1.5.jar"/> 
    141138        <file name="testng/testng/4.7-jdk15/testng-4.7-jdk15.jar"/> 
    … …  
    177174        <include name="org/acegisecurity/acegi-security/1.0.0-RC1/acegi-security-1.0.0-RC1.jar"/> 
    178175        <include name="org/hibernate/hibernate/3.2.0.cr2/hibernate-3.2.0.cr2.jar"/> 
    179         <include name="org/springframework/spring-hibernate3/2.0-rc1/spring-hibernate3-2.0-rc1.jar"/> 
    180         <include name="org/springframework/spring-mock/2.0-rc1/spring-mock-2.0-rc1.jar"/> 
    181         <include name="org/springframework/spring/2.0-rc1/spring-2.0-rc1.jar"/> 
     176        <include name="org/springframework/spring-mock/2.0/spring-mock-2.0.jar"/> 
     177        <include name="org/springframework/spring/2.0/spring-2.0.jar"/> 
    182178        <include name="qdox/qdox/1.5/qdox-1.5.jar"/> 
    183179        <include name="testng/testng/4.7-jdk15/testng-4.7-jdk15.jar"/> 

  • trunk/components/client/.classpath

    r773 r1039  
    11<?xml version="1.0" encoding="UTF-8"?> 
    22<classpath> 
    3         <classpathentry sourcepath="JRE_SRC" kind="var" rootpath="JRE_SRCROOT" path="JRE_LIB"/> 
     3        <classpathentry sourcepath="JRE_SRC" kind="var" path="JRE_LIB"/> 
    44        <classpathentry excluding="**/.svn" kind="src" path="src"/> 
    55        <classpathentry excluding="**/.svn" kind="src" path="resources"/> 
    … …  
    77        <classpathentry excluding="**/.svn" kind="src" path="target/generated/resources"/> 
    88        <classpathentry excluding="**/.svn" output="target/test-classes" kind="src" path="test"/> 
    9         <classpathentry kind="var" path="M2_REPO/ant/ant/1.6.5/ant-1.6.5.jar"/> 
    10         <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/> 
    11         <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar"/> 
    12         <classpathentry kind="var" path="M2_REPO/groovy/groovy-all-1.0-jsr/05/groovy-all-1.0-jsr-05.jar"/> 
    13         <classpathentry kind="var" path="M2_REPO/jmock/jmock/1.0.1/jmock-1.0.1.jar"/> 
    14         <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/> 
    15         <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.8/log4j-1.2.8.jar"/> 
    16         <classpathentry sourcepath="/OMERO_HOME/components/common/target/generated/src" kind="var" path="M2_REPO/omero/common/3.0-TRUNK/common-3.0-TRUNK.jar"/> 
    17         <classpathentry kind="var" path="M2_REPO/omero/dsl/3.0-TRUNK/dsl-3.0-TRUNK.jar"/> 
    18         <classpathentry kind="var" path="M2_REPO/omero/jboss-aop-jdk50-client/4.0.4.GA/jboss-aop-jdk50-client-4.0.4.GA.jar"/> 
    19         <classpathentry kind="var" path="M2_REPO/omero/jboss-aspect-library-jdk50/4.0.4.GA/jboss-aspect-library-jdk50-4.0.4.GA.jar"/> 
    20         <classpathentry kind="var" path="M2_REPO/omero/jboss-ejb3/4.0.4.GA/jboss-ejb3-4.0.4.GA.jar"/> 
    21         <classpathentry kind="var" path="M2_REPO/omero/jboss-ejb3x/4.0.4.GA/jboss-ejb3x-4.0.4.GA.jar"/> 
    22         <classpathentry kind="var" path="M2_REPO/omero/jbossall-client/4.0.4.GA/jbossall-client-4.0.4.GA.jar"/> 
    23         <classpathentry kind="var" path="M2_REPO/omero/postgresql/8.1-405.jdbc3/postgresql-8.1-405.jdbc3.jar"/> 
    24         <classpathentry kind="var" path="M2_REPO/org/springframework/spring-mock/2.0-rc1/spring-mock-2.0-rc1.jar"/> 
    25         <classpathentry sourcepath="/SPRING_HOME/src" kind="var" path="M2_REPO/org/springframework/spring/2.0-rc1/spring-2.0-rc1.jar"/> 
    26         <classpathentry kind="var" path="M2_REPO/qdox/qdox/1.5/qdox-1.5.jar"/> 
    27         <classpathentry kind="var" path="M2_REPO/testng/testng/4.7-jdk15/testng-4.7-jdk15.jar"/> 
    28         <classpathentry kind="var" path="M2_REPO/velocity-tools/velocity-tools-generic/1.1/velocity-tools-generic-1.1.jar"/> 
    29         <classpathentry kind="var" path="M2_REPO/velocity/velocity/1.4/velocity-1.4.jar"/> 
     9        <classpathentry exported="true" kind="var" path="M2_REPO/ant/ant/1.6.5/ant-1.6.5.jar"/> 
     10        <classpathentry exported="true" kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/> 
     11        <classpathentry exported="true" kind="var" path="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar"/> 
     12        <classpathentry exported="true" kind="var" path="M2_REPO/groovy/groovy-all-1.0-jsr/05/groovy-all-1.0-jsr-05.jar"/> 
     13        <classpathentry exported="true" kind="var" path="M2_REPO/jmock/jmock/1.0.1/jmock-1.0.1.jar"/> 
     14        <classpathentry exported="true" kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/> 
     15        <classpathentry exported="true" kind="var" path="M2_REPO/log4j/log4j/1.2.8/log4j-1.2.8.jar"/> 
     16        <classpathentry exported="true" sourcepath="/OMERO_COMMON" kind="var" path="M2_REPO/omero/common/3.0-TRUNK/common-3.0-TRUNK.jar"/> 
     17        <classpathentry exported="true" kind="var" path="M2_REPO/omero/dsl/3.0-TRUNK/dsl-3.0-TRUNK.jar"/> 
     18        <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"/> 
     19        <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"/> 
     20        <classpathentry exported="true" kind="var" path="M2_REPO/omero/jboss-ejb3/4.0.4.GA/jboss-ejb3-4.0.4.GA.jar"/> 
     21        <classpathentry exported="true" kind="var" path="M2_REPO/omero/jboss-ejb3x/4.0.4.GA/jboss-ejb3x-4.0.4.GA.jar"/> 
     22        <classpathentry exported="true" kind="var" path="M2_REPO/omero/jbossall-client/4.0.4.GA/jbossall-client-4.0.4.GA.jar"/> 
     23        <classpathentry exported="true" kind="var" path="M2_REPO/omero/postgresql/8.1-405.jdbc3/postgresql-8.1-405.jdbc3.jar"/> 
     24        <classpathentry exported="true" kind="var" path="M2_REPO/org/springframework/spring-mock/2.0/spring-mock-2.0.jar"/> 
     25        <classpathentry exported="true" sourcepath="/SPRING_HOME/src" kind="var" path="M2_REPO/org/springframework/spring/2.0/spring-2.0.jar"/> 
     26        <classpathentry exported="true" kind="var" path="M2_REPO/qdox/qdox/1.5/qdox-1.5.jar"/> 
     27        <classpathentry exported="true" kind="var" path="M2_REPO/testng/testng/4.7-jdk15/testng-4.7-jdk15.jar"/> 
     28        <classpathentry exported="true" kind="var" path="M2_REPO/velocity-tools/velocity-tools-generic/1.1/velocity-tools-generic-1.1.jar"/> 
     29        <classpathentry exported="true" kind="var" path="M2_REPO/velocity/velocity/1.4/velocity-1.4.jar"/> 
     30        <classpathentry kind="lib" path="/home/josh/lib/eclipse-3.2/plugins/org.junit_3.8.1/junit.jar"/> 
     31        <classpathentry kind="lib" path="/home/josh/lib/eclipse-3.2/plugins/org.codehaus.groovy.eclipse_1.0.0/lib/groovy-all-1.0-RC-01-SNAPSHOT.jar"/> 
    3032        <classpathentry kind="output" path="target/classes"/> 
    3133</classpath> 

  • trunk/components/client/classpath.xml

    r726 r1039  
    3939        <file name="omero/jboss-ejb3x/4.0.4.GA/jboss-ejb3x-4.0.4.GA.jar"/> 
    4040        <file name="omero/jbossall-client/4.0.4.GA/jbossall-client-4.0.4.GA.jar"/> 
    41         <file name="org/springframework/spring/2.0-rc1/spring-2.0-rc1.jar"/> 
     41        <file name="org/springframework/spring/2.0/spring-2.0.jar"/> 
    4242        <file name="qdox/qdox/1.5/qdox-1.5.jar"/> 
    4343        <file name="velocity-tools/velocity-tools-generic/1.1/velocity-tools-generic-1.1.jar"/> 
    … …  
    5858        <include name="omero/jboss-ejb3x/4.0.4.GA/jboss-ejb3x-4.0.4.GA.jar"/> 
    5959        <include name="omero/jbossall-client/4.0.4.GA/jbossall-client-4.0.4.GA.jar"/> 
    60         <include name="org/springframework/spring/2.0-rc1/spring-2.0-rc1.jar"/> 
     60        <include name="org/springframework/spring/2.0/spring-2.0.jar"/> 
    6161        <include name="qdox/qdox/1.5/qdox-1.5.jar"/> 
    6262        <include name="velocity-tools/velocity-tools-generic/1.1/velocity-tools-generic-1.1.jar"/> 
    … …  
    8080        <file name="omero/jbossall-client/4.0.4.GA/jbossall-client-4.0.4.GA.jar"/> 
    8181        <file name="omero/postgresql/8.1-405.jdbc3/postgresql-8.1-405.jdbc3.jar"/> 
    82         <file name="org/springframework/spring-mock/2.0-rc1/spring-mock-2.0-rc1.jar"/> 
    83         <file name="org/springframework/spring/2.0-rc1/spring-2.0-rc1.jar"/> 
     82        <file name="org/springframework/spring-mock/2.0/spring-mock-2.0.jar"/> 
     83        <file name="org/springframework/spring/2.0/spring-2.0.jar"/> 
    8484        <file name="qdox/qdox/1.5/qdox-1.5.jar"/> 
    8585        <file name="testng/testng/4.7-jdk15/testng-4.7-jdk15.jar"/> 
    … …  
    104104        <include name="omero/jbossall-client/4.0.4.GA/jbossall-client-4.0.4.GA.jar"/> 
    105105        <include name="omero/postgresql/8.1-405.jdbc3/postgresql-8.1-405.jdbc3.jar"/> 
    106         <include name="org/springframework/spring-mock/2.0-rc1/spring-mock-2.0-rc1.jar"/> 
    107         <include name="org/springframework/spring/2.0-rc1/spring-2.0-rc1.jar"/> 
     106        <include name="org/springframework/spring-mock/2.0/spring-mock-2.0.jar"/> 
     107        <include name="org/springframework/spring/2.0/spring-2.0.jar"/> 
    108108        <include name="qdox/qdox/1.5/qdox-1.5.jar"/> 
    109109        <include name="testng/testng/4.7-jdk15/testng-4.7-jdk15.jar"/> 

  • trunk/components/common/.classpath

    r825 r1039  
    2727        <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate/3.2.0.cr2/hibernate-3.2.0.cr2.jar"/> 
    2828        <classpathentry kind="var" path="M2_REPO/org/hibernate/jtidy/r8-21122004/jtidy-r8-21122004.jar"/> 
    29         <classpathentry kind="var" path="M2_REPO/org/springframework/spring-mock/2.0-rc1/spring-mock-2.0-rc1.jar"/> 
    30         <classpathentry kind="var" path="M2_REPO/org/springframework/spring/2.0-rc1/spring-2.0-rc1.jar"/> 
     29        <classpathentry kind="var" path="M2_REPO/org/springframework/spring-mock/2.0/spring-mock-2.0.jar"/> 
     30        <classpathentry kind="var" path="M2_REPO/org/springframework/spring/2.0/spring-2.0.jar"/> 
    3131        <classpathentry kind="var" path="M2_REPO/qdox/qdox/1.5/qdox-1.5.jar"/> 
    3232        <classpathentry kind="var" path="M2_REPO/testng/testng/4.7-jdk15/testng-4.7-jdk15.jar"/> 

  • trunk/components/common/classpath.xml

    r825 r1039  
    4444        <file name="org/hibernate/hibernate/3.2.0.cr2/hibernate-3.2.0.cr2.jar"/> 
    4545        <file name="org/hibernate/jtidy/r8-21122004/jtidy-r8-21122004.jar"/> 
    46         <file name="org/springframework/spring/2.0-rc1/spring-2.0-rc1.jar"/> 
     46        <file name="org/springframework/spring/2.0/spring-2.0.jar"/> 
    4747        <file name="qdox/qdox/1.5/qdox-1.5.jar"/> 
    4848        <file name="velocity-tools/velocity-tools-generic/1.1/velocity-tools-generic-1.1.jar"/> 
    … …  
    6868        <include name="org/hibernate/hibernate/3.2.0.cr2/hibernate-3.2.0.cr2.jar"/> 
    6969        <include name="org/hibernate/jtidy/r8-21122004/jtidy-r8-21122004.jar"/> 
    70         <include name="org/springframework/spring/2.0-rc1/spring-2.0-rc1.jar"/> 
     70        <include name="org/springframework/spring/2.0/spring-2.0.jar"/> 
    7171        <include name="qdox/qdox/1.5/qdox-1.5.jar"/> 
    7272        <include name="velocity-tools/velocity-tools-generic/1.1/velocity-tools-generic-1.1.jar"/> 
    … …  
    9595        <file name="org/hibernate/hibernate/3.2.0.cr2/hibernate-3.2.0.cr2.jar"/> 
    9696        <file name="org/hibernate/jtidy/r8-21122004/jtidy-r8-21122004.jar"/> 
    97         <file name="org/springframework/spring-mock/2.0-rc1/spring-mock-2.0-rc1.jar"/> 
    98         <file name="org/springframework/spring/2.0-rc1/spring-2.0-rc1.jar"/> 
     97        <file name="org/springframework/spring-mock/2.0/spring-mock-2.0.jar"/> 
     98        <file name="org/springframework/spring/2.0/spring-2.0.jar"/> 
    9999        <file name="qdox/qdox/1.5/qdox-1.5.jar"/> 
    100100        <file name="testng/testng/4.7-jdk15/testng-4.7-jdk15.jar"/> 
    … …  
    124124        <include name="org/hibernate/hibernate/3.2.0.cr2/hibernate-3.2.0.cr2.jar"/> 
    125125        <include name="org/hibernate/jtidy/r8-21122004/jtidy-r8-21122004.jar"/> 
    126         <include name="org/springframework/spring-mock/2.0-rc1/spring-mock-2.0-rc1.jar"/> 
    127         <include name="org/springframework/spring/2.0-rc1/spring-2.0-rc1.jar"/> 
     126        <include name="org/springframework/spring-mock/2.0/spring-mock-2.0.jar"/> 
     127        <include name="org/springframework/spring/2.0/spring-2.0.jar"/> 
    128128        <include name="qdox/qdox/1.5/qdox-1.5.jar"/> 
    129129        <include name="testng/testng/4.7-jdk15/testng-4.7-jdk15.jar"/> 

  • trunk/components/common/test/ome/system/utests/ContextTest.java

    r709 r1039  
    99 
    1010import org.springframework.beans.BeansException; 
    11 import org.springframework.beans.factory.config.BeanReferenceFactoryBean; 
    1211import org.springframework.beans.factory.config.ConstructorArgumentValues; 
    1312import org.springframework.beans.factory.config.PropertyPlaceholderConfigurer; 
    1413import org.springframework.beans.factory.config.RuntimeBeanReference; 
    15 import org.springframework.beans.factory.config.TypedStringValue; 
    16 import org.springframework.beans.factory.support.ManagedMap; 
    1714import org.springframework.beans.factory.support.RootBeanDefinition; 
    1815import org.springframework.context.ApplicationContext; 

  • trunk/components/dsl/.classpath

    r726 r1039  
    1515        <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.8/log4j-1.2.8.jar"/> 
    1616        <classpathentry kind="var" path="M2_REPO/omero/postgresql/8.1-405.jdbc3/postgresql-8.1-405.jdbc3.jar"/> 
    17         <classpathentry kind="var" path="M2_REPO/org/springframework/spring-mock/2.0-rc1/spring-mock-2.0-rc1.jar"/> 
    18         <classpathentry kind="var" path="M2_REPO/org/springframework/spring/2.0-rc1/spring-2.0-rc1.jar"/> 
     17        <classpathentry kind="var" path="M2_REPO/org/springframework/spring-mock/2.0/spring-mock-2.0.jar"/> 
     18        <classpathentry kind="var" path="M2_REPO/org/springframework/spring/2.0/spring-2.0.jar"/> 
    1919        <classpathentry kind="var" path="M2_REPO/qdox/qdox/1.5/qdox-1.5.jar"/> 
    2020        <classpathentry kind="var" path="M2_REPO/testng/testng/4.7-jdk15/testng-4.7-jdk15.jar"/> 

  • trunk/components/dsl/classpath.xml

    r726 r1039  
    3232        <file name="groovy/groovy-all-1.0-jsr/05/groovy-all-1.0-jsr-05.jar"/> 
    3333        <file name="log4j/log4j/1.2.8/log4j-1.2.8.jar"/> 
    34         <file name="org/springframework/spring/2.0-rc1/spring-2.0-rc1.jar"/> 
     34        <file name="org/springframework/spring/2.0/spring-2.0.jar"/> 
    3535        <file name="qdox/qdox/1.5/qdox-1.5.jar"/> 
    3636        <file name="velocity-tools/velocity-tools-generic/1.1/velocity-tools-generic-1.1.jar"/> 
    … …  
    4444        <include name="groovy/groovy-all-1.0-jsr/05/groovy-all-1.0-jsr-05.jar"/> 
    4545        <include name="log4j/log4j/1.2.8/log4j-1.2.8.jar"/> 
    46         <include name="org/springframework/spring/2.0-rc1/spring-2.0-rc1.jar"/> 
     46        <include name="org/springframework/spring/2.0/spring-2.0.jar"/> 
    4747        <include name="qdox/qdox/1.5/qdox-1.5.jar"/> 
    4848        <include name="velocity-tools/velocity-tools-generic/1.1/velocity-tools-generic-1.1.jar"/> 
    … …  
    5959        <file name="log4j/log4j/1.2.8/log4j-1.2.8.jar"/> 
    6060        <file name="omero/postgresql/8.1-405.jdbc3/postgresql-8.1-405.jdbc3.jar"/> 
    61         <file name="org/springframework/spring-mock/2.0-rc1/spring-mock-2.0-rc1.jar"/> 
    62         <file name="org/springframework/spring/2.0-rc1/spring-2.0-rc1.jar"/> 
     61        <file name="org/springframework/spring-mock/2.0/spring-mock-2.0.jar"/> 
     62        <file name="org/springframework/spring/2.0/spring-2.0.jar"/> 
    6363        <file name="qdox/qdox/1.5/qdox-1.5.jar"/> 
    6464        <file name="testng/testng/4.7-jdk15/testng-4.7-jdk15.jar"/> 
    … …  
    7676        <include name="log4j/log4j/1.2.8/log4j-1.2.8.jar"/> 
    7777        <include name="omero/postgresql/8.1-405.jdbc3/postgresql-8.1-405.jdbc3.jar"/> 
    78         <include name="org/springframework/spring-mock/2.0-rc1/spring-mock-2.0-rc1.jar"/> 
    79         <include name="org/springframework/spring/2.0-rc1/spring-2.0-rc1.jar"/> 
     78        <include name="org/springframework/spring-mock/2.0/spring-mock-2.0.jar"/> 
     79        <include name="org/springframework/spring/2.0/spring-2.0.jar"/> 
    8080        <include name="qdox/qdox/1.5/qdox-1.5.jar"/> 
    8181        <include name="testng/testng/4.7-jdk15/testng-4.7-jdk15.jar"/> 

  • trunk/components/rendering/.classpath

    r726 r1039  
    1818        <classpathentry kind="var" path="M2_REPO/omero/postgresql/8.1-405.jdbc3/postgresql-8.1-405.jdbc3.jar"/> 
    1919        <classpathentry kind="var" path="M2_REPO/omero/romio/3.0-TRUNK/romio-3.0-TRUNK.jar"/> 
    20         <classpathentry kind="var" path="M2_REPO/org/springframework/spring-mock/2.0-rc1/spring-mock-2.0-rc1.jar"/> 
    21         <classpathentry kind="var" path="M2_REPO/org/springframework/spring/2.0-rc1/spring-2.0-rc1.jar"/> 
     20        <classpathentry kind="var" path="M2_REPO/org/springframework/spring-mock/2.0/spring-mock-2.0.jar"/> 
     21        <classpathentry kind="var" path="M2_REPO/org/springframework/spring/2.0/spring-2.0.jar"/> 
    2222        <classpathentry kind="var" path="M2_REPO/qdox/qdox/1.5/qdox-1.5.jar"/> 
    2323        <classpathentry kind="var" path="M2_REPO/testng/testng/4.7-jdk15/testng-4.7-jdk15.jar"/> 

  • trunk/components/rendering/classpath.xml

    r726 r1039  
    3535        <file name="omero/dsl/3.0-TRUNK/dsl-3.0-TRUNK.jar"/> 
    3636        <file name="omero/romio/3.0-TRUNK/romio-3.0-TRUNK.jar"/> 
    37         <file name="org/springframework/spring/2.0-rc1/spring-2.0-rc1.jar"/> 
     37        <file name="org/springframework/spring/2.0/spring-2.0.jar"/> 
    3838        <file name="qdox/qdox/1.5/qdox-1.5.jar"/> 
    3939        <file name="velocity-tools/velocity-tools-generic/1.1/velocity-tools-generic-1.1.jar"/> 
    … …  
    5050        <include name="omero/dsl/3.0-TRUNK/dsl-3.0-TRUNK.jar"/> 
    5151        <include name="omero/romio/3.0-TRUNK/romio-3.0-TRUNK.jar"/> 
    52         <include name="org/springframework/spring/2.0-rc1/spring-2.0-rc1.jar"/> 
     52        <include name="org/springframework/spring/2.0/spring-2.0.jar"/> 
    5353        <include name="qdox/qdox/1.5/qdox-1.5.jar"/> 
    5454        <include name="velocity-tools/velocity-tools-generic/1.1/velocity-tools-generic-1.1.jar"/> 
    … …  
    6868        <file name="omero/postgresql/8.1-405.jdbc3/postgresql-8.1-405.jdbc3.jar"/> 
    6969        <file name="omero/romio/3.0-TRUNK/romio-3.0-TRUNK.jar"/> 
    70         <file name="org/springframework/spring-mock/2.0-rc1/spring-mock-2.0-rc1.jar"/> 
    71         <file name="org/springframework/spring/2.0-rc1/spring-2.0-rc1.jar"/> 
     70        <file name="org/springframework/spring-mock/2.0/spring-mock-2.0.jar"/> 
     71        <file name="org/springframework/spring/2.0/spring-2.0.jar"/> 
    7272        <file name="qdox/qdox/1.5/qdox-1.5.jar"/> 
    7373        <file name="testng/testng/4.7-jdk15/testng-4.7-jdk15.jar"/> 
    … …  
    8888        <include name="omero/postgresql/8.1-405.jdbc3/postgresql-8.1-405.jdbc3.jar"/> 
    8989        <include name="omero/romio/3.0-TRUNK/romio-3.0-TRUNK.jar"/> 
    90         <include name="org/springframework/spring-mock/2.0-rc1/spring-mock-2.0-rc1.jar"/> 
    91         <include name="org/springframework/spring/2.0-rc1/spring-2.0-rc1.jar"/> 
     90        <include name="org/springframework/spring-mock/2.0/spring-mock-2.0.jar"/> 
     91        <include name="org/springframework/spring/2.0/spring-2.0.jar"/> 
    9292        <include name="qdox/qdox/1.5/qdox-1.5.jar"/> 
    9393        <include name="testng/testng/4.7-jdk15/testng-4.7-jdk15.jar"/> 

  • trunk/components/romio/.classpath

    r726 r1039  
    1717        <classpathentry kind="var" path="M2_REPO/omero/dsl/3.0-TRUNK/dsl-3.0-TRUNK.jar"/> 
    1818        <classpathentry kind="var" path="M2_REPO/omero/postgresql/8.1-405.jdbc3/postgresql-8.1-405.jdbc3.jar"/> 
    19         <classpathentry kind="var" path="M2_REPO/org/springframework/spring-mock/2.0-rc1/spring-mock-2.0-rc1.jar"/> 
    20         <classpathentry kind="var" path="M2_REPO/org/springframework/spring/2.0-rc1/spring-2.0-rc1.jar"/> 
     19        <classpathentry kind="var" path="M2_REPO/org/springframework/spring-mock/2.0/spring-mock-2.0.jar"/> 
     20        <classpathentry kind="var" path="M2_REPO/org/springframework/spring/2.0/spring-2.0.jar"/> 
    2121        <classpathentry kind="var" path="M2_REPO/qdox/qdox/1.5/qdox-1.5.jar"/> 
    2222        <classpathentry kind="var" path="M2_REPO/testng/testng/4.7-jdk15/testng-4.7-jdk15.jar"/> 

  • trunk/components/romio/classpath.xml

    r726 r1039  
    3434        <file name="omero/common/3.0-TRUNK/common-3.0-TRUNK.jar"/> 
    3535        <file name="omero/dsl/3.0-TRUNK/dsl-3.0-TRUNK.jar"/> 
    36         <file name="org/springframework/spring/2.0-rc1/spring-2.0-rc1.jar"/> 
     36        <file name="org/springframework/spring/2.0/spring-2.0.jar"/> 
    3737        <file name="qdox/qdox/1.5/qdox-1.5.jar"/> 
    3838        <file name="velocity-tools/velocity-tools-generic/1.1/velocity-tools-generic-1.1.jar"/> 
    … …  
    4848        <include name="omero/common/3.0-TRUNK/common-3.0-TRUNK.jar"/> 
    4949        <include name="omero/dsl/3.0-TRUNK/dsl-3.0-TRUNK.jar"/> 
    50         <include name="org/springframework/spring/2.0-rc1/spring-2.0-rc1.jar"/> 
     50        <include name="org/springframework/spring/2.0/spring-2.0.jar"/> 
    5151        <include name="qdox/qdox/1.5/qdox-1.5.jar"/> 
    5252        <include name="velocity-tools/velocity-tools-generic/1.1/velocity-tools-generic-1.1.jar"/> 
    … …  
    6565        <file name="omero/dsl/3.0-TRUNK/dsl-3.0-TRUNK.jar"/> 
    6666        <file name="omero/postgresql/8.1-405.jdbc3/postgresql-8.1-405.jdbc3.jar"/> 
    67         <file name="org/springframework/spring-mock/2.0-rc1/spring-mock-2.0-rc1.jar"/> 
    68         <file name="org/springframework/spring/2.0-rc1/spring-2.0-rc1.jar"/> 
     67        <file name="org/springframework/spring-mock/2.0/spring-mock-2.0.jar"/> 
     68        <file name="org/springframework/spring/2.0/spring-2.0.jar"/> 
    6969        <file name="qdox/qdox/1.5/qdox-1.5.jar"/> 
    7070        <file name="testng/testng/4.7-jdk15/testng-4.7-jdk15.jar"/> 
    … …  
    8484        <include name="omero/dsl/3.0-TRUNK/dsl-3.0-TRUNK.jar"/> 
    8585        <include name="omero/postgresql/8.1-405.jdbc3/postgresql-8.1-405.jdbc3.jar"/> 
    86         <include name="org/springframework/spring-mock/2.0-rc1/spring-mock-2.0-rc1.jar"/> 
    87         <include name="org/springframework/spring/2.0-rc1/spring-2.0-rc1.jar"/> 
     86        <include name="org/springframework/spring-mock/2.0/spring-mock-2.0.jar"/> 
     87        <include name="org/springframework/spring/2.0/spring-2.0.jar"/> 
    8888        <include name="qdox/qdox/1.5/qdox-1.5.jar"/> 
    8989        <include name="testng/testng/4.7-jdk15/testng-4.7-jdk15.jar"/> 

  • trunk/components/server/.classpath

    r1011 r1039  
    4242        <classpathentry exported="true" kind="var" path="M2_REPO/org/acegisecurity/acegi-security/1.0.0-RC1/acegi-security-1.0.0-RC1.jar"/> 
    4343        <classpathentry exported="true" sourcepath="/HIBERNATE_SVN/src" kind="var" path="M2_REPO/org/hibernate/hibernate/3.2.0.cr2/hibernate-3.2.0.cr2.jar"/> 
    44         <classpathentry exported="true" sourcepath="/SPRING_HOME/src" kind="var" path="M2_REPO/org/springframework/spring-hibernate3/2.0-rc1/spring-hibernate3-2.0-rc1.jar"/> 
    45         <classpathentry exported="true" sourcepath="/SPRING_HOME" kind="var" path="M2_REPO/org/springframework/spring-mock/2.0-rc1/spring-mock-2.0-rc1.jar"/> 
    46         <classpathentry exported="true" sourcepath="/SPRING_HOME" kind="var" path="M2_REPO/org/springframework/spring/2.0-rc1/spring-2.0-rc1.jar"/> 
     44        <classpathentry exported="true" sourcepath="/SPRING_HOME" kind="var" path="M2_REPO/org/springframework/spring-mock/2.0/spring-mock-2.0.jar"/> 
     45        <classpathentry exported="true" sourcepath="/SPRING_HOME" kind="var" path="M2_REPO/org/springframework/spring/2.0/spring-2.0.jar"/> 
    4746        <classpathentry exported="true" kind="var" path="M2_REPO/qdox/qdox/1.5/qdox-1.5.jar"/> 
    4847        <classpathentry exported="true" kind="var" path="M2_REPO/testng/testng/4.7-jdk15/testng-4.7-jdk15.jar"/> 

  • trunk/components/server/classpath.xml

    r1011 r1039  
    6060        <file name="org/acegisecurity/acegi-security/1.0.0-RC1/acegi-security-1.0.0-RC1.jar"/> 
    6161        <file name="org/hibernate/hibernate/3.2.0.cr2/hibernate-3.2.0.cr2.jar"/> 
    62         <file name="org/springframework/spring-hibernate3/2.0-rc1/spring-hibernate3-2.0-rc1.jar"/> 
    63         <file name="org/springframework/spring/2.0-rc1/spring-2.0-rc1.jar"/> 
     62        <file name="org/springframework/spring/2.0/spring-2.0.jar"/> 
    6463        <file name="qdox/qdox/1.5/qdox-1.5.jar"/> 
    6564        <file name="velocity-tools/velocity-tools-generic/1.1/velocity-tools-generic-1.1.jar"/> 
    … …  
    103102        <include name="org/acegisecurity/acegi-security/1.0.0-RC1/acegi-security-1.0.0-RC1.jar"/> 
    104103        <include name="org/hibernate/hibernate/3.2.0.cr2/hibernate-3.2.0.cr2.jar"/> 
    105         <include name="org/springframework/spring-hibernate3/2.0-rc1/spring-hibernate3-2.0-rc1.jar"/> 
    106         <include name="org/springframework/spring/2.0-rc1/spring-2.0-rc1.jar"/> 
     104        <include name="org/springframework/spring/2.0/spring-2.0.jar"/> 
    107105        <include name="qdox/qdox/1.5/qdox-1.5.jar"/> 
    108106        <include name="velocity-tools/velocity-tools-generic/1.1/velocity-tools-generic-1.1.jar"/> 
    … …  
    149147        <file name="org/acegisecurity/acegi-security/1.0.0-RC1/acegi-security-1.0.0-RC1.jar"/> 
    150148        <file name="org/hibernate/hibernate/3.2.0.cr2/hibernate-3.2.0.cr2.jar"/> 
    151         <file name="org/springframework/spring-hibernate3/2.0-rc1/spring-hibernate3-2.0-rc1.jar"/> 
    152         <file name="org/springframework/spring-mock/2.0-rc1/spring-mock-2.0-rc1.jar"/> 
    153         <file name="org/springframework/spring/2.0-rc1/spring-2.0-rc1.jar"/> 
     149        <file name="org/springframework/spring-mock/2.0/spring-mock-2.0.jar"/> 
     150        <file name="org/springframework/spring/2.0/spring-2.0.jar"/> 
    154151        <file name="qdox/qdox/1.5/qdox-1.5.jar"/> 
    155152        <file name="testng/testng/4.7-jdk15/testng-4.7-jdk15.jar"/> 
    … …  
    197194        <include name="org/acegisecurity/acegi-security/1.0.0-RC1/acegi-security-1.0.0-RC1.jar"/> 
    198195        <include name="org/hibernate/hibernate/3.2.0.cr2/hibernate-3.2.0.cr2.jar"/> 
    199         <include name="org/springframework/spring-hibernate3/2.0-rc1/spring-hibernate3-2.0-rc1.jar"/>