Changeset 221
- Timestamp:
- 10/27/09 13:17:57 (2 years ago)
- Location:
- trunk
- Files:
-
- 3 added
- 9 modified
-
benchmarking/build.xml (added)
-
benchmarking/lib (added)
-
benchmarking/lib/google-collect-snapshot-20080820.jar (added)
-
bio/build.xml (modified) (3 diffs)
-
bio/test/org/bridgedb/bio/Test.java (modified) (1 diff)
-
bio/test/org/bridgedb/bio/TestStack.java (modified) (1 diff)
-
build.xml (modified) (2 diffs)
-
corelib/build.xml (modified) (1 diff)
-
corelib/test/org/bridgedb/TestFile.java (modified) (1 diff)
-
picr/build.xml (modified) (1 diff)
-
picr/test/org/bridgedb/webservice/picr/TestRest.java (modified) (2 diffs)
-
webservice/build.xml (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/bio/build.xml
r139 r221 12 12 </target> 13 13 14 <path id="class.path"> 15 <pathelement location="../dist/bridgedb.jar"/> 16 </path> 17 14 18 <target name="build" depends="prepare"> 15 19 <javac srcdir="src" … … 17 21 debug="true" 18 22 destdir="build"> 19 <classpath> 20 <pathelement location="../dist/bridgedb.jar"/> 21 </classpath> 23 <classpath refid="class.path"/> 22 24 </javac> 23 25 <copy file="../resources/datasources.txt" … … 49 51 <target name="test" depends="build"> 50 52 <path id="test.classpath"> 53 <path refid="class.path"/> 51 54 <pathelement location="build"/> 52 55 <pathelement location="../corelib/lib/derby.jar"/> 53 <pathelement location="../corelib/ lib/junit.jar"/>56 <pathelement location="../corelib/build-lib/junit.jar"/> 54 57 </path> 55 58 <javac srcdir="test" debug="true" -
trunk/bio/test/org/bridgedb/bio/Test.java
r188 r221 101 101 102 102 // get all crossrefs 103 Set<Xref> crossRefs1 = gdb.mapID(ref , null);103 Set<Xref> crossRefs1 = gdb.mapID(ref); 104 104 assertTrue(crossRefs1.contains(new Xref("Hs.465744", BioDataSource.UNIGENE))); 105 105 assertTrue(crossRefs1.contains(new Xref("NM_000208", BioDataSource.REFSEQ))); -
trunk/bio/test/org/bridgedb/bio/TestStack.java
r188 r221 20 20 System.getProperty ("user.home") + File.separator + 21 21 "PathVisio-Data/gene databases/Hs_Derby_20081119.pgdb"; 22 private static final File YEAST_ID_MAPPING = new File (" ../test-data/yeast_id_mapping.txt");22 private static final File YEAST_ID_MAPPING = new File ("test-data/yeast_id_mapping.txt"); 23 23 private static final File NUGO_CUSTOM_MAPPINGS = new File ("/home/martijn/prg/bridgedb/test-data/Nugo-hs-custom.txt"); 24 24 -
trunk/build.xml
r206 r221 5 5 <property name="svn.exec.svnversion" value="svnversion"/> 6 6 7 <macrodef name="iterate"> 8 <attribute name="target"/> 9 <sequential> 10 <subant target="@{target}"> 11 <filelist dir="."> 12 <file name="corelib/build.xml"/> 13 <file name="bio/build.xml"/> 14 <file name="batchmapper/build.xml"/> 15 <file name="webservice/build.xml"/> 16 <file name="picr/build.xml"/> 17 <file name="synergizer/build.xml"/> 18 </filelist> 19 </subant> 20 </sequential> 21 </macrodef> 22 7 23 <target name="dist" depends="doc"> 8 <antcall target="_allmodules"> 9 <param name="allmodules.target" value="dist"/> 10 </antcall> 24 <iterate target="dist"/> 25 11 26 12 27 <property name="zipbase" value="bridgedb-${bridgedb.version}"/> … … 36 51 37 52 <target name="clean"> 38 <antcall target="_allmodules"> 39 <param name="allmodules.target" value="clean"/> 40 </antcall> 53 <iterate target="clean"/> 41 54 </target> 42 55 43 56 <target name="test"> 44 <antcall target="_allmodules"> 45 <param name="allmodules.target" value="test"/> 46 </antcall> 57 <iterate target="test"/> 47 58 </target> 48 59 49 60 <target name="dist-clean"> 50 <antcall target="_allmodules"> 51 <param name="allmodules.target" value="dist-clean"/> 52 </antcall> 61 <iterate target="dist-clean"/> 53 62 </target> 54 63 -
trunk/corelib/build.xml
r181 r221 33 33 destdir="build"> 34 34 </javac> 35 <copy file=" ../resources/filterconversion.txt"36 todir="build/org/bridgedb/webservice/biomart /util" />35 <copy file="src/org/bridgedb/webservice/biomart/filterconversion.txt" 36 todir="build/org/bridgedb/webservice/biomart" /> 37 37 </target> 38 38 -
trunk/corelib/test/org/bridgedb/TestFile.java
r201 r221 40 40 private Measure measure; 41 41 42 private static final File YEAST_IDS = new File (" ../test-data/yeast_id_mapping.txt");42 private static final File YEAST_IDS = new File ("test-data/yeast_id_mapping.txt"); 43 43 private static final DataSource ENS_YEAST = DataSource.getByFullName("Ensembl Yeast"); 44 44 private static final DataSource ENTREZ = DataSource.getByFullName("Entrez Gene"); -
trunk/picr/build.xml
r165 r221 54 54 <target name="dist-clean" depends="clean"> 55 55 <delete file="${jar.name}"/> 56 56 57 </target> 58 <target name="test" depends="build"> 59 <path id="test.classpath"> 60 <path refid="class.path"/> 61 <pathelement location="build"/> 62 <pathelement location="../corelib/build-lib/junit.jar"/> 63 </path> 64 <javac srcdir="test" debug="true" 65 includes="**" 66 destdir="build" 67 source="1.5"> 68 <classpath refid="test.classpath"/> 69 </javac> 70 <junit printsummary="on" haltonfailure="true" fork="true"> 71 <formatter type="brief" usefile="false"/> 72 <classpath refid="test.classpath"/> 73 <batchtest> 74 <fileset dir="test"> 75 <include name="**/*Test*.java"/> 76 </fileset> 77 </batchtest> 78 </junit> 79 </target> 57 80 58 81 </project> -
trunk/picr/test/org/bridgedb/webservice/picr/TestRest.java
r188 r221 64 64 srcRefs.add (src1); 65 65 DataSource[] targets = new DataSource[] { SGD, PDB, ENSEMBL_YEAST }; 66 Map<Xref, Set<Xref>> result = idmap.mapID(srcRefs, targets); 66 //TODO: disabled while mapID is not yet implemented. 67 // Map<Xref, Set<Xref>> result = idmap.mapID(srcRefs, targets); 67 68 68 69 /* … … 74 75 S000000897 SGD 75 76 */ 76 for (Xref ref : result.get(src1))77 System.out.println (ref.getId() + " " + ref.getDataSource().getFullName());77 // for (Xref ref : result.get(src1)) 78 // System.out.println (ref.getId() + " " + ref.getDataSource().getFullName()); 78 79 79 80 } -
trunk/webservice/build.xml
r139 r221 13 13 </target> 14 14 15 <path id="class.path"> 16 <pathelement location="../dist/bridgedb.jar"/> 17 <pathelement location="../dist/bridgedb-bio.jar"/> 18 <pathelement location="lib/restlet-2.0m3/org.restlet.jar"/> 19 </path> 20 15 21 <target name="build" depends="prepare"> 16 22 <javac srcdir="src" … … 18 24 debug="true" 19 25 destdir="build"> 20 <classpath> 21 <pathelement location="../dist/bridgedb.jar"/> 22 <pathelement location="../dist/bridgedb-bio.jar"/> 23 <pathelement location="lib/restlet-2.0m3/org.restlet.jar"/> 24 </classpath> 26 <classpath refid="class.path"/> 25 27 </javac> 26 28 </target> … … 49 51 <delete dir="${dist.dir}/org.restlet.jar"/> 50 52 </target> 53 54 <target name="test" depends="build"> 55 <path id="test.classpath"> 56 <path refid="class.path"/> 57 <pathelement location="build"/> 58 <pathelement location="../corelib/lib/derby.jar"/> 59 <pathelement location="../corelib/build-lib/junit.jar"/> 60 </path> 61 <javac srcdir="test" debug="true" 62 includes="**" 63 destdir="build" 64 source="1.5"> 65 <classpath refid="test.classpath"/> 66 </javac> 67 <!-- Disabled for now... 68 <junit printsummary="on" haltonfailure="true" fork="true"> 69 <formatter type="brief" usefile="false"/> 70 <classpath refid="test.classpath"/> 71 <batchtest> 72 <fileset dir="test"> 73 <include name="**/*Test*.java"/> 74 </fileset> 75 </batchtest> 76 </junit> --> 77 </target> 78 51 79 </project>
