• 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 107 for branches/omero

Show
Ignore:
Timestamp:
06/13/05 15:29:59 (4 years ago)
Author:
jmoore
Message:

* More libs (Spring!) to main project.xml
* Added files to server/test/WEB-INF/test
* Added more pregoals to clean:clean

Location:
branches/omero
Files:
1 added
12 modified
1 moved

  • components/client/project.xml (modified) (1 diff)
  • components/common/project.xml (modified) (1 diff)
  • components/server/project.xml (modified) (1 diff)
  • components/server/test/WEB-INF/test/config-test.xml (moved) (moved from branches/omero/components/server/web/WEB-INF/config-test.xml)
  • components/server/test/WEB-INF/test/data-test.xml (added)
  • components/server/test/org/openmicroscopy/omero/server/itests/LeftOuterJoinTest.java (modified) (1 diff)
  • components/server/test/org/openmicroscopy/omero/server/itests/OmeroServiceTest.java (modified) (1 diff)
  • components/server/test/org/openmicroscopy/omero/server/itests/OmeroThumbnailsBugTest.java (modified) (1 diff)
  • components/server/test/org/openmicroscopy/omero/server/utests/HierarchyBrowsingDbUnitTest.java (modified) (1 diff)
  • components/shoola-adapter/project.xml (modified) (1 diff)
  • components/test/maven.xml (modified) (1 diff)
  • components/test/project.xml (modified) (1 diff)
  • maven.xml (modified) (1 diff)
  • project.xml (modified) (2 diffs)

Legend:

Unmodified
Added
Removed

  • branches/omero/components/client/project.xml

    r106 r107  
    1414      <artifactId>${pom.groupId}-common</artifactId> 
    1515      <version>1.0</version> 
    16     </dependency> 
    17     <dependency> 
    18       <groupId>springframework</groupId> 
    19       <artifactId>spring</artifactId> 
    20       <version>1.2.1</version> 
    21     </dependency> 
    22     <dependency> 
    23       <groupId>springframework</groupId> 
    24       <artifactId>spring-mock</artifactId> 
    25       <version>1.2.1</version> 
    2616    </dependency> 
    2717    <dependency> 

  • branches/omero/components/common/project.xml

    r106 r107  
    1010  <description>Common code: Model code generated from middlegen</description> 
    1111  <dependencies> 
    12     <dependency> 
    13       <groupId>springframework</groupId> 
    14       <artifactId>spring</artifactId> 
    15       <version>1.2.1</version> 
    16     </dependency> 
    17     <dependency> 
    18       <groupId>springframework</groupId> 
    19       <artifactId>spring-mock</artifactId> 
    20       <version>1.2.1</version> 
    21     </dependency> 
    2212    <dependency> 
    2313      <groupId>junit</groupId> 

  • branches/omero/components/server/project.xml

    r106 r107  
    1313      <artifactId>${pom.groupId}-common</artifactId> 
    1414      <version>1.0</version> 
    15       <type>jar</type> 
    16       <properties> 
    17         <war.bundle>true</war.bundle> 
    18       </properties> 
    19     </dependency> 
    20     <dependency> 
    21       <groupId>springframework</groupId> 
    22       <artifactId>spring</artifactId> 
    23       <version>1.2.1</version> 
    24       <type>jar</type> 
    25       <properties> 
    26         <war.bundle>true</war.bundle> 
    27       </properties> 
    28     </dependency> 
    29     <dependency> 
    30       <groupId>springframework</groupId> 
    31       <artifactId>spring-mock</artifactId> 
    32       <version>1.2.1</version> 
    3315      <type>jar</type> 
    3416      <properties> 

  • branches/omero/components/server/test/org/openmicroscopy/omero/server/itests/LeftOuterJoinTest.java

    r105 r107  
    8383                "WEB-INF/dao.xml", 
    8484                "WEB-INF/data.xml",  
    85                 "WEB-INF/config-test.xml" }; 
     85                "WEB-INF/test/config-test.xml" }; 
    8686    } 
    8787 

  • branches/omero/components/server/test/org/openmicroscopy/omero/server/itests/OmeroServiceTest.java

    r104 r107  
    7070                "WEB-INF/dao.xml", 
    7171                "WEB-INF/data.xml", 
    72                 "WEB-INF/config-test.xml"};  
     72                "WEB-INF/test/config-test.xml"};  
    7373    } 
    7474     

  • branches/omero/components/server/test/org/openmicroscopy/omero/server/itests/OmeroThumbnailsBugTest.java

    r105 r107  
    7878    protected String[] getConfigLocations() { 
    7979 
    80         return new String[] { "WEB-INF/services.xml", "WEB-INF/dao.xml", 
    81                 "WEB-INF/data.xml", "WEB-INF/config-test.xml" }; 
     80        return new String[] {  
     81                "WEB-INF/services.xml",  
     82                "WEB-INF/dao.xml", 
     83                "WEB-INF/data.xml",  
     84                "WEB-INF/test/config-test.xml" }; 
    8285    } 
    8386 

  • branches/omero/components/server/test/org/openmicroscopy/omero/server/utests/HierarchyBrowsingDbUnitTest.java

    r106 r107  
    4646        return new String[] {  
    4747                "WEB-INF/dao.xml", 
    48                 "WEB-INF/config-test.xml",  
    49                 "WEB-INF/data-test.xml" }; 
     48                "WEB-INF/test/config-test.xml",  
     49                "WEB-INF/test/data-test.xml" }; 
    5050    } 
    5151 

  • branches/omero/components/shoola-adapter/project.xml

    r106 r107  
    1919      <artifactId>${pom.groupId}-client</artifactId> 
    2020      <version>1.0</version> 
    21     </dependency> 
    22     <dependency> 
    23       <groupId>springframework</groupId> 
    24       <artifactId>spring</artifactId> 
    25       <version>1.2.1</version> 
    2621    </dependency> 
    2722    <dependency> 

  • branches/omero/components/test/maven.xml

    r105 r107  
    3333  </goal> 
    3434 
    35   <goal name="clean"> 
     35  <preGoal name="clean:clean"> 
    3636    <ant:delete dir="${basedir}/.cachedir"/> 
    3737    <ant:delete dir="${basedir}/cachedir"/> 
    38     <attainGoal name="clean:clean"/> 
    39   </goal> 
     38  </preGoal> 
    4039 
    4140</project> 

  • branches/omero/components/test/project.xml

    r106 r107  
    2424      <artifactId>${pom.groupId}-shoola-adapter</artifactId> 
    2525      <version>1.0</version> 
    26     </dependency> 
    27     <dependency> 
    28       <groupId>springframework</groupId> 
    29       <artifactId>spring</artifactId> 
    30       <version>1.2.1</version> 
    31     </dependency> 
    32     <dependency> 
    33       <groupId>springframework</groupId> 
    34       <artifactId>spring-mock</artifactId> 
    35       <version>1.2.1</version> 
    3626    </dependency> 
    3727    <dependency> 

  • branches/omero/maven.xml

    r106 r107  
    1515     <attainGoal name="filterTests"/> 
    1616   </preGoal> 
     17   <preGoal name="clean:clean"> 
     18     <ant:delete file="${basedir}/src/spring.properties"/> 
     19   </preGoal>  
    1720 
    1821<!-- Setup -->  

  • branches/omero/project.xml

    r106 r107  
    3636  <developers/> 
    3737  <dependencies> 
    38     <depdendency> 
    39       <groupId>jam</groupId> 
    40       <artifactId>maven-jam-plugin</artifactId> 
    41       <version>2.1</version> 
    42       <type>plugin</type> 
    43     </depdendency> 
    44     <depdendency> 
    45       <groupId>maven-plugins</groupId> 
    46       <artifactId>maven-dbunit-plugin</artifactId> 
    47       <version>1.5</version> 
    48       <type>plugin</type> 
    49     </depdendency> 
     38    <dependency> 
     39      <groupId>springframework</groupId> 
     40      <artifactId>spring</artifactId> 
     41      <version>1.2.1</version> 
     42      <type>jar</type> 
     43      <properties> 
     44        <war.bundle>true</war.bundle> 
     45      </properties> 
     46    </dependency> 
     47    <dependency> 
     48      <groupId>springframework</groupId> 
     49      <artifactId>spring-mock</artifactId> 
     50      <version>1.2.1</version> 
     51      <type>jar</type> 
     52      <properties> 
     53        <war.bundle>true</war.bundle> 
     54      </properties> 
     55    </dependency> 
    5056    <dependency> 
    5157      <groupId>commons-lang</groupId> 
    … …  
    6470      </properties> 
    6571    </dependency> 
     72    <depdendency> 
     73      <groupId>jam</groupId> 
     74      <artifactId>maven-jam-plugin</artifactId> 
     75      <version>2.1</version> 
     76      <type>plugin</type> 
     77    </depdendency> 
     78    <depdendency> 
     79      <groupId>maven-plugins</groupId> 
     80      <artifactId>maven-dbunit-plugin</artifactId> 
     81      <version>1.5</version> 
     82      <type>plugin</type> 
     83    </depdendency> 
    6684  </dependencies> 
    6785  <reports> 

Download in other formats:

  • Unified Diff
  • Zip Archive
Trac Powered

Powered by Trac 0.11
By Edgewall Software.

Visit the Trac open source project at
http://trac.edgewall.org/