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

Show
Ignore:
Timestamp:
06/12/05 19:51:18 (4 years ago)
Author:
jmoore
Message:

A bit quirky at the moment but things are working well.

*) Worked out jython issues in Grinder script
*) A rough method for writing u/i-tests for Spring "stuff" is emerging
*) Lots of null pointers to fix since creation of Daos
*) Ra ra ra. Ciao.

Location:
branches/omero/components
Files:
3 added
21 modified

  • common/src/org/openmicroscopy/omero/interfaces/HierarchyBrowsing.java (modified) (1 diff)
  • common/src/org/openmicroscopy/omero/model2/Category2.java (modified) (1 diff)
  • common/src/org/openmicroscopy/omero/model2/CategoryGroup2.java (modified) (1 diff)
  • common/src/org/openmicroscopy/omero/tests/AbstractOmeroHierarchyBrowserIntegrationTest.java (modified) (17 diffs)
  • common/src/org/openmicroscopy/omero/tests/OMEData.java (modified) (2 diffs)
  • common/src/org/openmicroscopy/omero/tests/OMEPerformanceData.java (modified) (3 diffs)
  • common/src/org/openmicroscopy/omero/util/Utils.java (modified) (3 diffs)
  • server/.classpath (modified) (1 diff)
  • server/.project (modified) (1 diff)
  • server/src/log4j.properties (modified) (1 diff)
  • server/src/org/openmicroscopy/omero/logic/HierarchyBrowsingImpl.java (modified) (13 diffs)
  • server/src/org/openmicroscopy/omero/logic/Utils.java (added)
  • server/src/org/openmicroscopy/omero/logic/queries.hbm.xml (modified) (6 diffs)
  • server/test/org/openmicroscopy/omero/server/itests/LeftOuterJoinTest.java (added)
  • server/test/org/openmicroscopy/omero/server/itests/OmeroThumbnailsBugTest.java (modified) (7 diffs)
  • shoola-adapter/src/org/openmicroscopy/omero/shoolaadapter/AdapterUtils.java (modified) (12 diffs)
  • test/.classpath (modified) (1 diff)
  • test/.project (modified) (1 diff)
  • test/grinder.properties (modified) (1 diff)
  • test/maven.xml (modified) (3 diffs)
  • test/project.properties (modified) (1 diff)
  • test/project.xml (modified) (2 diffs)
  • test/src/log4j.properties (added)
  • test/src/speed.py (modified) (3 diffs)

Legend:

Unmodified
Added
Removed

  • branches/omero/components/common/src/org/openmicroscopy/omero/interfaces/HierarchyBrowsing.java

    r104 r105  
    5858 * @since OME2.2 
    5959 * @DEV.TODO Possibly change these methods to return an abstract super type  
    60  * @DEV.TODO or even a concretefor these or concrete type like "Project loadPDIHierary()" 
     60 * @DEV.TODO or even a concrete for these or concrete type like "Project loadPDIHierary()" 
    6161 * @DEV.TODO Update code generation for Hibernate to include copyright.  
    6262 */ 

  • branches/omero/components/common/src/org/openmicroscopy/omero/model2/Category2.java

    r104 r105  
    5555    public Set images; 
    5656     
     57    public Set getImages() { 
     58        return images; 
     59    } 
     60    public void setImages(Set images) { 
     61        this.images = images; 
     62    } 
    5763} 

  • branches/omero/components/common/src/org/openmicroscopy/omero/model2/CategoryGroup2.java

    r104 r105  
    5555    public Set categories; 
    5656     
     57    public Set getCategories() { 
     58        return categories; 
     59    } 
     60    public void setCategories(Set categories) { 
     61        this.categories = categories; 
     62    } 
    5763} 

  • branches/omero/components/common/src/org/openmicroscopy/omero/tests/AbstractOmeroHierarchyBrowserIntegrationTest.java

    r104 r105  
    3838import org.apache.commons.logging.Log; 
    3939import org.apache.commons.logging.LogFactory; 
     40import org.springframework.beans.factory.config.AutowireCapableBeanFactory; 
     41import org.springframework.context.ApplicationContext; 
    4042import org.springframework.test.AbstractDependencyInjectionSpringContextTests; 
    4143 
    … …  
    4749import org.openmicroscopy.omero.model.Image; 
    4850import org.openmicroscopy.omero.model.Project; 
     51import org.openmicroscopy.omero.util.Utils; 
    4952 
    5053 
    … …  
    6164 * @since 1.0 
    6265 */ 
    63 public abstract class AbstractOmeroHierarchyBrowserIntegrationTest extends AbstractDependencyInjectionSpringContextTests { 
     66public abstract class AbstractOmeroHierarchyBrowserIntegrationTest  
     67        extends AbstractDependencyInjectionSpringContextTests { 
    6468 
    6569    private static Log log = LogFactory 
    … …  
    8488     
    8589    public AbstractOmeroHierarchyBrowserIntegrationTest(String name){ 
     90        super(); 
    8691        this.setName(name); 
    8792    } 
    8893     
    8994    public AbstractOmeroHierarchyBrowserIntegrationTest(OMEData data){ 
     95        super(); 
    9096        this.setName("AbstractOmeroHierarchyBrowserIntegrationTest with Data"); 
    9197        this.data = data; 
    … …  
    9399     
    94100    public AbstractOmeroHierarchyBrowserIntegrationTest(String name, OMEData data){ 
     101        super(); 
    95102        this.data = data; 
    96103        this.setName(name); 
    97104    } 
    98105     
    99     /***********************************/ 
    100     public void testLoadPDIHierarchyProjectNoReturn() { 
     106    public AbstractOmeroHierarchyBrowserIntegrationTest init(){ 
     107                this.applicationContext = getContext(getConfigLocations()); 
     108                this.applicationContext.getBeanFactory().autowireBeanProperties( 
     109                this, AutowireCapableBeanFactory.AUTOWIRE_BY_TYPE, isDependencyCheck()); 
     110                return this; 
     111    } 
     112     
     113    public ApplicationContext getAppContext(){ 
     114        return this.applicationContext; 
     115    } 
     116     
     117    /** 
     118     * @throws Exception*********************************/ 
     119    public void testLoadPDIHierarchyProjectNoReturn() throws Exception { 
     120        super.setUp(); 
    101121        Object obj = testLoadPDIHierarchyProject(); 
    102122    } 
    … …  
    104124        return hb.loadPDIHierarchy(Project.class, data.prjId); 
    105125    } 
    106     /***********************************/ 
    107     public void testLoadPDIHierarchyDatasetNoReturn() { 
     126    /** 
     127     * @throws Exception*********************************/ 
     128    public void testLoadPDIHierarchyDatasetNoReturn() throws Exception { 
     129        super.setUp(); 
    108130        Object obj = testLoadPDIHierarchyDataset(); 
    109131    } 
    … …  
    111133        return hb.loadPDIHierarchy(Dataset.class, data.dsId); 
    112134    } 
    113     /***********************************/ 
    114     public void testLoadCGCIHierarchyCategoryGroupNoReturn() { 
     135    /** 
     136     * @throws Exception*********************************/ 
     137    public void testLoadCGCIHierarchyCategoryGroupNoReturn() throws Exception { 
     138        super.setUp(); 
    115139        Object obj = testLoadCGCIHierarchyCategoryGroup(); 
    116140    } 
    … …  
    118142        return hb.loadCGCIHierarchy(CategoryGroup.class,data.cgId); 
    119143    } 
    120     /***********************************/ 
    121     public void testLoadCGCIHierarchyCategoryNoReturn() { 
     144    /** 
     145     * @throws Exception*********************************/ 
     146    public void testLoadCGCIHierarchyCategoryNoReturn() throws Exception { 
     147        super.setUp(); 
    122148        Object obj = testLoadCGCIHierarchyCategory(); 
    123149    } 
    … …  
    125151        return hb.loadCGCIHierarchy(Category.class,data.cId); 
    126152    } 
    127     /***********************************/ 
    128     public void testFindCGCIHierarchiesNoReturn() { 
     153    /** 
     154     * @throws Exception*********************************/ 
     155    public void testFindCGCIHierarchiesNoReturn() throws Exception { 
     156        super.setUp(); 
    129157        Object obj = testFindCGCIHierarchies();  
    130158    } 
    … …  
    132160        return hb.findCGCIHierarchies(data.imgsCGCI); 
    133161    } 
    134     /***********************************/ 
    135     public void testFindPDIHierarchiesNoReturn() { 
     162    /** 
     163     * @throws Exception*********************************/ 
     164    public void testFindPDIHierarchiesNoReturn() throws Exception { 
     165        super.setUp(); 
    136166        Object obj = testFindPDIHierarchies(); 
    137167    }     
    … …  
    139169        return hb.findPDIHierarchies(data.imgsPDI); 
    140170    } 
    141     /***********************************/ 
    142     public void testFindImageAnnotationsSetNoReturn() { 
     171    /** 
     172     * @throws Exception*********************************/ 
     173    public void testFindImageAnnotationsSetNoReturn() throws Exception { 
     174        super.setUp(); 
    143175        Object obj = testFindImageAnnotationsSet(); 
    144176    } 
    … …  
    146178        return hb.findImageAnnotations(data.imgsAnn1); 
    147179    } 
    148     /***********************************/ 
    149     public void testFindImageAnnotationsSetForExperimenterNoReturn() { 
     180    /** 
     181     * @throws Exception*********************************/ 
     182    public void testFindImageAnnotationsSetForExperimenterNoReturn() throws Exception { 
     183        super.setUp(); 
    150184        Object obj = testFindImageAnnotationsSetForExperimenter(); 
    151185    } 
    … …  
    153187        return hb.findImageAnnotationsForExperimenter(data.imgsAnn2, data.userId); 
    154188    } 
    155     /***********************************/ 
    156     public void testFindDatasetAnnotationsSetNoReturn() { 
     189    /** 
     190     * @throws Exception*********************************/ 
     191    public void testFindDatasetAnnotationsSetNoReturn() throws Exception { 
     192        super.setUp(); 
    157193        Object obj = testFindDatasetAnnotationsSet(); 
    158194    } 
    … …  
    160196        return hb.findDatasetAnnotations(data.dsAnn1); 
    161197    } 
    162     /***********************************/ 
    163     public void testFindDatasetAnnotationsSetForExperimenterNoReturn() { 
     198    /** 
     199     * @throws Exception*********************************/ 
     200    public void testFindDatasetAnnotationsSetForExperimenterNoReturn() throws Exception { 
     201        super.setUp(); 
    164202        Object obj = testFindDatasetAnnotationsSetForExperimenter(); 
    165203    } 
    … …  
    190228    String nonNull = "We should get something back"; 
    191229 
     230    /** Each method should return a null or an empty set as appropriate */ 
    192231    public void testNulls(){ 
    193         // Each method should return a null or an empty set as appropriate 
    194         //TODO getHb().findCGCIHierarchies(     ); 
    195         //TODO generate OMENullData(); and use it here. 
    196         //TODO OMEData toString(); 
    197          
    198232        Set test = new HashSet(); 
    199         test.add(new Integer(0)); // Non-existence set of ids 
    200         int nonExp = 0; // Non-existence experimenter ID 
     233        test.add(new Integer(-1)); // Non-existence set of ids 
     234        int nonExp = -1; // Non-existence experimenter ID 
    201235        // 
    202236        assertTrue(emptyColl,getHb().findDatasetAnnotations(test).size()==0); 
    … …  
    214248        assertTrue(emptyColl,getHb().findPDIHierarchies(test).size()==0); 
    215249        assertTrue(emptyColl,getHb().findPDIHierarchies(new HashSet()).size()==0); 
     250        // 
     251        assertTrue(emptyColl,getHb().findCGCIHierarchies(test).size()==0); 
     252        assertTrue(emptyColl,getHb().findCGCIHierarchies(new HashSet()).size()==0); 
    216253        // 
    217254        assertNull(nullObj,getHb().loadCGCIHierarchy(CategoryGroup.class, 0)); 
    … …  
    227264        assertTrue(nonNull, result != null && result.size() != 0); 
    228265        // Not to much 
    229         Set test = new HashSet(); 
    230         Iterator i = result.iterator(); 
    231         while (i.hasNext()){ 
    232             Object o = i.next(); 
    233             if (o instanceof Image) { 
    234                 test.add(o); 
    235             } else if (o instanceof Dataset) { 
    236                 Dataset dd = (Dataset) o; 
    237                 test.addAll(dd.getImages()); 
    238             } else if (o instanceof Project) { 
    239                 Project pd = (Project) o; 
    240                 Iterator p = pd.getDatasets().iterator(); 
    241                 while (p.hasNext()){ 
    242                     Dataset dd = (Dataset) p.next(); 
    243                     test.addAll(dd.getImages()); 
    244                 } 
    245             } 
    246         } 
     266        Set test = Utils.getImagesinPID(result); 
    247267        assertTrue("There should only be as many images as in the data.imagesPDI", test.size() == this.getData().imgsPDI.size()); 
    248 //      TODO Make sure joins aren't leaving anything out because of empties! 
    249     } 
     268    } 
     269   
     270 
    250271} 

  • branches/omero/components/common/src/org/openmicroscopy/omero/tests/OMEData.java

    r104 r105  
    9999    public Set dsAnn2; 
    100100 
    101     public void init() { 
     101    public OMEData init() { 
    102102        //      Perhaps generalize on type HOW OFTEN IS THIS USED! Each ONCE ? TODO 
    103103        if (!initialized) { 
    … …  
    126126             */ 
    127127        } 
     128        return this; 
    128129    } 
    129130 

  • branches/omero/components/common/src/org/openmicroscopy/omero/tests/OMEPerformanceData.java

    r104 r105  
    5454 
    5555    // Main field 
    56     double percent = 0.001; 
     56    public double percent = 0.001; 
    5757 
    5858    public OMEPerformanceData() { 
    … …  
    6969    } 
    7070 
    71     public void init() { 
     71    public OMEData init() { 
    7272        // Test data : calculated before to not change times. 
    7373        if (!initialized) { 
    … …  
    8080            dsAnn2 = getPercentOfCollection(allDss, percent); 
    8181        } 
     82        return this; 
    8283    } 
    8384} 

  • branches/omero/components/common/src/org/openmicroscopy/omero/util/Utils.java

    r104 r105  
    3535import java.lang.reflect.Method; 
    3636import java.util.HashSet; 
     37import java.util.Iterator; 
    3738import java.util.Set; 
    3839 
    … …  
    4041import com.caucho.hessian.io.HessianOutput; 
    4142 
     43import org.openmicroscopy.omero.model.Dataset; 
     44import org.openmicroscopy.omero.model.Image; 
     45import org.openmicroscopy.omero.model.Project; 
     46 
    4247//Application-internal dependencies 
    4348 
    44 //TODO 
    45 //import net.sf.acegisecurity.Authentication; 
    46 //import net.sf.acegisecurity.context.ContextHolder; 
    47 //import net.sf.acegisecurity.context.security.SecureContext; 
    48 //import net.sf.acegisecurity.context.security.SecureContextImpl; 
    49 //import net.sf.acegisecurity.providers.UsernamePasswordAuthenticationToken; 
    5049 
    5150/**  
    … …  
    103102        return (String[]) set.toArray(new String[set.size()]); 
    104103    } 
    105      
    106 //    public static void setUserAuth(){ 
    107 //        Authentication auth =  
    108 //            new UsernamePasswordAuthenticationToken( 
    109 //                "Josh","Moore"); 
    110 //        setAuth(auth); 
    111 //    } 
    112 //     
    113 //    public static void setAdminAuth(){ 
    114 //        Authentication auth =  
    115 //            new UsernamePasswordAuthenticationToken( 
    116 //                "admin","admin"); 
    117 //        setAuth(auth); 
    118 //    } 
    119 //     
    120 //    public static void setAuth(Authentication auth){ 
    121 //        SecureContext secureContext = new SecureContextImpl(); 
    122 //        secureContext.setAuthentication(auth); 
    123 //        ContextHolder.setContext(secureContext); 
    124 //    } 
     104 
     105    /** walks a PDI hierarchy and extracts the images */ 
     106    static public Set getImagesinPID(Set result) { 
     107        Set test = new HashSet(); 
     108        Iterator i = result.iterator(); 
     109        while (i.hasNext()){ 
     110            Object o = i.next(); 
     111            if (o instanceof Image) { 
     112                test.add(o); 
     113            } else if (o instanceof Dataset) { 
     114                Dataset dd = (Dataset) o; 
     115                test.addAll(dd.getImages()); 
     116            } else if (o instanceof Project) { 
     117                Project pd = (Project) o; 
     118                Iterator p = pd.getDatasets().iterator(); 
     119                while (p.hasNext()){ 
     120                    Dataset dd = (Dataset) p.next(); 
     121                    test.addAll(dd.getImages()); 
     122                } 
     123            } 
     124        } 
     125        return test; 
     126    } 
    125127} 

  • branches/omero/components/server/.classpath

    r103 r105  
    11<?xml version="1.0" encoding="UTF-8"?> 
    2  
    32<classpath> 
    4   <classpathentry excluding="" kind="src" path="src"> 
    5   </classpathentry> 
    6   <classpathentry kind="src" path="web"> 
    7   </classpathentry> 
    8   <classpathentry kind="src" path="test"> 
    9   </classpathentry> 
    10   <classpathentry kind="var" path="MAVEN_REPO/junit/jars/junit-3.8.1.jar"> 
    11   </classpathentry> 
    12   <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"> 
    13   </classpathentry> 
    14   <classpathentry kind="var" path="MAVEN_REPO/omero/jars/omero-common-1.0.jar"> 
    15   </classpathentry> 
    16   <classpathentry kind="var" path="MAVEN_REPO/springframework/jars/spring-1.2.1.jar"> 
    17   </classpathentry> 
    18   <classpathentry kind="var" path="MAVEN_REPO/springframework/jars/spring-mock-1.2.1.jar"> 
    19   </classpathentry> 
    20   <classpathentry kind="var" path="MAVEN_REPO/acegisecurity/jars/acegi-security-0.8.2.jar"> 
    21   </classpathentry> 
    22   <classpathentry kind="var" path="MAVEN_REPO/hessian/jars/hessian-2.1.12.jar"> 
    23   </classpathentry> 
    24   <classpathentry kind="var" path="MAVEN_REPO/hibernate/jars/hibernate-3.0.5.jar"> 
    25   </classpathentry> 
    26   <classpathentry kind="var" path="MAVEN_REPO/omero/jars/jta-hibernate.jar"> 
    27   </classpathentry> 
    28   <classpathentry kind="var" path="MAVEN_REPO/omero/jars/asm-hibernate.jar"> 
    29   </classpathentry> 
    30   <classpathentry kind="var" path="MAVEN_REPO/dom4j/jars/dom4j-1.6.jar"> 
    31   </classpathentry> 
    32   <classpathentry kind="var" path="MAVEN_REPO/ehcache/jars/ehcache-1.1.jar"> 
    33   </classpathentry> 
    34   <classpathentry kind="var" path="MAVEN_REPO/cglib/jars/cglib-2.1.jar"> 
    35   </classpathentry> 
    36   <classpathentry kind="var" path="MAVEN_REPO/antlr/jars/antlr-2.7.5H3.jar"> 
    37   </classpathentry> 
    38   <classpathentry kind="var" path="MAVEN_REPO/velocity/jars/velocity-1.4.jar"> 
    39   </classpathentry> 
    40   <classpathentry kind="var" path="MAVEN_REPO/servletapi/jars/servletapi-2.3.jar"> 
    41   </classpathentry> 
    42   <classpathentry kind="var" path="MAVEN_REPO/opensymphony/jars/oscache-2.0.1.jar"> 
    43   </classpathentry> 
    44   <classpathentry kind="var" path="MAVEN_REPO/mysql/jars/mysql-connector-java-3.0.8-stable-bin.jar"> 
    45   </classpathentry> 
    46   <classpathentry kind="var" path="MAVEN_REPO/postgresql/jars/postgresql-7.4.1-jdbc3.jar"> 
    47   </classpathentry> 
    48   <classpathentry kind="var" path="MAVEN_REPO/commons-codec/jars/commons-codec-1.2.jar"> 
    49   </classpathentry> 
    50   <classpathentry kind="var" path="MAVEN_REPO/commons-collections/jars/commons-collections-3.1.jar"> 
    51   </classpathentry> 
    52   <classpathentry kind="var" path="MAVEN_REPO/commons-lang/jars/commons-lang-2.0.jar"> 
    53   </classpathentry> 
    54   <classpathentry kind="var" path="MAVEN_REPO/commons-pool/jars/commons-pool-1.1.jar"> 
    55   </classpathentry> 
    56   <classpathentry kind="var" path="MAVEN_REPO/commons-dbcp/jars/commons-dbcp-1.2.1.jar"> 
    57   </classpathentry> 
    58   <classpathentry kind="var" path="MAVEN_REPO/commons-logging/jars/commons-logging-1.0.4.jar"> 
    59   </classpathentry> 
    60   <classpathentry kind="var" path="MAVEN_REPO/log4j/jars/log4j-1.2.8.jar"> 
    61   </classpathentry> 
    62   <classpathentry kind="var" path="MAVEN_REPO/odmg/jars/odmg-3.0.jar"> 
    63   </classpathentry> 
    64   <classpathentry kind="var" path="MAVEN_REPO/dbunit/jars/dbunit-2.1.jar"> 
    65   </classpathentry> 
    66   <classpathentry kind="var" path="MAVEN_REPO/jmock/jars/jmock-1.0.1.jar"> 
    67   </classpathentry> 
    68   <classpathentry kind="var" path="MAVEN_REPO/groovy/jars/groovy-all-1.0-beta-10.jar"> 
    69   </classpathentry> 
    70   <classpathentry kind="output" path="target/classes"> 
    71   </classpathentry> 
     3        <classpathentry kind="src" path="src"/> 
     4        <classpathentry kind="src" path="web"/> 
     5        <classpathentry kind="src" path="test"/> 
     6        <classpathentry kind="var" path="MAVEN_REPO/junit/jars/junit-3.8.1.jar"/> 
     7        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> 
     8        <classpathentry kind="var" path="MAVEN_REPO/omero/jars/omero-common-1.0.jar"/> 
     9        <classpathentry kind="var" path="MAVEN_REPO/springframework/jars/spring-1.2.1.jar"/> 
     10        <classpathentry sourcepath="HOME/lib/spring/mock" kind="var" path="MAVEN_REPO/springframework/jars/spring-mock-1.2.1.jar"/> 
     11        <classpathentry kind="var" path="MAVEN_REPO/acegisecurity/jars/acegi-security-0.8.2.jar"/> 
     12        <classpathentry kind="var" path="MAVEN_REPO/hessian/jars/hessian-2.1.12.jar"/> 
     13        <classpathentry kind="var" path="MAVEN_REPO/hibernate/jars/hibernate-3.0.5.jar"/> 
     14        <classpathentry kind="var" path="MAVEN_REPO/omero/jars/jta-hibernate.jar"/> 
     15        <classpathentry kind="var" path="MAVEN_REPO/omero/jars/asm-hibernate.jar"/> 
     16        <classpathentry kind="var" path="MAVEN_REPO/dom4j/jars/dom4j-1.6.jar"/> 
     17        <classpathentry kind="var" path="MAVEN_REPO/ehcache/jars/ehcache-1.1.jar"/> 
     18        <classpathentry kind="var" path="MAVEN_REPO/cglib/jars/cglib-2.1.jar"/> 
     19        <classpathentry kind="var" path="MAVEN_REPO/antlr/jars/antlr-2.7.5H3.jar"/> 
     20        <classpathentry kind="var" path="MAVEN_REPO/velocity/jars/velocity-1.4.jar"/> 
     21        <classpathentry kind="var" path="MAVEN_REPO/servletapi/jars/servletapi-2.3.jar"/> 
     22        <classpathentry kind="var" path="MAVEN_REPO/opensymphony/jars/oscache-2.0.1.jar"/> 
     23        <classpathentry kind="var" path="MAVEN_REPO/mysql/jars/mysql-connector-java-3.0.8-stable-bin.jar"/> 
     24        <classpathentry kind="var" path="MAVEN_REPO/postgresql/jars/postgresql-7.4.1-jdbc3.jar"/> 
     25        <classpathentry kind="var" path="MAVEN_REPO/commons-codec/jars/commons-codec-1.2.jar"/> 
     26        <classpathentry kind="var" path="MAVEN_REPO/commons-collections/jars/commons-collections-3.1.jar"/> 
     27        <classpathentry kind="var" path="MAVEN_REPO/commons-lang/jars/commons-lang-2.0.jar"/> 
     28        <classpathentry kind="var" path="MAVEN_REPO/commons-pool/jars/commons-pool-1.1.jar"/> 
     29        <classpathentry kind="var" path="MAVEN_REPO/commons-dbcp/jars/commons-dbcp-1.2.1.jar"/> 
     30        <classpathentry kind="var" path="MAVEN_REPO/commons-logging/jars/commons-logging-1.0.4.jar"/> 
     31        <classpathentry kind="var" path="MAVEN_REPO/log4j/jars/log4j-1.2.8.jar"/> 
     32        <classpathentry kind="var" path="MAVEN_REPO/odmg/jars/odmg-3.0.jar"/> 
     33        <classpathentry kind="var" path="MAVEN_REPO/dbunit/jars/dbunit-2.1.jar"/> 
     34        <classpathentry kind="var" path="MAVEN_REPO/jmock/jars/jmock-1.0.1.jar"/> 
     35        <classpathentry kind="var" path="MAVEN_REPO/groovy/jars/groovy-all-1.0-beta-10.jar"/> 
     36        <classpathentry kind="output" path="target/classes"/> 
    7237</classpath> 

  • branches/omero/components/server/.project

    r103 r105  
    11<?xml version="1.0" encoding="UTF-8"?> 
    2  
    32<projectDescription> 
    4   <name>omero-server</name> 
    5   <comment>Server code</comment> 
    6   <projects> 
    7   </projects> 
    8   <buildSpec> 
    9     <buildCommand> 
    10       <name>org.eclipse.jdt.core.javabuilder</name> 
    11       <arguments> 
    12       </arguments> 
    13     </buildCommand> 
    14   </buildSpec> 
    15   <natures> 
    16     <nature>org.eclipse.jdt.core.javanature</nature> 
    17   </natures> 
     3        <name>omero-server</name> 
     4        <comment>Server code</comment> 
     5        <projects> 
     6        </projects> 
     7        <buildSpec> 
     8                <buildCommand> 
     9                        <name>org.eclipse.jdt.core.javabuilder</name> 
     10                        <arguments> 
     11                        </arguments> 
     12                </buildCommand> 
     13                <buildCommand> 
     14                        <name>org.springframework.ide.eclipse.core.springbuilder</name> 
     15                        <arguments> 
     16                        </arguments> 
     17                </buildCommand> 
     18        </buildSpec> 
     19        <natures> 
     20                <nature>org.springframework.ide.eclipse.core.springnature</nature> 
     21                <nature>org.eclipse.jdt.core.javanature</nature> 
     22        </natures> 
    1823</projectDescription> 

  • branches/omero/components/server/src/log4j.properties

    r103 r105  
    88#log4j.logger.org.springframework=warn 
    99 
    10 log4j.category.org.openmicroscopy=debug 
     10log4j.category.org.openmicroscopy=info 
    1111 
    1212 

  • branches/omero/components/server/src/org/openmicroscopy/omero/logic/HierarchyBrowsingImpl.java

    r103 r105  
    4848 
    4949//Third-party libraries 
     50import org.apache.commons.logging.Log; 
     51import org.apache.commons.logging.LogFactory; 
    5052import org.hibernate.Hibernate; 
    5153 
    … …