Changeset 6749


Ignore:
Timestamp:
07/29/10 11:24:50 (9 years ago)
Author:
melissa
Message:

Fixed OMEReaderWriterServiceImpl dependency checking and ome-io component classpath so that missing library tests pass.

Location:
trunk/components/ome-io
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/components/ome-io/build.properties

    r6684 r6749  
    1313                           ${artifact.dir}/loci-common.jar:\ 
    1414                           ${lib.dir}/log4j-1.2.15.jar:\ 
     15                           ${lib.dir}/ome-java.jar:\ 
    1516                           ${lib.dir}/omero-client-4.1.1.jar:\ 
    1617                           ${lib.dir}/omero-common-4.1.1.jar:\ 
     
    2425 
    2526component.main-class     = loci.ome.io.OMEWriter 
    26 component.runtime-cp     = ${component.classpath}:\ 
    27                            ${lib.dir}/ome-java.jar 
     27component.runtime-cp     = ${component.classpath} 
     28 
     29 
     30# NB: do not include ${artifact.dir}/bio-formats.jar, as its' classpath 
     31#     includes ome-io.jar 
     32component.classpath-no-omeio  = ${root.dir}/components/bio-formats/build/classes:\ 
     33                                ${artifact.dir}/loci-common.jar:\ 
     34                                ${lib.dir}/log4j-1.2.15.jar:\ 
     35                                ${lib.dir}/slf4j-api-1.5.10.jar:\ 
     36                                ${lib.dir}/testng-5.11-jdk15.jar 
  • trunk/components/ome-io/build.xml

    r6745 r6749  
    3030 
    3131  <target name="test-no-omeio" depends="compile-tests" description="run missing OME I/O tests" if="doTests"> 
     32    <echo>${test-classes.dir}</echo> 
     33    <echo>${classes.dir}</echo> 
     34    <echo>${component.classpath-no-omeio}</echo> 
    3235    <copy tofile="${build.dir}/testng.xml" overwrite="true" 
    3336      file="${tests.dir}/loci/ome/utests/testng-no-ome-io.xml"/> 
     
    3538      <classpath> 
    3639        <pathelement location="${test-classes.dir}"/> 
    37         <pathelement path="${component.classpath}"/> 
     40        <pathelement location="${classes.dir}"/> 
     41        <pathelement path="${component.classpath-no-omeio}"/> 
    3842      </classpath> 
    3943      <xmlfileset file="${build.dir}/testng.xml"/> 
  • trunk/components/ome-io/src/loci/ome/io/services/OMEReaderWriterServiceImpl.java

    r6050 r6749  
    4949    checkClassDependency(OMEWriter.class); 
    5050    checkClassDependency(OmeroReader.class); 
     51    checkClassDependency(omero.model.Image.class); 
     52    checkClassDependency(org.openmicroscopy.ds.dto.Image.class); 
    5153  } 
    5254 
Note: See TracChangeset for help on using the changeset viewer.