From gss at pub.open-bio.org Thu May 5 13:30:47 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Thu May 5 13:11:34 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200505051730.j45HUlqC017398@pub.open-bio.org> gss Thu May 5 13:30:47 EDT 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies In directory pub.open-bio.org:/tmp/cvs-serv17312/WebRoot/examples/proxies Modified Files: wormbase-query tair-seqviewer flybase-genequery ncbi-megablast.n3 gramene-query.n3 sgd-quicksearch.n3 tair-seqviewer.n3 tair-mapviewer tair-mapviewer.n3 pubmed ncbi-megablast sgd-quicksearch pubmed.n3 gramene-query wormbase-query.n3 flybase-genequery.n3 Log Message: Some new proxy providers moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies wormbase-query,1.1,1.2 tair-seqviewer,1.1,1.2 flybase-genequery,1.1,1.2 ncbi-megablast.n3,1.1,1.2 gramene-query.n3,1.1,1.2 sgd-quicksearch.n3,1.1,1.2 tair-seqviewer.n3,1.1,1.2 tair-mapviewer,1.1,1.2 tair-mapviewer.n3,1.1,1.2 pubmed,1.1,1.2 ncbi-megablast,1.1,1.2 sgd-quicksearch,1.1,1.2 pubmed.n3,1.1,1.2 gramene-query,1.1,1.2 wormbase-query.n3,1.1,1.2 flybase-genequery.n3,1.2,1.3 =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/wormbase-query,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/wormbase-query 2005/03/23 19:56:12 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/wormbase-query 2005/05/05 17:30:46 1.2 @@ -7,22 +7,23 @@ xmlns:owl="http://www.w3.org/2002/07/owl#" xmlns:moby="http://www.semanticmoby.org/ontologies/core/" > - - - - - + + + C. elegans database query at wormbase.org http://www.wormbase.org/ - + WormBase Query - - + + + + + - \ No newline at end of file + =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/tair-seqviewer,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/tair-seqviewer 2005/03/23 19:56:12 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/tair-seqviewer 2005/05/05 17:30:46 1.2 @@ -9,20 +9,21 @@ - - - - TAIR Sequence Viewer Arabidopsis Sequence Viewera service provided by TAIR + http://www.arabidopsis.org/servlets/sv + + + + - + - \ No newline at end of file + =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/flybase-genequery,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/flybase-genequery 2005/04/18 22:58:16 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/flybase-genequery 2005/05/05 17:30:46 1.2 @@ -7,22 +7,23 @@ xmlns:owl="http://www.w3.org/2002/07/owl#" xmlns:moby="http://www.semanticmoby.org/ontologies/core/" > - - FlyBase gene query form at flybase.bio.indiana.edu - http://flybase.bio.indiana.edu/genes/fbgquery.hform + + FlyBase Gene Query + http://flybase.bio.indiana.edu/genes/fbgquery.hform + FlyBase gene query form at flybase.bio.indiana.edu + + + - + - - - - - + + - \ No newline at end of file + =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/ncbi-megablast.n3,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/ncbi-megablast.n3 2005/03/21 21:42:02 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/ncbi-megablast.n3 2005/05/05 17:30:46 1.2 @@ -7,7 +7,7 @@ @prefix xsd: . ex:ncbi-megablast - a moby:Provider, exterms:ProxyProvider ; + a moby:Provider, exterms:ProxyProvider, exterms:BlastProvider ; moby:name "NCBI Mega BLAST" ; moby:oneLineDescription "NCBI MegaBlast service provided by NCBI" ; moby:inputURI "http://www.ncbi.nlm.nih.gov/BLAST/Blast.cgi?CMD=Web&LAYOUT=TwoWindows&AUTO_FORMAT=Semiauto&ALIGNMENTS=50&ALIGNMENT_VIEW=Tabular&CLIENT=web&DATABASE=nr&DESCRIPTIONS=100&ENTREZ_QUERY=%28none%29&EXPECT=10&FILTER=L&FORMAT_OBJECT=Alignment&FORMAT_TYPE=HTML&NCBI_GI=on&PAGE=MegaBlast&SERVICE=plain&SET_DEFAULTS.x=34&SET_DEFAULTS.y=8&SHOW_OVERVIEW=on&END_OF_HTTPGET=Yes&SHOW_LINKOUT=yes&GET_SEQUENCE=yes&PERC_IDENT=None,1,-2" ; =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/gramene-query.n3,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/gramene-query.n3 2005/03/23 19:56:12 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/gramene-query.n3 2005/05/05 17:30:46 1.2 @@ -7,7 +7,7 @@ @prefix xsd: . ex:gramene-query - a moby:Provider, exterms:ProxyProvider ; + a moby:Provider, exterms:ProxyProvider, exterms:CerealGrainSearchProvider ; moby:name "Gramene Query" ; moby:oneLineDescription "Cereal grains database query at gramene.org" ; moby:inputURI "http://www.gramene.org/" ; =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/sgd-quicksearch.n3,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/sgd-quicksearch.n3 2005/03/23 19:56:12 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/sgd-quicksearch.n3 2005/05/05 17:30:46 1.2 @@ -7,7 +7,7 @@ @prefix xsd: . ex:sgd-quicksearch - a moby:Provider, exterms:ProxyProvider ; + a moby:Provider, exterms:ProxyProvider, exterms:SacchromycesSearchProvider ; moby:name "SGD Quick Search" ; moby:oneLineDescription "Saccharomyces cerevisiae quick search" ; moby:inputURI "http://db.yeastgenome.org/cgi-bin/search/quickSearch" ; =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/tair-seqviewer.n3,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/tair-seqviewer.n3 2005/03/23 19:56:12 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/tair-seqviewer.n3 2005/05/05 17:30:46 1.2 @@ -7,7 +7,7 @@ @prefix xsd: . ex:tair-seqviewer - a moby:Provider, exterms:ProxyProvider ; + a moby:Provider, exterms:ProxyProvider, exterms:ArabidopsisSearchProvider ; moby:name "TAIR Sequence Viewer" ; moby:oneLineDescription "Arabidopsis Sequence Viewera service provided by TAIR" ; moby:inputURI "http://www.arabidopsis.org/servlets/sv" ; =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/tair-mapviewer,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/tair-mapviewer 2005/03/23 19:56:12 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/tair-mapviewer 2005/05/05 17:30:46 1.2 @@ -10,19 +10,20 @@ http://www.arabidopsis.org/servlets/mapper TAIR Map Viewer - Arabidopsis Map Viewer service provided by TAIR + + - - - - \ No newline at end of file + + + + =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/tair-mapviewer.n3,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/tair-mapviewer.n3 2005/03/23 19:56:12 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/tair-mapviewer.n3 2005/05/05 17:30:46 1.2 @@ -7,7 +7,7 @@ @prefix xsd: . ex:tair-mapviewer - a moby:Provider, exterms:ProxyProvider ; + a moby:Provider, exterms:ProxyProvider, exterms:ArabidopsisSearchProvider ; moby:name "TAIR Map Viewer" ; moby:oneLineDescription "Arabidopsis Map Viewer service provided by TAIR" ; moby:inputURI "http://www.arabidopsis.org/servlets/mapper" ; =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/pubmed,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/pubmed 2005/03/21 21:42:02 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/pubmed 2005/05/05 17:30:46 1.2 @@ -7,22 +7,23 @@ xmlns:owl="http://www.w3.org/2002/07/owl#" xmlns:moby="http://www.semanticmoby.org/ontologies/core/" > - - - + - + + + + - PubMed http://www.ncbi.nlm.nih.gov/entrez/query.fcgi? - Entrez PubMed service provided by NCBI + PubMed + - - + + - \ No newline at end of file + =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/ncbi-megablast,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/ncbi-megablast 2005/03/21 21:42:02 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/ncbi-megablast 2005/05/05 17:30:46 1.2 @@ -7,8 +7,8 @@ xmlns:owl="http://www.w3.org/2002/07/owl#" xmlns:moby="http://www.semanticmoby.org/ontologies/core/" > - + @@ -19,9 +19,10 @@ NCBI Mega BLAST - + http://www.ncbi.nlm.nih.gov/BLAST/Blast.cgi?CMD=Web&LAYOUT=TwoWindows&AUTO_FORMAT=Semiauto&ALIGNMENTS=50&ALIGNMENT_VIEW=Tabular&CLIENT=web&DATABASE=nr&DESCRIPTIONS=100&ENTREZ_QUERY=%28none%29&EXPECT=10&FILTER=L&FORMAT_OBJECT=Alignment&FORMAT_TYPE=HTML&NCBI_GI=on&PAGE=MegaBlast&SERVICE=plain&SET_DEFAULTS.x=34&SET_DEFAULTS.y=8&SHOW_OVERVIEW=on&END_OF_HTTPGET=Yes&SHOW_LINKOUT=yes&GET_SEQUENCE=yes&PERC_IDENT=None,1,-2 + NCBI MegaBlast service provided by NCBI =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/sgd-quicksearch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/sgd-quicksearch 2005/03/23 19:56:12 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/sgd-quicksearch 2005/05/05 17:30:46 1.2 @@ -7,22 +7,23 @@ xmlns:owl="http://www.w3.org/2002/07/owl#" xmlns:moby="http://www.semanticmoby.org/ontologies/core/" > - - - - + - - - - SGD Quick Search - + http://db.yeastgenome.org/cgi-bin/search/quickSearch Saccharomyces cerevisiae quick search + + + + + + + + - \ No newline at end of file + =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/pubmed.n3,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/pubmed.n3 2005/03/21 21:42:02 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/pubmed.n3 2005/05/05 17:30:46 1.2 @@ -7,7 +7,7 @@ @prefix xsd: . ex:pubmed - a moby:Provider, exterms:ProxyProvider ; + a moby:Provider, exterms:ProxyProvider, exterms:PubSearchProvider ; moby:name "PubMed" ; moby:oneLineDescription "Entrez PubMed service provided by NCBI" ; moby:inputURI "http://www.ncbi.nlm.nih.gov/entrez/query.fcgi?" ; =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/gramene-query,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/gramene-query 2005/03/23 19:56:12 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/gramene-query 2005/05/05 17:30:46 1.2 @@ -13,16 +13,17 @@ - - - - Gramene Query - http://www.gramene.org/ + + Cereal grains database query at gramene.org + + + + \ No newline at end of file =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/wormbase-query.n3,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/wormbase-query.n3 2005/03/23 19:56:12 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/wormbase-query.n3 2005/05/05 17:30:46 1.2 @@ -7,7 +7,7 @@ @prefix xsd: . ex:wormbase-query - a moby:Provider, exterms:ProxyProvider ; + a moby:Provider, exterms:ProxyProvider, exterms:ElegansSearchProvider ; moby:name "WormBase Query" ; moby:oneLineDescription "C. elegans database query at wormbase.org" ; moby:inputURI "http://www.wormbase.org/" ; =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/flybase-genequery.n3,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/flybase-genequery.n3 2005/04/18 22:58:17 1.2 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/flybase-genequery.n3 2005/05/05 17:30:46 1.3 @@ -7,7 +7,7 @@ @prefix xsd: . ex:flybase-genequery - a moby:Provider, exterms:ProxyProvider ; + a moby:Provider, exterms:ProxyProvider, exterms:DrosophilaSearchProvider ; moby:name "FlyBase Gene Query" ; moby:oneLineDescription "FlyBase gene query form at flybase.bio.indiana.edu" ; moby:inputURI "http://flybase.bio.indiana.edu/genes/fbgquery.hform" ; From gss at pub.open-bio.org Thu May 5 13:32:37 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Thu May 5 13:12:09 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200505051732.j45HWbGc017435@pub.open-bio.org> gss Thu May 5 13:32:36 EDT 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/ontologies In directory pub.open-bio.org:/tmp/cvs-serv17414/WebRoot/examples/ontologies Added Files: BlastProvider CerealGrainSearchProvider SacchromycesSearchProvider.n3 DrosophilaSearchProvider ArabidopsisSearchProvider.n3 DrosophilaSearchProvider.n3 PubSearchProvider ElegansSearchProvider.n3 PubSearchProvider.n3 ElegansSearchProvider SacchromycesSearchProvider ArabidopsisSearchProvider BlastProvider.n3 CerealGrainSearchProvider.n3 Log Message: Supporting ontology elements for proxy providers moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/ontologies BlastProvider,NONE,1.1 CerealGrainSearchProvider,NONE,1.1 SacchromycesSearchProvider.n3,NONE,1.1 DrosophilaSearchProvider,NONE,1.1 ArabidopsisSearchProvider.n3,NONE,1.1 DrosophilaSearchProvider.n3,NONE,1.1 PubSearchProvider,NONE,1.1 ElegansSearchProvider.n3,NONE,1.1 PubSearchProvider.n3,NONE,1.1 ElegansSearchProvider,NONE,1.1 SacchromycesSearchProvider,NONE,1.1 ArabidopsisSearchProvider,NONE,1.1 BlastProvider.n3,NONE,1.1 CerealGrainSearchProvider.n3,NONE,1.1 From gss at pub.open-bio.org Thu May 5 13:35:26 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Thu May 5 13:14:43 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200505051735.j45HZQGX017501@pub.open-bio.org> gss Thu May 5 13:35:26 EDT 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies In directory pub.open-bio.org:/tmp/cvs-serv17464/WebRoot/examples/proxies Modified Files: tair-seqviewer.n3 tair-seqviewer sgd-quicksearch sgd-quicksearch.n3 Log Message: Incorporated new ontology elements moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies tair-seqviewer.n3,1.2,1.3 tair-seqviewer,1.2,1.3 sgd-quicksearch,1.2,1.3 sgd-quicksearch.n3,1.2,1.3 =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/tair-seqviewer.n3,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/tair-seqviewer.n3 2005/05/05 17:30:46 1.2 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/tair-seqviewer.n3 2005/05/05 17:35:26 1.3 @@ -9,7 +9,7 @@ ex:tair-seqviewer a moby:Provider, exterms:ProxyProvider, exterms:ArabidopsisSearchProvider ; moby:name "TAIR Sequence Viewer" ; - moby:oneLineDescription "Arabidopsis Sequence Viewera service provided by TAIR" ; + moby:oneLineDescription "Arabidopsis Sequence Viewer service provided by TAIR" ; moby:inputURI "http://www.arabidopsis.org/servlets/sv" ; moby:operatesOn [ a moby:Graph ; =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/tair-seqviewer,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/tair-seqviewer 2005/05/05 17:30:46 1.2 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/tair-seqviewer 2005/05/05 17:35:26 1.3 @@ -12,7 +12,7 @@ TAIR Sequence Viewer - Arabidopsis Sequence Viewera service provided by TAIR + Arabidopsis Sequence Viewer service provided by TAIR =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/sgd-quicksearch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/sgd-quicksearch 2005/05/05 17:30:46 1.2 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/sgd-quicksearch 2005/05/05 17:35:26 1.3 @@ -9,6 +9,7 @@ + SGD Quick Search @@ -21,6 +22,7 @@ + =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/sgd-quicksearch.n3,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/sgd-quicksearch.n3 2005/05/05 17:30:46 1.2 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/sgd-quicksearch.n3 2005/05/05 17:35:26 1.3 @@ -14,9 +14,9 @@ moby:operatesOn [ a moby:Graph ; moby:hasMapping [ - a moby:Subject ; + a moby:Subject, exterms:GeneSymbol ; moby:mapsTo [ - a moby:Object + a moby:Object, exterms:GeneDetails ] ] ] . From gss at pub.open-bio.org Thu May 5 13:35:57 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Thu May 5 13:15:08 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200505051735.j45HZvUE017535@pub.open-bio.org> gss Thu May 5 13:35:57 EDT 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/ontologies In directory pub.open-bio.org:/tmp/cvs-serv17514/WebRoot/examples/ontologies Added Files: GeneSymbol GeneSymbol.n3 GeneDetails GeneDetails.n3 Log Message: Supporting ontology elements for proxy providers moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/ontologies GeneSymbol,NONE,1.1 GeneSymbol.n3,NONE,1.1 GeneDetails,NONE,1.1 GeneDetails.n3,NONE,1.1 From kawas at pub.open-bio.org Sun May 8 16:04:25 2005 From: kawas at pub.open-bio.org (Eddie Kawas) Date: Sun May 8 15:43:40 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200505082004.j48K4PJ0006981@pub.open-bio.org> kawas Sun May 8 16:04:25 EDT 2005 Update of /home/repository/moby/moby-live/Java/docs In directory pub.open-bio.org:/tmp/cvs-serv6956 Modified Files: index.html Added Files: CodingGuidelines.html jMobyDesignManual.html Log Message: added some files for ben (jMoby doc) Ed moby-live/Java/docs CodingGuidelines.html,NONE,1.1 jMobyDesignManual.html,NONE,1.1 index.html,1.6,1.7 =================================================================== RCS file: /home/repository/moby/moby-live/Java/docs/index.html,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- /home/repository/moby/moby-live/Java/docs/index.html 2004/12/05 22:28:02 1.6 +++ /home/repository/moby/moby-live/Java/docs/index.html 2005/05/08 20:04:25 1.7 @@ -48,6 +48,7 @@
How to develop with jMoby
+
The twelve commandments for jMoby Developers (and some good advice)
Available APIs (more explanation coming...)
How to develop a client talking to a BioMoby service
How to develop a BioMoby service (coming...) From gordonp at pub.open-bio.org Thu May 12 00:58:12 2005 From: gordonp at pub.open-bio.org (Paul Gordon) Date: Thu May 12 00:36:49 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200505120458.j4C4wCYs026015@pub.open-bio.org> gordonp Thu May 12 00:58:12 EDT 2005 Update of /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data In directory pub.open-bio.org:/tmp/cvs-serv25991/main/org/biomoby/shared/data Log Message: Directory /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data added to the repository moby-live/Java/src/main/org/biomoby/shared/data - New directory rcsdiff: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/RCS/-,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/RCS/New,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/RCS/directory,v: No such file or directory From gordonp at pub.open-bio.org Thu May 12 00:59:49 2005 From: gordonp at pub.open-bio.org (Paul Gordon) Date: Thu May 12 00:38:19 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200505120459.j4C4xndH026055@pub.open-bio.org> gordonp Thu May 12 00:59:49 EDT 2005 Update of /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data In directory pub.open-bio.org:/tmp/cvs-serv26034 Added Files: MobyDataBytes.java MobyDataComposite.java MobyDataDateTime.java MobyDataFloat.java MobyDataInstance.java MobyDataInt.java MobyDataObject.java MobyDataObjectSet.java MobyDataSecondaryInstance.java MobyDataServiceAssocInstance.java MobyDataString.java MobyDataXref.java Log Message: Moved Data instances classes to new package, and included complete experimental instance implementations moby-live/Java/src/main/org/biomoby/shared/data MobyDataBytes.java,NONE,1.1 MobyDataComposite.java,NONE,1.1 MobyDataDateTime.java,NONE,1.1 MobyDataFloat.java,NONE,1.1 MobyDataInstance.java,NONE,1.1 MobyDataInt.java,NONE,1.1 MobyDataObject.java,NONE,1.1 MobyDataObjectSet.java,NONE,1.1 MobyDataSecondaryInstance.java,NONE,1.1 MobyDataServiceAssocInstance.java,NONE,1.1 MobyDataString.java,NONE,1.1 MobyDataXref.java,NONE,1.1 From gordonp at pub.open-bio.org Thu May 12 01:02:11 2005 From: gordonp at pub.open-bio.org (Paul Gordon) Date: Thu May 12 00:40:46 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200505120502.j4C52BwT026107@pub.open-bio.org> gordonp Thu May 12 01:02:11 EDT 2005 Update of /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared In directory pub.open-bio.org:/tmp/cvs-serv26081 Removed Files: MobyDataSecondaryInstance.java MobyDataServiceAssocInstance.java MobyDataSetInstance.java MobyDataSimpleInstance.java MobyDataString.java Log Message: Removed in favor of data instance classes in org.biomoby.shared.data moby-live/Java/src/main/org/biomoby/shared MobyDataSecondaryInstance.java,1.1,NONE MobyDataServiceAssocInstance.java,1.2,NONE MobyDataSetInstance.java,1.2,NONE MobyDataSimpleInstance.java,1.9,NONE MobyDataString.java,1.5,NONE rcsdiff: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/RCS/MobyDataSecondaryInstance.java,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/RCS/MobyDataServiceAssocInstance.java,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/RCS/MobyDataSetInstance.java,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/RCS/MobyDataSimpleInstance.java,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/RCS/MobyDataString.java,v: No such file or directory From gordonp at pub.open-bio.org Thu May 12 01:03:20 2005 From: gordonp at pub.open-bio.org (Paul Gordon) Date: Thu May 12 00:41:48 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200505120503.j4C53K2L026152@pub.open-bio.org> gordonp Thu May 12 01:03:20 EDT 2005 Update of /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared In directory pub.open-bio.org:/tmp/cvs-serv26126 Removed Files: MobyDataDateTime.java MobyDataFloat.java MobyDataInstance.java MobyDataInt.java MobyDataXref.java Log Message: Removed in favor of data instance classes in org.biomoby.shared.data moby-live/Java/src/main/org/biomoby/shared MobyDataDateTime.java,1.5,NONE MobyDataFloat.java,1.6,NONE MobyDataInstance.java,1.2,NONE MobyDataInt.java,1.5,NONE MobyDataXref.java,1.1,NONE rcsdiff: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/RCS/MobyDataDateTime.java,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/RCS/MobyDataFloat.java,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/RCS/MobyDataInstance.java,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/RCS/MobyDataInt.java,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/RCS/MobyDataXref.java,v: No such file or directory From gordonp at pub.open-bio.org Thu May 12 01:12:01 2005 From: gordonp at pub.open-bio.org (Paul Gordon) Date: Thu May 12 00:50:30 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200505120512.j4C5C1bP026223@pub.open-bio.org> gordonp Thu May 12 01:12:01 EDT 2005 Update of /home/repository/moby/moby-live/Java/src/Clients In directory pub.open-bio.org:/tmp/cvs-serv26201 Removed Files: MobyServiceInvocationExample.java Log Message: Replaced by TestRequest moby-live/Java/src/Clients MobyServiceInvocationExample.java,1.1,NONE rcsdiff: /home/repository/moby/moby-live/Java/src/Clients/RCS/MobyServiceInvocationExample.java,v: No such file or directory From gordonp at pub.open-bio.org Thu May 12 01:13:37 2005 From: gordonp at pub.open-bio.org (Paul Gordon) Date: Thu May 12 00:52:08 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200505120513.j4C5DbYh026267@pub.open-bio.org> gordonp Thu May 12 01:13:37 EDT 2005 Update of /home/repository/moby/moby-live/Java/src/main/org/biomoby/client In directory pub.open-bio.org:/tmp/cvs-serv26242 Modified Files: MobyRequest.java Log Message: Updates to deal with new data instance package moby-live/Java/src/main/org/biomoby/client MobyRequest.java,1.10,1.11 =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/MobyRequest.java,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/MobyRequest.java 2005/04/18 17:29:43 1.10 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/MobyRequest.java 2005/05/12 05:13:37 1.11 @@ -23,10 +23,10 @@ import org.apache.xpath.objects.XObject; import org.biomoby.shared.Central; import org.biomoby.shared.MobyData; -import org.biomoby.shared.MobyDataInstance; -import org.biomoby.shared.MobyDataSecondaryInstance; -import org.biomoby.shared.MobyDataSetInstance; -import org.biomoby.shared.MobyDataSimpleInstance; +import org.biomoby.shared.data.MobyDataInstance; +import org.biomoby.shared.data.MobyDataSecondaryInstance; +import org.biomoby.shared.data.MobyDataObjectSet; +import org.biomoby.shared.data.MobyDataObject; import org.biomoby.shared.MobyException; import org.biomoby.shared.MobyPrefixResolver; import org.biomoby.shared.MobyService; @@ -111,18 +111,24 @@ MobyPrefixResolver.XSI1999_PREFIX+ ":type, ':'), \"base64\") or starts-with(substring-after(@"+ MobyPrefixResolver.XSI2001_PREFIX+ - ":type, ':'), \"base64\")]", null, mobyPrefixResolver, XPath.SELECT); + ":type, ':'), \"base64\")]", null, + mobyPrefixResolver, XPath.SELECT); stringEncodedXPath = new XPath("//*[substring-after(@"+ MobyPrefixResolver.XSI1999_PREFIX+ ":type, ':')=\"string\" or substring-after(@"+ MobyPrefixResolver.XSI2001_PREFIX+ - ":type, ':')=\"string\"]", null, mobyPrefixResolver, XPath.SELECT); - queryResponseXPath = new XPath("//moby:mobyData | //mobyData", null, mobyPrefixResolver, XPath.SELECT); - simpleChildXPath = new XPath("moby:Simple | Simple", null, mobyPrefixResolver, XPath.SELECT); - collectionChildXPath = new XPath("moby:Collection | Collection", null, mobyPrefixResolver, XPath.SELECT); + ":type, ':')=\"string\"]", null, + mobyPrefixResolver, XPath.SELECT); + queryResponseXPath = new XPath("//moby:mobyData | //mobyData", null, + mobyPrefixResolver, XPath.SELECT); + simpleChildXPath = new XPath("moby:Simple | Simple", null, + mobyPrefixResolver, XPath.SELECT); + collectionChildXPath = new XPath("moby:Collection | Collection", null, + mobyPrefixResolver, XPath.SELECT); } catch(TransformerException te){ - debugPS.println("Syntax error encountered while compiling XPath statements for internal use (code bug?): " + te); + debugPS.println("Syntax error encountered while compiling XPath " + + "statements for internal use (code bug?): " + te); } } @@ -194,7 +200,7 @@ } /** - * Convenience method to run services that take one argument. + * Convenience method to run services that take one unnamed argument. */ public void setInput(MobyDataInstance datum) throws IllegalArgumentException{ inputData = new MobyDataInstance[1]; @@ -586,17 +592,23 @@ data[i].setXmlMode(MobyDataInstance.SERVICE_XML_MODE); } - if(data[i] instanceof MobyDataSimpleInstance){ - mobyRequest += ((MobyDataSimpleInstance) data[i]).toXML(); + if(data[i] instanceof MobyDataObject){ + // This line should be replaced with a named field + mobyRequest += ""+ + ((MobyDataObject) data[i]).toXML()+ + ""; } - else if(data[i] instanceof MobyDataSetInstance){ - mobyRequest += ((MobyDataSetInstance) data[i]).toXML(); + else if(data[i] instanceof MobyDataObjectSet){ + mobyRequest += ((MobyDataObjectSet) data[i]).toXML(); } else{ + // Could just call toXML, but don't know if it has a Simple wrapper + // already or not, or even if it's a set. throw new MobyException("Element #" + i + " of the input data was not a " + - "MobyDataSimpleInstance or a " + - "MobyDataSetInstance (found " + data[i] + ")"); + "MobyDataObject or a " + + "MobyDataObjectSet (found " + + data[i].getClass().getName() + ")"); } // Restore the old XML mode setting if not service mode @@ -667,7 +679,7 @@ if(debug & j == 0) debugPS.println("There are " + collections.getLength() + " collections in response #" +i); - MobyDataSetInstance collection = new MobyDataSetInstance(""); + MobyDataObjectSet collection = new MobyDataObjectSet(""); // For each collection, find the simple children NodeList subsimples = null; @@ -679,13 +691,13 @@ } // And add their values to the collection - MobyDataSimpleInstance[] subout = new MobyDataSimpleInstance[subsimples.getLength()]; + MobyDataObject[] subout = new MobyDataObject[subsimples.getLength()]; for(int k = 0; k < subsimples.getLength(); k++){ if(debug && k == 0) debugPS.println("There are " + subsimples.getLength() + " simples in response #" + i + ", collection #" + j); - subout[k] = new MobyDataSimpleInstance(mobyCentral, (Element) subsimples.item(k)); + subout[k] = (MobyDataObject) MobyDataObject.createInstanceFromDOM((Element) subsimples.item(k)); } collection.setElements(subout); releaseXPath(collections.item(j)); @@ -708,7 +720,7 @@ for(int j = 0; simples != null && j < simples.getLength(); j++){ if(debug && j == 0) debugPS.println("There are " + simples.getLength() + " simples in response #" +i); - out.add(new MobyDataSimpleInstance(mobyCentral, (Element) simples.item(j))); + out.add(MobyDataObject.createInstanceFromDOM((Element) simples.item(j))); } // What we're building is a Vector, where each element represents From gordonp at pub.open-bio.org Thu May 12 01:17:59 2005 From: gordonp at pub.open-bio.org (Paul Gordon) Date: Thu May 12 00:56:29 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200505120517.j4C5HxOI026333@pub.open-bio.org> gordonp Thu May 12 01:17:58 EDT 2005 Update of /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data In directory pub.open-bio.org:/tmp/cvs-serv26312/src/main/org/biomoby/shared/data Added Files: MobyProvisionInfo.java Log Message: New class encoding the PIB moby-live/Java/src/main/org/biomoby/shared/data MobyProvisionInfo.java,NONE,1.1 From gordonp at pub.open-bio.org Thu May 12 01:19:20 2005 From: gordonp at pub.open-bio.org (Paul Gordon) Date: Thu May 12 00:57:52 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200505120519.j4C5JKmN026366@pub.open-bio.org> gordonp Thu May 12 01:19:20 EDT 2005 Update of /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/rdf/builder In directory pub.open-bio.org:/tmp/cvs-serv26341/src/main/org/biomoby/client/rdf/builder Modified Files: ServiceInstanceRDF.java Log Message: Updates to Eddie's code to deal with the new org.biomoby.shared.data instance class package moby-live/Java/src/main/org/biomoby/client/rdf/builder ServiceInstanceRDF.java,1.1,1.2 =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/rdf/builder/ServiceInstanceRDF.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/rdf/builder/ServiceInstanceRDF.java 2005/04/07 16:42:29 1.1 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/rdf/builder/ServiceInstanceRDF.java 2005/05/12 05:19:20 1.2 @@ -15,7 +15,7 @@ import org.biomoby.registry.properties.MobyProperties; import org.biomoby.shared.Central; import org.biomoby.shared.MobyData; -import org.biomoby.shared.MobyDataSecondaryInstance; +import org.biomoby.shared.data.MobyDataSecondaryInstance; import org.biomoby.shared.MobyException; import org.biomoby.shared.MobyNamespace; import org.biomoby.shared.MobyPrimaryDataSet; From gordonp at pub.open-bio.org Thu May 12 01:19:20 2005 From: gordonp at pub.open-bio.org (Paul Gordon) Date: Thu May 12 00:57:55 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200505120519.j4C5JKSM026409@pub.open-bio.org> gordonp Thu May 12 01:19:20 EDT 2005 Update of /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared In directory pub.open-bio.org:/tmp/cvs-serv26341/src/main/org/biomoby/shared Modified Files: MobyObjectDecomposition.java MobyObjectDecompositionImpl.java Log Message: Updates to Eddie's code to deal with the new org.biomoby.shared.data instance class package moby-live/Java/src/main/org/biomoby/shared MobyObjectDecomposition.java,1.3,1.4 MobyObjectDecompositionImpl.java,1.3,1.4 =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/MobyObjectDecomposition.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/MobyObjectDecomposition.java 2005/04/18 23:57:45 1.3 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/MobyObjectDecomposition.java 2005/05/12 05:19:20 1.4 @@ -21,7 +21,7 @@ * @param object - the object to flatten into its primitives. * @return - the full decomposition of an object into its primitives. */ - public MobyDataSimpleInstance[] getFlattenedPrims(String object); + public org.biomoby.shared.data.MobyDataObject[] getFlattenedPrims(String object); /** * @@ -42,4 +42,4 @@ */ public boolean isPrimitive(String object); -} \ No newline at end of file +} =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/MobyObjectDecompositionImpl.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/MobyObjectDecompositionImpl.java 2005/04/18 23:57:45 1.3 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/MobyObjectDecompositionImpl.java 2005/05/12 05:19:20 1.4 @@ -4,6 +4,8 @@ */ package org.biomoby.shared; +import org.biomoby.shared.data.*; + import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; @@ -44,10 +46,10 @@ /* (non-Javadoc) * @see org.biomoby.client.gui.util.MobyObjectDecomposition#getFlattenedPrims(java.lang.String) */ - public final MobyDataSimpleInstance[] getFlattenedPrims(String object) { + public final MobyDataObject[] getFlattenedPrims(String object) { ArrayList list = new ArrayList(); if (isPrimitive(object)) { - return new MobyDataSimpleInstance[] {}; + return new MobyDataObject[] {}; } String lsid = "urn:lsid:biomoby.org:objectclass:" + object; String rdf = getObjectRDF(lsid); @@ -81,11 +83,11 @@ : articleNode.getTextContent(); // TODO - recurse if object is not a primitive if (isPrimitive(localName)) { - MobyDataSimpleInstance mdsi = createPrimitiveType( + MobyDataObject mdsi = createPrimitiveType( localName, articleName); list.add(mdsi); } else { - MobyDataSimpleInstance[] recurseArray = getFlattenedPrims(localName); + MobyDataObject[] recurseArray = getFlattenedPrims(localName); for (int k = 0; k < recurseArray.length; k++) { list.add(recurseArray[k]); } @@ -104,11 +106,11 @@ : articleNode.getTextContent(); // TODO - recurse if object is not a primitive if (isPrimitive(localName)) { - MobyDataSimpleInstance mdsi = createPrimitiveType( + MobyDataObject mdsi = createPrimitiveType( localName, articleName); list.add(mdsi); } else { - MobyDataSimpleInstance[] recurseArray = getFlattenedPrims(localName); + MobyDataObject[] recurseArray = getFlattenedPrims(localName); for (int k = 0; k < recurseArray.length; k++) { list.add(recurseArray[k]); } @@ -126,7 +128,7 @@ _object = _object.substring(_object.indexOf("#") + 1); } if (isPrimitive(_object) && !_object.equals("Object")) { - MobyDataSimpleInstance mdsi = new MobyDataSimpleInstance( + MobyDataObject mdsi = new MobyDataObject( _object); mdsi.setDataType(new MobyDataType(_object)); list.add(mdsi); @@ -139,7 +141,7 @@ _object = _object.substring(_object.indexOf("#") + 1); } if (isPrimitive(_object) && !_object.equals("Object")) { - MobyDataSimpleInstance mdsi = new MobyDataSimpleInstance( + MobyDataObject mdsi = new MobyDataObject( _object); mdsi.setDataType(new MobyDataType(_object)); list.add(mdsi); @@ -271,7 +273,7 @@ /* * method to create default DataTypes. */ - public final MobyDataSimpleInstance createPrimitiveType(String localName, + public final MobyDataObject createPrimitiveType(String localName, String articleName) { if (localName.equalsIgnoreCase("Float")) { return new MobyDataFloat(articleName, 0.0); @@ -280,7 +282,7 @@ } else if (localName.equalsIgnoreCase("Integer")) { return new MobyDataInt(articleName, 0); } else if (localName.equalsIgnoreCase("DateTime")) { - MobyDataSimpleInstance mdsi = new MobyDataSimpleInstance( + MobyDataObject mdsi = new MobyDataObject( articleName); mdsi.setDataType(new MobyDataType(localName)); return mdsi; @@ -289,12 +291,12 @@ return null; } - private final MobyDataSimpleInstance[] convertArrayListToMoby(ArrayList list) { + private final MobyDataObject[] convertArrayListToMoby(ArrayList list) { int size = list.size(); - MobyDataSimpleInstance[] mdsi = new MobyDataSimpleInstance[size]; + MobyDataObject[] mdsi = new MobyDataObject[size]; size = 0; for (Iterator x = list.iterator(); x.hasNext(); size++) { - mdsi[size] = (MobyDataSimpleInstance) x.next(); + mdsi[size] = (MobyDataObject) x.next(); } return mdsi; } @@ -415,4 +417,4 @@ return sb.toString(); } } -} \ No newline at end of file +} From gordonp at pub.open-bio.org Thu May 12 01:19:20 2005 From: gordonp at pub.open-bio.org (Paul Gordon) Date: Thu May 12 00:58:25 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200505120519.j4C5JKXH026385@pub.open-bio.org> gordonp Thu May 12 01:19:20 EDT 2005 Update of /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/ui/graphical/servlet/jresources In directory pub.open-bio.org:/tmp/cvs-serv26341/src/main/org/biomoby/client/ui/graphical/servlet/jresources Modified Files: RESOURCE.java Log Message: Updates to Eddie's code to deal with the new org.biomoby.shared.data instance class package moby-live/Java/src/main/org/biomoby/client/ui/graphical/servlet/jresources RESOURCE.java,1.2,1.3 =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/ui/graphical/servlet/jresources/RESOURCE.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/ui/graphical/servlet/jresources/RESOURCE.java 2005/04/28 18:39:40 1.2 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/ui/graphical/servlet/jresources/RESOURCE.java 2005/05/12 05:19:20 1.3 @@ -25,7 +25,7 @@ import org.biomoby.registry.properties.MobyProperties; import org.biomoby.shared.CentralDigest; import org.biomoby.shared.MobyData; -import org.biomoby.shared.MobyDataSecondaryInstance; +import org.biomoby.shared.data.MobyDataSecondaryInstance; import org.biomoby.shared.MobyException; import org.biomoby.shared.MobyNamespace; import org.biomoby.shared.MobyPrimaryDataSet; From gordonp at pub.open-bio.org Thu May 12 01:22:27 2005 From: gordonp at pub.open-bio.org (Paul Gordon) Date: Thu May 12 01:01:01 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200505120522.j4C5MRnU026477@pub.open-bio.org> gordonp Thu May 12 01:22:27 EDT 2005 Update of /home/repository/moby/moby-live/Java/src/Clients In directory pub.open-bio.org:/tmp/cvs-serv26456/src/Clients Added Files: TestRequest.java Log Message: Sample client demonstrating the usage of data instance classes in org.biomoby.shared.data, and the use of MobyRequest for service invocation moby-live/Java/src/Clients TestRequest.java,NONE,1.1 From kawas at pub.open-bio.org Fri May 13 15:18:19 2005 From: kawas at pub.open-bio.org (Eddie Kawas) Date: Fri May 13 14:56:41 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200505131918.j4DJIJ9T002285@pub.open-bio.org> kawas Fri May 13 15:18:18 EDT 2005 Update of /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/ui/graphical/servlet/jresources In directory pub.open-bio.org:/tmp/cvs-serv2260/org/biomoby/client/ui/graphical/servlet/jresources Modified Files: RESOURCE.java Log Message: Fixed some import statements. Not sure really why I had to do this though!?! Eddie moby-live/Java/src/main/org/biomoby/client/ui/graphical/servlet/jresources RESOURCE.java,1.3,1.4 =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/ui/graphical/servlet/jresources/RESOURCE.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/ui/graphical/servlet/jresources/RESOURCE.java 2005/05/12 05:19:20 1.3 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/ui/graphical/servlet/jresources/RESOURCE.java 2005/05/13 19:18:18 1.4 @@ -17,6 +17,7 @@ import javax.servlet.http.HttpServletResponse; import org.biomoby.client.CentralDigestImpl; +import org.biomoby.client.CentralImpl; import org.biomoby.client.rdf.vocabulary.MobyResources; import org.biomoby.client.rdf.vocabulary.Predicates; import org.biomoby.registry.definitions.types.JNamespaces; @@ -25,13 +26,15 @@ import org.biomoby.registry.properties.MobyProperties; import org.biomoby.shared.CentralDigest; import org.biomoby.shared.MobyData; -import org.biomoby.shared.data.MobyDataSecondaryInstance; +import org.biomoby.shared.MobyDataType; import org.biomoby.shared.MobyException; import org.biomoby.shared.MobyNamespace; import org.biomoby.shared.MobyPrimaryDataSet; import org.biomoby.shared.MobyPrimaryDataSimple; import org.biomoby.shared.MobySecondaryData; import org.biomoby.shared.MobyService; +import org.biomoby.shared.NoSuccessException; +import org.biomoby.shared.data.MobyDataSecondaryInstance; import org.w3c.rdf.model.ModelException; import com.hp.hpl.jena.rdf.model.Bag; @@ -663,6 +666,8 @@ // create the base object type "class" Resource subject = _addClassResource(model, OBJ, "Object", "a base object class consisting of a namespace and an identifier"); + model.add(model.createStatement(subject, DC.publisher, model.createLiteral("www.illuminae.com", "en"))); + model.add(model.createStatement(subject, DC.creator, model.createLiteral("markw@illuminae.com", "en"))); model.add(model.createStatement(subject, RDF.type, RDFS.Class)); for (int x = 0; x < objects.length; x++) { String[] _line = objects[x].split("\t"); @@ -679,7 +684,17 @@ Matcher m; if (obj.indexOf("(") >= 0) obj = obj.substring(0, obj.indexOf("(")); + Resource _subject = _addClassResource(model, OBJ, sub, def); + try { + //TODO make this an sql call + MobyDataType _datatype = new CentralImpl().getDataType(sub); + model.add(model.createStatement(subject, DC.publisher, model.createLiteral(_datatype.getAuthority(), "en"))); + model.add(model.createStatement(subject, DC.creator, model.createLiteral( _datatype.getEmailContact(), "en"))); + } catch (NoSuccessException e) { + // oh well, at least we tried + System.err.println(sub + " could not be augmented with its 'creator' or its 'publisher'. Oh well, at least we tried"); + } m = Pattern.compile(".*:isa$", Pattern.CASE_INSENSITIVE).matcher( pred); if (m.matches()) { @@ -921,7 +936,7 @@ } public static void main(String[] args) throws MobyException { - System.out.println(new RESOURCE().getRESOURCES("Objects")); + System.out.println(new RESOURCE().getRESOURCES("ServiceInstances")); } } From kawas at pub.open-bio.org Fri May 13 15:20:14 2005 From: kawas at pub.open-bio.org (Eddie Kawas) Date: Fri May 13 14:58:34 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200505131920.j4DJKEjx002361@pub.open-bio.org> kawas Fri May 13 15:20:14 EDT 2005 Update of /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared In directory pub.open-bio.org:/tmp/cvs-serv2332/org/biomoby/shared Modified Files: Tag: java_1_5_compat MobyObjectDecompositionImpl.java MobyObjectDecomposition.java Log Message: Changed the import statements and references to MobyDataSimpleInstance to MobyDataObject. Seems to be the right change. Eddie moby-live/Java/src/main/org/biomoby/shared MobyObjectDecompositionImpl.java,1.1,1.1.2.1 MobyObjectDecomposition.java,1.1,1.1.2.1 =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/MobyObjectDecompositionImpl.java,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -r1.1 -r1.1.2.1 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/MobyObjectDecompositionImpl.java 2005/04/07 16:37:02 1.1 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/MobyObjectDecompositionImpl.java 2005/05/13 19:20:14 1.1.2.1 @@ -18,6 +18,7 @@ import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; +import org.biomoby.shared.data.*; import org.biomoby.client.CentralImpl; import org.biomoby.client.ui.graphical.applets.util.PrimitiveTypes; import org.w3c.dom.Document; @@ -44,10 +45,10 @@ /* (non-Javadoc) * @see org.biomoby.client.gui.util.MobyObjectDecomposition#getFlattenedPrims(java.lang.String) */ - public final MobyDataSimpleInstance[] getFlattenedPrims(String object) { + public final MobyDataObject[] getFlattenedPrims(String object) { ArrayList list = new ArrayList(); if (isPrimitive(object)) { - return new MobyDataSimpleInstance[] {}; + return new MobyDataObject[] {}; } String lsid = "urn:lsid:biomoby.org:objectclass:" + object; String rdf = getObjectRDF(lsid); @@ -81,11 +82,11 @@ : articleNode.getTextContent(); // TODO - recurse if object is not a primitive if (isPrimitive(localName)) { - MobyDataSimpleInstance mdsi = createPrimitiveType( + MobyDataObject mdsi = createPrimitiveType( localName, articleName); list.add(mdsi); } else { - MobyDataSimpleInstance[] recurseArray = getFlattenedPrims(localName); + MobyDataObject[] recurseArray = getFlattenedPrims(localName); for (int k = 0; k < recurseArray.length; k++) { list.add(recurseArray[k]); } @@ -104,11 +105,11 @@ : articleNode.getTextContent(); // TODO - recurse if object is not a primitive if (isPrimitive(localName)) { - MobyDataSimpleInstance mdsi = createPrimitiveType( + MobyDataObject mdsi = createPrimitiveType( localName, articleName); list.add(mdsi); } else { - MobyDataSimpleInstance[] recurseArray = getFlattenedPrims(localName); + MobyDataObject[] recurseArray = getFlattenedPrims(localName); for (int k = 0; k < recurseArray.length; k++) { list.add(recurseArray[k]); } @@ -126,7 +127,7 @@ _object = _object.substring(_object.indexOf("#") + 1); } if (isPrimitive(_object) && !_object.equals("Object")) { - MobyDataSimpleInstance mdsi = new MobyDataSimpleInstance( + MobyDataObject mdsi = new MobyDataObject( _object); mdsi.setDataType(new MobyDataType(_object)); list.add(mdsi); @@ -139,7 +140,7 @@ _object = _object.substring(_object.indexOf("#") + 1); } if (isPrimitive(_object) && !_object.equals("Object")) { - MobyDataSimpleInstance mdsi = new MobyDataSimpleInstance( + MobyDataObject mdsi = new MobyDataObject( _object); mdsi.setDataType(new MobyDataType(_object)); list.add(mdsi); @@ -271,7 +272,7 @@ /* * method to create default DataTypes. */ - public final MobyDataSimpleInstance createPrimitiveType(String localName, + public final MobyDataObject createPrimitiveType(String localName, String articleName) { if (localName.equalsIgnoreCase("Float")) { return new MobyDataFloat(articleName, 0.0); @@ -280,7 +281,7 @@ } else if (localName.equalsIgnoreCase("Integer")) { return new MobyDataInt(articleName, 0); } else if (localName.equalsIgnoreCase("DateTime")) { - MobyDataSimpleInstance mdsi = new MobyDataSimpleInstance( + MobyDataObject mdsi = new MobyDataObject( articleName); mdsi.setDataType(new MobyDataType(localName)); return mdsi; @@ -289,12 +290,12 @@ return null; } - private final MobyDataSimpleInstance[] convertArrayListToMoby(ArrayList list) { + private final MobyDataObject[] convertArrayListToMoby(ArrayList list) { int size = list.size(); - MobyDataSimpleInstance[] mdsi = new MobyDataSimpleInstance[size]; + MobyDataObject[] mdsi = new MobyDataObject[size]; size = 0; for (Iterator x = list.iterator(); x.hasNext(); size++) { - mdsi[size] = (MobyDataSimpleInstance) x.next(); + mdsi[size] = (MobyDataObject) x.next(); } return mdsi; } =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/MobyObjectDecomposition.java,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -r1.1 -r1.1.2.1 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/MobyObjectDecomposition.java 2005/04/07 16:37:02 1.1 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/MobyObjectDecomposition.java 2005/05/13 19:20:14 1.1.2.1 @@ -4,6 +4,8 @@ */ package org.biomoby.shared; +import org.biomoby.shared.data.MobyDataObject; + /** * @author Eddie Kawas @@ -21,7 +23,7 @@ * @param object - the object to flatten into its primitives. * @return - the full decomposition of an object into its primitives. */ - public MobyDataSimpleInstance[] getFlattenedPrims(String object); + public MobyDataObject[] getFlattenedPrims(String object); /** * From yanwong at pub.open-bio.org Mon May 16 08:42:01 2005 From: yanwong at pub.open-bio.org (Yan Wong) Date: Mon May 16 08:21:33 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200505161242.j4GCg1qW022091@pub.open-bio.org> yanwong Mon May 16 08:42:01 EDT 2005 Update of /home/repository/moby/moby-live/Python/bioMoby In directory pub.open-bio.org:/tmp/cvs-serv22018 Modified Files: mobyDataTypes.py Log Message: Modified the serialization/deserialization code: from bioMoby import MobyMarshaller m=MobyMarshaller() m.dumps(0) should return 0 and not same for the float numbers ;) this should fix problems of deserializing numbers. moby-live/Python/bioMoby mobyDataTypes.py,1.20,1.21 =================================================================== RCS file: /home/repository/moby/moby-live/Python/bioMoby/mobyDataTypes.py,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- /home/repository/moby/moby-live/Python/bioMoby/mobyDataTypes.py 2005/04/26 15:09:59 1.20 +++ /home/repository/moby/moby-live/Python/bioMoby/mobyDataTypes.py 2005/05/16 12:42:01 1.21 @@ -107,7 +107,7 @@ mobyObjects=filter(filterFunc, dir(self)) #If none, return the tag closed - if len(mobyObjects)==0 and (not hasattr(self, "__cross__") or len(self.__cross__)==0) and (not hasattr(self, "__PIB__") or len(self.__PIB__)==0) and (not hasattr(self, "content") or not self.content): + if len(mobyObjects)==0 and (not hasattr(self, "__cross__") or len(self.__cross__)==0) and (not hasattr(self, "__PIB__") or len(self.__PIB__)==0) and (not hasattr(self, "content") or (self.content==None or self.content=="")): beginTag.append("/>") return " ".join(beginTag) @@ -149,8 +149,7 @@ #Put the raw content of the object #If you want to put your special object, then then you should write #a __str__ method - if hasattr(self, "content") and self.content: - result.append("%s"%(self.content)) + result.append("%s"%(self.content)) result.append(""%(self.__prefix__, self.__tag__)) @@ -269,7 +268,11 @@ def fromMoby(self, xml): MobyObject.fromMoby(self, xml) - self.content = int(self.content) + + try: + self.content = int(self.content) + except: + self.content=0 class MobyFloat(MobyObject): """Serialize/deserialize floating point numbers @@ -279,7 +282,11 @@ def fromMoby(self, xml): MobyObject.fromMoby(self, xml) - self.content=float(self.content) + + try: + self.content=float(self.content) + except: + self.content=0.0 class MobyString(MobyObject): From yanwong at pub.open-bio.org Wed May 18 04:26:33 2005 From: yanwong at pub.open-bio.org (Yan Wong) Date: Wed May 18 04:04:57 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200505180826.j4I8QXd5029919@pub.open-bio.org> yanwong Wed May 18 04:26:33 EDT 2005 Update of /home/repository/moby/moby-live/Python/bioMoby In directory pub.open-bio.org:/tmp/cvs-serv29889 Modified Files: mobyDataTypes.py Log Message: added a test (without it, some objects (objects without a content attributes) wouldn't get marshalled) Thanks Mark Fiers ;) moby-live/Python/bioMoby mobyDataTypes.py,1.21,1.22 =================================================================== RCS file: /home/repository/moby/moby-live/Python/bioMoby/mobyDataTypes.py,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- /home/repository/moby/moby-live/Python/bioMoby/mobyDataTypes.py 2005/05/16 12:42:01 1.21 +++ /home/repository/moby/moby-live/Python/bioMoby/mobyDataTypes.py 2005/05/18 08:26:32 1.22 @@ -149,7 +149,8 @@ #Put the raw content of the object #If you want to put your special object, then then you should write #a __str__ method - result.append("%s"%(self.content)) + if hasattr(self, "content"): + result.append("%s"%(self.content)) result.append(""%(self.__prefix__, self.__tag__)) @@ -161,7 +162,7 @@ elem=xml if isinstance(xml, str): - doc=parseString(xmlstring) + doc=parseString(xml) elem=doc.firstChild From senger at pub.open-bio.org Thu May 19 06:56:06 2005 From: senger at pub.open-bio.org (Martin Senger) Date: Thu May 19 06:35:33 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200505191056.j4JAu6j2002918@pub.open-bio.org> senger Thu May 19 06:56:05 EDT 2005 Update of /home/repository/moby/moby-live/Java In directory pub.open-bio.org:/tmp/cvs-serv2887 Modified Files: build-dev.bat build-dev.sh build.bat build.sh Log Message: moby-live/Java build-dev.bat,1.3,1.4 build-dev.sh,1.3,1.4 build.bat,1.3,1.4 build.sh,1.3,1.4 =================================================================== RCS file: /home/repository/moby/moby-live/Java/build-dev.bat,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- /home/repository/moby/moby-live/Java/build-dev.bat 2003/11/08 00:27:23 1.3 +++ /home/repository/moby/moby-live/Java/build-dev.bat 2005/05/19 10:56:05 1.4 @@ -18,11 +18,9 @@ goto end :javadone -REM Set-up and check ANT_HOME -REM ------------------------- -if NOT "%ANT_HOME%"=="" goto antdone +REM Set-up ANT_HOME +REM --------------- set ANT_HOME=.\lib\ant_home -:antdone REM Put Ant libraries in CLASSPATH REM ------------------------------ =================================================================== RCS file: /home/repository/moby/moby-live/Java/build-dev.sh,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- /home/repository/moby/moby-live/Java/build-dev.sh 2003/11/08 00:27:23 1.3 +++ /home/repository/moby/moby-live/Java/build-dev.sh 2005/05/19 10:56:05 1.4 @@ -16,8 +16,6 @@ # # This script can make use of the following environment variables: # -# ANT_HOME ... pointing to a directory with Ant libraries. -# Default (used if variable is not set): ./lib/ant_home # JAVA_HOME ... pointing to a directory with your Java JDK. # If not set the script tries to find it anyway. @@ -35,16 +33,9 @@ fi #echo "Using Java from: $JAVA_HOME." -# --- setup and check ANT_HOME -if [ -z "$ANT_HOME" ] ; then - ANT_HOME=./lib/ant_home - export ANT_HOME -fi -if [ ! -d "$ANT_HOME" ] ; then - echo "ANT_HOME is set to '$ANT_HOME' which is not an existing directory." - echo "Please set your ANT_HOME." - exit 1 -fi +# --- setup ANT_HOME +ANT_HOME=./lib/ant_home +export ANT_HOME #echo "Using Ant libraries from: $ANT_HOME/lib." # --- put Ant libraries in CLASSPATH =================================================================== RCS file: /home/repository/moby/moby-live/Java/build.bat,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- /home/repository/moby/moby-live/Java/build.bat 2003/11/08 00:27:23 1.3 +++ /home/repository/moby/moby-live/Java/build.bat 2005/05/19 10:56:05 1.4 @@ -19,11 +19,9 @@ goto end :javadone -REM Set-up and check ANT_HOME -REM ------------------------- -if NOT "%ANT_HOME%"=="" goto antdone +REM Set-up ANT_HOME +REM --------------- set ANT_HOME=.\lib\ant_home -:antdone REM Put Ant libraries in CLASSPATH REM ------------------------------ =================================================================== RCS file: /home/repository/moby/moby-live/Java/build.sh,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- /home/repository/moby/moby-live/Java/build.sh 2003/11/08 00:27:23 1.3 +++ /home/repository/moby/moby-live/Java/build.sh 2005/05/19 10:56:05 1.4 @@ -12,8 +12,6 @@ # # This script can make use of the following environment variables: # -# ANT_HOME ... pointing to a directory with Ant libraries. -# Default (used if variable is not set): ./lib/ant_home # JAVA_HOME ... pointing to a directory with your Java JDK. # If not set the script tries to find it anyway. @@ -31,16 +29,9 @@ fi #echo "Using Java from: $JAVA_HOME." -# --- setup and check ANT_HOME -if [ -z "$ANT_HOME" ] ; then - ANT_HOME=./lib/ant_home - export ANT_HOME -fi -if [ ! -d "$ANT_HOME" ] ; then - echo "ANT_HOME is set to '$ANT_HOME' which is not an existing directory." - echo "Please set your ANT_HOME." - exit 1 -fi +# --- setup ANT_HOME +ANT_HOME=./lib/ant_home +export ANT_HOME #echo "Using Ant libraries from: $ANT_HOME/lib." # --- put Ant libraries in CLASSPATH From senger at pub.open-bio.org Thu May 19 06:56:06 2005 From: senger at pub.open-bio.org (Martin Senger) Date: Thu May 19 06:36:18 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200505191056.j4JAu6S5002990@pub.open-bio.org> senger Thu May 19 06:56:06 EDT 2005 Update of /home/repository/moby/moby-live/Java/docs/images In directory pub.open-bio.org:/tmp/cvs-serv2887/docs/images Added Files: b_yellow.gif stylesheet.css Log Message: moby-live/Java/docs/images b_yellow.gif,NONE,1.1 stylesheet.css,NONE,1.1 From senger at pub.open-bio.org Thu May 19 07:00:41 2005 From: senger at pub.open-bio.org (Martin Senger) Date: Thu May 19 06:38:25 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200505191100.j4JB0fHZ003072@pub.open-bio.org> senger Thu May 19 07:00:41 EDT 2005 Update of /home/repository/moby/moby-live/Java/docs In directory pub.open-bio.org:/tmp/cvs-serv3049/docs Modified Files: ToDo.html index.html Log Message: moby-live/Java/docs ToDo.html,1.2,1.3 index.html,1.8,1.9 =================================================================== RCS file: /home/repository/moby/moby-live/Java/docs/ToDo.html,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- /home/repository/moby/moby-live/Java/docs/ToDo.html 2005/05/19 10:56:06 1.2 +++ /home/repository/moby/moby-live/Java/docs/ToDo.html 2005/05/19 11:00:41 1.3 @@ -39,33 +39,33 @@
-
MS +
MS Generate a complete XML Schema for registered services. This will allow to have complete WSDLs for BioMoby services, which will further allow to use all existing tools using such WSDLs for generating code and documentation.

-

MS +
MS Support for auto-generated clients (using the outcome of the previous issue).

-

MS +
MS Similar support for BioMoby service providers - a library helping to hide SOAP and BioMoby envelope layers so service providers can concentrate only on the business logic.

-

MS +
MS More support for BioMoby complex data type in Taverna.

-

MS +
MS The BioMoby Graphs available directly in Taverna.

-

MS, GS +
MS, GS Integrate Semantic Moby services into Taverna. This will (hopefully) help to combine S-Moby and Moby-S in the (near?) future. @@ -77,7 +77,7 @@ individual registered services (e.g. examples of their valid inputs).

-

MS +
MS MobyDigestClient (actually the classes it relies on) can be significantly optimized by @@ -98,14 +98,14 @@
-
MS +
MS MobyCmdLineClient does not correctly implement its -nc and -np options.

-

MS +
MS The servlet for BioMoby Graphs is still not robust enough.

@@ -119,7 +119,7 @@

Martin Senger
-Last modified: Tue May 17 15:55:44 2005 +Last modified: Thu May 19 11:20:08 2005
=================================================================== RCS file: /home/repository/moby/moby-live/Java/docs/index.html,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- /home/repository/moby/moby-live/Java/docs/index.html 2005/05/19 10:56:06 1.8 +++ /home/repository/moby/moby-live/Java/docs/index.html 2005/05/19 11:00:41 1.9 @@ -79,9 +79,9 @@
-
Martin Senger
+
Martin Senger
-Last modified: Tue May 17 16:01:17 2005 +Last modified: Thu May 19 11:20:22 2005
From senger at pub.open-bio.org Thu May 19 11:57:21 2005 From: senger at pub.open-bio.org (Martin Senger) Date: Thu May 19 11:35:06 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200505191557.j4JFvLML003910@pub.open-bio.org> senger Thu May 19 11:57:21 EDT 2005 Update of /home/repository/moby/moby-live/Java In directory pub.open-bio.org:/tmp/cvs-serv3891 Modified Files: build.xml Log Message: moby-live/Java build.xml,1.14,1.15 =================================================================== RCS file: /home/repository/moby/moby-live/Java/build.xml,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- /home/repository/moby/moby-live/Java/build.xml 2005/04/18 23:57:44 1.14 +++ /home/repository/moby/moby-live/Java/build.xml 2005/05/19 15:57:21 1.15 @@ -371,47 +371,102 @@ - + + - - - -
Generated: ${TODAY_LONG}]]>
- - Submit a bug or feature
- Generated: ${TODAY_LONG}]]>
-
+ + + + + + + + + + + + + + +
Generated: ${TODAY_LONG}]]>
+ + Submit a bug or feature
+ Generated: ${TODAY_LONG}]]>
+ + + + + + + + + + +
- - + + + + + + + + - - - - - - + + + + + + @@ -493,7 +548,11 @@ --> - + @@ -541,7 +600,11 @@ - +
From senger at pub.open-bio.org Thu May 19 11:57:21 2005 From: senger at pub.open-bio.org (Martin Senger) Date: Thu May 19 11:35:07 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200505191557.j4JFvL5a003942@pub.open-bio.org> senger Thu May 19 11:57:21 EDT 2005 Update of /home/repository/moby/moby-live/Java/docs In directory pub.open-bio.org:/tmp/cvs-serv3891/docs Modified Files: ChangeLog DirectoriesGuidelines.html Download.html index.html Added Files: ChangesInBuild.html Log Message: moby-live/Java/docs ChangesInBuild.html,NONE,1.1 ChangeLog,1.28,1.29 DirectoriesGuidelines.html,1.1,1.2 Download.html,1.2,1.3 index.html,1.9,1.10 =================================================================== RCS file: /home/repository/moby/moby-live/Java/docs/ChangeLog,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- /home/repository/moby/moby-live/Java/docs/ChangeLog 2005/05/19 10:56:06 1.28 +++ /home/repository/moby/moby-live/Java/docs/ChangeLog 2005/05/19 15:57:21 1.29 @@ -1,3 +1,7 @@ +2005-05-19 Martin Senger + + * Ant changed to its latest release. + 2005-05-17 Martin Senger * Added documentation as a result of the BioMoby meeting in =================================================================== RCS file: /home/repository/moby/moby-live/Java/docs/DirectoriesGuidelines.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/Java/docs/DirectoriesGuidelines.html 2005/05/19 10:56:06 1.1 +++ /home/repository/moby/moby-live/Java/docs/DirectoriesGuidelines.html 2005/05/19 15:57:21 1.2 @@ -86,7 +86,7 @@
- +

jMoby packages

One of the Ben's Twelve @@ -105,7 +105,7 @@ it).

-
org.biomoby.client +
org.biomoby.client
It contains components used to develop Moby clients. The Moby clients can be both clients of the Moby registry and clients of the @@ -123,7 +123,7 @@ access to the registry databases (like a direct JDBC access), or here we may have Java-implementation of the whole registry someday. -
org.biomoby.service +
org.biomoby.service
It contains general components that can be used by those writing code for Moby services. This is not meant to be used for the @@ -159,10 +159,13 @@

Other package names

Please feel free (or better: feel obliged) to add here basic -descriptions of your own packages. +descriptions of your own packages. You may also consider to add a +package.html file directly into your package directory (to +the same sub-directory where your sources are) - such files will be +picked up by Ant and included directly in the generated API.
-
embl.ebi.soap +
embl.ebi.soap
It contains general utilities for making SOAP calls (for SOAP clients) and to get access to the request and deployment environment, @@ -181,7 +184,7 @@
Martin Senger
-Last modified: Thu May 19 11:13:55 2005 +Last modified: Thu May 19 15:29:48 2005
=================================================================== RCS file: /home/repository/moby/moby-live/Java/docs/Download.html,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- /home/repository/moby/moby-live/Java/docs/Download.html 2005/05/19 10:56:06 1.2 +++ /home/repository/moby/moby-live/Java/docs/Download.html 2005/05/19 15:57:21 1.3 @@ -49,7 +49,7 @@
How to build it
What are the build targets
-Where to put things
+Where to put things
How to use it
@@ -362,7 +362,7 @@
Martin Senger
-Last modified: Tue May 17 13:38:10 2005 +Last modified: Thu May 19 13:46:02 2005
=================================================================== RCS file: /home/repository/moby/moby-live/Java/docs/index.html,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- /home/repository/moby/moby-live/Java/docs/index.html 2005/05/19 11:00:41 1.9 +++ /home/repository/moby/moby-live/Java/docs/index.html 2005/05/19 15:57:21 1.10 @@ -53,7 +53,9 @@ @@ -81,7 +83,7 @@
Martin Senger
-Last modified: Thu May 19 11:20:22 2005 +Last modified: Thu May 19 13:48:27 2005
From senger at pub.open-bio.org Thu May 19 11:57:25 2005 From: senger at pub.open-bio.org (Martin Senger) Date: Thu May 19 11:35:09 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200505191557.j4JFvPvZ003994@pub.open-bio.org> senger Thu May 19 11:57:25 EDT 2005 Update of /home/repository/moby/moby-live/Java/src/Clients In directory pub.open-bio.org:/tmp/cvs-serv3891/src/Clients Modified Files: PopulateLocalCentralForTesting.java Log Message: moby-live/Java/src/Clients PopulateLocalCentralForTesting.java,1.3,1.4 =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/Clients/PopulateLocalCentralForTesting.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- /home/repository/moby/moby-live/Java/src/Clients/PopulateLocalCentralForTesting.java 2004/09/23 10:20:29 1.3 +++ /home/repository/moby/moby-live/Java/src/Clients/PopulateLocalCentralForTesting.java 2005/05/19 15:57:24 1.4 @@ -49,7 +49,7 @@ * @version $Id$ */ public class PopulateLocalCentralForTesting { - public final String DEFAULT_ENDPOINT = "http://localhost/cgi-bin/moby"; + public static final String DEFAULT_ENDPOINT = "http://localhost/cgi-bin/moby"; protected String serviceType = "ATestingServiceType"; protected String namespace_1 = "ns1"; @@ -351,7 +351,7 @@ return services; } - private final int MAX_MSG_LEN = 35; + private static final int MAX_MSG_LEN = 35; protected void start (String msg) { System.out.print (msg); for (int i = MAX_MSG_LEN; i > msg.length(); i--) From senger at pub.open-bio.org Thu May 19 11:57:25 2005 From: senger at pub.open-bio.org (Martin Senger) Date: Thu May 19 11:35:10 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200505191557.j4JFvPIm003975@pub.open-bio.org> senger Thu May 19 11:57:22 EDT 2005 Update of /home/repository/moby/moby-live/Java/lib/ant_home/lib In directory pub.open-bio.org:/tmp/cvs-serv3891/lib/ant_home/lib Modified Files: ant.jar xercesImpl.jar xml-apis.jar Added Files: ant-antlr.jar ant-apache-bcel.jar ant-apache-bsf.jar ant-apache-log4j.jar ant-apache-oro.jar ant-apache-regexp.jar ant-apache-resolver.jar ant-commons-logging.jar ant-commons-net.jar ant-icontract.jar ant-jai.jar ant-javamail.jar ant-jdepend.jar ant-jmf.jar ant-jsch.jar ant-junit.jar ant-launcher.jar ant-netrexx.jar ant-nodeps.jar ant-starteam.jar ant-stylebook.jar ant-swing.jar ant-trax.jar ant-vaj.jar ant-weblogic.jar ant-xalan1.jar ant-xslp.jar Removed Files: optional.jar Log Message: moby-live/Java/lib/ant_home/lib ant-antlr.jar,NONE,1.1 ant-apache-bcel.jar,NONE,1.1 ant-apache-bsf.jar,NONE,1.1 ant-apache-log4j.jar,NONE,1.1 ant-apache-oro.jar,NONE,1.1 ant-apache-regexp.jar,NONE,1.1 ant-apache-resolver.jar,NONE,1.1 ant-commons-logging.jar,NONE,1.1 ant-commons-net.jar,NONE,1.1 ant-icontract.jar,NONE,1.1 ant-jai.jar,NONE,1.1 ant-javamail.jar,NONE,1.1 ant-jdepend.jar,NONE,1.1 ant-jmf.jar,NONE,1.1 ant-jsch.jar,NONE,1.1 ant-junit.jar,NONE,1.1 ant-launcher.jar,NONE,1.1 ant-netrexx.jar,NONE,1.1 ant-nodeps.jar,NONE,1.1 ant-starteam.jar,NONE,1.1 ant-stylebook.jar,NONE,1.1 ant-swing.jar,NONE,1.1 ant-trax.jar,NONE,1.1 ant-vaj.jar,NONE,1.1 ant-weblogic.jar,NONE,1.1 ant-xalan1.jar,NONE,1.1 ant-xslp.jar,NONE,1.1 ant.jar,1.2,1.3 xercesImpl.jar,1.2,1.3 xml-apis.jar,1.1,1.2 optional.jar,1.2,NONE =================================================================== RCS file: /home/repository/moby/moby-live/Java/lib/ant_home/lib/ant.jar,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 Binary files /home/repository/moby/moby-live/Java/lib/ant_home/lib/ant.jar 2003/09/25 02:48:14 1.2 and /home/repository/moby/moby-live/Java/lib/ant_home/lib/ant.jar 2005/05/19 15:57:21 1.3 differ rcsdiff: /home/repository/moby/moby-live/Java/lib/ant_home/lib/ant.jar: diff failed =================================================================== RCS file: /home/repository/moby/moby-live/Java/lib/ant_home/lib/xercesImpl.jar,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 Binary files /home/repository/moby/moby-live/Java/lib/ant_home/lib/xercesImpl.jar 2003/09/25 02:48:15 1.2 and /home/repository/moby/moby-live/Java/lib/ant_home/lib/xercesImpl.jar 2005/05/19 15:57:22 1.3 differ rcsdiff: /home/repository/moby/moby-live/Java/lib/ant_home/lib/xercesImpl.jar: diff failed =================================================================== RCS file: /home/repository/moby/moby-live/Java/lib/ant_home/lib/xml-apis.jar,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 Binary files /home/repository/moby/moby-live/Java/lib/ant_home/lib/xml-apis.jar 2003/09/24 12:33:49 1.1 and /home/repository/moby/moby-live/Java/lib/ant_home/lib/xml-apis.jar 2005/05/19 15:57:22 1.2 differ rcsdiff: /home/repository/moby/moby-live/Java/lib/ant_home/lib/xml-apis.jar: diff failed rcsdiff: /home/repository/moby/moby-live/Java/lib/ant_home/lib/RCS/optional.jar,v: No such file or directory From senger at pub.open-bio.org Thu May 19 11:57:25 2005 From: senger at pub.open-bio.org (Martin Senger) Date: Thu May 19 11:35:14 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200505191557.j4JFvP7O004013@pub.open-bio.org> senger Thu May 19 11:57:25 EDT 2005 Update of /home/repository/moby/moby-live/Java/src/Services/org/biomoby/service In directory pub.open-bio.org:/tmp/cvs-serv3891/src/Services/org/biomoby/service Added Files: package.html Removed Files: Echo.java EchoImpl.java EchoImplFromStubs.java README Log Message: moby-live/Java/src/Services/org/biomoby/service package.html,NONE,1.1 Echo.java,1.1,NONE EchoImpl.java,1.2,NONE EchoImplFromStubs.java,1.1,NONE README,1.1,NONE rcsdiff: /home/repository/moby/moby-live/Java/src/Services/org/biomoby/service/RCS/Echo.java,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/Java/src/Services/org/biomoby/service/RCS/EchoImpl.java,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/Java/src/Services/org/biomoby/service/RCS/EchoImplFromStubs.java,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/Java/src/Services/org/biomoby/service/RCS/README,v: No such file or directory From senger at pub.open-bio.org Thu May 19 11:57:25 2005 From: senger at pub.open-bio.org (Martin Senger) Date: Thu May 19 11:35:15 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200505191557.j4JFvP4U004108@pub.open-bio.org> senger Thu May 19 11:57:25 EDT 2005 Update of /home/repository/moby/moby-live/Java/src/main/org/biomoby/client In directory pub.open-bio.org:/tmp/cvs-serv3891/src/main/org/biomoby/client Modified Files: CentralDigestCachedImpl.java GraphsServlet.java Graphviz.java RDF.java SimpleCache.java SimpleFileCache.java Taverna.java package.html Log Message: moby-live/Java/src/main/org/biomoby/client CentralDigestCachedImpl.java,1.3,1.4 GraphsServlet.java,1.9,1.10 Graphviz.java,1.6,1.7 RDF.java,1.2,1.3 SimpleCache.java,1.3,1.4 SimpleFileCache.java,1.2,1.3 Taverna.java,1.2,1.3 package.html,1.1,1.2 =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/CentralDigestCachedImpl.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/CentralDigestCachedImpl.java 2005/04/07 16:37:02 1.3 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/CentralDigestCachedImpl.java 2005/05/19 15:57:25 1.4 @@ -359,9 +359,9 @@ if (list == null) throw new MobyException ("Surprisingly, '" + servicesCache.getAbsolutePath() + "' is not a directory. Strange..."); for (int i = 0; i < list.length; i++) { - MobyService[] services = extractServices (load (list[i])); - for (int j = 0; j < services.length; j++) - v.addElement (services[j]); + MobyService[] servs = extractServices (load (list[i])); + for (int j = 0; j < servs.length; j++) + v.addElement (servs[j]); } MobyService[] result = new MobyService [v.size()]; v.copyInto (result); =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/GraphsServlet.java,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/GraphsServlet.java 2005/04/07 22:55:06 1.9 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/GraphsServlet.java 2005/05/19 15:57:25 1.10 @@ -1639,13 +1639,13 @@ static final int BUF_SIZE = 8192; public void run() { - byte[] buf = new byte [BUF_SIZE]; + byte[] myBuf = new byte [BUF_SIZE]; int readBytes; try { - while ((readBytes = stream.read (buf)) != -1) { + while ((readBytes = stream.read (myBuf)) != -1) { byte[] tmp = new byte [result.length + readBytes]; System.arraycopy (result, 0, tmp, 0, result.length); - System.arraycopy (buf, 0, tmp, result.length, readBytes); + System.arraycopy (myBuf, 0, tmp, result.length, readBytes); result = new byte [tmp.length]; System.arraycopy (tmp, 0, result, 0, tmp.length); } =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/Graphviz.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/Graphviz.java 2005/04/07 16:37:02 1.6 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/Graphviz.java 2005/05/19 15:57:25 1.7 @@ -17,7 +17,7 @@ /** * A utility class that understands how to create - * {@link http://www.research.att.com/sw/tools/graphviz/ graphviz} graphs from a set of + * graphviz graphs from a set of * {@link org.biomoby.client.ServicesEdge ServiceEdges}, or from other * data structures. * @@ -293,7 +293,7 @@ * Creates a graph connecting 'serviceTypes' using their ISA * relationship.

* - * @param servicesTypes represent nodes in the created graph + * @param serviceTypes represent nodes in the created graph * @param props are some properties that can influence how the * graph will look like; see the property names elswhere in this * API what properties are understood =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/RDF.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/RDF.java 2005/04/07 16:37:02 1.2 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/RDF.java 2005/05/19 15:57:25 1.3 @@ -19,7 +19,7 @@ /** * A utility class that understands how to create - * {@link http://www.research.att.com/sw/tools/graphviz/ graphviz} graphs from a set of + * graphviz graphs from a set of * {@link org.biomoby.client.ServicesEdge ServiceEdges}, or from other * data structures. * =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/SimpleCache.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/SimpleCache.java 2005/04/07 16:37:02 1.3 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/SimpleCache.java 2005/05/19 15:57:25 1.4 @@ -65,7 +65,7 @@ * @param id a unique ID of the object being returned * @return data previously stored under 'id'; or null if such data * do not exist - * @thow IOExcepiton if the retrieving failed + * @throws IOExcepiton if the retrieving failed **************************************************************************/ java.lang.Object getContents (String id) throws IOException; @@ -75,7 +75,7 @@ * * @param id a unique ID of the object being stored * @param data are being stored - * @thow IOExcepiton if the storing failed + * @throws IOExcepiton if the storing failed **************************************************************************/ void setContents (String id, java.lang.Object data) throws IOException; @@ -85,7 +85,7 @@ *

* * @param id a unique ID - * @throw IOException if the object exists but cannot be removed + * @throws IOException if the object exists but cannot be removed * (meaning that it does not raise any exception if the * object is not anymore in the cache) **************************************************************************/ =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/SimpleFileCache.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/SimpleFileCache.java 2005/04/07 16:37:02 1.2 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/SimpleFileCache.java 2005/05/19 15:57:25 1.3 @@ -32,7 +32,7 @@ * * @param id a unique ID of the cached (or possibly cached) object * @return a filename with the full path representing an object 'id' - * @throw IOException if creating the parent directories caused problem + * @throws IOException if creating the parent directories caused problem **************************************************************************/ String getFilename (String id) throws IOException; @@ -42,7 +42,7 @@ * * @param id a unique ID of the object being stored * @param data are being stored - * @thow IOExcepiton if the storing failed + * @throws IOExcepiton if the storing failed **************************************************************************/ void setContents (String id, byte[] data) throws IOException; @@ -62,7 +62,7 @@ * * @param millis how many milliseconds must be an object stored to * be remopved by calling this method - * @throw IOException if any object that exists in the cache and + * @throws IOException if any object that exists in the cache and * is targeted to be removed but cannot be removed **************************************************************************/ void removeOlderThen (long millis) =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/Taverna.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/Taverna.java 2005/04/07 16:37:02 1.2 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/Taverna.java 2005/05/19 15:57:25 1.3 @@ -24,7 +24,7 @@ /** * A utility class that understands how to create workflow definitions - * for {@link http://taverna.sf.net/ Taverna}.

+ * for Taverna.

* * @see MobyGraphs * @author Martin Senger =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/package.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/package.html 2003/09/24 14:33:37 1.1 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/package.html 2005/05/19 15:57:25 1.2 @@ -3,17 +3,13 @@ -The components used for developing Moby clients. -

-The most important class is {@link org.biomoby.client.CentralImpl} -implementing interface {@link org.biomoby.shared.Central} and by doing so -hiding all Moby complexity (and changes) under the hood. +The components used for developing Moby clients. The Moby clients can +be both clients of the Moby registry and clients of the Moby services.

-Note that this package does not contain ready and complete Moby clients -but only pieces, tools and helpers to build such clients. The ready/full -clients are in the Clients sub-directory (they are not in any -named package) - {@link MobyCmdLineClient} and {@link TestingCentral}. +The most important class is {@link org.biomoby.client.CentralImpl} +implementing interface {@link org.biomoby.shared.Central} and by doing +so hiding all Moby complexity (and changes) under the hood.

From senger at pub.open-bio.org Thu May 19 11:57:26 2005 From: senger at pub.open-bio.org (Martin Senger) Date: Thu May 19 11:35:19 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200505191557.j4JFvQYv004171@pub.open-bio.org> senger Thu May 19 11:57:26 EDT 2005 Update of /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared In directory pub.open-bio.org:/tmp/cvs-serv3891/src/main/org/biomoby/shared Modified Files: package.html Log Message: moby-live/Java/src/main/org/biomoby/shared package.html,1.1,1.2 =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/package.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/package.html 2003/09/24 14:33:37 1.1 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/package.html 2005/05/19 15:57:26 1.2 @@ -3,15 +3,22 @@ -The components used by packages and classes developed for both -Moby clients and (in the future) Moby servers. -

-The cornerstone piece is the interface {@link org.biomoby.shared.Central} that -defines how to access Moby registry without any knowledge of -the used transport protocol (SOAP, XML, etc.). This interface -uses several "containers" representing pieces of the Moby mosaic - -but most of them may not be necessary for the client. -

+It contains components that are used from more than one (other) +packages. The bottom-line (or a bottom-rule) is: If one wants to run +clients, it must be sufficent for him to pack all classes from {@link +org.biomoby.client} and from this package only. If one wants to create +a registry oriented component, it is enough for him to pack +org.biomoby.registry and this package. And similarly for service +providers which would pack org.biomoby.service and again this +package.

+ +Additionally this is a good place for putting here Java interfaces - +assuming that they are expected to be used more generally. The +cornerstone piece is the interface {@link org.biomoby.shared.Central} +that defines how to access Moby registry without any knowledge of the +used transport protocol (SOAP, XML, etc.). This interface uses several +container classes representing pieces of the Moby mosaic. + From senger at pub.open-bio.org Thu May 19 11:57:26 2005 From: senger at pub.open-bio.org (Martin Senger) Date: Thu May 19 11:35:20 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200505191557.j4JFvQqI004249@pub.open-bio.org> senger Thu May 19 11:57:26 EDT 2005 Update of /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/dom/wrappers In directory pub.open-bio.org:/tmp/cvs-serv3891/src/main/org/biomoby/shared/dom/wrappers Modified Files: Xerces.java Log Message: moby-live/Java/src/main/org/biomoby/shared/dom/wrappers Xerces.java,1.2,1.3 =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/dom/wrappers/Xerces.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/dom/wrappers/Xerces.java 2005/04/20 21:42:10 1.2 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/dom/wrappers/Xerces.java 2005/05/19 15:57:26 1.3 @@ -14,7 +14,7 @@ /** * Wraps the Xerces DOM parser in order to provide interface - * {@link org.biomoby.shared.dom/ParserWrapper}. + * {@link org.biomoby.shared.dom.ParserWrapper}. * * @version $Id$ */ From senger at pub.open-bio.org Thu May 19 11:57:25 2005 From: senger at pub.open-bio.org (Martin Senger) Date: Thu May 19 11:35:20 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200505191557.j4JFvPER004129@pub.open-bio.org> senger Thu May 19 11:57:25 EDT 2005 Update of /home/repository/moby/moby-live/Java/src/main/org/biomoby/registry In directory pub.open-bio.org:/tmp/cvs-serv3891/src/main/org/biomoby/registry Added Files: package.html Removed Files: .keep_me Log Message: moby-live/Java/src/main/org/biomoby/registry package.html,NONE,1.1 .keep_me,1.1,NONE rcsdiff: /home/repository/moby/moby-live/Java/src/main/org/biomoby/registry/RCS/.keep_me,v: No such file or directory From senger at pub.open-bio.org Thu May 19 11:57:25 2005 From: senger at pub.open-bio.org (Martin Senger) Date: Thu May 19 11:35:22 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200505191557.j4JFvPP9004053@pub.open-bio.org> senger Thu May 19 11:57:25 EDT 2005 Update of /home/repository/moby/moby-live/Java/src/main/embl/ebi/soap In directory pub.open-bio.org:/tmp/cvs-serv3891/src/main/embl/ebi/soap Modified Files: SOAPToolkit.java Added Files: package.html Log Message: moby-live/Java/src/main/embl/ebi/soap package.html,NONE,1.1 SOAPToolkit.java,1.2,1.3 =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/embl/ebi/soap/SOAPToolkit.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- /home/repository/moby/moby-live/Java/src/main/embl/ebi/soap/SOAPToolkit.java 2005/04/07 16:33:07 1.2 +++ /home/repository/moby/moby-live/Java/src/main/embl/ebi/soap/SOAPToolkit.java 2005/05/19 15:57:25 1.3 @@ -63,7 +63,7 @@ * current service space (giving the priority to the one which is * service-specific).

* - * @see getAttributeNames + * @see #getAttributeNames */ String getAttribute (String name); @@ -71,8 +71,6 @@ * Returns an Enumeration of Strings containing the attribute names of all * objects bound to the underlying session which the current request is * part of. - * These attributes were created by previous requests within the same - * session - see method {@link #setSessionAttribute}. *

* Use the {@link #getSessionAttribute(String)} method with an attribute name * to get the value of an attribute. @@ -82,7 +80,7 @@ /** * Returns the object bound with the specified name in this session, * or null if no object is bound under the name. - * @see getSessionAttributeNames + * @see #getSessionAttributeNames */ Object getSessionAttribute (String name); From senger at pub.open-bio.org Thu May 19 11:57:25 2005 From: senger at pub.open-bio.org (Martin Senger) Date: Thu May 19 11:35:22 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200505191557.j4JFvPBo004034@pub.open-bio.org> senger Thu May 19 11:57:25 EDT 2005 Update of /home/repository/moby/moby-live/Java/src/Services/org/biomoby/service/generated In directory pub.open-bio.org:/tmp/cvs-serv3891/src/Services/org/biomoby/service/generated Modified Files: EchoServiceLocator.java Log Message: moby-live/Java/src/Services/org/biomoby/service/generated EchoServiceLocator.java,1.1,1.2 =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/Services/org/biomoby/service/generated/EchoServiceLocator.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/Java/src/Services/org/biomoby/service/generated/EchoServiceLocator.java 2003/11/08 00:49:06 1.1 +++ /home/repository/moby/moby-live/Java/src/Services/org/biomoby/service/generated/EchoServiceLocator.java 2005/05/19 15:57:25 1.2 @@ -10,7 +10,7 @@ public class EchoServiceLocator extends org.apache.axis.client.Service implements org.biomoby.service.generated.EchoService { // Use to get a proxy class for echoString - private final java.lang.String echoString_address = "http://localhost:8080/axis/services/echoString"; + private static final java.lang.String echoString_address = "http://localhost:8080/axis/services/echoString"; public java.lang.String getechoStringAddress() { return echoString_address; From senger at pub.open-bio.org Thu May 19 11:57:26 2005 From: senger at pub.open-bio.org (Martin Senger) Date: Thu May 19 11:35:23 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200505191557.j4JFvQjm004150@pub.open-bio.org> senger Thu May 19 11:57:25 EDT 2005 Update of /home/repository/moby/moby-live/Java/src/main/org/biomoby/registry/rdfagent/verifier In directory pub.open-bio.org:/tmp/cvs-serv3891/src/main/org/biomoby/registry/rdfagent/verifier Modified Files: ServiceDescrParser.java Log Message: moby-live/Java/src/main/org/biomoby/registry/rdfagent/verifier ServiceDescrParser.java,1.4,1.5 =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/registry/rdfagent/verifier/ServiceDescrParser.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/registry/rdfagent/verifier/ServiceDescrParser.java 2005/04/16 14:32:12 1.4 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/registry/rdfagent/verifier/ServiceDescrParser.java 2005/05/19 15:57:25 1.5 @@ -146,12 +146,12 @@ Report.add(" "); Report.add("DELETED SERVICES: "); Iterator i = deletedServ.iterator(); - int n=1; + int m=1; while (i.hasNext()){ String delServ = i.next().toString(); - Report.doWrite(n+". "+delServ); - Report.add(n+". "+delServ); - n+=1; + Report.doWrite(m+". "+delServ); + Report.add(m+". "+delServ); + m+=1; } } @@ -791,4 +791,4 @@ } return lsid; } -} \ No newline at end of file +} From senger at pub.open-bio.org Thu May 19 11:57:26 2005 From: senger at pub.open-bio.org (Martin Senger) Date: Thu May 19 11:35:25 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200505191557.j4JFvQil004228@pub.open-bio.org> senger Thu May 19 11:57:26 EDT 2005 Update of /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data In directory pub.open-bio.org:/tmp/cvs-serv3891/src/main/org/biomoby/shared/data Modified Files: MobyDataBytes.java MobyDataComposite.java MobyDataDateTime.java MobyDataFloat.java MobyDataInt.java MobyDataObject.java MobyDataObjectSet.java MobyDataString.java MobyDataXref.java Log Message: moby-live/Java/src/main/org/biomoby/shared/data MobyDataBytes.java,1.1,1.2 MobyDataComposite.java,1.1,1.2 MobyDataDateTime.java,1.1,1.2 MobyDataFloat.java,1.1,1.2 MobyDataInt.java,1.1,1.2 MobyDataObject.java,1.1,1.2 MobyDataObjectSet.java,1.1,1.2 MobyDataString.java,1.1,1.2 MobyDataXref.java,1.1,1.2 =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataBytes.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataBytes.java 2005/05/12 04:59:49 1.1 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataBytes.java 2005/05/19 15:57:26 1.2 @@ -27,7 +27,7 @@ /** * Construct the object using a DOM fragment. * - * @throw IllegalArgumentException if the element is not a text-base64 tag + * @throws IllegalArgumentException if the element is not a text-base64 tag */ public MobyDataBytes(org.w3c.dom.Element element) throws IllegalArgumentException{ this(getName(element), getTextContents(element)); =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataComposite.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataComposite.java 2005/05/12 04:59:49 1.1 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataComposite.java 2005/05/19 15:57:26 1.2 @@ -28,7 +28,7 @@ /** * Construct the object using a DOM fragment. * - * @throw IllegalArgumentException if the element is not a MobyObject tag + * @throws IllegalArgumentException if the element is not a MobyObject tag */ public MobyDataComposite(org.w3c.dom.Element element) throws IllegalArgumentException{ this(new MobyDataType(element.getLocalName()), getName(element), getNamespace(element), getId(element)); =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataDateTime.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataDateTime.java 2005/05/12 04:59:49 1.1 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataDateTime.java 2005/05/19 15:57:26 1.2 @@ -31,7 +31,7 @@ /** * Construct the object using a DOM fragment. * - * @throw IllegalArgumentException if the element is not a DateTime tag, or the text children of the element do not encode a valid ISO8601 date/time + * @throws IllegalArgumentException if the element is not a DateTime tag, or the text children of the element do not encode a valid ISO8601 date/time */ public MobyDataDateTime(org.w3c.dom.Element element) throws IllegalArgumentException{ this(getName(element), getTextContents(element)); =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataFloat.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataFloat.java 2005/05/12 04:59:49 1.1 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataFloat.java 2005/05/19 15:57:26 1.2 @@ -23,7 +23,7 @@ /** * Construct the object using a DOM fragment. * - * @throw IllegalArgumentException if the element is not a Float tag + * @throws IllegalArgumentException if the element is not a Float tag */ public MobyDataFloat(org.w3c.dom.Element element) throws IllegalArgumentException{ this(getName(element), getTextContents(element)); =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataInt.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataInt.java 2005/05/12 04:59:49 1.1 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataInt.java 2005/05/19 15:57:26 1.2 @@ -23,7 +23,7 @@ /** * Construct the object using a DOM fragment. * - * @throw IllegalArgumentException if the element is not a Integer tag + * @throws IllegalArgumentException if the element is not a Integer tag */ public MobyDataInt(org.w3c.dom.Element element) throws IllegalArgumentException{ this(getName(element), getTextContents(element)); =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataObject.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataObject.java 2005/05/12 04:59:49 1.1 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataObject.java 2005/05/19 15:57:26 1.2 @@ -45,7 +45,7 @@ /** * Construct the object using a DOM fragment. * - * @throw IllegalArgumentException if the element is not an Object tag + * @throws IllegalArgumentException if the element is not an Object tag */ public MobyDataObject(Element element) throws IllegalArgumentException{ this(getNamespace(element).getName(), getId(element)); =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataObjectSet.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataObjectSet.java 2005/05/12 04:59:49 1.1 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataObjectSet.java 2005/05/19 15:57:26 1.2 @@ -52,7 +52,7 @@ /** * Creates a collection with a name, initializing the members with the given array * - * @throw NullPointerException if the input array is null, or contains null elements + * @throws NullPointerException if the input array is null, or contains null elements */ public MobyDataObjectSet(String name, MobyDataObject[] values) throws NullPointerException{ this(name); @@ -64,8 +64,8 @@ * * @param c usually another MobyDataObjectSet, or a Vector of MobyDataObjects * - * @throw ClassCastException if a member of the input collection is not a MobyDataObject - * @throw NullPointerException if the collection or one of its members is a null object + * @throws ClassCastException if a member of the input collection is not a MobyDataObject + * @throws NullPointerException if the collection or one of its members is a null object */ public MobyDataObjectSet(String name, Collection c) throws ClassCastException, NullPointerException{ this(name); @@ -75,7 +75,7 @@ /** * Replace whatever is in the collection right now with the values in the input array. * - * @throw NullPointerException if the input array is null, or contains null elements + * @throws NullPointerException if the input array is null, or contains null elements */ public void setElements(MobyDataObject[] values) throws NullPointerException{ if(values == null){ @@ -139,8 +139,8 @@ /** * Add a single MobyDataObject to the collection. * - * @throw ClassCastException if the input is not a MobyDataObject - * @throw NullPointerException if the input is a null object + * @throws ClassCastException if the input is not a MobyDataObject + * @throws NullPointerException if the input is a null object */ public boolean add(Object mdsi) throws ClassCastException, NullPointerException{ checkInputClass("add", mdsi); @@ -153,8 +153,8 @@ * (usually a MobyDataObjectSet, or a Vector of MobyDataObjects) * to this collection. * - * @throw ClassCastException if a member of the input collection is not a MobyDataObject - * @throw NullPointerException if the collection or one of its members is a null object + * @throws ClassCastException if a member of the input collection is not a MobyDataObject + * @throws NullPointerException if the collection or one of its members is a null object * @return true if the collection changes as a result of the operation */ public boolean addAll(Collection c) throws ClassCastException, NullPointerException{ @@ -172,8 +172,8 @@ /** * @return true if this collection contains an element with the exact same value (equivalent in MOBY XML representation, including name) - * @throw ClassCastException if the input is not a MobyDataObject - * @throw NullPointerException if the input is a null object + * @throws ClassCastException if the input is not a MobyDataObject + * @throws NullPointerException if the input is a null object */ public boolean contains(Object mdsi) throws ClassCastException, NullPointerException{ checkInputClass("check for the presence of", mdsi); @@ -183,8 +183,8 @@ /** * @return true if each element in the input collection returns true when contains(Object o) is called - * @throw ClassCastException if a member of the input collection is not a MobyDataObject - * @throw NullPointerException if the collection or one of its members is a null object + * @throws ClassCastException if a member of the input collection is not a MobyDataObject + * @throws NullPointerException if the collection or one of its members is a null object */ public boolean containsAll(Collection c) throws ClassCastException, NullPointerException{ checkCollectionClass("check for presence of", c); @@ -198,8 +198,8 @@ * to convert into an array for sorting. * * @return true if and only if the input object is a MobyDataObjectSet, and the two collections contain exactly equal elements from a MOBY XML perspective - * @throw ClassCastException if the input is not a Collection of MobyDataObjects - * @throw NullPointerException if the input is a null object + * @throws ClassCastException if the input is not a Collection of MobyDataObjects + * @throws NullPointerException if the input is a null object */ public boolean equals(Object set) throws ClassCastException, NullPointerException{ if(!(set instanceof Collection)){ @@ -259,8 +259,8 @@ * * @param mdsi the MobyDataObject whose value equivalent (not object reference) is to be removed * @return true if the element was found and removed - * @throw ClassCastException if the input is not a MobyDataObject - * @throw NullPointerException if the input is a null object + * @throws ClassCastException if the input is not a MobyDataObject + * @throws NullPointerException if the input is a null object */ public boolean remove(Object mdsi) throws ClassCastException, NullPointerException{ checkInputClass("remove", mdsi); @@ -272,8 +272,8 @@ * Set theory subtraction operator implementation. * * @return true if this collection changed as a result of the call - * @throw ClassCastException if a member of the input collection is not a MobyDataObject - * @throw NullPointerException if the collection or one of its members is a null object + * @throws ClassCastException if a member of the input collection is not a MobyDataObject + * @throws NullPointerException if the collection or one of its members is a null object */ public boolean removeAll(Collection c) throws ClassCastException, NullPointerException{ checkCollectionClass("remove", c); @@ -285,8 +285,8 @@ * Set theory intersection operator implementation. * * @return true if this collection changed as a result of the call - * @throw ClassCastException if a member of the input collection is not a MobyDataObject - * @throw NullPointerException if the collection or one of its members is a null object + * @throws ClassCastException if a member of the input collection is not a MobyDataObject + * @throws NullPointerException if the collection or one of its members is a null object */ public boolean retainAll(Collection c){ checkCollectionClass("intersect", c); =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataString.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataString.java 2005/05/12 04:59:49 1.1 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataString.java 2005/05/19 15:57:26 1.2 @@ -18,7 +18,7 @@ /** * Construct the object using a DOM fragment. * - * @throw IllegalArgumentException if the element is not a String tag + * @throws IllegalArgumentException if the element is not a String tag */ public MobyDataString(org.w3c.dom.Element element) throws IllegalArgumentException{ this(getName(element), getTextContents(element)); =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataXref.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataXref.java 2005/05/12 04:59:49 1.1 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataXref.java 2005/05/19 15:57:26 1.2 @@ -261,8 +261,8 @@ // If we are a service provider it should look like an Xref if(isCRIBXML){ MobyService service = getService(); - MobyNamespace[] namespaces = getNamespaces(); - return " @@ -67,110 +71,19 @@ - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - + + &libraries; + + &exceptions; @@ -193,47 +106,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -557,8 +429,6 @@ - - From senger at pub.open-bio.org Thu May 19 16:18:54 2005 From: senger at pub.open-bio.org (Martin Senger) Date: Thu May 19 15:56:49 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200505192018.j4JKIskt005036@pub.open-bio.org> senger Thu May 19 16:18:54 EDT 2005 Update of /home/repository/moby/moby-live/Java/docs In directory pub.open-bio.org:/tmp/cvs-serv4985/docs Modified Files: ChangeLog DirectoriesGuidelines.html Download.html index.html Added Files: vizant.txt Log Message: moby-live/Java/docs vizant.txt,NONE,1.1 ChangeLog,1.29,1.30 DirectoriesGuidelines.html,1.2,1.3 Download.html,1.3,1.4 index.html,1.10,1.11 =================================================================== RCS file: /home/repository/moby/moby-live/Java/docs/ChangeLog,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- /home/repository/moby/moby-live/Java/docs/ChangeLog 2005/05/19 15:57:21 1.29 +++ /home/repository/moby/moby-live/Java/docs/ChangeLog 2005/05/19 20:18:53 1.30 @@ -1,5 +1,8 @@ 2005-05-19 Martin Senger + * Updated build.xml; also separate some fragments into xmls + directory. + * Ant changed to its latest release. 2005-05-17 Martin Senger =================================================================== RCS file: /home/repository/moby/moby-live/Java/docs/DirectoriesGuidelines.html,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- /home/repository/moby/moby-live/Java/docs/DirectoriesGuidelines.html 2005/05/19 15:57:21 1.2 +++ /home/repository/moby/moby-live/Java/docs/DirectoriesGuidelines.html 2005/05/19 20:18:53 1.3 @@ -84,6 +84,10 @@

data
A place for data files used by various tutorials or examples. +
xmls +
A place for additional fragments used by Ant's +build.xml. +
@@ -184,7 +188,7 @@
Martin Senger
-Last modified: Thu May 19 15:29:48 2005 +Last modified: Thu May 19 19:59:46 2005
=================================================================== RCS file: /home/repository/moby/moby-live/Java/docs/Download.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- /home/repository/moby/moby-live/Java/docs/Download.html 2005/05/19 15:57:21 1.3 +++ /home/repository/moby/moby-live/Java/docs/Download.html 2005/05/19 20:18:53 1.4 @@ -136,9 +136,14 @@ The build scripts (as usual for building with Ant) are based on file build.xml. There you can find all details what can be build, -and what properties are used. Here are just few targets explained in +and what properties are used. Here are just main targets explained in more details.

+There is also a graphical +snapshot of our Ant tagrets (and here you can find how it was +created).

+ Note that a target name is used as the command-line parameter of a build script. For example a target docs is invoked by typing:

@@ -362,7 +367,7 @@
 
Martin Senger
-Last modified: Thu May 19 13:46:02 2005 +Last modified: Thu May 19 19:07:17 2005
=================================================================== RCS file: /home/repository/moby/moby-live/Java/docs/index.html,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- /home/repository/moby/moby-live/Java/docs/index.html 2005/05/19 15:57:21 1.10 +++ /home/repository/moby/moby-live/Java/docs/index.html 2005/05/19 20:18:53 1.11 @@ -57,7 +57,6 @@ (see also a general description of package names)
  • How to change Ant's build.xml
  • How to develop a client talking to a BioMoby service (a Paul Gordon's simple client) -
  • How to develop a BioMoby service (coming...)

    @@ -83,7 +82,7 @@

    Martin Senger
    -Last modified: Thu May 19 13:48:27 2005 +Last modified: Thu May 19 18:54:56 2005
    From senger at pub.open-bio.org Thu May 19 16:18:54 2005 From: senger at pub.open-bio.org (Martin Senger) Date: Thu May 19 15:56:52 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200505192018.j4JKIsex005052@pub.open-bio.org> senger Thu May 19 16:18:54 EDT 2005 Update of /home/repository/moby/moby-live/Java/docs/images In directory pub.open-bio.org:/tmp/cvs-serv4985/docs/images Added Files: ant-snapshot.png Log Message: moby-live/Java/docs/images ant-snapshot.png,NONE,1.1 From senger at pub.open-bio.org Thu May 19 16:18:54 2005 From: senger at pub.open-bio.org (Martin Senger) Date: Thu May 19 15:56:59 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200505192018.j4JKIsas005067@pub.open-bio.org> senger Thu May 19 16:18:54 EDT 2005 Update of /home/repository/moby/moby-live/Java/xmls In directory pub.open-bio.org:/tmp/cvs-serv4985/xmls Added Files: exceptions.xml libraries.xml Log Message: moby-live/Java/xmls exceptions.xml,NONE,1.1 libraries.xml,NONE,1.1 From senger at pub.open-bio.org Thu May 19 16:25:40 2005 From: senger at pub.open-bio.org (Martin Senger) Date: Thu May 19 16:03:20 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200505192025.j4JKPeVb005141@pub.open-bio.org> senger Thu May 19 16:25:40 EDT 2005 Update of /home/repository/moby/moby-live/Java/docs In directory pub.open-bio.org:/tmp/cvs-serv5118/docs Modified Files: 3rdPartyLibraries.html LatestJava.html Log Message: moby-live/Java/docs 3rdPartyLibraries.html,1.1,1.2 LatestJava.html,1.1,1.2 =================================================================== RCS file: /home/repository/moby/moby-live/Java/docs/3rdPartyLibraries.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/Java/docs/3rdPartyLibraries.html 2005/05/19 10:56:06 1.1 +++ /home/repository/moby/moby-live/Java/docs/3rdPartyLibraries.html 2005/05/19 20:25:40 1.2 @@ -11,6 +11,10 @@ Comming soon.. +

    + +For now, just look into xmls/libraries.xml - and it's almost +self-explanatory...

    @@ -19,7 +23,7 @@

    Martin Senger
    -Last modified: Thu May 19 10:39:48 2005 +Last modified: Thu May 19 20:35:23 2005
    =================================================================== RCS file: /home/repository/moby/moby-live/Java/docs/LatestJava.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/Java/docs/LatestJava.html 2005/05/19 10:56:06 1.1 +++ /home/repository/moby/moby-live/Java/docs/LatestJava.html 2005/05/19 20:25:40 1.2 @@ -27,9 +27,10 @@ First to say is that it was put there as a working solution for those who really need to use 1.5. Any new class that needs 1.5 must be explicitly named in the build.xml file in the property -version.excludes. Which is not too suitable if you have many -such classes. So when we start to use Java 1.5. in greater scale we -need to re-factor it.

    +version.excludes (the property is actually in a separate +fragment in xmls/exceptions.xml). Which is not too suitable +if you have many such classes. So when we start to use Java 1.5. in +greater scale we need to re-factor it.

    Having said that please note that nothing prevents you to use Java 1.5 @@ -76,7 +77,7 @@

    Martin Senger
    -Last modified: Tue May 17 13:01:36 2005 +Last modified: Thu May 19 20:33:59 2005
    From senger at pub.open-bio.org Thu May 19 16:27:03 2005 From: senger at pub.open-bio.org (Martin Senger) Date: Thu May 19 16:04:44 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200505192027.j4JKR3ev005186@pub.open-bio.org> senger Thu May 19 16:27:03 EDT 2005 Update of /home/repository/moby/moby-live/Java/docs/API In directory pub.open-bio.org:/tmp/cvs-serv5167/docs/API Modified Files: .cvsignore.template Log Message: moby-live/Java/docs/API .cvsignore.template,1.3,1.4 =================================================================== RCS file: /home/repository/moby/moby-live/Java/docs/API/.cvsignore.template,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- /home/repository/moby/moby-live/Java/docs/API/.cvsignore.template 2004/09/23 00:18:01 1.3 +++ /home/repository/moby/moby-live/Java/docs/API/.cvsignore.template 2005/05/19 20:27:02 1.4 @@ -4,4 +4,5 @@ *-list class-use org +embl resources From yanwong at pub.open-bio.org Fri May 20 03:35:23 2005 From: yanwong at pub.open-bio.org (Yan Wong) Date: Fri May 20 03:13:54 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200505200735.j4K7ZNns006617@pub.open-bio.org> yanwong Fri May 20 03:35:23 EDT 2005 Update of /home/repository/moby/moby-live/Python/bioMoby In directory pub.open-bio.org:/tmp/cvs-serv6578 Modified Files: mobyDataTypes.py Log Message: Changed the tag into moby-live/Python/bioMoby mobyDataTypes.py,1.22,1.23 =================================================================== RCS file: /home/repository/moby/moby-live/Python/bioMoby/mobyDataTypes.py,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- /home/repository/moby/moby-live/Python/bioMoby/mobyDataTypes.py 2005/05/18 08:26:32 1.22 +++ /home/repository/moby/moby-live/Python/bioMoby/mobyDataTypes.py 2005/05/20 07:35:23 1.23 @@ -31,7 +31,7 @@ def toMoby(self): """Returns the object as a XML """ - return ""+str(self.value)+"" + return ""+str(self.value)+"" def __str__(self): """Return the Parameter in its XML form @@ -52,9 +52,9 @@ xmlelt=parseString(xml).firstChild self.articleName=xmlelt.getAttribute('moby:articleName') - l=xmlelt.getElementsByTagName("value") + l=xmlelt.getElementsByTagName("Value") if len(l)==0: - l=xmlelt.getElementsByTagName("moby:value") + l=xmlelt.getElementsByTagName("moby:Value") self.value=l[0].firstChild.nodeValue From senger at pub.open-bio.org Wed May 25 06:09:16 2005 From: senger at pub.open-bio.org (Martin Senger) Date: Wed May 25 05:46:32 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200505251009.j4PA9GTc002366@pub.open-bio.org> senger Wed May 25 06:09:16 EDT 2005 Update of /home/repository/moby/moby-live/Java/docs In directory pub.open-bio.org:/tmp/cvs-serv2347 Modified Files: CodingGuidelines.html Log Message: moby-live/Java/docs CodingGuidelines.html,1.2,1.3 =================================================================== RCS file: /home/repository/moby/moby-live/Java/docs/CodingGuidelines.html,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- /home/repository/moby/moby-live/Java/docs/CodingGuidelines.html 2005/05/19 10:56:06 1.2 +++ /home/repository/moby/moby-live/Java/docs/CodingGuidelines.html 2005/05/25 10:09:16 1.3 @@ -42,7 +42,7 @@ href="DirectoriesGuidelines.html#packages">package descriptions. -
  • Do not commit your services unless they are part of a tutorial (aka didactice services). +
  • Do not commit your services unless they are part of a tutorial (aka didactic services).
    In other words, jMoby is not a place for every BioMoby service written in Java. Such services are and will be spread around @@ -57,12 +57,27 @@
  • Whenever possible, include test programs that display the functionality of the new classes. -
  • Use the shared libraries (what come when you -execute gather Ant target, or when you use -./build.sh script). +
  • Join the MOBY-dev +mailing list, consider to join also the moby-l +mailing list. -
  • If you have to use another third party library, +
  • If you have to use a new third party library, you need to modify the build.xml file to go and get it. +
    + + It is not enough just to add a new jar file in your lib +sub-directory (because other developers will not have it). It is not +recommended to add a new jar file into CVS - if you have a new jar +file, change instead the build.xml file (actually change the +xmls/libraries that is used by build.xml).

    + +All third parties come to your CVS local copy when you execute +gather Ant target, or when you use ./build.sh +script. + +

  • Package names do not neccesarily have to start with org.biomoby. @@ -88,7 +103,7 @@
    Eddie Kawas
    -Last modified: Thu May 19 11:07:49 2005 +Last modified: Wed May 25 10:50:58 2005
    From kawas at pub.open-bio.org Mon May 30 17:39:05 2005 From: kawas at pub.open-bio.org (Eddie Kawas) Date: Mon May 30 17:16:18 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200505302139.j4ULd5NC002524@pub.open-bio.org> kawas Mon May 30 17:39:05 EDT 2005 Update of /home/repository/moby/moby-live/Perl/MOBY/Client In directory pub.open-bio.org:/tmp/cvs-serv2499/Client Modified Files: ServiceInstance.pm Log Message: added lsid specific code. eddie moby-live/Perl/MOBY/Client ServiceInstance.pm,1.13,1.14 =================================================================== RCS file: /home/repository/moby/moby-live/Perl/MOBY/Client/ServiceInstance.pm,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- /home/repository/moby/moby-live/Perl/MOBY/Client/ServiceInstance.pm 2004/11/18 17:41:16 1.13 +++ /home/repository/moby/moby-live/Perl/MOBY/Client/ServiceInstance.pm 2005/05/30 21:39:05 1.14 @@ -189,6 +189,7 @@ authoritative => [ undef, 'read/write' ], URL => [ undef, 'read/write' ], contactEmail => [ undef, 'read/write' ], + LSID => [ undef, 'read/write'] ); #_____________________________________________________________ From kawas at pub.open-bio.org Mon May 30 18:39:54 2005 From: kawas at pub.open-bio.org (Eddie Kawas) Date: Mon May 30 18:18:37 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200505302239.j4UMds6m002678@pub.open-bio.org> kawas Mon May 30 18:39:54 EDT 2005 Update of /home/repository/moby/moby-live/Perl/MOBY/Client In directory pub.open-bio.org:/tmp/cvs-serv2653/Client Modified Files: Central.pm Log Message: made lsid properties lowercase. Eddie moby-live/Perl/MOBY/Client Central.pm,1.95,1.96 =================================================================== RCS file: /home/repository/moby/moby-live/Perl/MOBY/Client/Central.pm,v retrieving revision 1.95 retrieving revision 1.96 diff -u -r1.95 -r1.96 --- /home/repository/moby/moby-live/Perl/MOBY/Client/Central.pm 2005/05/30 21:38:42 1.95 +++ /home/repository/moby/moby-live/Perl/MOBY/Client/Central.pm 2005/05/30 22:39:54 1.96 @@ -1017,8 +1017,8 @@ #create LSID for service and register it in the DB my $_config ||= MOBY::Config->new; my $service_lsid = "urn:lsid:" - . $_config->{mobycentral}->{LSID_authority} . ":" - . $_config->{mobycentral}->{LSID_namespace} . ":" + . $_config->{mobycentral}->{lsid_authority} . ":" + . $_config->{mobycentral}->{lsid_namespace} . ":" . $authURI . "," . $name; my $dbhA = $_config->getDataAdaptor( source => 'mobycentral' ); From kawas at pub.open-bio.org Mon May 30 18:54:43 2005 From: kawas at pub.open-bio.org (Eddie Kawas) Date: Mon May 30 18:31:12 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200505302254.j4UMshxm002771@pub.open-bio.org> kawas Mon May 30 18:54:43 EDT 2005 Update of /home/repository/moby/moby-live/Perl/MOBY/Client In directory pub.open-bio.org:/tmp/cvs-serv2746/Client Modified Files: Central.pm Log Message: excised some db code that was ill placed. Eddie moby-live/Perl/MOBY/Client Central.pm,1.96,1.97 =================================================================== RCS file: /home/repository/moby/moby-live/Perl/MOBY/Client/Central.pm,v retrieving revision 1.96 retrieving revision 1.97 diff -u -r1.96 -r1.97 --- /home/repository/moby/moby-live/Perl/MOBY/Client/Central.pm 2005/05/30 22:39:54 1.96 +++ /home/repository/moby/moby-live/Perl/MOBY/Client/Central.pm 2005/05/30 22:54:43 1.97 @@ -1013,21 +1013,7 @@ # my $rdf = $response->content; # print "$rdf\n"; #} - - #create LSID for service and register it in the DB - my $_config ||= MOBY::Config->new; - my $service_lsid = "urn:lsid:" - . $_config->{mobycentral}->{lsid_authority} . ":" - . $_config->{mobycentral}->{lsid_namespace} . ":" - . $authURI . "," - . $name; - my $dbhA = $_config->getDataAdaptor( source => 'mobycentral' ); - my $dbh = $dbhA->dbh; - my $sth = - $dbh->prepare( -"update service_instance set lsid = ? where authority_id= ? and servicename= ?" - ); - $sth->execute( $service_lsid, $authURI, $name ); + return $reg; #_______________________________________________________________________________________________ From kawas at pub.open-bio.org Mon May 30 19:28:45 2005 From: kawas at pub.open-bio.org (Eddie Kawas) Date: Mon May 30 19:06:59 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200505302328.j4UNSjJ4002915@pub.open-bio.org> kawas Mon May 30 19:28:45 EDT 2005 Update of /home/repository/moby/moby-live/Perl/MOBY In directory pub.open-bio.org:/tmp/cvs-serv2890 Modified Files: service_instance.pm Log Message: created an lsid for insertion into db Eddie moby-live/Perl/MOBY service_instance.pm,1.9,1.10 =================================================================== RCS file: /home/repository/moby/moby-live/Perl/MOBY/service_instance.pm,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- /home/repository/moby/moby-live/Perl/MOBY/service_instance.pm 2004/11/18 17:41:14 1.9 +++ /home/repository/moby/moby-live/Perl/MOBY/service_instance.pm 2005/05/30 23:28:45 1.10 @@ -261,6 +261,14 @@ && ( defined $self->description ) ) { # then create it de novo if we have enough information + #create LSID for service and register it in the DB + my $_config ||= MOBY::Config->new; + my $service_lsid = "urn:lsid:" + . $_config->{mobycentral}->{lsid_authority} . ":" + . $_config->{mobycentral}->{lsid_namespace} . ":" + . $self->authority_uri . "," + . $self->servicename; + my $id = $self->adaptor->insert_service_instance( category => $self->category, servicename => $self->servicename, @@ -271,6 +279,7 @@ authoritative => $self->authoritative, description => $self->description, signatureURL => $self->signatureURL, + lsid => $service_lsid ); $self->service_instance_id($id); $self->{__exists__} = 1; # this service now exists From kawas at pub.open-bio.org Mon May 30 19:33:44 2005 From: kawas at pub.open-bio.org (Eddie Kawas) Date: Mon May 30 19:10:36 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200505302333.j4UNXiPr002980@pub.open-bio.org> kawas Mon May 30 19:33:44 EDT 2005 Update of /home/repository/moby/moby-live/Perl/MOBY In directory pub.open-bio.org:/tmp/cvs-serv2936 Modified Files: service_instance.pm Log Message: Added more lsid stuff. Last time, i promise. Eddie moby-live/Perl/MOBY service_instance.pm,1.10,1.11 =================================================================== RCS file: /home/repository/moby/moby-live/Perl/MOBY/service_instance.pm,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- /home/repository/moby/moby-live/Perl/MOBY/service_instance.pm 2005/05/30 23:28:45 1.10 +++ /home/repository/moby/moby-live/Perl/MOBY/service_instance.pm 2005/05/30 23:33:44 1.11 @@ -71,7 +71,8 @@ contact_email => [ undef, 'read/write' ], authoritative => [ 0, 'read/write' ], description => [ undef, 'read/write' ], - registry => [ 'MOBY_Central', 'read/write' ], + registry => [ 'MOBY_Central', 'read/write' ], + lsid => [ undef, 'read/write' ], test => [ 0, 'read/write' ] , # toggles create or test_existence behaviour ); @@ -249,6 +250,7 @@ $self->description( $existing_service->{'desc'} ); $self->authority( $existing_service->{'authURI'} ); $self->signatureURL( $existing_service->{'signatureURL'} ); + $self->lsid( $existing_service->{'lsid'} ); $self->{__exists__} = 1; # this service already existed } elsif ( !($existing_service) # if it doesn't exist From kawas at pub.open-bio.org Mon May 30 19:33:44 2005 From: kawas at pub.open-bio.org (Eddie Kawas) Date: Mon May 30 19:10:45 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200505302333.j4UNXiM4002961@pub.open-bio.org> kawas Mon May 30 19:33:43 EDT 2005 Update of /home/repository/moby/moby-live/Perl/MOBY/Adaptor/moby/queryapi In directory pub.open-bio.org:/tmp/cvs-serv2936/Adaptor/moby/queryapi Modified Files: mysql.pm Log Message: Added more lsid stuff. Last time, i promise. Eddie moby-live/Perl/MOBY/Adaptor/moby/queryapi mysql.pm,1.9,1.10 =================================================================== RCS file: /home/repository/moby/moby-live/Perl/MOBY/Adaptor/moby/queryapi/mysql.pm,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- /home/repository/moby/moby-live/Perl/MOBY/Adaptor/moby/queryapi/mysql.pm 2005/03/09 00:56:15 1.9 +++ /home/repository/moby/moby-live/Perl/MOBY/Adaptor/moby/queryapi/mysql.pm 2005/05/30 23:33:43 1.10 @@ -173,7 +173,7 @@ my ($self, %args) = @_; my $dbh = $self->dbh; - my ($serviceid, $category, $name, $typeURI, $authURI,$url,$email,$authoritative,$desc, $signatureURL) = $dbh->selectrow_array( # does this service already exist? + my ($serviceid, $category, $name, $typeURI, $authURI,$url,$email,$authoritative,$desc, $signatureURL, $lsid) = $dbh->selectrow_array( # does this service already exist? q{select service_instance_id, category, @@ -184,7 +184,8 @@ service_instance.contact_email, authoritative, description, - signatureURL + signatureURL, + lsid from service_instance, authority where service_instance.authority_id = authority.authority_id @@ -202,6 +203,7 @@ email => $email, authoritative => $authoritative, desc => $desc, + lsid => $lsid }; } @@ -210,7 +212,7 @@ my ($self, %args) = @_; my $dbh = $self->dbh; - $dbh->do(q{insert into service_instance (category, servicename, service_type_uri, authority_id, url, contact_email, authoritative, description, signatureURL) values (?,?,?,?,?,?,?,?,?)}, + $dbh->do(q{insert into service_instance (category, servicename, service_type_uri, authority_id, url, contact_email, authoritative, description, signatureURL, lsid) values (?,?,?,?,?,?,?,?,?,?)}, undef, $args{'category'}, $args{'servicename'}, @@ -220,7 +222,8 @@ $args{'contact_email'}, $args{'authoritative'}, $args{'description'}, - $args{'signatureURL'}); + $args{'signatureURL'}, + $args{'lsid'}); my $id = $dbh->{mysql_insertid}; return $id; From mwilkinson at pub.open-bio.org Mon May 30 20:06:48 2005 From: mwilkinson at pub.open-bio.org (Mark Wilkinson) Date: Mon May 30 19:43:27 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200505310006.j4V06mDj003119@pub.open-bio.org> mwilkinson Mon May 30 20:06:48 EDT 2005 Update of /home/repository/moby/moby-live/Perl In directory pub.open-bio.org:/tmp/cvs-serv3100 Modified Files: Makefile.PL Log Message: updated Makefile moving to LS::ID dependencies moby-live/Perl Makefile.PL,1.7,1.8 =================================================================== RCS file: /home/repository/moby/moby-live/Perl/Makefile.PL,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- /home/repository/moby/moby-live/Perl/Makefile.PL 2005/02/18 15:21:03 1.7 +++ /home/repository/moby/moby-live/Perl/Makefile.PL 2005/05/31 00:06:48 1.8 @@ -77,6 +77,10 @@ 'PREREQ_PM' => { 'SOAP::Lite' => 0.55, 'XML::LibXML' => 1.58, + 'Text::Shellwords' => 1.00, + 'SOAP::MIME' => 0.55, + 'XML::XPath' => 1.12, + 'LS::ID' => 1.1.1, }, # e.g., Module::Name => 1.1 #'PM_FILTER' => "", ($] >= 5.005 ? ## Add these new keywords supported since 5.005 From kawas at pub.open-bio.org Tue May 31 11:09:26 2005 From: kawas at pub.open-bio.org (Eddie Kawas) Date: Tue May 31 10:45:52 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200505311509.j4VF9Qnu005820@pub.open-bio.org> kawas Tue May 31 11:09:26 EDT 2005 Update of /home/repository/moby/moby-live/Perl/MOBY In directory pub.open-bio.org:/tmp/cvs-serv5794 Modified Files: Central.pm Log Message: Fixed bug that caused an error on test 17 of testMobyClientCentral. ... Eddie moby-live/Perl/MOBY Central.pm,1.152,1.153 =================================================================== RCS file: /home/repository/moby/moby-live/Perl/MOBY/Central.pm,v retrieving revision 1.152 retrieving revision 1.153 diff -u -r1.152 -r1.153 --- /home/repository/moby/moby-live/Perl/MOBY/Central.pm 2005/05/30 21:38:41 1.152 +++ /home/repository/moby/moby-live/Perl/MOBY/Central.pm 2005/05/31 15:09:25 1.153 @@ -1409,16 +1409,16 @@ ); } - # use MOBY::Client::Central; - # my $services = MOBY::Client::Central::_parseServices( '', '', $si ); - # my $service_instance = shift @{$services}; + use MOBY::Client::Central; + my $services = MOBY::Client::Central::_parseServices( '', '', $si ); + my $service_instance = shift @{$services}; # my $storage = new RDF::Core::Storage::Memory; # my $model = new RDF::Core::Model( Storage => $storage ); # my $RDF_MODEL = MOBY::RDF::ServiceInstanceRDF->new( #model => $model, #service_instance => $service_instance ); # my $RDF_XML = $RDF_MODEL->serialize; - my $LSID = $si->LSID; + my $LSID = $service_instance->LSID; my $RDF = _getServiceInstanceRDF($LSID); unless ($RDF){return &_success("Registration successful but LSID resolution error",$SVC->service_instance_id,"" )} unless ($RDF =~ /RDF/){ From kawas at pub.open-bio.org Tue May 31 14:09:24 2005 From: kawas at pub.open-bio.org (Eddie Kawas) Date: Tue May 31 13:46:03 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200505311809.j4VI9Obi006293@pub.open-bio.org> kawas Tue May 31 14:09:24 EDT 2005 Update of /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/ui/graphical/servlet/jresources In directory pub.open-bio.org:/tmp/cvs-serv6268/org/biomoby/client/ui/graphical/servlet/jresources Modified Files: RESOURCE.java Log Message: updated the 'script' to use updated properties. Eddie moby-live/Java/src/main/org/biomoby/client/ui/graphical/servlet/jresources RESOURCE.java,1.4,1.5 =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/ui/graphical/servlet/jresources/RESOURCE.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/ui/graphical/servlet/jresources/RESOURCE.java 2005/05/13 19:18:18 1.4 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/ui/graphical/servlet/jresources/RESOURCE.java 2005/05/31 18:09:24 1.5 @@ -17,7 +17,6 @@ import javax.servlet.http.HttpServletResponse; import org.biomoby.client.CentralDigestImpl; -import org.biomoby.client.CentralImpl; import org.biomoby.client.rdf.vocabulary.MobyResources; import org.biomoby.client.rdf.vocabulary.Predicates; import org.biomoby.registry.definitions.types.JNamespaces; @@ -26,14 +25,12 @@ import org.biomoby.registry.properties.MobyProperties; import org.biomoby.shared.CentralDigest; import org.biomoby.shared.MobyData; -import org.biomoby.shared.MobyDataType; import org.biomoby.shared.MobyException; import org.biomoby.shared.MobyNamespace; import org.biomoby.shared.MobyPrimaryDataSet; import org.biomoby.shared.MobyPrimaryDataSimple; import org.biomoby.shared.MobySecondaryData; import org.biomoby.shared.MobyService; -import org.biomoby.shared.NoSuccessException; import org.biomoby.shared.data.MobyDataSecondaryInstance; import org.w3c.rdf.model.ModelException; @@ -143,21 +140,21 @@ private static Properties properties = MobyProperties.PROPERTIES();; private static final String OBJ = "http://" - + properties.getProperty("domain") + "/RESOURCES/MOBY-S/Objects#"; + + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/Objects#"; private static final String SRV = "http://" - + properties.getProperty("domain") + "/RESOURCES/MOBY-S/Services#"; + + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/Services#"; private static final String NS = "http://" - + properties.getProperty("domain") + + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/Namespaces#"; private static final String MP = "http://" - + properties.getProperty("domain") + + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/Predicates#"; private static final String SI = "http://" - + properties.getProperty("domain") + + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/ServiceInstances#"; private static boolean RUN_MAIN = false; @@ -686,15 +683,7 @@ obj = obj.substring(0, obj.indexOf("(")); Resource _subject = _addClassResource(model, OBJ, sub, def); - try { - //TODO make this an sql call - MobyDataType _datatype = new CentralImpl().getDataType(sub); - model.add(model.createStatement(subject, DC.publisher, model.createLiteral(_datatype.getAuthority(), "en"))); - model.add(model.createStatement(subject, DC.creator, model.createLiteral( _datatype.getEmailContact(), "en"))); - } catch (NoSuccessException e) { - // oh well, at least we tried - System.err.println(sub + " could not be augmented with its 'creator' or its 'publisher'. Oh well, at least we tried"); - } + m = Pattern.compile(".*:isa$", Pattern.CASE_INSENSITIVE).matcher( pred); if (m.matches()) { From kawas at pub.open-bio.org Tue May 31 14:11:08 2005 From: kawas at pub.open-bio.org (Eddie Kawas) Date: Tue May 31 13:47:33 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200505311811.j4VIB8vk006343@pub.open-bio.org> kawas Tue May 31 14:11:08 EDT 2005 Update of /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/rdf/builder In directory pub.open-bio.org:/tmp/cvs-serv6314/org/biomoby/client/rdf/builder Modified Files: ServiceInstanceRDF.java RDFConfigure.java Log Message: updated the code to use updated properties located in MobyProperties.java. Eddie moby-live/Java/src/main/org/biomoby/client/rdf/builder ServiceInstanceRDF.java,1.2,1.3 RDFConfigure.java,1.1,1.2 =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/rdf/builder/ServiceInstanceRDF.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/rdf/builder/ServiceInstanceRDF.java 2005/05/12 05:19:20 1.2 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/rdf/builder/ServiceInstanceRDF.java 2005/05/31 18:11:07 1.3 @@ -40,10 +40,9 @@ */ /** - * @author Eddie Kawas - *

    This class was created to present a way to retrieve a service instances' RDF using just a service name and authority. - *

    For questions, comments, or bugs - *

    email me at edward.kawas@gmail.com + * @author Eddie Kawas

    This class was created to present a way to retrieve a + * service instances' RDF using just a service name and authority.

    For + * questions, comments, or bugs

    email me at edward.kawas@gmail.com */ public class ServiceInstanceRDF { @@ -60,26 +59,28 @@ + System.getProperty("line.separator") + ""; /* - * load the properties file and set the properties + * load the properties file and set the properties */ private static Properties properties = MobyProperties.PROPERTIES(); private static final String OBJ = "http://" - + properties.getProperty("domain") + "/RESOURCES/MOBY-S/Objects#"; + + properties.getProperty("resources_script_domain") + + "/RESOURCES/MOBY-S/Objects#"; private static final String SRV = "http://" - + properties.getProperty("domain") + "/RESOURCES/MOBY-S/Services#"; + + properties.getProperty("resources_script_domain") + + "/RESOURCES/MOBY-S/Services#"; private static final String NS = "http://" - + properties.getProperty("domain") + + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/Namespaces#"; private static final String MP = "http://" - + properties.getProperty("domain") + + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/Predicates#"; private static final String SI = "http://" - + properties.getProperty("domain") + + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/ServiceInstances#"; // the endpoint for the test server @@ -88,15 +89,23 @@ private final static String TEST_URI = properties.getProperty("test_uri"); /** - * - * PRE:name is either a valid name or null

    - * POST:If authorURI is a valid authority, then a RDF containing all of the service instances will be returned. - * If authorURI and name are valid then a single RDF containing just the service instance identified by name is returned.

    - * @param authorURI - the authority to query - * @param name - the name of the service instance if applicable or null. - * @param useTestMachine - if true then services are searched for on the test server, otherwise the production server is used. - * @return a string representing either all of services defined by authorURI, (if name is null) or a single service instances' - * rdf if name and authorURI are valid. If name and/or authorURI are invalid an empty rdf document is returned. + * + * PRE:name is either a valid name or null

    POST:If + * authorURI is a valid authority, then a RDF containing all of the service + * instances will be returned. If authorURI and name are valid then a single + * RDF containing just the service instance identified by name is returned.

    + * + * @param authorURI - + * the authority to query + * @param name - + * the name of the service instance if applicable or null. + * @param useTestMachine - + * if true then services are searched for on the test server, + * otherwise the production server is used. + * @return a string representing either all of services defined by + * authorURI, (if name is null) or a single service instances' rdf + * if name and authorURI are valid. If name and/or authorURI are + * invalid an empty rdf document is returned. */ public final static String findService(String authorURI, String name, boolean useTestMachine) { @@ -109,19 +118,28 @@ /** * - * method that retrieves the RDF describing a specific service instance based on the parameters domain, serviceName, url and uri. - *

    PRE:None. - *

    POST:The RDF describing the service with parameters domain, serviceName, url and uri is created. - * @param domain - the authoring domain of the service instance in question. - * @param serviceName - the name of the service instance in question. - * @param url - the URL of the endpoint of the BioMoby registry that you would like to query. If null, the mobycentral registry is queried. - * @param uri - the URI of the BioMoby registry that you would like to query. If null, the mobycentral registry is queried. - * @return - the string representation of the RDF describing the service instance based on the parameters given. + * method that retrieves the RDF describing a specific service instance + * based on the parameters domain, serviceName, url and uri.

    PRE:None. + *

    POST:The RDF describing the service with parameters domain, + * serviceName, url and uri is created. + * + * @param domain - + * the authoring domain of the service instance in question. + * @param serviceName - + * the name of the service instance in question. + * @param url - + * the URL of the endpoint of the BioMoby registry that you would + * like to query. If null, the mobycentral registry is queried. + * @param uri - + * the URI of the BioMoby registry that you would like to query. + * If null, the mobycentral registry is queried. + * @return - the string representation of the RDF describing the service + * instance based on the parameters given. */ public final static String findService(String domain, String serviceName, String url, String uri) { if (serviceName != null) { - // variables needed + // variables needed MobyService service = null; MobyService[] services = null; Central central = null; @@ -157,7 +175,8 @@ } /* - * a method that retrieves all of the service instances based on an authoriy. + * a method that retrieves all of the service instances based on an + * authoriy. */ private final static String getAllServices(String URI, boolean useTestMachine) { @@ -239,20 +258,19 @@ } /* - * method that actually creates the rdf based on one or more services contained in the array services + * method that actually creates the rdf based on one or more services + * contained in the array services */ private final static String createRDF(MobyService[] services) { Model model = ModelFactory.createDefaultModel(); // set up the prefixes/namespaces Map map = model.getNsPrefixMap(); map.put("mobyPred", Predicates.getURI()); - map.put("mobyObject", "http://biomoby.org/RESOURCES/MOBY-S/Objects#"); - map.put("serviceInstances", - "http://biomoby.org/RESOURCES/MOBY-S/ServiceInstances#"); - map.put("mobyNamespace", - "http://biomoby.org/RESOURCES/MOBY-S/Namespaces#"); - map.put("mobyService", "http://biomoby.org/RESOURCES/MOBY-S/Services#"); - map.put("moby", "http://biomoby.org/RESOURCES/MOBY-S/MOBYResources#"); + map.put("mobyObject", OBJ); + map.put("serviceInstances", SI); + map.put("mobyNamespace", NS); + map.put("mobyService", SRV); + map.put("moby", MobyResources.getURI()); model.setNsPrefixes(map); for (int i = 0; i < services.length; i++) { @@ -340,7 +358,7 @@ } } if (innerBag != null && innerBag.size() > 0) { - //TODO + // TODO consumeBag.add(innerBag); } @@ -443,7 +461,7 @@ return null; } } - if (innerBag != null /*&& innerBag.size() > 0*/) { + if (innerBag != null /* && innerBag.size() > 0 */) { produceBag.add(innerBag); } } else { @@ -489,7 +507,7 @@ } /* - * convenience method that creates a mobyPred:Simple + * convenience method that creates a mobyPred:Simple */ private final static Resource createSimpleDataItem(Model model, MobyPrimaryDataSimple simpleData, Resource _li) { @@ -505,19 +523,24 @@ MobyNamespace mns = ns[k]; _li.addProperty(Predicates.namespace_type, model .createResource(NS + mns.getName())); - //.addProperty(RDF.type, RDFS.Class)); + // .addProperty(RDF.type, RDFS.Class)); } } return _li; } /** - * - * PRE:None

    - * POST:If a service instance exists such that it has a name of name and an authoring URI of uri true is returned, otherwise false is returned.

    - * @param uri - the authors uri - * @param name - the name of the service instance - * @return true if a service instance exists with authority uri, and name name, otherwise false is returned. + * + * PRE:None

    POST:If a service instance exists such that + * it has a name of name and an authoring URI of uri true is returned, + * otherwise false is returned.

    + * + * @param uri - + * the authors uri + * @param name - + * the name of the service instance + * @return true if a service instance exists with authority uri, and name + * name, otherwise false is returned. */ public final static boolean serviceInstanceExists(String uri, String name) { Central central = null; @@ -542,15 +565,16 @@ } /** - * + * * Usage: ServiceInstanceRDF authorityURI [serviceName]

    * authorityURI: is the authortitys' domain to query

    - * serviceName:optional argument that identifies a specific service instance

    + * serviceName:optional argument that identifies a specific service + * instance

    + * * @throws LSIDException */ public final static void main(String[] args) throws LSIDException { - System.out.println("1:\n" - + findService("www.test.com", null, false)); + System.out.println("1:\n" + findService("www.test.com", null, false)); } } =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/rdf/builder/RDFConfigure.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/rdf/builder/RDFConfigure.java 2005/04/07 16:42:29 1.1 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/rdf/builder/RDFConfigure.java 2005/05/31 18:11:07 1.2 @@ -46,15 +46,15 @@ /* * Some constants for use in the rdfs */ - final public static String URI_OBJECT = "http://" + properties.getProperty("domain") +"/RESOURCES/MOBY-S/Objects#"; + final public static String URI_OBJECT = "http://" + properties.getProperty("resources_script_domain") +"/RESOURCES/MOBY-S/Objects#"; - final public static String URI_SERVICE = "http://" + properties.getProperty("domain") +"/RESOURCES/MOBY-S/Services#"; + final public static String URI_SERVICE = "http://" + properties.getProperty("resources_script_domain") +"/RESOURCES/MOBY-S/Services#"; - final public static String URI_NAMESPACE = "http://" + properties.getProperty("domain") +"/RESOURCES/MOBY-S/Namespaces#"; + final public static String URI_NAMESPACE = "http://" + properties.getProperty("resources_script_domain") +"/RESOURCES/MOBY-S/Namespaces#"; - final public static String URI_PREDICATE = "http://" + properties.getProperty("domain") +"/RESOURCES/MOBY-S/Predicates#"; + final public static String URI_PREDICATE = "http://" + properties.getProperty("resources_script_domain") +"/RESOURCES/MOBY-S/Predicates#"; - final public static String URI_ServiceINSTANCE = "http://" + properties.getProperty("domain") +"/RESOURCES/MOBY-S/ServiceInstances#"; + final public static String URI_ServiceINSTANCE = "http://" + properties.getProperty("resources_script_domain") +"/RESOURCES/MOBY-S/ServiceInstances#"; private Model model = null; From kawas at pub.open-bio.org Tue May 31 14:11:08 2005 From: kawas at pub.open-bio.org (Eddie Kawas) Date: Tue May 31 13:47:34 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200505311811.j4VIB8So006366@pub.open-bio.org> kawas Tue May 31 14:11:08 EDT 2005 Update of /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/rdf/vocabulary In directory pub.open-bio.org:/tmp/cvs-serv6314/org/biomoby/client/rdf/vocabulary Modified Files: Predicates.java MobyResources.java Log Message: updated the code to use updated properties located in MobyProperties.java. Eddie moby-live/Java/src/main/org/biomoby/client/rdf/vocabulary Predicates.java,1.1,1.2 MobyResources.java,1.1,1.2 =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/rdf/vocabulary/Predicates.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/rdf/vocabulary/Predicates.java 2005/04/07 16:42:29 1.1 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/rdf/vocabulary/Predicates.java 2005/05/31 18:11:08 1.2 @@ -22,33 +22,33 @@ public class Predicates { private final static Properties properties = MobyProperties.PROPERTIES(); - protected final static String uri = "http://" + properties.getProperty("domain") + "/RESOURCES/MOBY-S/Predicates#"; + protected final static String uri = "http://" + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/Predicates#"; private final static Model _model = ModelFactory.createDefaultModel();; - public static final Property category = _model.getProperty("http://" + properties.getProperty("domain") + "/RESOURCES/MOBY-S/Predicates#category"); - public static final Property isa = _model.getProperty("http://" + properties.getProperty("domain") + "/RESOURCES/MOBY-S/Predicates#isa"); - public static final Property has = _model.getProperty("http://" + properties.getProperty("domain") + "/RESOURCES/MOBY-S/Predicates#has"); - public static final Property hasa = _model.getProperty("http://" + properties.getProperty("domain") + "/RESOURCES/MOBY-S/Predicates#hasa"); - public static final Property articleName = _model.getProperty("http://" + properties.getProperty("domain") + "/RESOURCES/MOBY-S/Predicates#articleName"); - public static final Property article_name = _model.getProperty("http://" + properties.getProperty("domain") + "/RESOURCES/MOBY-S/Predicates#article_name"); - public static final Property namespace_type = _model.getProperty("http://" + properties.getProperty("domain") + "/RESOURCES/MOBY-S/Predicates#namespace_type"); - public static final Property object_type = _model.getProperty("http://" + properties.getProperty("domain") + "/RESOURCES/MOBY-S/Predicates#object_type"); - public static final Property input = _model.getProperty("http://" + properties.getProperty("domain") + "/RESOURCES/MOBY-S/Predicates#input"); - public static final Property output = _model.getProperty("http://" + properties.getProperty("domain") + "/RESOURCES/MOBY-S/Predicates#output"); - public static final Property consumes = _model.getProperty("http://" + properties.getProperty("domain") + "/RESOURCES/MOBY-S/Predicates#consumes"); - public static final Property produces = _model.getProperty("http://" + properties.getProperty("domain") + "/RESOURCES/MOBY-S/Predicates#produces"); - public static final Property performs_task = _model.getProperty("http://" + properties.getProperty("domain") + "/RESOURCES/MOBY-S/Predicates#performs_task"); - public static final Property comment = _model.getProperty("http://" + properties.getProperty("domain") + "/RESOURCES/MOBY-S/Predicates#comment"); - public static final Property label = _model.getProperty("http://" + properties.getProperty("domain") + "/RESOURCES/MOBY-S/Predicates#label"); - public static final Property default_value = _model.getProperty("http://" + properties.getProperty("domain") + "/RESOURCES/MOBY-S/Predicates#default_value"); - public static final Property datatype = _model.getProperty("http://" + properties.getProperty("domain") + "/RESOURCES/MOBY-S/Predicates#datatype"); - public static final Property max = _model.getProperty("http://" + properties.getProperty("domain") + "/RESOURCES/MOBY-S/Predicates#max"); - public static final Property min = _model.getProperty("http://" + properties.getProperty("domain") + "/RESOURCES/MOBY-S/Predicates#min"); - public static final Property enumeration = _model.getProperty("http://" + properties.getProperty("domain") + "/RESOURCES/MOBY-S/Predicates#enum"); - public static final Property SimpleArticle = _model.getProperty("http://" + properties.getProperty("domain") + "/RESOURCES/MOBY-S/Predicates#SimpleArticle"); - public static final Property CollectionArticle = _model.getProperty("http://" + properties.getProperty("domain") + "/RESOURCES/MOBY-S/Predicates#CollectionArticle"); - public static final Property SecondaryArticle = _model.getProperty("http://" + properties.getProperty("domain") + "/RESOURCES/MOBY-S/Predicates#SecondaryArticle"); - public static final Property SignatureURL = _model.getProperty("http://" + properties.getProperty("domain") + "/RESOURCES/MOBY-S/Predicates#SignatureURL"); - public static final Property authoritative = _model.getProperty("http://" + properties.getProperty("domain") + "/RESOURCES/MOBY-S/Predicates#authoritative"); + public static final Property category = _model.getProperty("http://" + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/Predicates#category"); + public static final Property isa = _model.getProperty("http://" + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/Predicates#isa"); + public static final Property has = _model.getProperty("http://" + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/Predicates#has"); + public static final Property hasa = _model.getProperty("http://" + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/Predicates#hasa"); + public static final Property articleName = _model.getProperty("http://" + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/Predicates#articleName"); + public static final Property article_name = _model.getProperty("http://" + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/Predicates#article_name"); + public static final Property namespace_type = _model.getProperty("http://" + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/Predicates#namespace_type"); + public static final Property object_type = _model.getProperty("http://" + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/Predicates#object_type"); + public static final Property input = _model.getProperty("http://" + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/Predicates#input"); + public static final Property output = _model.getProperty("http://" + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/Predicates#output"); + public static final Property consumes = _model.getProperty("http://" + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/Predicates#consumes"); + public static final Property produces = _model.getProperty("http://" + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/Predicates#produces"); + public static final Property performs_task = _model.getProperty("http://" + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/Predicates#performs_task"); + public static final Property comment = _model.getProperty("http://" + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/Predicates#comment"); + public static final Property label = _model.getProperty("http://" + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/Predicates#label"); + public static final Property default_value = _model.getProperty("http://" + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/Predicates#default_value"); + public static final Property datatype = _model.getProperty("http://" + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/Predicates#datatype"); + public static final Property max = _model.getProperty("http://" + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/Predicates#max"); + public static final Property min = _model.getProperty("http://" + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/Predicates#min"); + public static final Property enumeration = _model.getProperty("http://" + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/Predicates#enum"); + public static final Property SimpleArticle = _model.getProperty("http://" + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/Predicates#SimpleArticle"); + public static final Property CollectionArticle = _model.getProperty("http://" + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/Predicates#CollectionArticle"); + public static final Property SecondaryArticle = _model.getProperty("http://" + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/Predicates#SecondaryArticle"); + public static final Property SignatureURL = _model.getProperty("http://" + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/Predicates#SignatureURL"); + public static final Property authoritative = _model.getProperty("http://" + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/Predicates#authoritative"); public final static String getURI() { return uri; } =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/rdf/vocabulary/MobyResources.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/rdf/vocabulary/MobyResources.java 2005/04/07 16:42:29 1.1 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/rdf/vocabulary/MobyResources.java 2005/05/31 18:11:08 1.2 @@ -21,13 +21,13 @@ */ public class MobyResources { private final static Properties properties = MobyProperties.PROPERTIES(); - private static final String uri = "http://" + properties.getProperty("domain") + "/RESOURCES/MOBY-S/MOBYResources#"; + private static final String uri = "http://" + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/MOBYResources#"; private static Model _model = ModelFactory.createDefaultModel(); - public static final Property SimpleArticle = _model.getProperty("http://" + properties.getProperty("domain") + "/RESOURCES/MOBY-S/MOBYResources#Simple"); - public static final Property CollectionArticle = _model.getProperty("http://" + properties.getProperty("domain") + "/RESOURCES/MOBY-S/MOBYResources#articleName"); - public static final Property SecondaryArticle = _model.getProperty("http://" + properties.getProperty("domain") + "/RESOURCES/MOBY-S/MOBYResources#Secondary"); - public static final Property Collection = _model.getProperty("http://" + properties.getProperty("domain") + "/RESOURCES/MOBY-S/MOBYResources#Collection"); + public static final Property SimpleArticle = _model.getProperty("http://" + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/MOBYResources#Simple"); + public static final Property CollectionArticle = _model.getProperty("http://" + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/MOBYResources#articleName"); + public static final Property SecondaryArticle = _model.getProperty("http://" + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/MOBYResources#Secondary"); + public static final Property Collection = _model.getProperty("http://" + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/MOBYResources#Collection"); public final static String getURI() { return uri; } From kawas at pub.open-bio.org Tue May 31 14:13:13 2005 From: kawas at pub.open-bio.org (Eddie Kawas) Date: Tue May 31 13:49:36 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200505311813.j4VIDDWr006414@pub.open-bio.org> kawas Tue May 31 14:13:13 EDT 2005 Update of /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/ui/graphical/servlet/lsid/authority In directory pub.open-bio.org:/tmp/cvs-serv6385/org/biomoby/client/ui/graphical/servlet/lsid/authority Modified Files: MobyAuthority.java LSIDDataLookup.java Log Message: Updated property file usage and improved some logic to (Hopefully) make code more portable. Eddie moby-live/Java/src/main/org/biomoby/client/ui/graphical/servlet/lsid/authority MobyAuthority.java,1.1,1.2 LSIDDataLookup.java,1.1,1.2 =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/ui/graphical/servlet/lsid/authority/MobyAuthority.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/ui/graphical/servlet/lsid/authority/MobyAuthority.java 2005/04/07 16:42:26 1.1 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/ui/graphical/servlet/lsid/authority/MobyAuthority.java 2005/05/31 18:13:13 1.2 @@ -1,6 +1,9 @@ - package org.biomoby.client.ui.graphical.servlet.lsid.authority; +import java.util.Properties; + +import org.biomoby.registry.properties.MobyProperties; + import com.ibm.lsid.ExpiringResponse; import com.ibm.lsid.LSID; import com.ibm.lsid.LSIDException; @@ -20,19 +23,14 @@ */ /** - * @author Eddie Kawas - *

    - * Created for - *

    - * This class was created to ... - *

    - * For questions, comments, or bugs - *

    - * email me at edward.kawas@gmail.com + * @author Eddie Kawas

    Created for

    This class was created to ...

    For + * questions, comments, or bugs

    email me at edward.kawas@gmail.com */ public class MobyAuthority extends SimpleAuthority { private LSIDDataLookup lookup = null; + private Properties properties = MobyProperties.PROPERTIES(); + public LSIDMetadataPort[] getMetadataLocations(LSID lsid, String url) { if (lookup == null) @@ -48,7 +46,13 @@ if (lsType == LSIDDataLookup.UNKNOWN) return null; - return new LSIDMetadataPort[] { new SOAPLocation("BioMOBYSOAPPort","http://mobycentral.cbr.nrc.ca:8090/authority/metadata"), new HTTPLocation("BioMOBYHTTPPort","mobycentral.cbr.nrc.ca",8090, "/authority/metadata" ) }; + return new LSIDMetadataPort[] { + new SOAPLocation("BioMOBYSOAPPort", "http://" + + properties.getProperty("lsid_domain") + ":" + + properties.getProperty("lsid_port") + + "/authority/metadata"), + new HTTPLocation("BioMOBYHTTPPort", properties.getProperty("lsid_domain"), + Integer.parseInt(properties.getProperty("lsid_port")), "/authority/metadata") }; } public LSIDDataPort[] getDataLocations(LSID lsid, String url) { @@ -56,24 +60,29 @@ } /* - * (non-Javadoc) + * (non-Javadoc) + * * @see com.ibm.lsid.server.LSIDAuthorityService#getAvailableServices(com.ibm.lsid.server.LSIDRequestContext) */ - public ExpiringResponse getAvailableServices(LSIDRequestContext ctx) throws LSIDServerException { + public ExpiringResponse getAvailableServices(LSIDRequestContext ctx) + throws LSIDServerException { LSID lsid = ctx.getLsid(); - String url = ctx.getReqUrl(); - try { - LSIDWSDLWrapper wsdl = new LSIDWSDLWrapper(lsid); - LSIDMetadataPort[] metaLocs = getMetadataLocations(lsid,url); - if (metaLocs != null) - for (int i = 0; i < metaLocs.length; ++i) { - wsdl.setMetadataLocation(metaLocs[i]); - } - return new ExpiringResponse(wsdl.toString(),getExpiration()); - } catch (LSIDException e) { - throw new LSIDServerException(e, e.getErrorCode(), "Simple Authority Error in getAvailableOperations(" + lsid + "): "); - } + String url = ctx.getReqUrl(); + try { + LSIDWSDLWrapper wsdl = new LSIDWSDLWrapper(lsid); + LSIDMetadataPort[] metaLocs = getMetadataLocations(lsid, url); + if (metaLocs != null) + for (int i = 0; i < metaLocs.length; ++i) { + wsdl.setMetadataLocation(metaLocs[i]); + } + return new ExpiringResponse(wsdl.toString(), getExpiration()); + } catch (LSIDException e) { + throw new LSIDServerException(e, e.getErrorCode(), + "Simple Authority Error in getAvailableOperations(" + lsid + + "): "); + } } + /* * (non-Javadoc) * @@ -83,4 +92,4 @@ throws LSIDServerException { lookup = new LSIDDataLookup(); } -} \ No newline at end of file +} =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/ui/graphical/servlet/lsid/authority/LSIDDataLookup.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/ui/graphical/servlet/lsid/authority/LSIDDataLookup.java 2005/04/07 16:42:26 1.1 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/ui/graphical/servlet/lsid/authority/LSIDDataLookup.java 2005/05/31 18:13:13 1.2 @@ -18,9 +18,11 @@ package org.biomoby.client.ui.graphical.servlet.lsid.authority; import java.io.IOException; import java.util.HashMap; +import java.util.Properties; import org.biomoby.client.rdf.builder.RDFConfigure; import org.biomoby.client.rdf.builder.ServiceInstanceRDF; +import org.biomoby.registry.properties.MobyProperties; import com.ibm.lsid.LSID; import com.ibm.lsid.server.LSIDServerException; @@ -43,6 +45,12 @@ public static final int MOBY_PREDICATE = 6; + private Properties mobycentral = MobyProperties.SERVICE_INSTANCE_PROPERTIES(); + private Properties mobyobject = MobyProperties.OBJECT_PROPERTIES(); + private Properties mobyservice = MobyProperties.SERVICE_PROPERTIES(); + private Properties mobynamespace = MobyProperties.NAMESPACE_PROPERTIES(); + private Properties mobyrelationship = MobyProperties.RELATIONSHIP_PROPERTIES(); + /** * 0 - object * 1 - namespace @@ -64,15 +72,15 @@ int result = UNKNOWN; System.err.println(lsid.toString()); String authority = lsid.getAuthority().getAuthority(); - if (!authority.equals("biomoby.org")) { - throw new LSIDServerException("Error in lsidType - Unknown LSID: " + lsid.getLsid()); - } if (ver != null || (ver != null && ver.length() != 0)) return UNKNOWN; - if (ns.equalsIgnoreCase("namespacetype")) { + if (ns.equalsIgnoreCase(mobynamespace.getProperty("lsid_namespace"))) { if (lsidLookup[1] == null) { + if (!authority.equals(mobynamespace.getProperty("lsid_authority"))) { + throw new LSIDServerException("Error in lsidType - Unknown LSID: " + lsid.getLsid()); + } try { lsidLookup[1] = new RDFConfigure(RDFConfigure.URI_NAMESPACE); } catch (IOException e) { @@ -82,8 +90,11 @@ if (lsidLookup[1].objectExists(lsid.getObject())) result = NAMESPACE_TYPE; } - else if (ns.equalsIgnoreCase("objectclass")) { + else if (ns.equalsIgnoreCase(mobyobject.getProperty("lsid_namespace"))) { if (lsidLookup[0] == null) { + if (!authority.equals(mobyobject.getProperty("lsid_authority"))) { + throw new LSIDServerException("Error in lsidType - Unknown LSID: " + lsid.getLsid()); + } try { lsidLookup[0] = new RDFConfigure(RDFConfigure.URI_OBJECT); } catch (IOException e) { @@ -93,8 +104,11 @@ if (lsidLookup[0].objectExists(lsid.getObject())) result = OBJECT_CLASS; } - else if (ns.equalsIgnoreCase("servicetype")) { + else if (ns.equalsIgnoreCase(mobyservice.getProperty("lsid_namespace"))) { if (lsidLookup[2] == null) { + if (!authority.equals(mobyservice.getProperty("lsid_authority"))) { + throw new LSIDServerException("Error in lsidType - Unknown LSID: " + lsid.getLsid()); + } try { lsidLookup[2] = new RDFConfigure(RDFConfigure.URI_SERVICE); } catch (IOException e) { @@ -117,11 +131,14 @@ return UNKNOWN; } - else if (ns.equalsIgnoreCase("serviceinstance")) { + else if (ns.equalsIgnoreCase(mobycentral.getProperty("lsid_namespace"))) { String str = lsid.getObject(); // make sure that the service instance is in the form // domain,serviceInstanceName if (lsidLookup[3] == null) { + if (!authority.equals(mobycentral.getProperty("lsid_authority"))) { + throw new LSIDServerException("Error in lsidType - Unknown LSID: " + lsid.getLsid()); + } try { lsidLookup[3] = new RDFConfigure(RDFConfigure.URI_ServiceINSTANCE); } catch (IOException e) { From kawas at pub.open-bio.org Tue May 31 14:15:14 2005 From: kawas at pub.open-bio.org (Eddie Kawas) Date: Tue May 31 13:51:37 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200505311815.j4VIFEXG006469@pub.open-bio.org> kawas Tue May 31 14:15:14 EDT 2005 Update of /home/repository/moby/moby-live/Java/src/main/org/biomoby/registry/properties In directory pub.open-bio.org:/tmp/cvs-serv6440/org/biomoby/registry/properties Modified Files: MobyProperties.java MobyCentralConfig.java Log Message: Made the properties more consistent with how Mark uses mobycentral.config in Perl. Eddie moby-live/Java/src/main/org/biomoby/registry/properties MobyProperties.java,1.1,1.2 MobyCentralConfig.java,1.2,1.3 =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/registry/properties/MobyProperties.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/registry/properties/MobyProperties.java 2005/04/07 16:42:26 1.1 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/registry/properties/MobyProperties.java 2005/05/31 18:15:14 1.2 @@ -31,8 +31,12 @@ package org.biomoby.registry.properties; import java.io.IOException; +import java.util.HashMap; +import java.util.Map; import java.util.Properties; +import org.biomoby.shared.MobyException; + /** * @author Eddie Kawas *

    This class was created to provide classes that depend on external variables a way to retrieve these variables. @@ -51,10 +55,110 @@ */ public final static Properties PROPERTIES() { try { - properties.load(MobyProperties.class.getClassLoader().getResourceAsStream("org/biomoby/client/properties/biomoby.properties")); + properties.load(MobyProperties.class.getClassLoader().getResourceAsStream("org/biomoby/registry/properties/biomoby.properties")); } catch (IOException e) { System.err.println("Biomoby properties file cannot be found!"); } return properties; } + + /** + * + * Retrieve the properties for [mobyobject] in mobycentral.conf + *

    PRE:The file org/biomoby/registry/properties/biomoby.properties exists and is valid. + *

    POST:The properties contained in mobycentral.conf for [mobyobject] are returned in a Properties object. + * @return Properties contained in the mobycentral.conf file. + */ + public final static Properties OBJECT_PROPERTIES() { + Map map = new HashMap(); + try { + map = MobyCentralConfig.getMobyObject(); + } catch (MobyException e) { + System.err.println("Error retrieving Moby Object Properties.\n" + e); + } + Properties p = new Properties(); + p.putAll(map); + return p; + } + + /** + * + * Retrieve the properties for [mobycentral] in mobycentral.conf + *

    PRE:The file org/biomoby/registry/properties/biomoby.properties exists and is valid. + *

    POST:The properties contained in mobycentral.conf for [mobycentral] are returned in a Properties object. + * @return Properties contained in the mobycentral.conf file. + */ + public final static Properties SERVICE_INSTANCE_PROPERTIES() { + Map map = new HashMap(); + try { + map = MobyCentralConfig.getMobyCentral(); + } catch (MobyException e) { + System.err.println("Error retrieving Moby Service Instance Properties.\n" + e); + } + Properties p = new Properties(); + p.putAll(map); + return p; + } + + /** + * + * Retrieve the properties for [mobyservice] in mobycentral.conf + *

    PRE:The file org/biomoby/registry/properties/biomoby.properties exists and is valid. + *

    POST:The properties contained in mobycentral.conf for [mobyservice] are returned in a Properties object. + * @return Properties contained in the mobycentral.conf file. + */ + public final static Properties SERVICE_PROPERTIES() { + Map map = new HashMap(); + try { + map = MobyCentralConfig.getMobyService(); + } catch (MobyException e) { + System.err.println("Error retrieving Moby Service Properties.\n" + e); + } + Properties p = new Properties(); + p.putAll(map); + return p; + } + + /** + * + * Retrieve the properties for [mobynamespace] in mobycentral.conf + *

    PRE:The file org/biomoby/registry/properties/biomoby.properties exists and is valid. + *

    POST:The properties contained in mobycentral.conf for [mobynamespace] are returned in a Properties object. + * @return Properties contained in the mobycentral.conf file. + */ + public final static Properties NAMESPACE_PROPERTIES() { + Map map = new HashMap(); + try { + map = MobyCentralConfig.getMobyNamespace(); + } catch (MobyException e) { + System.err.println("Error retrieving Moby Namespace Properties.\n" + e); + } + Properties p = new Properties(); + p.putAll(map); + return p; + } + + /** + * + * Retrieve the properties for [mobyrelationship] in mobycentral.conf + *

    PRE:The file org/biomoby/registry/properties/biomoby.properties exists and is valid. + *

    POST:The properties contained in mobycentral.conf for [mobyrelationship] are returned in a Properties object. + * @return Properties contained in the mobycentral.conf file. + */ + public final static Properties RELATIONSHIP_PROPERTIES() { + Map map = new HashMap(); + try { + map = MobyCentralConfig.getMobyRelationship(); + } catch (MobyException e) { + System.err.println("Error retrieving Moby Relationship Properties.\n" + e); + } + Properties p = new Properties(); + p.putAll(map); + return p; + } + + /* a little test method*/ + public static void main(String[] args) { + System.out.println(NAMESPACE_PROPERTIES()); + } } =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/registry/properties/MobyCentralConfig.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/registry/properties/MobyCentralConfig.java 2005/04/20 21:42:10 1.2 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/registry/properties/MobyCentralConfig.java 2005/05/31 18:15:14 1.3 @@ -127,7 +127,6 @@ String key = parse(line, 1); String value = parse(line, 2); map.put(key, value); - System.out.println(key+"->"+value); } } } From gss at pub.open-bio.org Thu May 5 13:30:47 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Thu, 5 May 2005 13:30:47 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505051730.j45HUlqC017398@pub.open-bio.org> gss Thu May 5 13:30:47 EDT 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies In directory pub.open-bio.org:/tmp/cvs-serv17312/WebRoot/examples/proxies Modified Files: wormbase-query tair-seqviewer flybase-genequery ncbi-megablast.n3 gramene-query.n3 sgd-quicksearch.n3 tair-seqviewer.n3 tair-mapviewer tair-mapviewer.n3 pubmed ncbi-megablast sgd-quicksearch pubmed.n3 gramene-query wormbase-query.n3 flybase-genequery.n3 Log Message: Some new proxy providers moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies wormbase-query,1.1,1.2 tair-seqviewer,1.1,1.2 flybase-genequery,1.1,1.2 ncbi-megablast.n3,1.1,1.2 gramene-query.n3,1.1,1.2 sgd-quicksearch.n3,1.1,1.2 tair-seqviewer.n3,1.1,1.2 tair-mapviewer,1.1,1.2 tair-mapviewer.n3,1.1,1.2 pubmed,1.1,1.2 ncbi-megablast,1.1,1.2 sgd-quicksearch,1.1,1.2 pubmed.n3,1.1,1.2 gramene-query,1.1,1.2 wormbase-query.n3,1.1,1.2 flybase-genequery.n3,1.2,1.3 =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/wormbase-query,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/wormbase-query 2005/03/23 19:56:12 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/wormbase-query 2005/05/05 17:30:46 1.2 @@ -7,22 +7,23 @@ xmlns:owl="http://www.w3.org/2002/07/owl#" xmlns:moby="http://www.semanticmoby.org/ontologies/core/" > - - - - - + + + C. elegans database query at wormbase.org http://www.wormbase.org/ - + WormBase Query - - + + + + + - \ No newline at end of file + =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/tair-seqviewer,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/tair-seqviewer 2005/03/23 19:56:12 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/tair-seqviewer 2005/05/05 17:30:46 1.2 @@ -9,20 +9,21 @@ - - - - TAIR Sequence Viewer Arabidopsis Sequence Viewera service provided by TAIR + http://www.arabidopsis.org/servlets/sv + + + + - + - \ No newline at end of file + =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/flybase-genequery,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/flybase-genequery 2005/04/18 22:58:16 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/flybase-genequery 2005/05/05 17:30:46 1.2 @@ -7,22 +7,23 @@ xmlns:owl="http://www.w3.org/2002/07/owl#" xmlns:moby="http://www.semanticmoby.org/ontologies/core/" > - - FlyBase gene query form at flybase.bio.indiana.edu - http://flybase.bio.indiana.edu/genes/fbgquery.hform + + FlyBase Gene Query + http://flybase.bio.indiana.edu/genes/fbgquery.hform + FlyBase gene query form at flybase.bio.indiana.edu + + + - + - - - - - + + - \ No newline at end of file + =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/ncbi-megablast.n3,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/ncbi-megablast.n3 2005/03/21 21:42:02 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/ncbi-megablast.n3 2005/05/05 17:30:46 1.2 @@ -7,7 +7,7 @@ @prefix xsd: . ex:ncbi-megablast - a moby:Provider, exterms:ProxyProvider ; + a moby:Provider, exterms:ProxyProvider, exterms:BlastProvider ; moby:name "NCBI Mega BLAST" ; moby:oneLineDescription "NCBI MegaBlast service provided by NCBI" ; moby:inputURI "http://www.ncbi.nlm.nih.gov/BLAST/Blast.cgi?CMD=Web&LAYOUT=TwoWindows&AUTO_FORMAT=Semiauto&ALIGNMENTS=50&ALIGNMENT_VIEW=Tabular&CLIENT=web&DATABASE=nr&DESCRIPTIONS=100&ENTREZ_QUERY=%28none%29&EXPECT=10&FILTER=L&FORMAT_OBJECT=Alignment&FORMAT_TYPE=HTML&NCBI_GI=on&PAGE=MegaBlast&SERVICE=plain&SET_DEFAULTS.x=34&SET_DEFAULTS.y=8&SHOW_OVERVIEW=on&END_OF_HTTPGET=Yes&SHOW_LINKOUT=yes&GET_SEQUENCE=yes&PERC_IDENT=None,1,-2" ; =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/gramene-query.n3,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/gramene-query.n3 2005/03/23 19:56:12 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/gramene-query.n3 2005/05/05 17:30:46 1.2 @@ -7,7 +7,7 @@ @prefix xsd: . ex:gramene-query - a moby:Provider, exterms:ProxyProvider ; + a moby:Provider, exterms:ProxyProvider, exterms:CerealGrainSearchProvider ; moby:name "Gramene Query" ; moby:oneLineDescription "Cereal grains database query at gramene.org" ; moby:inputURI "http://www.gramene.org/" ; =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/sgd-quicksearch.n3,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/sgd-quicksearch.n3 2005/03/23 19:56:12 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/sgd-quicksearch.n3 2005/05/05 17:30:46 1.2 @@ -7,7 +7,7 @@ @prefix xsd: . ex:sgd-quicksearch - a moby:Provider, exterms:ProxyProvider ; + a moby:Provider, exterms:ProxyProvider, exterms:SacchromycesSearchProvider ; moby:name "SGD Quick Search" ; moby:oneLineDescription "Saccharomyces cerevisiae quick search" ; moby:inputURI "http://db.yeastgenome.org/cgi-bin/search/quickSearch" ; =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/tair-seqviewer.n3,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/tair-seqviewer.n3 2005/03/23 19:56:12 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/tair-seqviewer.n3 2005/05/05 17:30:46 1.2 @@ -7,7 +7,7 @@ @prefix xsd: . ex:tair-seqviewer - a moby:Provider, exterms:ProxyProvider ; + a moby:Provider, exterms:ProxyProvider, exterms:ArabidopsisSearchProvider ; moby:name "TAIR Sequence Viewer" ; moby:oneLineDescription "Arabidopsis Sequence Viewera service provided by TAIR" ; moby:inputURI "http://www.arabidopsis.org/servlets/sv" ; =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/tair-mapviewer,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/tair-mapviewer 2005/03/23 19:56:12 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/tair-mapviewer 2005/05/05 17:30:46 1.2 @@ -10,19 +10,20 @@ http://www.arabidopsis.org/servlets/mapper TAIR Map Viewer - Arabidopsis Map Viewer service provided by TAIR + + - - - - \ No newline at end of file + + + + =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/tair-mapviewer.n3,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/tair-mapviewer.n3 2005/03/23 19:56:12 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/tair-mapviewer.n3 2005/05/05 17:30:46 1.2 @@ -7,7 +7,7 @@ @prefix xsd: . ex:tair-mapviewer - a moby:Provider, exterms:ProxyProvider ; + a moby:Provider, exterms:ProxyProvider, exterms:ArabidopsisSearchProvider ; moby:name "TAIR Map Viewer" ; moby:oneLineDescription "Arabidopsis Map Viewer service provided by TAIR" ; moby:inputURI "http://www.arabidopsis.org/servlets/mapper" ; =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/pubmed,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/pubmed 2005/03/21 21:42:02 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/pubmed 2005/05/05 17:30:46 1.2 @@ -7,22 +7,23 @@ xmlns:owl="http://www.w3.org/2002/07/owl#" xmlns:moby="http://www.semanticmoby.org/ontologies/core/" > - - - + - + + + + - PubMed http://www.ncbi.nlm.nih.gov/entrez/query.fcgi? - Entrez PubMed service provided by NCBI + PubMed + - - + + - \ No newline at end of file + =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/ncbi-megablast,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/ncbi-megablast 2005/03/21 21:42:02 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/ncbi-megablast 2005/05/05 17:30:46 1.2 @@ -7,8 +7,8 @@ xmlns:owl="http://www.w3.org/2002/07/owl#" xmlns:moby="http://www.semanticmoby.org/ontologies/core/" > - + @@ -19,9 +19,10 @@ NCBI Mega BLAST - + http://www.ncbi.nlm.nih.gov/BLAST/Blast.cgi?CMD=Web&LAYOUT=TwoWindows&AUTO_FORMAT=Semiauto&ALIGNMENTS=50&ALIGNMENT_VIEW=Tabular&CLIENT=web&DATABASE=nr&DESCRIPTIONS=100&ENTREZ_QUERY=%28none%29&EXPECT=10&FILTER=L&FORMAT_OBJECT=Alignment&FORMAT_TYPE=HTML&NCBI_GI=on&PAGE=MegaBlast&SERVICE=plain&SET_DEFAULTS.x=34&SET_DEFAULTS.y=8&SHOW_OVERVIEW=on&END_OF_HTTPGET=Yes&SHOW_LINKOUT=yes&GET_SEQUENCE=yes&PERC_IDENT=None,1,-2 + NCBI MegaBlast service provided by NCBI =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/sgd-quicksearch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/sgd-quicksearch 2005/03/23 19:56:12 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/sgd-quicksearch 2005/05/05 17:30:46 1.2 @@ -7,22 +7,23 @@ xmlns:owl="http://www.w3.org/2002/07/owl#" xmlns:moby="http://www.semanticmoby.org/ontologies/core/" > - - - - + - - - - SGD Quick Search - + http://db.yeastgenome.org/cgi-bin/search/quickSearch Saccharomyces cerevisiae quick search + + + + + + + + - \ No newline at end of file + =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/pubmed.n3,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/pubmed.n3 2005/03/21 21:42:02 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/pubmed.n3 2005/05/05 17:30:46 1.2 @@ -7,7 +7,7 @@ @prefix xsd: . ex:pubmed - a moby:Provider, exterms:ProxyProvider ; + a moby:Provider, exterms:ProxyProvider, exterms:PubSearchProvider ; moby:name "PubMed" ; moby:oneLineDescription "Entrez PubMed service provided by NCBI" ; moby:inputURI "http://www.ncbi.nlm.nih.gov/entrez/query.fcgi?" ; =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/gramene-query,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/gramene-query 2005/03/23 19:56:12 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/gramene-query 2005/05/05 17:30:46 1.2 @@ -13,16 +13,17 @@ - - - - Gramene Query - http://www.gramene.org/ + + Cereal grains database query at gramene.org + + + + \ No newline at end of file =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/wormbase-query.n3,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/wormbase-query.n3 2005/03/23 19:56:12 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/wormbase-query.n3 2005/05/05 17:30:46 1.2 @@ -7,7 +7,7 @@ @prefix xsd: . ex:wormbase-query - a moby:Provider, exterms:ProxyProvider ; + a moby:Provider, exterms:ProxyProvider, exterms:ElegansSearchProvider ; moby:name "WormBase Query" ; moby:oneLineDescription "C. elegans database query at wormbase.org" ; moby:inputURI "http://www.wormbase.org/" ; =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/flybase-genequery.n3,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/flybase-genequery.n3 2005/04/18 22:58:17 1.2 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/flybase-genequery.n3 2005/05/05 17:30:46 1.3 @@ -7,7 +7,7 @@ @prefix xsd: . ex:flybase-genequery - a moby:Provider, exterms:ProxyProvider ; + a moby:Provider, exterms:ProxyProvider, exterms:DrosophilaSearchProvider ; moby:name "FlyBase Gene Query" ; moby:oneLineDescription "FlyBase gene query form at flybase.bio.indiana.edu" ; moby:inputURI "http://flybase.bio.indiana.edu/genes/fbgquery.hform" ; From gss at pub.open-bio.org Thu May 5 13:32:37 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Thu, 5 May 2005 13:32:37 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505051732.j45HWbGc017435@pub.open-bio.org> gss Thu May 5 13:32:36 EDT 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/ontologies In directory pub.open-bio.org:/tmp/cvs-serv17414/WebRoot/examples/ontologies Added Files: BlastProvider CerealGrainSearchProvider SacchromycesSearchProvider.n3 DrosophilaSearchProvider ArabidopsisSearchProvider.n3 DrosophilaSearchProvider.n3 PubSearchProvider ElegansSearchProvider.n3 PubSearchProvider.n3 ElegansSearchProvider SacchromycesSearchProvider ArabidopsisSearchProvider BlastProvider.n3 CerealGrainSearchProvider.n3 Log Message: Supporting ontology elements for proxy providers moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/ontologies BlastProvider,NONE,1.1 CerealGrainSearchProvider,NONE,1.1 SacchromycesSearchProvider.n3,NONE,1.1 DrosophilaSearchProvider,NONE,1.1 ArabidopsisSearchProvider.n3,NONE,1.1 DrosophilaSearchProvider.n3,NONE,1.1 PubSearchProvider,NONE,1.1 ElegansSearchProvider.n3,NONE,1.1 PubSearchProvider.n3,NONE,1.1 ElegansSearchProvider,NONE,1.1 SacchromycesSearchProvider,NONE,1.1 ArabidopsisSearchProvider,NONE,1.1 BlastProvider.n3,NONE,1.1 CerealGrainSearchProvider.n3,NONE,1.1 From gss at pub.open-bio.org Thu May 5 13:35:26 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Thu, 5 May 2005 13:35:26 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505051735.j45HZQGX017501@pub.open-bio.org> gss Thu May 5 13:35:26 EDT 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies In directory pub.open-bio.org:/tmp/cvs-serv17464/WebRoot/examples/proxies Modified Files: tair-seqviewer.n3 tair-seqviewer sgd-quicksearch sgd-quicksearch.n3 Log Message: Incorporated new ontology elements moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies tair-seqviewer.n3,1.2,1.3 tair-seqviewer,1.2,1.3 sgd-quicksearch,1.2,1.3 sgd-quicksearch.n3,1.2,1.3 =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/tair-seqviewer.n3,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/tair-seqviewer.n3 2005/05/05 17:30:46 1.2 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/tair-seqviewer.n3 2005/05/05 17:35:26 1.3 @@ -9,7 +9,7 @@ ex:tair-seqviewer a moby:Provider, exterms:ProxyProvider, exterms:ArabidopsisSearchProvider ; moby:name "TAIR Sequence Viewer" ; - moby:oneLineDescription "Arabidopsis Sequence Viewera service provided by TAIR" ; + moby:oneLineDescription "Arabidopsis Sequence Viewer service provided by TAIR" ; moby:inputURI "http://www.arabidopsis.org/servlets/sv" ; moby:operatesOn [ a moby:Graph ; =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/tair-seqviewer,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/tair-seqviewer 2005/05/05 17:30:46 1.2 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/tair-seqviewer 2005/05/05 17:35:26 1.3 @@ -12,7 +12,7 @@ TAIR Sequence Viewer - Arabidopsis Sequence Viewera service provided by TAIR + Arabidopsis Sequence Viewer service provided by TAIR =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/sgd-quicksearch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/sgd-quicksearch 2005/05/05 17:30:46 1.2 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/sgd-quicksearch 2005/05/05 17:35:26 1.3 @@ -9,6 +9,7 @@ + SGD Quick Search @@ -21,6 +22,7 @@ + =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/sgd-quicksearch.n3,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/sgd-quicksearch.n3 2005/05/05 17:30:46 1.2 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/sgd-quicksearch.n3 2005/05/05 17:35:26 1.3 @@ -14,9 +14,9 @@ moby:operatesOn [ a moby:Graph ; moby:hasMapping [ - a moby:Subject ; + a moby:Subject, exterms:GeneSymbol ; moby:mapsTo [ - a moby:Object + a moby:Object, exterms:GeneDetails ] ] ] . From gss at pub.open-bio.org Thu May 5 13:35:57 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Thu, 5 May 2005 13:35:57 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505051735.j45HZvUE017535@pub.open-bio.org> gss Thu May 5 13:35:57 EDT 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/ontologies In directory pub.open-bio.org:/tmp/cvs-serv17514/WebRoot/examples/ontologies Added Files: GeneSymbol GeneSymbol.n3 GeneDetails GeneDetails.n3 Log Message: Supporting ontology elements for proxy providers moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/ontologies GeneSymbol,NONE,1.1 GeneSymbol.n3,NONE,1.1 GeneDetails,NONE,1.1 GeneDetails.n3,NONE,1.1 From kawas at pub.open-bio.org Sun May 8 16:04:25 2005 From: kawas at pub.open-bio.org (Eddie Kawas) Date: Sun, 8 May 2005 16:04:25 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505082004.j48K4PJ0006981@pub.open-bio.org> kawas Sun May 8 16:04:25 EDT 2005 Update of /home/repository/moby/moby-live/Java/docs In directory pub.open-bio.org:/tmp/cvs-serv6956 Modified Files: index.html Added Files: CodingGuidelines.html jMobyDesignManual.html Log Message: added some files for ben (jMoby doc) Ed moby-live/Java/docs CodingGuidelines.html,NONE,1.1 jMobyDesignManual.html,NONE,1.1 index.html,1.6,1.7 =================================================================== RCS file: /home/repository/moby/moby-live/Java/docs/index.html,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- /home/repository/moby/moby-live/Java/docs/index.html 2004/12/05 22:28:02 1.6 +++ /home/repository/moby/moby-live/Java/docs/index.html 2005/05/08 20:04:25 1.7 @@ -48,6 +48,7 @@

    How to develop with jMoby
    +
    The twelve commandments for jMoby Developers (and some good advice)
    Available APIs (more explanation coming...)
    How to develop a client talking to a BioMoby service
    How to develop a BioMoby service (coming...) From gordonp at pub.open-bio.org Thu May 12 00:58:12 2005 From: gordonp at pub.open-bio.org (Paul Gordon) Date: Thu, 12 May 2005 00:58:12 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505120458.j4C4wCYs026015@pub.open-bio.org> gordonp Thu May 12 00:58:12 EDT 2005 Update of /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data In directory pub.open-bio.org:/tmp/cvs-serv25991/main/org/biomoby/shared/data Log Message: Directory /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data added to the repository moby-live/Java/src/main/org/biomoby/shared/data - New directory rcsdiff: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/RCS/-,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/RCS/New,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/RCS/directory,v: No such file or directory From gordonp at pub.open-bio.org Thu May 12 00:59:49 2005 From: gordonp at pub.open-bio.org (Paul Gordon) Date: Thu, 12 May 2005 00:59:49 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505120459.j4C4xndH026055@pub.open-bio.org> gordonp Thu May 12 00:59:49 EDT 2005 Update of /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data In directory pub.open-bio.org:/tmp/cvs-serv26034 Added Files: MobyDataBytes.java MobyDataComposite.java MobyDataDateTime.java MobyDataFloat.java MobyDataInstance.java MobyDataInt.java MobyDataObject.java MobyDataObjectSet.java MobyDataSecondaryInstance.java MobyDataServiceAssocInstance.java MobyDataString.java MobyDataXref.java Log Message: Moved Data instances classes to new package, and included complete experimental instance implementations moby-live/Java/src/main/org/biomoby/shared/data MobyDataBytes.java,NONE,1.1 MobyDataComposite.java,NONE,1.1 MobyDataDateTime.java,NONE,1.1 MobyDataFloat.java,NONE,1.1 MobyDataInstance.java,NONE,1.1 MobyDataInt.java,NONE,1.1 MobyDataObject.java,NONE,1.1 MobyDataObjectSet.java,NONE,1.1 MobyDataSecondaryInstance.java,NONE,1.1 MobyDataServiceAssocInstance.java,NONE,1.1 MobyDataString.java,NONE,1.1 MobyDataXref.java,NONE,1.1 From gordonp at pub.open-bio.org Thu May 12 01:02:11 2005 From: gordonp at pub.open-bio.org (Paul Gordon) Date: Thu, 12 May 2005 01:02:11 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505120502.j4C52BwT026107@pub.open-bio.org> gordonp Thu May 12 01:02:11 EDT 2005 Update of /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared In directory pub.open-bio.org:/tmp/cvs-serv26081 Removed Files: MobyDataSecondaryInstance.java MobyDataServiceAssocInstance.java MobyDataSetInstance.java MobyDataSimpleInstance.java MobyDataString.java Log Message: Removed in favor of data instance classes in org.biomoby.shared.data moby-live/Java/src/main/org/biomoby/shared MobyDataSecondaryInstance.java,1.1,NONE MobyDataServiceAssocInstance.java,1.2,NONE MobyDataSetInstance.java,1.2,NONE MobyDataSimpleInstance.java,1.9,NONE MobyDataString.java,1.5,NONE rcsdiff: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/RCS/MobyDataSecondaryInstance.java,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/RCS/MobyDataServiceAssocInstance.java,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/RCS/MobyDataSetInstance.java,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/RCS/MobyDataSimpleInstance.java,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/RCS/MobyDataString.java,v: No such file or directory From gordonp at pub.open-bio.org Thu May 12 01:03:20 2005 From: gordonp at pub.open-bio.org (Paul Gordon) Date: Thu, 12 May 2005 01:03:20 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505120503.j4C53K2L026152@pub.open-bio.org> gordonp Thu May 12 01:03:20 EDT 2005 Update of /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared In directory pub.open-bio.org:/tmp/cvs-serv26126 Removed Files: MobyDataDateTime.java MobyDataFloat.java MobyDataInstance.java MobyDataInt.java MobyDataXref.java Log Message: Removed in favor of data instance classes in org.biomoby.shared.data moby-live/Java/src/main/org/biomoby/shared MobyDataDateTime.java,1.5,NONE MobyDataFloat.java,1.6,NONE MobyDataInstance.java,1.2,NONE MobyDataInt.java,1.5,NONE MobyDataXref.java,1.1,NONE rcsdiff: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/RCS/MobyDataDateTime.java,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/RCS/MobyDataFloat.java,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/RCS/MobyDataInstance.java,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/RCS/MobyDataInt.java,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/RCS/MobyDataXref.java,v: No such file or directory From gordonp at pub.open-bio.org Thu May 12 01:12:01 2005 From: gordonp at pub.open-bio.org (Paul Gordon) Date: Thu, 12 May 2005 01:12:01 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505120512.j4C5C1bP026223@pub.open-bio.org> gordonp Thu May 12 01:12:01 EDT 2005 Update of /home/repository/moby/moby-live/Java/src/Clients In directory pub.open-bio.org:/tmp/cvs-serv26201 Removed Files: MobyServiceInvocationExample.java Log Message: Replaced by TestRequest moby-live/Java/src/Clients MobyServiceInvocationExample.java,1.1,NONE rcsdiff: /home/repository/moby/moby-live/Java/src/Clients/RCS/MobyServiceInvocationExample.java,v: No such file or directory From gordonp at pub.open-bio.org Thu May 12 01:13:37 2005 From: gordonp at pub.open-bio.org (Paul Gordon) Date: Thu, 12 May 2005 01:13:37 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505120513.j4C5DbYh026267@pub.open-bio.org> gordonp Thu May 12 01:13:37 EDT 2005 Update of /home/repository/moby/moby-live/Java/src/main/org/biomoby/client In directory pub.open-bio.org:/tmp/cvs-serv26242 Modified Files: MobyRequest.java Log Message: Updates to deal with new data instance package moby-live/Java/src/main/org/biomoby/client MobyRequest.java,1.10,1.11 =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/MobyRequest.java,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/MobyRequest.java 2005/04/18 17:29:43 1.10 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/MobyRequest.java 2005/05/12 05:13:37 1.11 @@ -23,10 +23,10 @@ import org.apache.xpath.objects.XObject; import org.biomoby.shared.Central; import org.biomoby.shared.MobyData; -import org.biomoby.shared.MobyDataInstance; -import org.biomoby.shared.MobyDataSecondaryInstance; -import org.biomoby.shared.MobyDataSetInstance; -import org.biomoby.shared.MobyDataSimpleInstance; +import org.biomoby.shared.data.MobyDataInstance; +import org.biomoby.shared.data.MobyDataSecondaryInstance; +import org.biomoby.shared.data.MobyDataObjectSet; +import org.biomoby.shared.data.MobyDataObject; import org.biomoby.shared.MobyException; import org.biomoby.shared.MobyPrefixResolver; import org.biomoby.shared.MobyService; @@ -111,18 +111,24 @@ MobyPrefixResolver.XSI1999_PREFIX+ ":type, ':'), \"base64\") or starts-with(substring-after(@"+ MobyPrefixResolver.XSI2001_PREFIX+ - ":type, ':'), \"base64\")]", null, mobyPrefixResolver, XPath.SELECT); + ":type, ':'), \"base64\")]", null, + mobyPrefixResolver, XPath.SELECT); stringEncodedXPath = new XPath("//*[substring-after(@"+ MobyPrefixResolver.XSI1999_PREFIX+ ":type, ':')=\"string\" or substring-after(@"+ MobyPrefixResolver.XSI2001_PREFIX+ - ":type, ':')=\"string\"]", null, mobyPrefixResolver, XPath.SELECT); - queryResponseXPath = new XPath("//moby:mobyData | //mobyData", null, mobyPrefixResolver, XPath.SELECT); - simpleChildXPath = new XPath("moby:Simple | Simple", null, mobyPrefixResolver, XPath.SELECT); - collectionChildXPath = new XPath("moby:Collection | Collection", null, mobyPrefixResolver, XPath.SELECT); + ":type, ':')=\"string\"]", null, + mobyPrefixResolver, XPath.SELECT); + queryResponseXPath = new XPath("//moby:mobyData | //mobyData", null, + mobyPrefixResolver, XPath.SELECT); + simpleChildXPath = new XPath("moby:Simple | Simple", null, + mobyPrefixResolver, XPath.SELECT); + collectionChildXPath = new XPath("moby:Collection | Collection", null, + mobyPrefixResolver, XPath.SELECT); } catch(TransformerException te){ - debugPS.println("Syntax error encountered while compiling XPath statements for internal use (code bug?): " + te); + debugPS.println("Syntax error encountered while compiling XPath " + + "statements for internal use (code bug?): " + te); } } @@ -194,7 +200,7 @@ } /** - * Convenience method to run services that take one argument. + * Convenience method to run services that take one unnamed argument. */ public void setInput(MobyDataInstance datum) throws IllegalArgumentException{ inputData = new MobyDataInstance[1]; @@ -586,17 +592,23 @@ data[i].setXmlMode(MobyDataInstance.SERVICE_XML_MODE); } - if(data[i] instanceof MobyDataSimpleInstance){ - mobyRequest += ((MobyDataSimpleInstance) data[i]).toXML(); + if(data[i] instanceof MobyDataObject){ + // This line should be replaced with a named field + mobyRequest += ""+ + ((MobyDataObject) data[i]).toXML()+ + ""; } - else if(data[i] instanceof MobyDataSetInstance){ - mobyRequest += ((MobyDataSetInstance) data[i]).toXML(); + else if(data[i] instanceof MobyDataObjectSet){ + mobyRequest += ((MobyDataObjectSet) data[i]).toXML(); } else{ + // Could just call toXML, but don't know if it has a Simple wrapper + // already or not, or even if it's a set. throw new MobyException("Element #" + i + " of the input data was not a " + - "MobyDataSimpleInstance or a " + - "MobyDataSetInstance (found " + data[i] + ")"); + "MobyDataObject or a " + + "MobyDataObjectSet (found " + + data[i].getClass().getName() + ")"); } // Restore the old XML mode setting if not service mode @@ -667,7 +679,7 @@ if(debug & j == 0) debugPS.println("There are " + collections.getLength() + " collections in response #" +i); - MobyDataSetInstance collection = new MobyDataSetInstance(""); + MobyDataObjectSet collection = new MobyDataObjectSet(""); // For each collection, find the simple children NodeList subsimples = null; @@ -679,13 +691,13 @@ } // And add their values to the collection - MobyDataSimpleInstance[] subout = new MobyDataSimpleInstance[subsimples.getLength()]; + MobyDataObject[] subout = new MobyDataObject[subsimples.getLength()]; for(int k = 0; k < subsimples.getLength(); k++){ if(debug && k == 0) debugPS.println("There are " + subsimples.getLength() + " simples in response #" + i + ", collection #" + j); - subout[k] = new MobyDataSimpleInstance(mobyCentral, (Element) subsimples.item(k)); + subout[k] = (MobyDataObject) MobyDataObject.createInstanceFromDOM((Element) subsimples.item(k)); } collection.setElements(subout); releaseXPath(collections.item(j)); @@ -708,7 +720,7 @@ for(int j = 0; simples != null && j < simples.getLength(); j++){ if(debug && j == 0) debugPS.println("There are " + simples.getLength() + " simples in response #" +i); - out.add(new MobyDataSimpleInstance(mobyCentral, (Element) simples.item(j))); + out.add(MobyDataObject.createInstanceFromDOM((Element) simples.item(j))); } // What we're building is a Vector, where each element represents From gordonp at pub.open-bio.org Thu May 12 01:17:59 2005 From: gordonp at pub.open-bio.org (Paul Gordon) Date: Thu, 12 May 2005 01:17:59 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505120517.j4C5HxOI026333@pub.open-bio.org> gordonp Thu May 12 01:17:58 EDT 2005 Update of /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data In directory pub.open-bio.org:/tmp/cvs-serv26312/src/main/org/biomoby/shared/data Added Files: MobyProvisionInfo.java Log Message: New class encoding the PIB moby-live/Java/src/main/org/biomoby/shared/data MobyProvisionInfo.java,NONE,1.1 From gordonp at pub.open-bio.org Thu May 12 01:19:20 2005 From: gordonp at pub.open-bio.org (Paul Gordon) Date: Thu, 12 May 2005 01:19:20 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505120519.j4C5JKmN026366@pub.open-bio.org> gordonp Thu May 12 01:19:20 EDT 2005 Update of /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/rdf/builder In directory pub.open-bio.org:/tmp/cvs-serv26341/src/main/org/biomoby/client/rdf/builder Modified Files: ServiceInstanceRDF.java Log Message: Updates to Eddie's code to deal with the new org.biomoby.shared.data instance class package moby-live/Java/src/main/org/biomoby/client/rdf/builder ServiceInstanceRDF.java,1.1,1.2 =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/rdf/builder/ServiceInstanceRDF.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/rdf/builder/ServiceInstanceRDF.java 2005/04/07 16:42:29 1.1 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/rdf/builder/ServiceInstanceRDF.java 2005/05/12 05:19:20 1.2 @@ -15,7 +15,7 @@ import org.biomoby.registry.properties.MobyProperties; import org.biomoby.shared.Central; import org.biomoby.shared.MobyData; -import org.biomoby.shared.MobyDataSecondaryInstance; +import org.biomoby.shared.data.MobyDataSecondaryInstance; import org.biomoby.shared.MobyException; import org.biomoby.shared.MobyNamespace; import org.biomoby.shared.MobyPrimaryDataSet; From gordonp at pub.open-bio.org Thu May 12 01:19:20 2005 From: gordonp at pub.open-bio.org (Paul Gordon) Date: Thu, 12 May 2005 01:19:20 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505120519.j4C5JKSM026409@pub.open-bio.org> gordonp Thu May 12 01:19:20 EDT 2005 Update of /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared In directory pub.open-bio.org:/tmp/cvs-serv26341/src/main/org/biomoby/shared Modified Files: MobyObjectDecomposition.java MobyObjectDecompositionImpl.java Log Message: Updates to Eddie's code to deal with the new org.biomoby.shared.data instance class package moby-live/Java/src/main/org/biomoby/shared MobyObjectDecomposition.java,1.3,1.4 MobyObjectDecompositionImpl.java,1.3,1.4 =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/MobyObjectDecomposition.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/MobyObjectDecomposition.java 2005/04/18 23:57:45 1.3 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/MobyObjectDecomposition.java 2005/05/12 05:19:20 1.4 @@ -21,7 +21,7 @@ * @param object - the object to flatten into its primitives. * @return - the full decomposition of an object into its primitives. */ - public MobyDataSimpleInstance[] getFlattenedPrims(String object); + public org.biomoby.shared.data.MobyDataObject[] getFlattenedPrims(String object); /** * @@ -42,4 +42,4 @@ */ public boolean isPrimitive(String object); -} \ No newline at end of file +} =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/MobyObjectDecompositionImpl.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/MobyObjectDecompositionImpl.java 2005/04/18 23:57:45 1.3 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/MobyObjectDecompositionImpl.java 2005/05/12 05:19:20 1.4 @@ -4,6 +4,8 @@ */ package org.biomoby.shared; +import org.biomoby.shared.data.*; + import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; @@ -44,10 +46,10 @@ /* (non-Javadoc) * @see org.biomoby.client.gui.util.MobyObjectDecomposition#getFlattenedPrims(java.lang.String) */ - public final MobyDataSimpleInstance[] getFlattenedPrims(String object) { + public final MobyDataObject[] getFlattenedPrims(String object) { ArrayList list = new ArrayList(); if (isPrimitive(object)) { - return new MobyDataSimpleInstance[] {}; + return new MobyDataObject[] {}; } String lsid = "urn:lsid:biomoby.org:objectclass:" + object; String rdf = getObjectRDF(lsid); @@ -81,11 +83,11 @@ : articleNode.getTextContent(); // TODO - recurse if object is not a primitive if (isPrimitive(localName)) { - MobyDataSimpleInstance mdsi = createPrimitiveType( + MobyDataObject mdsi = createPrimitiveType( localName, articleName); list.add(mdsi); } else { - MobyDataSimpleInstance[] recurseArray = getFlattenedPrims(localName); + MobyDataObject[] recurseArray = getFlattenedPrims(localName); for (int k = 0; k < recurseArray.length; k++) { list.add(recurseArray[k]); } @@ -104,11 +106,11 @@ : articleNode.getTextContent(); // TODO - recurse if object is not a primitive if (isPrimitive(localName)) { - MobyDataSimpleInstance mdsi = createPrimitiveType( + MobyDataObject mdsi = createPrimitiveType( localName, articleName); list.add(mdsi); } else { - MobyDataSimpleInstance[] recurseArray = getFlattenedPrims(localName); + MobyDataObject[] recurseArray = getFlattenedPrims(localName); for (int k = 0; k < recurseArray.length; k++) { list.add(recurseArray[k]); } @@ -126,7 +128,7 @@ _object = _object.substring(_object.indexOf("#") + 1); } if (isPrimitive(_object) && !_object.equals("Object")) { - MobyDataSimpleInstance mdsi = new MobyDataSimpleInstance( + MobyDataObject mdsi = new MobyDataObject( _object); mdsi.setDataType(new MobyDataType(_object)); list.add(mdsi); @@ -139,7 +141,7 @@ _object = _object.substring(_object.indexOf("#") + 1); } if (isPrimitive(_object) && !_object.equals("Object")) { - MobyDataSimpleInstance mdsi = new MobyDataSimpleInstance( + MobyDataObject mdsi = new MobyDataObject( _object); mdsi.setDataType(new MobyDataType(_object)); list.add(mdsi); @@ -271,7 +273,7 @@ /* * method to create default DataTypes. */ - public final MobyDataSimpleInstance createPrimitiveType(String localName, + public final MobyDataObject createPrimitiveType(String localName, String articleName) { if (localName.equalsIgnoreCase("Float")) { return new MobyDataFloat(articleName, 0.0); @@ -280,7 +282,7 @@ } else if (localName.equalsIgnoreCase("Integer")) { return new MobyDataInt(articleName, 0); } else if (localName.equalsIgnoreCase("DateTime")) { - MobyDataSimpleInstance mdsi = new MobyDataSimpleInstance( + MobyDataObject mdsi = new MobyDataObject( articleName); mdsi.setDataType(new MobyDataType(localName)); return mdsi; @@ -289,12 +291,12 @@ return null; } - private final MobyDataSimpleInstance[] convertArrayListToMoby(ArrayList list) { + private final MobyDataObject[] convertArrayListToMoby(ArrayList list) { int size = list.size(); - MobyDataSimpleInstance[] mdsi = new MobyDataSimpleInstance[size]; + MobyDataObject[] mdsi = new MobyDataObject[size]; size = 0; for (Iterator x = list.iterator(); x.hasNext(); size++) { - mdsi[size] = (MobyDataSimpleInstance) x.next(); + mdsi[size] = (MobyDataObject) x.next(); } return mdsi; } @@ -415,4 +417,4 @@ return sb.toString(); } } -} \ No newline at end of file +} From gordonp at pub.open-bio.org Thu May 12 01:19:20 2005 From: gordonp at pub.open-bio.org (Paul Gordon) Date: Thu, 12 May 2005 01:19:20 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505120519.j4C5JKXH026385@pub.open-bio.org> gordonp Thu May 12 01:19:20 EDT 2005 Update of /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/ui/graphical/servlet/jresources In directory pub.open-bio.org:/tmp/cvs-serv26341/src/main/org/biomoby/client/ui/graphical/servlet/jresources Modified Files: RESOURCE.java Log Message: Updates to Eddie's code to deal with the new org.biomoby.shared.data instance class package moby-live/Java/src/main/org/biomoby/client/ui/graphical/servlet/jresources RESOURCE.java,1.2,1.3 =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/ui/graphical/servlet/jresources/RESOURCE.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/ui/graphical/servlet/jresources/RESOURCE.java 2005/04/28 18:39:40 1.2 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/ui/graphical/servlet/jresources/RESOURCE.java 2005/05/12 05:19:20 1.3 @@ -25,7 +25,7 @@ import org.biomoby.registry.properties.MobyProperties; import org.biomoby.shared.CentralDigest; import org.biomoby.shared.MobyData; -import org.biomoby.shared.MobyDataSecondaryInstance; +import org.biomoby.shared.data.MobyDataSecondaryInstance; import org.biomoby.shared.MobyException; import org.biomoby.shared.MobyNamespace; import org.biomoby.shared.MobyPrimaryDataSet; From gordonp at pub.open-bio.org Thu May 12 01:22:27 2005 From: gordonp at pub.open-bio.org (Paul Gordon) Date: Thu, 12 May 2005 01:22:27 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505120522.j4C5MRnU026477@pub.open-bio.org> gordonp Thu May 12 01:22:27 EDT 2005 Update of /home/repository/moby/moby-live/Java/src/Clients In directory pub.open-bio.org:/tmp/cvs-serv26456/src/Clients Added Files: TestRequest.java Log Message: Sample client demonstrating the usage of data instance classes in org.biomoby.shared.data, and the use of MobyRequest for service invocation moby-live/Java/src/Clients TestRequest.java,NONE,1.1 From kawas at pub.open-bio.org Fri May 13 15:18:19 2005 From: kawas at pub.open-bio.org (Eddie Kawas) Date: Fri, 13 May 2005 15:18:19 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505131918.j4DJIJ9T002285@pub.open-bio.org> kawas Fri May 13 15:18:18 EDT 2005 Update of /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/ui/graphical/servlet/jresources In directory pub.open-bio.org:/tmp/cvs-serv2260/org/biomoby/client/ui/graphical/servlet/jresources Modified Files: RESOURCE.java Log Message: Fixed some import statements. Not sure really why I had to do this though!?! Eddie moby-live/Java/src/main/org/biomoby/client/ui/graphical/servlet/jresources RESOURCE.java,1.3,1.4 =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/ui/graphical/servlet/jresources/RESOURCE.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/ui/graphical/servlet/jresources/RESOURCE.java 2005/05/12 05:19:20 1.3 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/ui/graphical/servlet/jresources/RESOURCE.java 2005/05/13 19:18:18 1.4 @@ -17,6 +17,7 @@ import javax.servlet.http.HttpServletResponse; import org.biomoby.client.CentralDigestImpl; +import org.biomoby.client.CentralImpl; import org.biomoby.client.rdf.vocabulary.MobyResources; import org.biomoby.client.rdf.vocabulary.Predicates; import org.biomoby.registry.definitions.types.JNamespaces; @@ -25,13 +26,15 @@ import org.biomoby.registry.properties.MobyProperties; import org.biomoby.shared.CentralDigest; import org.biomoby.shared.MobyData; -import org.biomoby.shared.data.MobyDataSecondaryInstance; +import org.biomoby.shared.MobyDataType; import org.biomoby.shared.MobyException; import org.biomoby.shared.MobyNamespace; import org.biomoby.shared.MobyPrimaryDataSet; import org.biomoby.shared.MobyPrimaryDataSimple; import org.biomoby.shared.MobySecondaryData; import org.biomoby.shared.MobyService; +import org.biomoby.shared.NoSuccessException; +import org.biomoby.shared.data.MobyDataSecondaryInstance; import org.w3c.rdf.model.ModelException; import com.hp.hpl.jena.rdf.model.Bag; @@ -663,6 +666,8 @@ // create the base object type "class" Resource subject = _addClassResource(model, OBJ, "Object", "a base object class consisting of a namespace and an identifier"); + model.add(model.createStatement(subject, DC.publisher, model.createLiteral("www.illuminae.com", "en"))); + model.add(model.createStatement(subject, DC.creator, model.createLiteral("markw at illuminae.com", "en"))); model.add(model.createStatement(subject, RDF.type, RDFS.Class)); for (int x = 0; x < objects.length; x++) { String[] _line = objects[x].split("\t"); @@ -679,7 +684,17 @@ Matcher m; if (obj.indexOf("(") >= 0) obj = obj.substring(0, obj.indexOf("(")); + Resource _subject = _addClassResource(model, OBJ, sub, def); + try { + //TODO make this an sql call + MobyDataType _datatype = new CentralImpl().getDataType(sub); + model.add(model.createStatement(subject, DC.publisher, model.createLiteral(_datatype.getAuthority(), "en"))); + model.add(model.createStatement(subject, DC.creator, model.createLiteral( _datatype.getEmailContact(), "en"))); + } catch (NoSuccessException e) { + // oh well, at least we tried + System.err.println(sub + " could not be augmented with its 'creator' or its 'publisher'. Oh well, at least we tried"); + } m = Pattern.compile(".*:isa$", Pattern.CASE_INSENSITIVE).matcher( pred); if (m.matches()) { @@ -921,7 +936,7 @@ } public static void main(String[] args) throws MobyException { - System.out.println(new RESOURCE().getRESOURCES("Objects")); + System.out.println(new RESOURCE().getRESOURCES("ServiceInstances")); } } From kawas at pub.open-bio.org Fri May 13 15:20:14 2005 From: kawas at pub.open-bio.org (Eddie Kawas) Date: Fri, 13 May 2005 15:20:14 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505131920.j4DJKEjx002361@pub.open-bio.org> kawas Fri May 13 15:20:14 EDT 2005 Update of /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared In directory pub.open-bio.org:/tmp/cvs-serv2332/org/biomoby/shared Modified Files: Tag: java_1_5_compat MobyObjectDecompositionImpl.java MobyObjectDecomposition.java Log Message: Changed the import statements and references to MobyDataSimpleInstance to MobyDataObject. Seems to be the right change. Eddie moby-live/Java/src/main/org/biomoby/shared MobyObjectDecompositionImpl.java,1.1,1.1.2.1 MobyObjectDecomposition.java,1.1,1.1.2.1 =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/MobyObjectDecompositionImpl.java,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -r1.1 -r1.1.2.1 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/MobyObjectDecompositionImpl.java 2005/04/07 16:37:02 1.1 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/MobyObjectDecompositionImpl.java 2005/05/13 19:20:14 1.1.2.1 @@ -18,6 +18,7 @@ import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; +import org.biomoby.shared.data.*; import org.biomoby.client.CentralImpl; import org.biomoby.client.ui.graphical.applets.util.PrimitiveTypes; import org.w3c.dom.Document; @@ -44,10 +45,10 @@ /* (non-Javadoc) * @see org.biomoby.client.gui.util.MobyObjectDecomposition#getFlattenedPrims(java.lang.String) */ - public final MobyDataSimpleInstance[] getFlattenedPrims(String object) { + public final MobyDataObject[] getFlattenedPrims(String object) { ArrayList list = new ArrayList(); if (isPrimitive(object)) { - return new MobyDataSimpleInstance[] {}; + return new MobyDataObject[] {}; } String lsid = "urn:lsid:biomoby.org:objectclass:" + object; String rdf = getObjectRDF(lsid); @@ -81,11 +82,11 @@ : articleNode.getTextContent(); // TODO - recurse if object is not a primitive if (isPrimitive(localName)) { - MobyDataSimpleInstance mdsi = createPrimitiveType( + MobyDataObject mdsi = createPrimitiveType( localName, articleName); list.add(mdsi); } else { - MobyDataSimpleInstance[] recurseArray = getFlattenedPrims(localName); + MobyDataObject[] recurseArray = getFlattenedPrims(localName); for (int k = 0; k < recurseArray.length; k++) { list.add(recurseArray[k]); } @@ -104,11 +105,11 @@ : articleNode.getTextContent(); // TODO - recurse if object is not a primitive if (isPrimitive(localName)) { - MobyDataSimpleInstance mdsi = createPrimitiveType( + MobyDataObject mdsi = createPrimitiveType( localName, articleName); list.add(mdsi); } else { - MobyDataSimpleInstance[] recurseArray = getFlattenedPrims(localName); + MobyDataObject[] recurseArray = getFlattenedPrims(localName); for (int k = 0; k < recurseArray.length; k++) { list.add(recurseArray[k]); } @@ -126,7 +127,7 @@ _object = _object.substring(_object.indexOf("#") + 1); } if (isPrimitive(_object) && !_object.equals("Object")) { - MobyDataSimpleInstance mdsi = new MobyDataSimpleInstance( + MobyDataObject mdsi = new MobyDataObject( _object); mdsi.setDataType(new MobyDataType(_object)); list.add(mdsi); @@ -139,7 +140,7 @@ _object = _object.substring(_object.indexOf("#") + 1); } if (isPrimitive(_object) && !_object.equals("Object")) { - MobyDataSimpleInstance mdsi = new MobyDataSimpleInstance( + MobyDataObject mdsi = new MobyDataObject( _object); mdsi.setDataType(new MobyDataType(_object)); list.add(mdsi); @@ -271,7 +272,7 @@ /* * method to create default DataTypes. */ - public final MobyDataSimpleInstance createPrimitiveType(String localName, + public final MobyDataObject createPrimitiveType(String localName, String articleName) { if (localName.equalsIgnoreCase("Float")) { return new MobyDataFloat(articleName, 0.0); @@ -280,7 +281,7 @@ } else if (localName.equalsIgnoreCase("Integer")) { return new MobyDataInt(articleName, 0); } else if (localName.equalsIgnoreCase("DateTime")) { - MobyDataSimpleInstance mdsi = new MobyDataSimpleInstance( + MobyDataObject mdsi = new MobyDataObject( articleName); mdsi.setDataType(new MobyDataType(localName)); return mdsi; @@ -289,12 +290,12 @@ return null; } - private final MobyDataSimpleInstance[] convertArrayListToMoby(ArrayList list) { + private final MobyDataObject[] convertArrayListToMoby(ArrayList list) { int size = list.size(); - MobyDataSimpleInstance[] mdsi = new MobyDataSimpleInstance[size]; + MobyDataObject[] mdsi = new MobyDataObject[size]; size = 0; for (Iterator x = list.iterator(); x.hasNext(); size++) { - mdsi[size] = (MobyDataSimpleInstance) x.next(); + mdsi[size] = (MobyDataObject) x.next(); } return mdsi; } =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/MobyObjectDecomposition.java,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -r1.1 -r1.1.2.1 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/MobyObjectDecomposition.java 2005/04/07 16:37:02 1.1 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/MobyObjectDecomposition.java 2005/05/13 19:20:14 1.1.2.1 @@ -4,6 +4,8 @@ */ package org.biomoby.shared; +import org.biomoby.shared.data.MobyDataObject; + /** * @author Eddie Kawas @@ -21,7 +23,7 @@ * @param object - the object to flatten into its primitives. * @return - the full decomposition of an object into its primitives. */ - public MobyDataSimpleInstance[] getFlattenedPrims(String object); + public MobyDataObject[] getFlattenedPrims(String object); /** * From yanwong at pub.open-bio.org Mon May 16 08:42:01 2005 From: yanwong at pub.open-bio.org (Yan Wong) Date: Mon, 16 May 2005 08:42:01 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505161242.j4GCg1qW022091@pub.open-bio.org> yanwong Mon May 16 08:42:01 EDT 2005 Update of /home/repository/moby/moby-live/Python/bioMoby In directory pub.open-bio.org:/tmp/cvs-serv22018 Modified Files: mobyDataTypes.py Log Message: Modified the serialization/deserialization code: from bioMoby import MobyMarshaller m=MobyMarshaller() m.dumps(0) should return 0 and not same for the float numbers ;) this should fix problems of deserializing numbers. moby-live/Python/bioMoby mobyDataTypes.py,1.20,1.21 =================================================================== RCS file: /home/repository/moby/moby-live/Python/bioMoby/mobyDataTypes.py,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- /home/repository/moby/moby-live/Python/bioMoby/mobyDataTypes.py 2005/04/26 15:09:59 1.20 +++ /home/repository/moby/moby-live/Python/bioMoby/mobyDataTypes.py 2005/05/16 12:42:01 1.21 @@ -107,7 +107,7 @@ mobyObjects=filter(filterFunc, dir(self)) #If none, return the tag closed - if len(mobyObjects)==0 and (not hasattr(self, "__cross__") or len(self.__cross__)==0) and (not hasattr(self, "__PIB__") or len(self.__PIB__)==0) and (not hasattr(self, "content") or not self.content): + if len(mobyObjects)==0 and (not hasattr(self, "__cross__") or len(self.__cross__)==0) and (not hasattr(self, "__PIB__") or len(self.__PIB__)==0) and (not hasattr(self, "content") or (self.content==None or self.content=="")): beginTag.append("/>") return " ".join(beginTag) @@ -149,8 +149,7 @@ #Put the raw content of the object #If you want to put your special object, then then you should write #a __str__ method - if hasattr(self, "content") and self.content: - result.append("%s"%(self.content)) + result.append("%s"%(self.content)) result.append(""%(self.__prefix__, self.__tag__)) @@ -269,7 +268,11 @@ def fromMoby(self, xml): MobyObject.fromMoby(self, xml) - self.content = int(self.content) + + try: + self.content = int(self.content) + except: + self.content=0 class MobyFloat(MobyObject): """Serialize/deserialize floating point numbers @@ -279,7 +282,11 @@ def fromMoby(self, xml): MobyObject.fromMoby(self, xml) - self.content=float(self.content) + + try: + self.content=float(self.content) + except: + self.content=0.0 class MobyString(MobyObject): From yanwong at pub.open-bio.org Wed May 18 04:26:33 2005 From: yanwong at pub.open-bio.org (Yan Wong) Date: Wed, 18 May 2005 04:26:33 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505180826.j4I8QXd5029919@pub.open-bio.org> yanwong Wed May 18 04:26:33 EDT 2005 Update of /home/repository/moby/moby-live/Python/bioMoby In directory pub.open-bio.org:/tmp/cvs-serv29889 Modified Files: mobyDataTypes.py Log Message: added a test (without it, some objects (objects without a content attributes) wouldn't get marshalled) Thanks Mark Fiers ;) moby-live/Python/bioMoby mobyDataTypes.py,1.21,1.22 =================================================================== RCS file: /home/repository/moby/moby-live/Python/bioMoby/mobyDataTypes.py,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- /home/repository/moby/moby-live/Python/bioMoby/mobyDataTypes.py 2005/05/16 12:42:01 1.21 +++ /home/repository/moby/moby-live/Python/bioMoby/mobyDataTypes.py 2005/05/18 08:26:32 1.22 @@ -149,7 +149,8 @@ #Put the raw content of the object #If you want to put your special object, then then you should write #a __str__ method - result.append("%s"%(self.content)) + if hasattr(self, "content"): + result.append("%s"%(self.content)) result.append(""%(self.__prefix__, self.__tag__)) @@ -161,7 +162,7 @@ elem=xml if isinstance(xml, str): - doc=parseString(xmlstring) + doc=parseString(xml) elem=doc.firstChild From senger at pub.open-bio.org Thu May 19 06:56:06 2005 From: senger at pub.open-bio.org (Martin Senger) Date: Thu, 19 May 2005 06:56:06 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505191056.j4JAu6j2002918@pub.open-bio.org> senger Thu May 19 06:56:05 EDT 2005 Update of /home/repository/moby/moby-live/Java In directory pub.open-bio.org:/tmp/cvs-serv2887 Modified Files: build-dev.bat build-dev.sh build.bat build.sh Log Message: moby-live/Java build-dev.bat,1.3,1.4 build-dev.sh,1.3,1.4 build.bat,1.3,1.4 build.sh,1.3,1.4 =================================================================== RCS file: /home/repository/moby/moby-live/Java/build-dev.bat,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- /home/repository/moby/moby-live/Java/build-dev.bat 2003/11/08 00:27:23 1.3 +++ /home/repository/moby/moby-live/Java/build-dev.bat 2005/05/19 10:56:05 1.4 @@ -18,11 +18,9 @@ goto end :javadone -REM Set-up and check ANT_HOME -REM ------------------------- -if NOT "%ANT_HOME%"=="" goto antdone +REM Set-up ANT_HOME +REM --------------- set ANT_HOME=.\lib\ant_home -:antdone REM Put Ant libraries in CLASSPATH REM ------------------------------ =================================================================== RCS file: /home/repository/moby/moby-live/Java/build-dev.sh,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- /home/repository/moby/moby-live/Java/build-dev.sh 2003/11/08 00:27:23 1.3 +++ /home/repository/moby/moby-live/Java/build-dev.sh 2005/05/19 10:56:05 1.4 @@ -16,8 +16,6 @@ # # This script can make use of the following environment variables: # -# ANT_HOME ... pointing to a directory with Ant libraries. -# Default (used if variable is not set): ./lib/ant_home # JAVA_HOME ... pointing to a directory with your Java JDK. # If not set the script tries to find it anyway. @@ -35,16 +33,9 @@ fi #echo "Using Java from: $JAVA_HOME." -# --- setup and check ANT_HOME -if [ -z "$ANT_HOME" ] ; then - ANT_HOME=./lib/ant_home - export ANT_HOME -fi -if [ ! -d "$ANT_HOME" ] ; then - echo "ANT_HOME is set to '$ANT_HOME' which is not an existing directory." - echo "Please set your ANT_HOME." - exit 1 -fi +# --- setup ANT_HOME +ANT_HOME=./lib/ant_home +export ANT_HOME #echo "Using Ant libraries from: $ANT_HOME/lib." # --- put Ant libraries in CLASSPATH =================================================================== RCS file: /home/repository/moby/moby-live/Java/build.bat,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- /home/repository/moby/moby-live/Java/build.bat 2003/11/08 00:27:23 1.3 +++ /home/repository/moby/moby-live/Java/build.bat 2005/05/19 10:56:05 1.4 @@ -19,11 +19,9 @@ goto end :javadone -REM Set-up and check ANT_HOME -REM ------------------------- -if NOT "%ANT_HOME%"=="" goto antdone +REM Set-up ANT_HOME +REM --------------- set ANT_HOME=.\lib\ant_home -:antdone REM Put Ant libraries in CLASSPATH REM ------------------------------ =================================================================== RCS file: /home/repository/moby/moby-live/Java/build.sh,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- /home/repository/moby/moby-live/Java/build.sh 2003/11/08 00:27:23 1.3 +++ /home/repository/moby/moby-live/Java/build.sh 2005/05/19 10:56:05 1.4 @@ -12,8 +12,6 @@ # # This script can make use of the following environment variables: # -# ANT_HOME ... pointing to a directory with Ant libraries. -# Default (used if variable is not set): ./lib/ant_home # JAVA_HOME ... pointing to a directory with your Java JDK. # If not set the script tries to find it anyway. @@ -31,16 +29,9 @@ fi #echo "Using Java from: $JAVA_HOME." -# --- setup and check ANT_HOME -if [ -z "$ANT_HOME" ] ; then - ANT_HOME=./lib/ant_home - export ANT_HOME -fi -if [ ! -d "$ANT_HOME" ] ; then - echo "ANT_HOME is set to '$ANT_HOME' which is not an existing directory." - echo "Please set your ANT_HOME." - exit 1 -fi +# --- setup ANT_HOME +ANT_HOME=./lib/ant_home +export ANT_HOME #echo "Using Ant libraries from: $ANT_HOME/lib." # --- put Ant libraries in CLASSPATH From senger at pub.open-bio.org Thu May 19 06:56:06 2005 From: senger at pub.open-bio.org (Martin Senger) Date: Thu, 19 May 2005 06:56:06 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505191056.j4JAu6S5002990@pub.open-bio.org> senger Thu May 19 06:56:06 EDT 2005 Update of /home/repository/moby/moby-live/Java/docs/images In directory pub.open-bio.org:/tmp/cvs-serv2887/docs/images Added Files: b_yellow.gif stylesheet.css Log Message: moby-live/Java/docs/images b_yellow.gif,NONE,1.1 stylesheet.css,NONE,1.1 From senger at pub.open-bio.org Thu May 19 07:00:41 2005 From: senger at pub.open-bio.org (Martin Senger) Date: Thu, 19 May 2005 07:00:41 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505191100.j4JB0fHZ003072@pub.open-bio.org> senger Thu May 19 07:00:41 EDT 2005 Update of /home/repository/moby/moby-live/Java/docs In directory pub.open-bio.org:/tmp/cvs-serv3049/docs Modified Files: ToDo.html index.html Log Message: moby-live/Java/docs ToDo.html,1.2,1.3 index.html,1.8,1.9 =================================================================== RCS file: /home/repository/moby/moby-live/Java/docs/ToDo.html,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- /home/repository/moby/moby-live/Java/docs/ToDo.html 2005/05/19 10:56:06 1.2 +++ /home/repository/moby/moby-live/Java/docs/ToDo.html 2005/05/19 11:00:41 1.3 @@ -39,33 +39,33 @@
    -
    MS +
    MS Generate a complete XML Schema for registered services. This will allow to have complete WSDLs for BioMoby services, which will further allow to use all existing tools using such WSDLs for generating code and documentation.

    -

    MS +
    MS Support for auto-generated clients (using the outcome of the previous issue).

    -

    MS +
    MS Similar support for BioMoby service providers - a library helping to hide SOAP and BioMoby envelope layers so service providers can concentrate only on the business logic.

    -

    MS +
    MS More support for BioMoby complex data type in Taverna.

    -

    MS +
    MS The BioMoby Graphs available directly in Taverna.

    -

    MS, GS +
    MS, GS Integrate Semantic Moby services into Taverna. This will (hopefully) help to combine S-Moby and Moby-S in the (near?) future. @@ -77,7 +77,7 @@ individual registered services (e.g. examples of their valid inputs).

    -

    MS +
    MS MobyDigestClient (actually the classes it relies on) can be significantly optimized by @@ -98,14 +98,14 @@
    -
    MS +
    MS MobyCmdLineClient does not correctly implement its -nc and -np options.

    -

    MS +
    MS The servlet for BioMoby Graphs is still not robust enough.

    @@ -119,7 +119,7 @@

    Martin Senger
    -Last modified: Tue May 17 15:55:44 2005 +Last modified: Thu May 19 11:20:08 2005
    =================================================================== RCS file: /home/repository/moby/moby-live/Java/docs/index.html,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- /home/repository/moby/moby-live/Java/docs/index.html 2005/05/19 10:56:06 1.8 +++ /home/repository/moby/moby-live/Java/docs/index.html 2005/05/19 11:00:41 1.9 @@ -79,9 +79,9 @@
    -
    Martin Senger
    +
    Martin Senger
    -Last modified: Tue May 17 16:01:17 2005 +Last modified: Thu May 19 11:20:22 2005
    From senger at pub.open-bio.org Thu May 19 11:57:21 2005 From: senger at pub.open-bio.org (Martin Senger) Date: Thu, 19 May 2005 11:57:21 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505191557.j4JFvLML003910@pub.open-bio.org> senger Thu May 19 11:57:21 EDT 2005 Update of /home/repository/moby/moby-live/Java In directory pub.open-bio.org:/tmp/cvs-serv3891 Modified Files: build.xml Log Message: moby-live/Java build.xml,1.14,1.15 =================================================================== RCS file: /home/repository/moby/moby-live/Java/build.xml,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- /home/repository/moby/moby-live/Java/build.xml 2005/04/18 23:57:44 1.14 +++ /home/repository/moby/moby-live/Java/build.xml 2005/05/19 15:57:21 1.15 @@ -371,47 +371,102 @@ - + + - - - -
    Generated: ${TODAY_LONG}]]>
    - - Submit a bug or feature
    - Generated: ${TODAY_LONG}]]>
    -
    + + + + + + + + + + + + + + +
    Generated: ${TODAY_LONG}]]>
    + + Submit a bug or feature
    + Generated: ${TODAY_LONG}]]>
    + + + + + + + + + + +
    - - + + + + + + + + - - - - - - + + + + + + @@ -493,7 +548,11 @@ --> - + @@ -541,7 +600,11 @@ - +
    From senger at pub.open-bio.org Thu May 19 11:57:21 2005 From: senger at pub.open-bio.org (Martin Senger) Date: Thu, 19 May 2005 11:57:21 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505191557.j4JFvL5a003942@pub.open-bio.org> senger Thu May 19 11:57:21 EDT 2005 Update of /home/repository/moby/moby-live/Java/docs In directory pub.open-bio.org:/tmp/cvs-serv3891/docs Modified Files: ChangeLog DirectoriesGuidelines.html Download.html index.html Added Files: ChangesInBuild.html Log Message: moby-live/Java/docs ChangesInBuild.html,NONE,1.1 ChangeLog,1.28,1.29 DirectoriesGuidelines.html,1.1,1.2 Download.html,1.2,1.3 index.html,1.9,1.10 =================================================================== RCS file: /home/repository/moby/moby-live/Java/docs/ChangeLog,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- /home/repository/moby/moby-live/Java/docs/ChangeLog 2005/05/19 10:56:06 1.28 +++ /home/repository/moby/moby-live/Java/docs/ChangeLog 2005/05/19 15:57:21 1.29 @@ -1,3 +1,7 @@ +2005-05-19 Martin Senger + + * Ant changed to its latest release. + 2005-05-17 Martin Senger * Added documentation as a result of the BioMoby meeting in =================================================================== RCS file: /home/repository/moby/moby-live/Java/docs/DirectoriesGuidelines.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/Java/docs/DirectoriesGuidelines.html 2005/05/19 10:56:06 1.1 +++ /home/repository/moby/moby-live/Java/docs/DirectoriesGuidelines.html 2005/05/19 15:57:21 1.2 @@ -86,7 +86,7 @@
    - +

    jMoby packages

    One of the Ben's Twelve @@ -105,7 +105,7 @@ it).

    -
    org.biomoby.client +
    org.biomoby.client
    It contains components used to develop Moby clients. The Moby clients can be both clients of the Moby registry and clients of the @@ -123,7 +123,7 @@ access to the registry databases (like a direct JDBC access), or here we may have Java-implementation of the whole registry someday. -
    org.biomoby.service +
    org.biomoby.service
    It contains general components that can be used by those writing code for Moby services. This is not meant to be used for the @@ -159,10 +159,13 @@

    Other package names

    Please feel free (or better: feel obliged) to add here basic -descriptions of your own packages. +descriptions of your own packages. You may also consider to add a +package.html file directly into your package directory (to +the same sub-directory where your sources are) - such files will be +picked up by Ant and included directly in the generated API.
    -
    embl.ebi.soap +
    embl.ebi.soap
    It contains general utilities for making SOAP calls (for SOAP clients) and to get access to the request and deployment environment, @@ -181,7 +184,7 @@
    Martin Senger
    -Last modified: Thu May 19 11:13:55 2005 +Last modified: Thu May 19 15:29:48 2005
    =================================================================== RCS file: /home/repository/moby/moby-live/Java/docs/Download.html,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- /home/repository/moby/moby-live/Java/docs/Download.html 2005/05/19 10:56:06 1.2 +++ /home/repository/moby/moby-live/Java/docs/Download.html 2005/05/19 15:57:21 1.3 @@ -49,7 +49,7 @@
    How to build it
    What are the build targets
    -Where to put things
    +Where to put things
    How to use it
    @@ -362,7 +362,7 @@
    Martin Senger
    -Last modified: Tue May 17 13:38:10 2005 +Last modified: Thu May 19 13:46:02 2005
    =================================================================== RCS file: /home/repository/moby/moby-live/Java/docs/index.html,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- /home/repository/moby/moby-live/Java/docs/index.html 2005/05/19 11:00:41 1.9 +++ /home/repository/moby/moby-live/Java/docs/index.html 2005/05/19 15:57:21 1.10 @@ -53,7 +53,9 @@ @@ -81,7 +83,7 @@
    Martin Senger
    -Last modified: Thu May 19 11:20:22 2005 +Last modified: Thu May 19 13:48:27 2005
    From senger at pub.open-bio.org Thu May 19 11:57:25 2005 From: senger at pub.open-bio.org (Martin Senger) Date: Thu, 19 May 2005 11:57:25 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505191557.j4JFvPvZ003994@pub.open-bio.org> senger Thu May 19 11:57:25 EDT 2005 Update of /home/repository/moby/moby-live/Java/src/Clients In directory pub.open-bio.org:/tmp/cvs-serv3891/src/Clients Modified Files: PopulateLocalCentralForTesting.java Log Message: moby-live/Java/src/Clients PopulateLocalCentralForTesting.java,1.3,1.4 =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/Clients/PopulateLocalCentralForTesting.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- /home/repository/moby/moby-live/Java/src/Clients/PopulateLocalCentralForTesting.java 2004/09/23 10:20:29 1.3 +++ /home/repository/moby/moby-live/Java/src/Clients/PopulateLocalCentralForTesting.java 2005/05/19 15:57:24 1.4 @@ -49,7 +49,7 @@ * @version $Id$ */ public class PopulateLocalCentralForTesting { - public final String DEFAULT_ENDPOINT = "http://localhost/cgi-bin/moby"; + public static final String DEFAULT_ENDPOINT = "http://localhost/cgi-bin/moby"; protected String serviceType = "ATestingServiceType"; protected String namespace_1 = "ns1"; @@ -351,7 +351,7 @@ return services; } - private final int MAX_MSG_LEN = 35; + private static final int MAX_MSG_LEN = 35; protected void start (String msg) { System.out.print (msg); for (int i = MAX_MSG_LEN; i > msg.length(); i--) From senger at pub.open-bio.org Thu May 19 11:57:25 2005 From: senger at pub.open-bio.org (Martin Senger) Date: Thu, 19 May 2005 11:57:25 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505191557.j4JFvPIm003975@pub.open-bio.org> senger Thu May 19 11:57:22 EDT 2005 Update of /home/repository/moby/moby-live/Java/lib/ant_home/lib In directory pub.open-bio.org:/tmp/cvs-serv3891/lib/ant_home/lib Modified Files: ant.jar xercesImpl.jar xml-apis.jar Added Files: ant-antlr.jar ant-apache-bcel.jar ant-apache-bsf.jar ant-apache-log4j.jar ant-apache-oro.jar ant-apache-regexp.jar ant-apache-resolver.jar ant-commons-logging.jar ant-commons-net.jar ant-icontract.jar ant-jai.jar ant-javamail.jar ant-jdepend.jar ant-jmf.jar ant-jsch.jar ant-junit.jar ant-launcher.jar ant-netrexx.jar ant-nodeps.jar ant-starteam.jar ant-stylebook.jar ant-swing.jar ant-trax.jar ant-vaj.jar ant-weblogic.jar ant-xalan1.jar ant-xslp.jar Removed Files: optional.jar Log Message: moby-live/Java/lib/ant_home/lib ant-antlr.jar,NONE,1.1 ant-apache-bcel.jar,NONE,1.1 ant-apache-bsf.jar,NONE,1.1 ant-apache-log4j.jar,NONE,1.1 ant-apache-oro.jar,NONE,1.1 ant-apache-regexp.jar,NONE,1.1 ant-apache-resolver.jar,NONE,1.1 ant-commons-logging.jar,NONE,1.1 ant-commons-net.jar,NONE,1.1 ant-icontract.jar,NONE,1.1 ant-jai.jar,NONE,1.1 ant-javamail.jar,NONE,1.1 ant-jdepend.jar,NONE,1.1 ant-jmf.jar,NONE,1.1 ant-jsch.jar,NONE,1.1 ant-junit.jar,NONE,1.1 ant-launcher.jar,NONE,1.1 ant-netrexx.jar,NONE,1.1 ant-nodeps.jar,NONE,1.1 ant-starteam.jar,NONE,1.1 ant-stylebook.jar,NONE,1.1 ant-swing.jar,NONE,1.1 ant-trax.jar,NONE,1.1 ant-vaj.jar,NONE,1.1 ant-weblogic.jar,NONE,1.1 ant-xalan1.jar,NONE,1.1 ant-xslp.jar,NONE,1.1 ant.jar,1.2,1.3 xercesImpl.jar,1.2,1.3 xml-apis.jar,1.1,1.2 optional.jar,1.2,NONE =================================================================== RCS file: /home/repository/moby/moby-live/Java/lib/ant_home/lib/ant.jar,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 Binary files /home/repository/moby/moby-live/Java/lib/ant_home/lib/ant.jar 2003/09/25 02:48:14 1.2 and /home/repository/moby/moby-live/Java/lib/ant_home/lib/ant.jar 2005/05/19 15:57:21 1.3 differ rcsdiff: /home/repository/moby/moby-live/Java/lib/ant_home/lib/ant.jar: diff failed =================================================================== RCS file: /home/repository/moby/moby-live/Java/lib/ant_home/lib/xercesImpl.jar,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 Binary files /home/repository/moby/moby-live/Java/lib/ant_home/lib/xercesImpl.jar 2003/09/25 02:48:15 1.2 and /home/repository/moby/moby-live/Java/lib/ant_home/lib/xercesImpl.jar 2005/05/19 15:57:22 1.3 differ rcsdiff: /home/repository/moby/moby-live/Java/lib/ant_home/lib/xercesImpl.jar: diff failed =================================================================== RCS file: /home/repository/moby/moby-live/Java/lib/ant_home/lib/xml-apis.jar,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 Binary files /home/repository/moby/moby-live/Java/lib/ant_home/lib/xml-apis.jar 2003/09/24 12:33:49 1.1 and /home/repository/moby/moby-live/Java/lib/ant_home/lib/xml-apis.jar 2005/05/19 15:57:22 1.2 differ rcsdiff: /home/repository/moby/moby-live/Java/lib/ant_home/lib/xml-apis.jar: diff failed rcsdiff: /home/repository/moby/moby-live/Java/lib/ant_home/lib/RCS/optional.jar,v: No such file or directory From senger at pub.open-bio.org Thu May 19 11:57:25 2005 From: senger at pub.open-bio.org (Martin Senger) Date: Thu, 19 May 2005 11:57:25 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505191557.j4JFvP7O004013@pub.open-bio.org> senger Thu May 19 11:57:25 EDT 2005 Update of /home/repository/moby/moby-live/Java/src/Services/org/biomoby/service In directory pub.open-bio.org:/tmp/cvs-serv3891/src/Services/org/biomoby/service Added Files: package.html Removed Files: Echo.java EchoImpl.java EchoImplFromStubs.java README Log Message: moby-live/Java/src/Services/org/biomoby/service package.html,NONE,1.1 Echo.java,1.1,NONE EchoImpl.java,1.2,NONE EchoImplFromStubs.java,1.1,NONE README,1.1,NONE rcsdiff: /home/repository/moby/moby-live/Java/src/Services/org/biomoby/service/RCS/Echo.java,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/Java/src/Services/org/biomoby/service/RCS/EchoImpl.java,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/Java/src/Services/org/biomoby/service/RCS/EchoImplFromStubs.java,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/Java/src/Services/org/biomoby/service/RCS/README,v: No such file or directory From senger at pub.open-bio.org Thu May 19 11:57:25 2005 From: senger at pub.open-bio.org (Martin Senger) Date: Thu, 19 May 2005 11:57:25 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505191557.j4JFvP4U004108@pub.open-bio.org> senger Thu May 19 11:57:25 EDT 2005 Update of /home/repository/moby/moby-live/Java/src/main/org/biomoby/client In directory pub.open-bio.org:/tmp/cvs-serv3891/src/main/org/biomoby/client Modified Files: CentralDigestCachedImpl.java GraphsServlet.java Graphviz.java RDF.java SimpleCache.java SimpleFileCache.java Taverna.java package.html Log Message: moby-live/Java/src/main/org/biomoby/client CentralDigestCachedImpl.java,1.3,1.4 GraphsServlet.java,1.9,1.10 Graphviz.java,1.6,1.7 RDF.java,1.2,1.3 SimpleCache.java,1.3,1.4 SimpleFileCache.java,1.2,1.3 Taverna.java,1.2,1.3 package.html,1.1,1.2 =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/CentralDigestCachedImpl.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/CentralDigestCachedImpl.java 2005/04/07 16:37:02 1.3 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/CentralDigestCachedImpl.java 2005/05/19 15:57:25 1.4 @@ -359,9 +359,9 @@ if (list == null) throw new MobyException ("Surprisingly, '" + servicesCache.getAbsolutePath() + "' is not a directory. Strange..."); for (int i = 0; i < list.length; i++) { - MobyService[] services = extractServices (load (list[i])); - for (int j = 0; j < services.length; j++) - v.addElement (services[j]); + MobyService[] servs = extractServices (load (list[i])); + for (int j = 0; j < servs.length; j++) + v.addElement (servs[j]); } MobyService[] result = new MobyService [v.size()]; v.copyInto (result); =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/GraphsServlet.java,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/GraphsServlet.java 2005/04/07 22:55:06 1.9 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/GraphsServlet.java 2005/05/19 15:57:25 1.10 @@ -1639,13 +1639,13 @@ static final int BUF_SIZE = 8192; public void run() { - byte[] buf = new byte [BUF_SIZE]; + byte[] myBuf = new byte [BUF_SIZE]; int readBytes; try { - while ((readBytes = stream.read (buf)) != -1) { + while ((readBytes = stream.read (myBuf)) != -1) { byte[] tmp = new byte [result.length + readBytes]; System.arraycopy (result, 0, tmp, 0, result.length); - System.arraycopy (buf, 0, tmp, result.length, readBytes); + System.arraycopy (myBuf, 0, tmp, result.length, readBytes); result = new byte [tmp.length]; System.arraycopy (tmp, 0, result, 0, tmp.length); } =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/Graphviz.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/Graphviz.java 2005/04/07 16:37:02 1.6 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/Graphviz.java 2005/05/19 15:57:25 1.7 @@ -17,7 +17,7 @@ /** * A utility class that understands how to create - * {@link http://www.research.att.com/sw/tools/graphviz/ graphviz} graphs from a set of + * graphviz graphs from a set of * {@link org.biomoby.client.ServicesEdge ServiceEdges}, or from other * data structures. * @@ -293,7 +293,7 @@ * Creates a graph connecting 'serviceTypes' using their ISA * relationship.

    * - * @param servicesTypes represent nodes in the created graph + * @param serviceTypes represent nodes in the created graph * @param props are some properties that can influence how the * graph will look like; see the property names elswhere in this * API what properties are understood =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/RDF.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/RDF.java 2005/04/07 16:37:02 1.2 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/RDF.java 2005/05/19 15:57:25 1.3 @@ -19,7 +19,7 @@ /** * A utility class that understands how to create - * {@link http://www.research.att.com/sw/tools/graphviz/ graphviz} graphs from a set of + * graphviz graphs from a set of * {@link org.biomoby.client.ServicesEdge ServiceEdges}, or from other * data structures. * =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/SimpleCache.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/SimpleCache.java 2005/04/07 16:37:02 1.3 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/SimpleCache.java 2005/05/19 15:57:25 1.4 @@ -65,7 +65,7 @@ * @param id a unique ID of the object being returned * @return data previously stored under 'id'; or null if such data * do not exist - * @thow IOExcepiton if the retrieving failed + * @throws IOExcepiton if the retrieving failed **************************************************************************/ java.lang.Object getContents (String id) throws IOException; @@ -75,7 +75,7 @@ * * @param id a unique ID of the object being stored * @param data are being stored - * @thow IOExcepiton if the storing failed + * @throws IOExcepiton if the storing failed **************************************************************************/ void setContents (String id, java.lang.Object data) throws IOException; @@ -85,7 +85,7 @@ *

    * * @param id a unique ID - * @throw IOException if the object exists but cannot be removed + * @throws IOException if the object exists but cannot be removed * (meaning that it does not raise any exception if the * object is not anymore in the cache) **************************************************************************/ =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/SimpleFileCache.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/SimpleFileCache.java 2005/04/07 16:37:02 1.2 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/SimpleFileCache.java 2005/05/19 15:57:25 1.3 @@ -32,7 +32,7 @@ * * @param id a unique ID of the cached (or possibly cached) object * @return a filename with the full path representing an object 'id' - * @throw IOException if creating the parent directories caused problem + * @throws IOException if creating the parent directories caused problem **************************************************************************/ String getFilename (String id) throws IOException; @@ -42,7 +42,7 @@ * * @param id a unique ID of the object being stored * @param data are being stored - * @thow IOExcepiton if the storing failed + * @throws IOExcepiton if the storing failed **************************************************************************/ void setContents (String id, byte[] data) throws IOException; @@ -62,7 +62,7 @@ * * @param millis how many milliseconds must be an object stored to * be remopved by calling this method - * @throw IOException if any object that exists in the cache and + * @throws IOException if any object that exists in the cache and * is targeted to be removed but cannot be removed **************************************************************************/ void removeOlderThen (long millis) =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/Taverna.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/Taverna.java 2005/04/07 16:37:02 1.2 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/Taverna.java 2005/05/19 15:57:25 1.3 @@ -24,7 +24,7 @@ /** * A utility class that understands how to create workflow definitions - * for {@link http://taverna.sf.net/ Taverna}.

    + * for Taverna.

    * * @see MobyGraphs * @author Martin Senger =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/package.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/package.html 2003/09/24 14:33:37 1.1 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/package.html 2005/05/19 15:57:25 1.2 @@ -3,17 +3,13 @@ -The components used for developing Moby clients. -

    -The most important class is {@link org.biomoby.client.CentralImpl} -implementing interface {@link org.biomoby.shared.Central} and by doing so -hiding all Moby complexity (and changes) under the hood. +The components used for developing Moby clients. The Moby clients can +be both clients of the Moby registry and clients of the Moby services.

    -Note that this package does not contain ready and complete Moby clients -but only pieces, tools and helpers to build such clients. The ready/full -clients are in the Clients sub-directory (they are not in any -named package) - {@link MobyCmdLineClient} and {@link TestingCentral}. +The most important class is {@link org.biomoby.client.CentralImpl} +implementing interface {@link org.biomoby.shared.Central} and by doing +so hiding all Moby complexity (and changes) under the hood.

    From senger at pub.open-bio.org Thu May 19 11:57:26 2005 From: senger at pub.open-bio.org (Martin Senger) Date: Thu, 19 May 2005 11:57:26 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505191557.j4JFvQYv004171@pub.open-bio.org> senger Thu May 19 11:57:26 EDT 2005 Update of /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared In directory pub.open-bio.org:/tmp/cvs-serv3891/src/main/org/biomoby/shared Modified Files: package.html Log Message: moby-live/Java/src/main/org/biomoby/shared package.html,1.1,1.2 =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/package.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/package.html 2003/09/24 14:33:37 1.1 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/package.html 2005/05/19 15:57:26 1.2 @@ -3,15 +3,22 @@ -The components used by packages and classes developed for both -Moby clients and (in the future) Moby servers. -

    -The cornerstone piece is the interface {@link org.biomoby.shared.Central} that -defines how to access Moby registry without any knowledge of -the used transport protocol (SOAP, XML, etc.). This interface -uses several "containers" representing pieces of the Moby mosaic - -but most of them may not be necessary for the client. -

    +It contains components that are used from more than one (other) +packages. The bottom-line (or a bottom-rule) is: If one wants to run +clients, it must be sufficent for him to pack all classes from {@link +org.biomoby.client} and from this package only. If one wants to create +a registry oriented component, it is enough for him to pack +org.biomoby.registry and this package. And similarly for service +providers which would pack org.biomoby.service and again this +package.

    + +Additionally this is a good place for putting here Java interfaces - +assuming that they are expected to be used more generally. The +cornerstone piece is the interface {@link org.biomoby.shared.Central} +that defines how to access Moby registry without any knowledge of the +used transport protocol (SOAP, XML, etc.). This interface uses several +container classes representing pieces of the Moby mosaic. + From senger at pub.open-bio.org Thu May 19 11:57:26 2005 From: senger at pub.open-bio.org (Martin Senger) Date: Thu, 19 May 2005 11:57:26 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505191557.j4JFvQqI004249@pub.open-bio.org> senger Thu May 19 11:57:26 EDT 2005 Update of /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/dom/wrappers In directory pub.open-bio.org:/tmp/cvs-serv3891/src/main/org/biomoby/shared/dom/wrappers Modified Files: Xerces.java Log Message: moby-live/Java/src/main/org/biomoby/shared/dom/wrappers Xerces.java,1.2,1.3 =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/dom/wrappers/Xerces.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/dom/wrappers/Xerces.java 2005/04/20 21:42:10 1.2 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/dom/wrappers/Xerces.java 2005/05/19 15:57:26 1.3 @@ -14,7 +14,7 @@ /** * Wraps the Xerces DOM parser in order to provide interface - * {@link org.biomoby.shared.dom/ParserWrapper}. + * {@link org.biomoby.shared.dom.ParserWrapper}. * * @version $Id$ */ From senger at pub.open-bio.org Thu May 19 11:57:25 2005 From: senger at pub.open-bio.org (Martin Senger) Date: Thu, 19 May 2005 11:57:25 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505191557.j4JFvPER004129@pub.open-bio.org> senger Thu May 19 11:57:25 EDT 2005 Update of /home/repository/moby/moby-live/Java/src/main/org/biomoby/registry In directory pub.open-bio.org:/tmp/cvs-serv3891/src/main/org/biomoby/registry Added Files: package.html Removed Files: .keep_me Log Message: moby-live/Java/src/main/org/biomoby/registry package.html,NONE,1.1 .keep_me,1.1,NONE rcsdiff: /home/repository/moby/moby-live/Java/src/main/org/biomoby/registry/RCS/.keep_me,v: No such file or directory From senger at pub.open-bio.org Thu May 19 11:57:25 2005 From: senger at pub.open-bio.org (Martin Senger) Date: Thu, 19 May 2005 11:57:25 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505191557.j4JFvPP9004053@pub.open-bio.org> senger Thu May 19 11:57:25 EDT 2005 Update of /home/repository/moby/moby-live/Java/src/main/embl/ebi/soap In directory pub.open-bio.org:/tmp/cvs-serv3891/src/main/embl/ebi/soap Modified Files: SOAPToolkit.java Added Files: package.html Log Message: moby-live/Java/src/main/embl/ebi/soap package.html,NONE,1.1 SOAPToolkit.java,1.2,1.3 =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/embl/ebi/soap/SOAPToolkit.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- /home/repository/moby/moby-live/Java/src/main/embl/ebi/soap/SOAPToolkit.java 2005/04/07 16:33:07 1.2 +++ /home/repository/moby/moby-live/Java/src/main/embl/ebi/soap/SOAPToolkit.java 2005/05/19 15:57:25 1.3 @@ -63,7 +63,7 @@ * current service space (giving the priority to the one which is * service-specific).

    * - * @see getAttributeNames + * @see #getAttributeNames */ String getAttribute (String name); @@ -71,8 +71,6 @@ * Returns an Enumeration of Strings containing the attribute names of all * objects bound to the underlying session which the current request is * part of. - * These attributes were created by previous requests within the same - * session - see method {@link #setSessionAttribute}. *

    * Use the {@link #getSessionAttribute(String)} method with an attribute name * to get the value of an attribute. @@ -82,7 +80,7 @@ /** * Returns the object bound with the specified name in this session, * or null if no object is bound under the name. - * @see getSessionAttributeNames + * @see #getSessionAttributeNames */ Object getSessionAttribute (String name); From senger at pub.open-bio.org Thu May 19 11:57:25 2005 From: senger at pub.open-bio.org (Martin Senger) Date: Thu, 19 May 2005 11:57:25 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505191557.j4JFvPBo004034@pub.open-bio.org> senger Thu May 19 11:57:25 EDT 2005 Update of /home/repository/moby/moby-live/Java/src/Services/org/biomoby/service/generated In directory pub.open-bio.org:/tmp/cvs-serv3891/src/Services/org/biomoby/service/generated Modified Files: EchoServiceLocator.java Log Message: moby-live/Java/src/Services/org/biomoby/service/generated EchoServiceLocator.java,1.1,1.2 =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/Services/org/biomoby/service/generated/EchoServiceLocator.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/Java/src/Services/org/biomoby/service/generated/EchoServiceLocator.java 2003/11/08 00:49:06 1.1 +++ /home/repository/moby/moby-live/Java/src/Services/org/biomoby/service/generated/EchoServiceLocator.java 2005/05/19 15:57:25 1.2 @@ -10,7 +10,7 @@ public class EchoServiceLocator extends org.apache.axis.client.Service implements org.biomoby.service.generated.EchoService { // Use to get a proxy class for echoString - private final java.lang.String echoString_address = "http://localhost:8080/axis/services/echoString"; + private static final java.lang.String echoString_address = "http://localhost:8080/axis/services/echoString"; public java.lang.String getechoStringAddress() { return echoString_address; From senger at pub.open-bio.org Thu May 19 11:57:26 2005 From: senger at pub.open-bio.org (Martin Senger) Date: Thu, 19 May 2005 11:57:26 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505191557.j4JFvQjm004150@pub.open-bio.org> senger Thu May 19 11:57:25 EDT 2005 Update of /home/repository/moby/moby-live/Java/src/main/org/biomoby/registry/rdfagent/verifier In directory pub.open-bio.org:/tmp/cvs-serv3891/src/main/org/biomoby/registry/rdfagent/verifier Modified Files: ServiceDescrParser.java Log Message: moby-live/Java/src/main/org/biomoby/registry/rdfagent/verifier ServiceDescrParser.java,1.4,1.5 =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/registry/rdfagent/verifier/ServiceDescrParser.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/registry/rdfagent/verifier/ServiceDescrParser.java 2005/04/16 14:32:12 1.4 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/registry/rdfagent/verifier/ServiceDescrParser.java 2005/05/19 15:57:25 1.5 @@ -146,12 +146,12 @@ Report.add(" "); Report.add("DELETED SERVICES: "); Iterator i = deletedServ.iterator(); - int n=1; + int m=1; while (i.hasNext()){ String delServ = i.next().toString(); - Report.doWrite(n+". "+delServ); - Report.add(n+". "+delServ); - n+=1; + Report.doWrite(m+". "+delServ); + Report.add(m+". "+delServ); + m+=1; } } @@ -791,4 +791,4 @@ } return lsid; } -} \ No newline at end of file +} From senger at pub.open-bio.org Thu May 19 11:57:26 2005 From: senger at pub.open-bio.org (Martin Senger) Date: Thu, 19 May 2005 11:57:26 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505191557.j4JFvQil004228@pub.open-bio.org> senger Thu May 19 11:57:26 EDT 2005 Update of /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data In directory pub.open-bio.org:/tmp/cvs-serv3891/src/main/org/biomoby/shared/data Modified Files: MobyDataBytes.java MobyDataComposite.java MobyDataDateTime.java MobyDataFloat.java MobyDataInt.java MobyDataObject.java MobyDataObjectSet.java MobyDataString.java MobyDataXref.java Log Message: moby-live/Java/src/main/org/biomoby/shared/data MobyDataBytes.java,1.1,1.2 MobyDataComposite.java,1.1,1.2 MobyDataDateTime.java,1.1,1.2 MobyDataFloat.java,1.1,1.2 MobyDataInt.java,1.1,1.2 MobyDataObject.java,1.1,1.2 MobyDataObjectSet.java,1.1,1.2 MobyDataString.java,1.1,1.2 MobyDataXref.java,1.1,1.2 =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataBytes.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataBytes.java 2005/05/12 04:59:49 1.1 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataBytes.java 2005/05/19 15:57:26 1.2 @@ -27,7 +27,7 @@ /** * Construct the object using a DOM fragment. * - * @throw IllegalArgumentException if the element is not a text-base64 tag + * @throws IllegalArgumentException if the element is not a text-base64 tag */ public MobyDataBytes(org.w3c.dom.Element element) throws IllegalArgumentException{ this(getName(element), getTextContents(element)); =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataComposite.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataComposite.java 2005/05/12 04:59:49 1.1 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataComposite.java 2005/05/19 15:57:26 1.2 @@ -28,7 +28,7 @@ /** * Construct the object using a DOM fragment. * - * @throw IllegalArgumentException if the element is not a MobyObject tag + * @throws IllegalArgumentException if the element is not a MobyObject tag */ public MobyDataComposite(org.w3c.dom.Element element) throws IllegalArgumentException{ this(new MobyDataType(element.getLocalName()), getName(element), getNamespace(element), getId(element)); =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataDateTime.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataDateTime.java 2005/05/12 04:59:49 1.1 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataDateTime.java 2005/05/19 15:57:26 1.2 @@ -31,7 +31,7 @@ /** * Construct the object using a DOM fragment. * - * @throw IllegalArgumentException if the element is not a DateTime tag, or the text children of the element do not encode a valid ISO8601 date/time + * @throws IllegalArgumentException if the element is not a DateTime tag, or the text children of the element do not encode a valid ISO8601 date/time */ public MobyDataDateTime(org.w3c.dom.Element element) throws IllegalArgumentException{ this(getName(element), getTextContents(element)); =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataFloat.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataFloat.java 2005/05/12 04:59:49 1.1 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataFloat.java 2005/05/19 15:57:26 1.2 @@ -23,7 +23,7 @@ /** * Construct the object using a DOM fragment. * - * @throw IllegalArgumentException if the element is not a Float tag + * @throws IllegalArgumentException if the element is not a Float tag */ public MobyDataFloat(org.w3c.dom.Element element) throws IllegalArgumentException{ this(getName(element), getTextContents(element)); =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataInt.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataInt.java 2005/05/12 04:59:49 1.1 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataInt.java 2005/05/19 15:57:26 1.2 @@ -23,7 +23,7 @@ /** * Construct the object using a DOM fragment. * - * @throw IllegalArgumentException if the element is not a Integer tag + * @throws IllegalArgumentException if the element is not a Integer tag */ public MobyDataInt(org.w3c.dom.Element element) throws IllegalArgumentException{ this(getName(element), getTextContents(element)); =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataObject.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataObject.java 2005/05/12 04:59:49 1.1 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataObject.java 2005/05/19 15:57:26 1.2 @@ -45,7 +45,7 @@ /** * Construct the object using a DOM fragment. * - * @throw IllegalArgumentException if the element is not an Object tag + * @throws IllegalArgumentException if the element is not an Object tag */ public MobyDataObject(Element element) throws IllegalArgumentException{ this(getNamespace(element).getName(), getId(element)); =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataObjectSet.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataObjectSet.java 2005/05/12 04:59:49 1.1 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataObjectSet.java 2005/05/19 15:57:26 1.2 @@ -52,7 +52,7 @@ /** * Creates a collection with a name, initializing the members with the given array * - * @throw NullPointerException if the input array is null, or contains null elements + * @throws NullPointerException if the input array is null, or contains null elements */ public MobyDataObjectSet(String name, MobyDataObject[] values) throws NullPointerException{ this(name); @@ -64,8 +64,8 @@ * * @param c usually another MobyDataObjectSet, or a Vector of MobyDataObjects * - * @throw ClassCastException if a member of the input collection is not a MobyDataObject - * @throw NullPointerException if the collection or one of its members is a null object + * @throws ClassCastException if a member of the input collection is not a MobyDataObject + * @throws NullPointerException if the collection or one of its members is a null object */ public MobyDataObjectSet(String name, Collection c) throws ClassCastException, NullPointerException{ this(name); @@ -75,7 +75,7 @@ /** * Replace whatever is in the collection right now with the values in the input array. * - * @throw NullPointerException if the input array is null, or contains null elements + * @throws NullPointerException if the input array is null, or contains null elements */ public void setElements(MobyDataObject[] values) throws NullPointerException{ if(values == null){ @@ -139,8 +139,8 @@ /** * Add a single MobyDataObject to the collection. * - * @throw ClassCastException if the input is not a MobyDataObject - * @throw NullPointerException if the input is a null object + * @throws ClassCastException if the input is not a MobyDataObject + * @throws NullPointerException if the input is a null object */ public boolean add(Object mdsi) throws ClassCastException, NullPointerException{ checkInputClass("add", mdsi); @@ -153,8 +153,8 @@ * (usually a MobyDataObjectSet, or a Vector of MobyDataObjects) * to this collection. * - * @throw ClassCastException if a member of the input collection is not a MobyDataObject - * @throw NullPointerException if the collection or one of its members is a null object + * @throws ClassCastException if a member of the input collection is not a MobyDataObject + * @throws NullPointerException if the collection or one of its members is a null object * @return true if the collection changes as a result of the operation */ public boolean addAll(Collection c) throws ClassCastException, NullPointerException{ @@ -172,8 +172,8 @@ /** * @return true if this collection contains an element with the exact same value (equivalent in MOBY XML representation, including name) - * @throw ClassCastException if the input is not a MobyDataObject - * @throw NullPointerException if the input is a null object + * @throws ClassCastException if the input is not a MobyDataObject + * @throws NullPointerException if the input is a null object */ public boolean contains(Object mdsi) throws ClassCastException, NullPointerException{ checkInputClass("check for the presence of", mdsi); @@ -183,8 +183,8 @@ /** * @return true if each element in the input collection returns true when contains(Object o) is called - * @throw ClassCastException if a member of the input collection is not a MobyDataObject - * @throw NullPointerException if the collection or one of its members is a null object + * @throws ClassCastException if a member of the input collection is not a MobyDataObject + * @throws NullPointerException if the collection or one of its members is a null object */ public boolean containsAll(Collection c) throws ClassCastException, NullPointerException{ checkCollectionClass("check for presence of", c); @@ -198,8 +198,8 @@ * to convert into an array for sorting. * * @return true if and only if the input object is a MobyDataObjectSet, and the two collections contain exactly equal elements from a MOBY XML perspective - * @throw ClassCastException if the input is not a Collection of MobyDataObjects - * @throw NullPointerException if the input is a null object + * @throws ClassCastException if the input is not a Collection of MobyDataObjects + * @throws NullPointerException if the input is a null object */ public boolean equals(Object set) throws ClassCastException, NullPointerException{ if(!(set instanceof Collection)){ @@ -259,8 +259,8 @@ * * @param mdsi the MobyDataObject whose value equivalent (not object reference) is to be removed * @return true if the element was found and removed - * @throw ClassCastException if the input is not a MobyDataObject - * @throw NullPointerException if the input is a null object + * @throws ClassCastException if the input is not a MobyDataObject + * @throws NullPointerException if the input is a null object */ public boolean remove(Object mdsi) throws ClassCastException, NullPointerException{ checkInputClass("remove", mdsi); @@ -272,8 +272,8 @@ * Set theory subtraction operator implementation. * * @return true if this collection changed as a result of the call - * @throw ClassCastException if a member of the input collection is not a MobyDataObject - * @throw NullPointerException if the collection or one of its members is a null object + * @throws ClassCastException if a member of the input collection is not a MobyDataObject + * @throws NullPointerException if the collection or one of its members is a null object */ public boolean removeAll(Collection c) throws ClassCastException, NullPointerException{ checkCollectionClass("remove", c); @@ -285,8 +285,8 @@ * Set theory intersection operator implementation. * * @return true if this collection changed as a result of the call - * @throw ClassCastException if a member of the input collection is not a MobyDataObject - * @throw NullPointerException if the collection or one of its members is a null object + * @throws ClassCastException if a member of the input collection is not a MobyDataObject + * @throws NullPointerException if the collection or one of its members is a null object */ public boolean retainAll(Collection c){ checkCollectionClass("intersect", c); =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataString.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataString.java 2005/05/12 04:59:49 1.1 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataString.java 2005/05/19 15:57:26 1.2 @@ -18,7 +18,7 @@ /** * Construct the object using a DOM fragment. * - * @throw IllegalArgumentException if the element is not a String tag + * @throws IllegalArgumentException if the element is not a String tag */ public MobyDataString(org.w3c.dom.Element element) throws IllegalArgumentException{ this(getName(element), getTextContents(element)); =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataXref.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataXref.java 2005/05/12 04:59:49 1.1 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataXref.java 2005/05/19 15:57:26 1.2 @@ -261,8 +261,8 @@ // If we are a service provider it should look like an Xref if(isCRIBXML){ MobyService service = getService(); - MobyNamespace[] namespaces = getNamespaces(); - return " @@ -67,110 +71,19 @@ - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - + + &libraries; + + &exceptions; @@ -193,47 +106,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -557,8 +429,6 @@ - - From senger at pub.open-bio.org Thu May 19 16:18:54 2005 From: senger at pub.open-bio.org (Martin Senger) Date: Thu, 19 May 2005 16:18:54 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505192018.j4JKIskt005036@pub.open-bio.org> senger Thu May 19 16:18:54 EDT 2005 Update of /home/repository/moby/moby-live/Java/docs In directory pub.open-bio.org:/tmp/cvs-serv4985/docs Modified Files: ChangeLog DirectoriesGuidelines.html Download.html index.html Added Files: vizant.txt Log Message: moby-live/Java/docs vizant.txt,NONE,1.1 ChangeLog,1.29,1.30 DirectoriesGuidelines.html,1.2,1.3 Download.html,1.3,1.4 index.html,1.10,1.11 =================================================================== RCS file: /home/repository/moby/moby-live/Java/docs/ChangeLog,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- /home/repository/moby/moby-live/Java/docs/ChangeLog 2005/05/19 15:57:21 1.29 +++ /home/repository/moby/moby-live/Java/docs/ChangeLog 2005/05/19 20:18:53 1.30 @@ -1,5 +1,8 @@ 2005-05-19 Martin Senger + * Updated build.xml; also separate some fragments into xmls + directory. + * Ant changed to its latest release. 2005-05-17 Martin Senger =================================================================== RCS file: /home/repository/moby/moby-live/Java/docs/DirectoriesGuidelines.html,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- /home/repository/moby/moby-live/Java/docs/DirectoriesGuidelines.html 2005/05/19 15:57:21 1.2 +++ /home/repository/moby/moby-live/Java/docs/DirectoriesGuidelines.html 2005/05/19 20:18:53 1.3 @@ -84,6 +84,10 @@

    data
    A place for data files used by various tutorials or examples. +
    xmls +
    A place for additional fragments used by Ant's +build.xml. +
    @@ -184,7 +188,7 @@
    Martin Senger
    -Last modified: Thu May 19 15:29:48 2005 +Last modified: Thu May 19 19:59:46 2005
    =================================================================== RCS file: /home/repository/moby/moby-live/Java/docs/Download.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- /home/repository/moby/moby-live/Java/docs/Download.html 2005/05/19 15:57:21 1.3 +++ /home/repository/moby/moby-live/Java/docs/Download.html 2005/05/19 20:18:53 1.4 @@ -136,9 +136,14 @@ The build scripts (as usual for building with Ant) are based on file build.xml. There you can find all details what can be build, -and what properties are used. Here are just few targets explained in +and what properties are used. Here are just main targets explained in more details.

    +There is also a graphical +snapshot of our Ant tagrets (and here you can find how it was +created).

    + Note that a target name is used as the command-line parameter of a build script. For example a target docs is invoked by typing:

    @@ -362,7 +367,7 @@
     
    Martin Senger
    -Last modified: Thu May 19 13:46:02 2005 +Last modified: Thu May 19 19:07:17 2005
    =================================================================== RCS file: /home/repository/moby/moby-live/Java/docs/index.html,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- /home/repository/moby/moby-live/Java/docs/index.html 2005/05/19 15:57:21 1.10 +++ /home/repository/moby/moby-live/Java/docs/index.html 2005/05/19 20:18:53 1.11 @@ -57,7 +57,6 @@ (see also a general description of package names)
  • How to change Ant's build.xml
  • How to develop a client talking to a BioMoby service (a Paul Gordon's simple client) -
  • How to develop a BioMoby service (coming...)

    @@ -83,7 +82,7 @@

    Martin Senger
    -Last modified: Thu May 19 13:48:27 2005 +Last modified: Thu May 19 18:54:56 2005
    From senger at pub.open-bio.org Thu May 19 16:18:54 2005 From: senger at pub.open-bio.org (Martin Senger) Date: Thu, 19 May 2005 16:18:54 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505192018.j4JKIsex005052@pub.open-bio.org> senger Thu May 19 16:18:54 EDT 2005 Update of /home/repository/moby/moby-live/Java/docs/images In directory pub.open-bio.org:/tmp/cvs-serv4985/docs/images Added Files: ant-snapshot.png Log Message: moby-live/Java/docs/images ant-snapshot.png,NONE,1.1 From senger at pub.open-bio.org Thu May 19 16:18:54 2005 From: senger at pub.open-bio.org (Martin Senger) Date: Thu, 19 May 2005 16:18:54 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505192018.j4JKIsas005067@pub.open-bio.org> senger Thu May 19 16:18:54 EDT 2005 Update of /home/repository/moby/moby-live/Java/xmls In directory pub.open-bio.org:/tmp/cvs-serv4985/xmls Added Files: exceptions.xml libraries.xml Log Message: moby-live/Java/xmls exceptions.xml,NONE,1.1 libraries.xml,NONE,1.1 From senger at pub.open-bio.org Thu May 19 16:25:40 2005 From: senger at pub.open-bio.org (Martin Senger) Date: Thu, 19 May 2005 16:25:40 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505192025.j4JKPeVb005141@pub.open-bio.org> senger Thu May 19 16:25:40 EDT 2005 Update of /home/repository/moby/moby-live/Java/docs In directory pub.open-bio.org:/tmp/cvs-serv5118/docs Modified Files: 3rdPartyLibraries.html LatestJava.html Log Message: moby-live/Java/docs 3rdPartyLibraries.html,1.1,1.2 LatestJava.html,1.1,1.2 =================================================================== RCS file: /home/repository/moby/moby-live/Java/docs/3rdPartyLibraries.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/Java/docs/3rdPartyLibraries.html 2005/05/19 10:56:06 1.1 +++ /home/repository/moby/moby-live/Java/docs/3rdPartyLibraries.html 2005/05/19 20:25:40 1.2 @@ -11,6 +11,10 @@ Comming soon.. +

    + +For now, just look into xmls/libraries.xml - and it's almost +self-explanatory...

    @@ -19,7 +23,7 @@

    Martin Senger
    -Last modified: Thu May 19 10:39:48 2005 +Last modified: Thu May 19 20:35:23 2005
    =================================================================== RCS file: /home/repository/moby/moby-live/Java/docs/LatestJava.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/Java/docs/LatestJava.html 2005/05/19 10:56:06 1.1 +++ /home/repository/moby/moby-live/Java/docs/LatestJava.html 2005/05/19 20:25:40 1.2 @@ -27,9 +27,10 @@ First to say is that it was put there as a working solution for those who really need to use 1.5. Any new class that needs 1.5 must be explicitly named in the build.xml file in the property -version.excludes. Which is not too suitable if you have many -such classes. So when we start to use Java 1.5. in greater scale we -need to re-factor it.

    +version.excludes (the property is actually in a separate +fragment in xmls/exceptions.xml). Which is not too suitable +if you have many such classes. So when we start to use Java 1.5. in +greater scale we need to re-factor it.

    Having said that please note that nothing prevents you to use Java 1.5 @@ -76,7 +77,7 @@

    Martin Senger
    -Last modified: Tue May 17 13:01:36 2005 +Last modified: Thu May 19 20:33:59 2005
    From senger at pub.open-bio.org Thu May 19 16:27:03 2005 From: senger at pub.open-bio.org (Martin Senger) Date: Thu, 19 May 2005 16:27:03 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505192027.j4JKR3ev005186@pub.open-bio.org> senger Thu May 19 16:27:03 EDT 2005 Update of /home/repository/moby/moby-live/Java/docs/API In directory pub.open-bio.org:/tmp/cvs-serv5167/docs/API Modified Files: .cvsignore.template Log Message: moby-live/Java/docs/API .cvsignore.template,1.3,1.4 =================================================================== RCS file: /home/repository/moby/moby-live/Java/docs/API/.cvsignore.template,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- /home/repository/moby/moby-live/Java/docs/API/.cvsignore.template 2004/09/23 00:18:01 1.3 +++ /home/repository/moby/moby-live/Java/docs/API/.cvsignore.template 2005/05/19 20:27:02 1.4 @@ -4,4 +4,5 @@ *-list class-use org +embl resources From yanwong at pub.open-bio.org Fri May 20 03:35:23 2005 From: yanwong at pub.open-bio.org (Yan Wong) Date: Fri, 20 May 2005 03:35:23 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505200735.j4K7ZNns006617@pub.open-bio.org> yanwong Fri May 20 03:35:23 EDT 2005 Update of /home/repository/moby/moby-live/Python/bioMoby In directory pub.open-bio.org:/tmp/cvs-serv6578 Modified Files: mobyDataTypes.py Log Message: Changed the tag into moby-live/Python/bioMoby mobyDataTypes.py,1.22,1.23 =================================================================== RCS file: /home/repository/moby/moby-live/Python/bioMoby/mobyDataTypes.py,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- /home/repository/moby/moby-live/Python/bioMoby/mobyDataTypes.py 2005/05/18 08:26:32 1.22 +++ /home/repository/moby/moby-live/Python/bioMoby/mobyDataTypes.py 2005/05/20 07:35:23 1.23 @@ -31,7 +31,7 @@ def toMoby(self): """Returns the object as a XML """ - return ""+str(self.value)+"" + return ""+str(self.value)+"" def __str__(self): """Return the Parameter in its XML form @@ -52,9 +52,9 @@ xmlelt=parseString(xml).firstChild self.articleName=xmlelt.getAttribute('moby:articleName') - l=xmlelt.getElementsByTagName("value") + l=xmlelt.getElementsByTagName("Value") if len(l)==0: - l=xmlelt.getElementsByTagName("moby:value") + l=xmlelt.getElementsByTagName("moby:Value") self.value=l[0].firstChild.nodeValue From senger at pub.open-bio.org Wed May 25 06:09:16 2005 From: senger at pub.open-bio.org (Martin Senger) Date: Wed, 25 May 2005 06:09:16 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505251009.j4PA9GTc002366@pub.open-bio.org> senger Wed May 25 06:09:16 EDT 2005 Update of /home/repository/moby/moby-live/Java/docs In directory pub.open-bio.org:/tmp/cvs-serv2347 Modified Files: CodingGuidelines.html Log Message: moby-live/Java/docs CodingGuidelines.html,1.2,1.3 =================================================================== RCS file: /home/repository/moby/moby-live/Java/docs/CodingGuidelines.html,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- /home/repository/moby/moby-live/Java/docs/CodingGuidelines.html 2005/05/19 10:56:06 1.2 +++ /home/repository/moby/moby-live/Java/docs/CodingGuidelines.html 2005/05/25 10:09:16 1.3 @@ -42,7 +42,7 @@ href="DirectoriesGuidelines.html#packages">package descriptions.
  • -
  • Do not commit your services unless they are part of a tutorial (aka didactice services). +
  • Do not commit your services unless they are part of a tutorial (aka didactic services).
    In other words, jMoby is not a place for every BioMoby service written in Java. Such services are and will be spread around @@ -57,12 +57,27 @@
  • Whenever possible, include test programs that display the functionality of the new classes. -
  • Use the shared libraries (what come when you -execute gather Ant target, or when you use -./build.sh script). +
  • Join the MOBY-dev +mailing list, consider to join also the moby-l +mailing list. -
  • If you have to use another third party library, +
  • If you have to use a new third party library, you need to modify the build.xml file to go and get it. +
    + + It is not enough just to add a new jar file in your lib +sub-directory (because other developers will not have it). It is not +recommended to add a new jar file into CVS - if you have a new jar +file, change instead the build.xml file (actually change the +xmls/libraries that is used by build.xml).

    + +All third parties come to your CVS local copy when you execute +gather Ant target, or when you use ./build.sh +script. + +

  • Package names do not neccesarily have to start with org.biomoby. @@ -88,7 +103,7 @@
    Eddie Kawas
    -Last modified: Thu May 19 11:07:49 2005 +Last modified: Wed May 25 10:50:58 2005
    From kawas at pub.open-bio.org Mon May 30 17:39:05 2005 From: kawas at pub.open-bio.org (Eddie Kawas) Date: Mon, 30 May 2005 17:39:05 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505302139.j4ULd5NC002524@pub.open-bio.org> kawas Mon May 30 17:39:05 EDT 2005 Update of /home/repository/moby/moby-live/Perl/MOBY/Client In directory pub.open-bio.org:/tmp/cvs-serv2499/Client Modified Files: ServiceInstance.pm Log Message: added lsid specific code. eddie moby-live/Perl/MOBY/Client ServiceInstance.pm,1.13,1.14 =================================================================== RCS file: /home/repository/moby/moby-live/Perl/MOBY/Client/ServiceInstance.pm,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- /home/repository/moby/moby-live/Perl/MOBY/Client/ServiceInstance.pm 2004/11/18 17:41:16 1.13 +++ /home/repository/moby/moby-live/Perl/MOBY/Client/ServiceInstance.pm 2005/05/30 21:39:05 1.14 @@ -189,6 +189,7 @@ authoritative => [ undef, 'read/write' ], URL => [ undef, 'read/write' ], contactEmail => [ undef, 'read/write' ], + LSID => [ undef, 'read/write'] ); #_____________________________________________________________ From kawas at pub.open-bio.org Mon May 30 18:39:54 2005 From: kawas at pub.open-bio.org (Eddie Kawas) Date: Mon, 30 May 2005 18:39:54 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505302239.j4UMds6m002678@pub.open-bio.org> kawas Mon May 30 18:39:54 EDT 2005 Update of /home/repository/moby/moby-live/Perl/MOBY/Client In directory pub.open-bio.org:/tmp/cvs-serv2653/Client Modified Files: Central.pm Log Message: made lsid properties lowercase. Eddie moby-live/Perl/MOBY/Client Central.pm,1.95,1.96 =================================================================== RCS file: /home/repository/moby/moby-live/Perl/MOBY/Client/Central.pm,v retrieving revision 1.95 retrieving revision 1.96 diff -u -r1.95 -r1.96 --- /home/repository/moby/moby-live/Perl/MOBY/Client/Central.pm 2005/05/30 21:38:42 1.95 +++ /home/repository/moby/moby-live/Perl/MOBY/Client/Central.pm 2005/05/30 22:39:54 1.96 @@ -1017,8 +1017,8 @@ #create LSID for service and register it in the DB my $_config ||= MOBY::Config->new; my $service_lsid = "urn:lsid:" - . $_config->{mobycentral}->{LSID_authority} . ":" - . $_config->{mobycentral}->{LSID_namespace} . ":" + . $_config->{mobycentral}->{lsid_authority} . ":" + . $_config->{mobycentral}->{lsid_namespace} . ":" . $authURI . "," . $name; my $dbhA = $_config->getDataAdaptor( source => 'mobycentral' ); From kawas at pub.open-bio.org Mon May 30 18:54:43 2005 From: kawas at pub.open-bio.org (Eddie Kawas) Date: Mon, 30 May 2005 18:54:43 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505302254.j4UMshxm002771@pub.open-bio.org> kawas Mon May 30 18:54:43 EDT 2005 Update of /home/repository/moby/moby-live/Perl/MOBY/Client In directory pub.open-bio.org:/tmp/cvs-serv2746/Client Modified Files: Central.pm Log Message: excised some db code that was ill placed. Eddie moby-live/Perl/MOBY/Client Central.pm,1.96,1.97 =================================================================== RCS file: /home/repository/moby/moby-live/Perl/MOBY/Client/Central.pm,v retrieving revision 1.96 retrieving revision 1.97 diff -u -r1.96 -r1.97 --- /home/repository/moby/moby-live/Perl/MOBY/Client/Central.pm 2005/05/30 22:39:54 1.96 +++ /home/repository/moby/moby-live/Perl/MOBY/Client/Central.pm 2005/05/30 22:54:43 1.97 @@ -1013,21 +1013,7 @@ # my $rdf = $response->content; # print "$rdf\n"; #} - - #create LSID for service and register it in the DB - my $_config ||= MOBY::Config->new; - my $service_lsid = "urn:lsid:" - . $_config->{mobycentral}->{lsid_authority} . ":" - . $_config->{mobycentral}->{lsid_namespace} . ":" - . $authURI . "," - . $name; - my $dbhA = $_config->getDataAdaptor( source => 'mobycentral' ); - my $dbh = $dbhA->dbh; - my $sth = - $dbh->prepare( -"update service_instance set lsid = ? where authority_id= ? and servicename= ?" - ); - $sth->execute( $service_lsid, $authURI, $name ); + return $reg; #_______________________________________________________________________________________________ From kawas at pub.open-bio.org Mon May 30 19:28:45 2005 From: kawas at pub.open-bio.org (Eddie Kawas) Date: Mon, 30 May 2005 19:28:45 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505302328.j4UNSjJ4002915@pub.open-bio.org> kawas Mon May 30 19:28:45 EDT 2005 Update of /home/repository/moby/moby-live/Perl/MOBY In directory pub.open-bio.org:/tmp/cvs-serv2890 Modified Files: service_instance.pm Log Message: created an lsid for insertion into db Eddie moby-live/Perl/MOBY service_instance.pm,1.9,1.10 =================================================================== RCS file: /home/repository/moby/moby-live/Perl/MOBY/service_instance.pm,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- /home/repository/moby/moby-live/Perl/MOBY/service_instance.pm 2004/11/18 17:41:14 1.9 +++ /home/repository/moby/moby-live/Perl/MOBY/service_instance.pm 2005/05/30 23:28:45 1.10 @@ -261,6 +261,14 @@ && ( defined $self->description ) ) { # then create it de novo if we have enough information + #create LSID for service and register it in the DB + my $_config ||= MOBY::Config->new; + my $service_lsid = "urn:lsid:" + . $_config->{mobycentral}->{lsid_authority} . ":" + . $_config->{mobycentral}->{lsid_namespace} . ":" + . $self->authority_uri . "," + . $self->servicename; + my $id = $self->adaptor->insert_service_instance( category => $self->category, servicename => $self->servicename, @@ -271,6 +279,7 @@ authoritative => $self->authoritative, description => $self->description, signatureURL => $self->signatureURL, + lsid => $service_lsid ); $self->service_instance_id($id); $self->{__exists__} = 1; # this service now exists From kawas at pub.open-bio.org Mon May 30 19:33:44 2005 From: kawas at pub.open-bio.org (Eddie Kawas) Date: Mon, 30 May 2005 19:33:44 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505302333.j4UNXiPr002980@pub.open-bio.org> kawas Mon May 30 19:33:44 EDT 2005 Update of /home/repository/moby/moby-live/Perl/MOBY In directory pub.open-bio.org:/tmp/cvs-serv2936 Modified Files: service_instance.pm Log Message: Added more lsid stuff. Last time, i promise. Eddie moby-live/Perl/MOBY service_instance.pm,1.10,1.11 =================================================================== RCS file: /home/repository/moby/moby-live/Perl/MOBY/service_instance.pm,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- /home/repository/moby/moby-live/Perl/MOBY/service_instance.pm 2005/05/30 23:28:45 1.10 +++ /home/repository/moby/moby-live/Perl/MOBY/service_instance.pm 2005/05/30 23:33:44 1.11 @@ -71,7 +71,8 @@ contact_email => [ undef, 'read/write' ], authoritative => [ 0, 'read/write' ], description => [ undef, 'read/write' ], - registry => [ 'MOBY_Central', 'read/write' ], + registry => [ 'MOBY_Central', 'read/write' ], + lsid => [ undef, 'read/write' ], test => [ 0, 'read/write' ] , # toggles create or test_existence behaviour ); @@ -249,6 +250,7 @@ $self->description( $existing_service->{'desc'} ); $self->authority( $existing_service->{'authURI'} ); $self->signatureURL( $existing_service->{'signatureURL'} ); + $self->lsid( $existing_service->{'lsid'} ); $self->{__exists__} = 1; # this service already existed } elsif ( !($existing_service) # if it doesn't exist From kawas at pub.open-bio.org Mon May 30 19:33:44 2005 From: kawas at pub.open-bio.org (Eddie Kawas) Date: Mon, 30 May 2005 19:33:44 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505302333.j4UNXiM4002961@pub.open-bio.org> kawas Mon May 30 19:33:43 EDT 2005 Update of /home/repository/moby/moby-live/Perl/MOBY/Adaptor/moby/queryapi In directory pub.open-bio.org:/tmp/cvs-serv2936/Adaptor/moby/queryapi Modified Files: mysql.pm Log Message: Added more lsid stuff. Last time, i promise. Eddie moby-live/Perl/MOBY/Adaptor/moby/queryapi mysql.pm,1.9,1.10 =================================================================== RCS file: /home/repository/moby/moby-live/Perl/MOBY/Adaptor/moby/queryapi/mysql.pm,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- /home/repository/moby/moby-live/Perl/MOBY/Adaptor/moby/queryapi/mysql.pm 2005/03/09 00:56:15 1.9 +++ /home/repository/moby/moby-live/Perl/MOBY/Adaptor/moby/queryapi/mysql.pm 2005/05/30 23:33:43 1.10 @@ -173,7 +173,7 @@ my ($self, %args) = @_; my $dbh = $self->dbh; - my ($serviceid, $category, $name, $typeURI, $authURI,$url,$email,$authoritative,$desc, $signatureURL) = $dbh->selectrow_array( # does this service already exist? + my ($serviceid, $category, $name, $typeURI, $authURI,$url,$email,$authoritative,$desc, $signatureURL, $lsid) = $dbh->selectrow_array( # does this service already exist? q{select service_instance_id, category, @@ -184,7 +184,8 @@ service_instance.contact_email, authoritative, description, - signatureURL + signatureURL, + lsid from service_instance, authority where service_instance.authority_id = authority.authority_id @@ -202,6 +203,7 @@ email => $email, authoritative => $authoritative, desc => $desc, + lsid => $lsid }; } @@ -210,7 +212,7 @@ my ($self, %args) = @_; my $dbh = $self->dbh; - $dbh->do(q{insert into service_instance (category, servicename, service_type_uri, authority_id, url, contact_email, authoritative, description, signatureURL) values (?,?,?,?,?,?,?,?,?)}, + $dbh->do(q{insert into service_instance (category, servicename, service_type_uri, authority_id, url, contact_email, authoritative, description, signatureURL, lsid) values (?,?,?,?,?,?,?,?,?,?)}, undef, $args{'category'}, $args{'servicename'}, @@ -220,7 +222,8 @@ $args{'contact_email'}, $args{'authoritative'}, $args{'description'}, - $args{'signatureURL'}); + $args{'signatureURL'}, + $args{'lsid'}); my $id = $dbh->{mysql_insertid}; return $id; From mwilkinson at pub.open-bio.org Mon May 30 20:06:48 2005 From: mwilkinson at pub.open-bio.org (Mark Wilkinson) Date: Mon, 30 May 2005 20:06:48 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505310006.j4V06mDj003119@pub.open-bio.org> mwilkinson Mon May 30 20:06:48 EDT 2005 Update of /home/repository/moby/moby-live/Perl In directory pub.open-bio.org:/tmp/cvs-serv3100 Modified Files: Makefile.PL Log Message: updated Makefile moving to LS::ID dependencies moby-live/Perl Makefile.PL,1.7,1.8 =================================================================== RCS file: /home/repository/moby/moby-live/Perl/Makefile.PL,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- /home/repository/moby/moby-live/Perl/Makefile.PL 2005/02/18 15:21:03 1.7 +++ /home/repository/moby/moby-live/Perl/Makefile.PL 2005/05/31 00:06:48 1.8 @@ -77,6 +77,10 @@ 'PREREQ_PM' => { 'SOAP::Lite' => 0.55, 'XML::LibXML' => 1.58, + 'Text::Shellwords' => 1.00, + 'SOAP::MIME' => 0.55, + 'XML::XPath' => 1.12, + 'LS::ID' => 1.1.1, }, # e.g., Module::Name => 1.1 #'PM_FILTER' => "", ($] >= 5.005 ? ## Add these new keywords supported since 5.005 From kawas at pub.open-bio.org Tue May 31 11:09:26 2005 From: kawas at pub.open-bio.org (Eddie Kawas) Date: Tue, 31 May 2005 11:09:26 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505311509.j4VF9Qnu005820@pub.open-bio.org> kawas Tue May 31 11:09:26 EDT 2005 Update of /home/repository/moby/moby-live/Perl/MOBY In directory pub.open-bio.org:/tmp/cvs-serv5794 Modified Files: Central.pm Log Message: Fixed bug that caused an error on test 17 of testMobyClientCentral. ... Eddie moby-live/Perl/MOBY Central.pm,1.152,1.153 =================================================================== RCS file: /home/repository/moby/moby-live/Perl/MOBY/Central.pm,v retrieving revision 1.152 retrieving revision 1.153 diff -u -r1.152 -r1.153 --- /home/repository/moby/moby-live/Perl/MOBY/Central.pm 2005/05/30 21:38:41 1.152 +++ /home/repository/moby/moby-live/Perl/MOBY/Central.pm 2005/05/31 15:09:25 1.153 @@ -1409,16 +1409,16 @@ ); } - # use MOBY::Client::Central; - # my $services = MOBY::Client::Central::_parseServices( '', '', $si ); - # my $service_instance = shift @{$services}; + use MOBY::Client::Central; + my $services = MOBY::Client::Central::_parseServices( '', '', $si ); + my $service_instance = shift @{$services}; # my $storage = new RDF::Core::Storage::Memory; # my $model = new RDF::Core::Model( Storage => $storage ); # my $RDF_MODEL = MOBY::RDF::ServiceInstanceRDF->new( #model => $model, #service_instance => $service_instance ); # my $RDF_XML = $RDF_MODEL->serialize; - my $LSID = $si->LSID; + my $LSID = $service_instance->LSID; my $RDF = _getServiceInstanceRDF($LSID); unless ($RDF){return &_success("Registration successful but LSID resolution error",$SVC->service_instance_id,"" )} unless ($RDF =~ /RDF/){ From kawas at pub.open-bio.org Tue May 31 14:09:24 2005 From: kawas at pub.open-bio.org (Eddie Kawas) Date: Tue, 31 May 2005 14:09:24 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505311809.j4VI9Obi006293@pub.open-bio.org> kawas Tue May 31 14:09:24 EDT 2005 Update of /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/ui/graphical/servlet/jresources In directory pub.open-bio.org:/tmp/cvs-serv6268/org/biomoby/client/ui/graphical/servlet/jresources Modified Files: RESOURCE.java Log Message: updated the 'script' to use updated properties. Eddie moby-live/Java/src/main/org/biomoby/client/ui/graphical/servlet/jresources RESOURCE.java,1.4,1.5 =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/ui/graphical/servlet/jresources/RESOURCE.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/ui/graphical/servlet/jresources/RESOURCE.java 2005/05/13 19:18:18 1.4 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/ui/graphical/servlet/jresources/RESOURCE.java 2005/05/31 18:09:24 1.5 @@ -17,7 +17,6 @@ import javax.servlet.http.HttpServletResponse; import org.biomoby.client.CentralDigestImpl; -import org.biomoby.client.CentralImpl; import org.biomoby.client.rdf.vocabulary.MobyResources; import org.biomoby.client.rdf.vocabulary.Predicates; import org.biomoby.registry.definitions.types.JNamespaces; @@ -26,14 +25,12 @@ import org.biomoby.registry.properties.MobyProperties; import org.biomoby.shared.CentralDigest; import org.biomoby.shared.MobyData; -import org.biomoby.shared.MobyDataType; import org.biomoby.shared.MobyException; import org.biomoby.shared.MobyNamespace; import org.biomoby.shared.MobyPrimaryDataSet; import org.biomoby.shared.MobyPrimaryDataSimple; import org.biomoby.shared.MobySecondaryData; import org.biomoby.shared.MobyService; -import org.biomoby.shared.NoSuccessException; import org.biomoby.shared.data.MobyDataSecondaryInstance; import org.w3c.rdf.model.ModelException; @@ -143,21 +140,21 @@ private static Properties properties = MobyProperties.PROPERTIES();; private static final String OBJ = "http://" - + properties.getProperty("domain") + "/RESOURCES/MOBY-S/Objects#"; + + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/Objects#"; private static final String SRV = "http://" - + properties.getProperty("domain") + "/RESOURCES/MOBY-S/Services#"; + + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/Services#"; private static final String NS = "http://" - + properties.getProperty("domain") + + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/Namespaces#"; private static final String MP = "http://" - + properties.getProperty("domain") + + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/Predicates#"; private static final String SI = "http://" - + properties.getProperty("domain") + + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/ServiceInstances#"; private static boolean RUN_MAIN = false; @@ -686,15 +683,7 @@ obj = obj.substring(0, obj.indexOf("(")); Resource _subject = _addClassResource(model, OBJ, sub, def); - try { - //TODO make this an sql call - MobyDataType _datatype = new CentralImpl().getDataType(sub); - model.add(model.createStatement(subject, DC.publisher, model.createLiteral(_datatype.getAuthority(), "en"))); - model.add(model.createStatement(subject, DC.creator, model.createLiteral( _datatype.getEmailContact(), "en"))); - } catch (NoSuccessException e) { - // oh well, at least we tried - System.err.println(sub + " could not be augmented with its 'creator' or its 'publisher'. Oh well, at least we tried"); - } + m = Pattern.compile(".*:isa$", Pattern.CASE_INSENSITIVE).matcher( pred); if (m.matches()) { From kawas at pub.open-bio.org Tue May 31 14:11:08 2005 From: kawas at pub.open-bio.org (Eddie Kawas) Date: Tue, 31 May 2005 14:11:08 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505311811.j4VIB8vk006343@pub.open-bio.org> kawas Tue May 31 14:11:08 EDT 2005 Update of /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/rdf/builder In directory pub.open-bio.org:/tmp/cvs-serv6314/org/biomoby/client/rdf/builder Modified Files: ServiceInstanceRDF.java RDFConfigure.java Log Message: updated the code to use updated properties located in MobyProperties.java. Eddie moby-live/Java/src/main/org/biomoby/client/rdf/builder ServiceInstanceRDF.java,1.2,1.3 RDFConfigure.java,1.1,1.2 =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/rdf/builder/ServiceInstanceRDF.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/rdf/builder/ServiceInstanceRDF.java 2005/05/12 05:19:20 1.2 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/rdf/builder/ServiceInstanceRDF.java 2005/05/31 18:11:07 1.3 @@ -40,10 +40,9 @@ */ /** - * @author Eddie Kawas - *

    This class was created to present a way to retrieve a service instances' RDF using just a service name and authority. - *

    For questions, comments, or bugs - *

    email me at edward.kawas at gmail.com + * @author Eddie Kawas

    This class was created to present a way to retrieve a + * service instances' RDF using just a service name and authority.

    For + * questions, comments, or bugs

    email me at edward.kawas at gmail.com */ public class ServiceInstanceRDF { @@ -60,26 +59,28 @@ + System.getProperty("line.separator") + ""; /* - * load the properties file and set the properties + * load the properties file and set the properties */ private static Properties properties = MobyProperties.PROPERTIES(); private static final String OBJ = "http://" - + properties.getProperty("domain") + "/RESOURCES/MOBY-S/Objects#"; + + properties.getProperty("resources_script_domain") + + "/RESOURCES/MOBY-S/Objects#"; private static final String SRV = "http://" - + properties.getProperty("domain") + "/RESOURCES/MOBY-S/Services#"; + + properties.getProperty("resources_script_domain") + + "/RESOURCES/MOBY-S/Services#"; private static final String NS = "http://" - + properties.getProperty("domain") + + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/Namespaces#"; private static final String MP = "http://" - + properties.getProperty("domain") + + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/Predicates#"; private static final String SI = "http://" - + properties.getProperty("domain") + + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/ServiceInstances#"; // the endpoint for the test server @@ -88,15 +89,23 @@ private final static String TEST_URI = properties.getProperty("test_uri"); /** - * - * PRE:name is either a valid name or null

    - * POST:If authorURI is a valid authority, then a RDF containing all of the service instances will be returned. - * If authorURI and name are valid then a single RDF containing just the service instance identified by name is returned.

    - * @param authorURI - the authority to query - * @param name - the name of the service instance if applicable or null. - * @param useTestMachine - if true then services are searched for on the test server, otherwise the production server is used. - * @return a string representing either all of services defined by authorURI, (if name is null) or a single service instances' - * rdf if name and authorURI are valid. If name and/or authorURI are invalid an empty rdf document is returned. + * + * PRE:name is either a valid name or null

    POST:If + * authorURI is a valid authority, then a RDF containing all of the service + * instances will be returned. If authorURI and name are valid then a single + * RDF containing just the service instance identified by name is returned.

    + * + * @param authorURI - + * the authority to query + * @param name - + * the name of the service instance if applicable or null. + * @param useTestMachine - + * if true then services are searched for on the test server, + * otherwise the production server is used. + * @return a string representing either all of services defined by + * authorURI, (if name is null) or a single service instances' rdf + * if name and authorURI are valid. If name and/or authorURI are + * invalid an empty rdf document is returned. */ public final static String findService(String authorURI, String name, boolean useTestMachine) { @@ -109,19 +118,28 @@ /** * - * method that retrieves the RDF describing a specific service instance based on the parameters domain, serviceName, url and uri. - *

    PRE:None. - *

    POST:The RDF describing the service with parameters domain, serviceName, url and uri is created. - * @param domain - the authoring domain of the service instance in question. - * @param serviceName - the name of the service instance in question. - * @param url - the URL of the endpoint of the BioMoby registry that you would like to query. If null, the mobycentral registry is queried. - * @param uri - the URI of the BioMoby registry that you would like to query. If null, the mobycentral registry is queried. - * @return - the string representation of the RDF describing the service instance based on the parameters given. + * method that retrieves the RDF describing a specific service instance + * based on the parameters domain, serviceName, url and uri.

    PRE:None. + *

    POST:The RDF describing the service with parameters domain, + * serviceName, url and uri is created. + * + * @param domain - + * the authoring domain of the service instance in question. + * @param serviceName - + * the name of the service instance in question. + * @param url - + * the URL of the endpoint of the BioMoby registry that you would + * like to query. If null, the mobycentral registry is queried. + * @param uri - + * the URI of the BioMoby registry that you would like to query. + * If null, the mobycentral registry is queried. + * @return - the string representation of the RDF describing the service + * instance based on the parameters given. */ public final static String findService(String domain, String serviceName, String url, String uri) { if (serviceName != null) { - // variables needed + // variables needed MobyService service = null; MobyService[] services = null; Central central = null; @@ -157,7 +175,8 @@ } /* - * a method that retrieves all of the service instances based on an authoriy. + * a method that retrieves all of the service instances based on an + * authoriy. */ private final static String getAllServices(String URI, boolean useTestMachine) { @@ -239,20 +258,19 @@ } /* - * method that actually creates the rdf based on one or more services contained in the array services + * method that actually creates the rdf based on one or more services + * contained in the array services */ private final static String createRDF(MobyService[] services) { Model model = ModelFactory.createDefaultModel(); // set up the prefixes/namespaces Map map = model.getNsPrefixMap(); map.put("mobyPred", Predicates.getURI()); - map.put("mobyObject", "http://biomoby.org/RESOURCES/MOBY-S/Objects#"); - map.put("serviceInstances", - "http://biomoby.org/RESOURCES/MOBY-S/ServiceInstances#"); - map.put("mobyNamespace", - "http://biomoby.org/RESOURCES/MOBY-S/Namespaces#"); - map.put("mobyService", "http://biomoby.org/RESOURCES/MOBY-S/Services#"); - map.put("moby", "http://biomoby.org/RESOURCES/MOBY-S/MOBYResources#"); + map.put("mobyObject", OBJ); + map.put("serviceInstances", SI); + map.put("mobyNamespace", NS); + map.put("mobyService", SRV); + map.put("moby", MobyResources.getURI()); model.setNsPrefixes(map); for (int i = 0; i < services.length; i++) { @@ -340,7 +358,7 @@ } } if (innerBag != null && innerBag.size() > 0) { - //TODO + // TODO consumeBag.add(innerBag); } @@ -443,7 +461,7 @@ return null; } } - if (innerBag != null /*&& innerBag.size() > 0*/) { + if (innerBag != null /* && innerBag.size() > 0 */) { produceBag.add(innerBag); } } else { @@ -489,7 +507,7 @@ } /* - * convenience method that creates a mobyPred:Simple + * convenience method that creates a mobyPred:Simple */ private final static Resource createSimpleDataItem(Model model, MobyPrimaryDataSimple simpleData, Resource _li) { @@ -505,19 +523,24 @@ MobyNamespace mns = ns[k]; _li.addProperty(Predicates.namespace_type, model .createResource(NS + mns.getName())); - //.addProperty(RDF.type, RDFS.Class)); + // .addProperty(RDF.type, RDFS.Class)); } } return _li; } /** - * - * PRE:None

    - * POST:If a service instance exists such that it has a name of name and an authoring URI of uri true is returned, otherwise false is returned.

    - * @param uri - the authors uri - * @param name - the name of the service instance - * @return true if a service instance exists with authority uri, and name name, otherwise false is returned. + * + * PRE:None

    POST:If a service instance exists such that + * it has a name of name and an authoring URI of uri true is returned, + * otherwise false is returned.

    + * + * @param uri - + * the authors uri + * @param name - + * the name of the service instance + * @return true if a service instance exists with authority uri, and name + * name, otherwise false is returned. */ public final static boolean serviceInstanceExists(String uri, String name) { Central central = null; @@ -542,15 +565,16 @@ } /** - * + * * Usage: ServiceInstanceRDF authorityURI [serviceName]

    * authorityURI: is the authortitys' domain to query

    - * serviceName:optional argument that identifies a specific service instance

    + * serviceName:optional argument that identifies a specific service + * instance

    + * * @throws LSIDException */ public final static void main(String[] args) throws LSIDException { - System.out.println("1:\n" - + findService("www.test.com", null, false)); + System.out.println("1:\n" + findService("www.test.com", null, false)); } } =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/rdf/builder/RDFConfigure.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/rdf/builder/RDFConfigure.java 2005/04/07 16:42:29 1.1 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/rdf/builder/RDFConfigure.java 2005/05/31 18:11:07 1.2 @@ -46,15 +46,15 @@ /* * Some constants for use in the rdfs */ - final public static String URI_OBJECT = "http://" + properties.getProperty("domain") +"/RESOURCES/MOBY-S/Objects#"; + final public static String URI_OBJECT = "http://" + properties.getProperty("resources_script_domain") +"/RESOURCES/MOBY-S/Objects#"; - final public static String URI_SERVICE = "http://" + properties.getProperty("domain") +"/RESOURCES/MOBY-S/Services#"; + final public static String URI_SERVICE = "http://" + properties.getProperty("resources_script_domain") +"/RESOURCES/MOBY-S/Services#"; - final public static String URI_NAMESPACE = "http://" + properties.getProperty("domain") +"/RESOURCES/MOBY-S/Namespaces#"; + final public static String URI_NAMESPACE = "http://" + properties.getProperty("resources_script_domain") +"/RESOURCES/MOBY-S/Namespaces#"; - final public static String URI_PREDICATE = "http://" + properties.getProperty("domain") +"/RESOURCES/MOBY-S/Predicates#"; + final public static String URI_PREDICATE = "http://" + properties.getProperty("resources_script_domain") +"/RESOURCES/MOBY-S/Predicates#"; - final public static String URI_ServiceINSTANCE = "http://" + properties.getProperty("domain") +"/RESOURCES/MOBY-S/ServiceInstances#"; + final public static String URI_ServiceINSTANCE = "http://" + properties.getProperty("resources_script_domain") +"/RESOURCES/MOBY-S/ServiceInstances#"; private Model model = null; From kawas at pub.open-bio.org Tue May 31 14:11:08 2005 From: kawas at pub.open-bio.org (Eddie Kawas) Date: Tue, 31 May 2005 14:11:08 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505311811.j4VIB8So006366@pub.open-bio.org> kawas Tue May 31 14:11:08 EDT 2005 Update of /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/rdf/vocabulary In directory pub.open-bio.org:/tmp/cvs-serv6314/org/biomoby/client/rdf/vocabulary Modified Files: Predicates.java MobyResources.java Log Message: updated the code to use updated properties located in MobyProperties.java. Eddie moby-live/Java/src/main/org/biomoby/client/rdf/vocabulary Predicates.java,1.1,1.2 MobyResources.java,1.1,1.2 =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/rdf/vocabulary/Predicates.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/rdf/vocabulary/Predicates.java 2005/04/07 16:42:29 1.1 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/rdf/vocabulary/Predicates.java 2005/05/31 18:11:08 1.2 @@ -22,33 +22,33 @@ public class Predicates { private final static Properties properties = MobyProperties.PROPERTIES(); - protected final static String uri = "http://" + properties.getProperty("domain") + "/RESOURCES/MOBY-S/Predicates#"; + protected final static String uri = "http://" + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/Predicates#"; private final static Model _model = ModelFactory.createDefaultModel();; - public static final Property category = _model.getProperty("http://" + properties.getProperty("domain") + "/RESOURCES/MOBY-S/Predicates#category"); - public static final Property isa = _model.getProperty("http://" + properties.getProperty("domain") + "/RESOURCES/MOBY-S/Predicates#isa"); - public static final Property has = _model.getProperty("http://" + properties.getProperty("domain") + "/RESOURCES/MOBY-S/Predicates#has"); - public static final Property hasa = _model.getProperty("http://" + properties.getProperty("domain") + "/RESOURCES/MOBY-S/Predicates#hasa"); - public static final Property articleName = _model.getProperty("http://" + properties.getProperty("domain") + "/RESOURCES/MOBY-S/Predicates#articleName"); - public static final Property article_name = _model.getProperty("http://" + properties.getProperty("domain") + "/RESOURCES/MOBY-S/Predicates#article_name"); - public static final Property namespace_type = _model.getProperty("http://" + properties.getProperty("domain") + "/RESOURCES/MOBY-S/Predicates#namespace_type"); - public static final Property object_type = _model.getProperty("http://" + properties.getProperty("domain") + "/RESOURCES/MOBY-S/Predicates#object_type"); - public static final Property input = _model.getProperty("http://" + properties.getProperty("domain") + "/RESOURCES/MOBY-S/Predicates#input"); - public static final Property output = _model.getProperty("http://" + properties.getProperty("domain") + "/RESOURCES/MOBY-S/Predicates#output"); - public static final Property consumes = _model.getProperty("http://" + properties.getProperty("domain") + "/RESOURCES/MOBY-S/Predicates#consumes"); - public static final Property produces = _model.getProperty("http://" + properties.getProperty("domain") + "/RESOURCES/MOBY-S/Predicates#produces"); - public static final Property performs_task = _model.getProperty("http://" + properties.getProperty("domain") + "/RESOURCES/MOBY-S/Predicates#performs_task"); - public static final Property comment = _model.getProperty("http://" + properties.getProperty("domain") + "/RESOURCES/MOBY-S/Predicates#comment"); - public static final Property label = _model.getProperty("http://" + properties.getProperty("domain") + "/RESOURCES/MOBY-S/Predicates#label"); - public static final Property default_value = _model.getProperty("http://" + properties.getProperty("domain") + "/RESOURCES/MOBY-S/Predicates#default_value"); - public static final Property datatype = _model.getProperty("http://" + properties.getProperty("domain") + "/RESOURCES/MOBY-S/Predicates#datatype"); - public static final Property max = _model.getProperty("http://" + properties.getProperty("domain") + "/RESOURCES/MOBY-S/Predicates#max"); - public static final Property min = _model.getProperty("http://" + properties.getProperty("domain") + "/RESOURCES/MOBY-S/Predicates#min"); - public static final Property enumeration = _model.getProperty("http://" + properties.getProperty("domain") + "/RESOURCES/MOBY-S/Predicates#enum"); - public static final Property SimpleArticle = _model.getProperty("http://" + properties.getProperty("domain") + "/RESOURCES/MOBY-S/Predicates#SimpleArticle"); - public static final Property CollectionArticle = _model.getProperty("http://" + properties.getProperty("domain") + "/RESOURCES/MOBY-S/Predicates#CollectionArticle"); - public static final Property SecondaryArticle = _model.getProperty("http://" + properties.getProperty("domain") + "/RESOURCES/MOBY-S/Predicates#SecondaryArticle"); - public static final Property SignatureURL = _model.getProperty("http://" + properties.getProperty("domain") + "/RESOURCES/MOBY-S/Predicates#SignatureURL"); - public static final Property authoritative = _model.getProperty("http://" + properties.getProperty("domain") + "/RESOURCES/MOBY-S/Predicates#authoritative"); + public static final Property category = _model.getProperty("http://" + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/Predicates#category"); + public static final Property isa = _model.getProperty("http://" + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/Predicates#isa"); + public static final Property has = _model.getProperty("http://" + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/Predicates#has"); + public static final Property hasa = _model.getProperty("http://" + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/Predicates#hasa"); + public static final Property articleName = _model.getProperty("http://" + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/Predicates#articleName"); + public static final Property article_name = _model.getProperty("http://" + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/Predicates#article_name"); + public static final Property namespace_type = _model.getProperty("http://" + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/Predicates#namespace_type"); + public static final Property object_type = _model.getProperty("http://" + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/Predicates#object_type"); + public static final Property input = _model.getProperty("http://" + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/Predicates#input"); + public static final Property output = _model.getProperty("http://" + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/Predicates#output"); + public static final Property consumes = _model.getProperty("http://" + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/Predicates#consumes"); + public static final Property produces = _model.getProperty("http://" + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/Predicates#produces"); + public static final Property performs_task = _model.getProperty("http://" + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/Predicates#performs_task"); + public static final Property comment = _model.getProperty("http://" + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/Predicates#comment"); + public static final Property label = _model.getProperty("http://" + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/Predicates#label"); + public static final Property default_value = _model.getProperty("http://" + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/Predicates#default_value"); + public static final Property datatype = _model.getProperty("http://" + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/Predicates#datatype"); + public static final Property max = _model.getProperty("http://" + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/Predicates#max"); + public static final Property min = _model.getProperty("http://" + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/Predicates#min"); + public static final Property enumeration = _model.getProperty("http://" + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/Predicates#enum"); + public static final Property SimpleArticle = _model.getProperty("http://" + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/Predicates#SimpleArticle"); + public static final Property CollectionArticle = _model.getProperty("http://" + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/Predicates#CollectionArticle"); + public static final Property SecondaryArticle = _model.getProperty("http://" + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/Predicates#SecondaryArticle"); + public static final Property SignatureURL = _model.getProperty("http://" + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/Predicates#SignatureURL"); + public static final Property authoritative = _model.getProperty("http://" + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/Predicates#authoritative"); public final static String getURI() { return uri; } =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/rdf/vocabulary/MobyResources.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/rdf/vocabulary/MobyResources.java 2005/04/07 16:42:29 1.1 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/rdf/vocabulary/MobyResources.java 2005/05/31 18:11:08 1.2 @@ -21,13 +21,13 @@ */ public class MobyResources { private final static Properties properties = MobyProperties.PROPERTIES(); - private static final String uri = "http://" + properties.getProperty("domain") + "/RESOURCES/MOBY-S/MOBYResources#"; + private static final String uri = "http://" + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/MOBYResources#"; private static Model _model = ModelFactory.createDefaultModel(); - public static final Property SimpleArticle = _model.getProperty("http://" + properties.getProperty("domain") + "/RESOURCES/MOBY-S/MOBYResources#Simple"); - public static final Property CollectionArticle = _model.getProperty("http://" + properties.getProperty("domain") + "/RESOURCES/MOBY-S/MOBYResources#articleName"); - public static final Property SecondaryArticle = _model.getProperty("http://" + properties.getProperty("domain") + "/RESOURCES/MOBY-S/MOBYResources#Secondary"); - public static final Property Collection = _model.getProperty("http://" + properties.getProperty("domain") + "/RESOURCES/MOBY-S/MOBYResources#Collection"); + public static final Property SimpleArticle = _model.getProperty("http://" + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/MOBYResources#Simple"); + public static final Property CollectionArticle = _model.getProperty("http://" + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/MOBYResources#articleName"); + public static final Property SecondaryArticle = _model.getProperty("http://" + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/MOBYResources#Secondary"); + public static final Property Collection = _model.getProperty("http://" + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/MOBYResources#Collection"); public final static String getURI() { return uri; } From kawas at pub.open-bio.org Tue May 31 14:13:13 2005 From: kawas at pub.open-bio.org (Eddie Kawas) Date: Tue, 31 May 2005 14:13:13 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505311813.j4VIDDWr006414@pub.open-bio.org> kawas Tue May 31 14:13:13 EDT 2005 Update of /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/ui/graphical/servlet/lsid/authority In directory pub.open-bio.org:/tmp/cvs-serv6385/org/biomoby/client/ui/graphical/servlet/lsid/authority Modified Files: MobyAuthority.java LSIDDataLookup.java Log Message: Updated property file usage and improved some logic to (Hopefully) make code more portable. Eddie moby-live/Java/src/main/org/biomoby/client/ui/graphical/servlet/lsid/authority MobyAuthority.java,1.1,1.2 LSIDDataLookup.java,1.1,1.2 =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/ui/graphical/servlet/lsid/authority/MobyAuthority.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/ui/graphical/servlet/lsid/authority/MobyAuthority.java 2005/04/07 16:42:26 1.1 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/ui/graphical/servlet/lsid/authority/MobyAuthority.java 2005/05/31 18:13:13 1.2 @@ -1,6 +1,9 @@ - package org.biomoby.client.ui.graphical.servlet.lsid.authority; +import java.util.Properties; + +import org.biomoby.registry.properties.MobyProperties; + import com.ibm.lsid.ExpiringResponse; import com.ibm.lsid.LSID; import com.ibm.lsid.LSIDException; @@ -20,19 +23,14 @@ */ /** - * @author Eddie Kawas - *

    - * Created for - *

    - * This class was created to ... - *

    - * For questions, comments, or bugs - *

    - * email me at edward.kawas at gmail.com + * @author Eddie Kawas

    Created for

    This class was created to ...

    For + * questions, comments, or bugs

    email me at edward.kawas at gmail.com */ public class MobyAuthority extends SimpleAuthority { private LSIDDataLookup lookup = null; + private Properties properties = MobyProperties.PROPERTIES(); + public LSIDMetadataPort[] getMetadataLocations(LSID lsid, String url) { if (lookup == null) @@ -48,7 +46,13 @@ if (lsType == LSIDDataLookup.UNKNOWN) return null; - return new LSIDMetadataPort[] { new SOAPLocation("BioMOBYSOAPPort","http://mobycentral.cbr.nrc.ca:8090/authority/metadata"), new HTTPLocation("BioMOBYHTTPPort","mobycentral.cbr.nrc.ca",8090, "/authority/metadata" ) }; + return new LSIDMetadataPort[] { + new SOAPLocation("BioMOBYSOAPPort", "http://" + + properties.getProperty("lsid_domain") + ":" + + properties.getProperty("lsid_port") + + "/authority/metadata"), + new HTTPLocation("BioMOBYHTTPPort", properties.getProperty("lsid_domain"), + Integer.parseInt(properties.getProperty("lsid_port")), "/authority/metadata") }; } public LSIDDataPort[] getDataLocations(LSID lsid, String url) { @@ -56,24 +60,29 @@ } /* - * (non-Javadoc) + * (non-Javadoc) + * * @see com.ibm.lsid.server.LSIDAuthorityService#getAvailableServices(com.ibm.lsid.server.LSIDRequestContext) */ - public ExpiringResponse getAvailableServices(LSIDRequestContext ctx) throws LSIDServerException { + public ExpiringResponse getAvailableServices(LSIDRequestContext ctx) + throws LSIDServerException { LSID lsid = ctx.getLsid(); - String url = ctx.getReqUrl(); - try { - LSIDWSDLWrapper wsdl = new LSIDWSDLWrapper(lsid); - LSIDMetadataPort[] metaLocs = getMetadataLocations(lsid,url); - if (metaLocs != null) - for (int i = 0; i < metaLocs.length; ++i) { - wsdl.setMetadataLocation(metaLocs[i]); - } - return new ExpiringResponse(wsdl.toString(),getExpiration()); - } catch (LSIDException e) { - throw new LSIDServerException(e, e.getErrorCode(), "Simple Authority Error in getAvailableOperations(" + lsid + "): "); - } + String url = ctx.getReqUrl(); + try { + LSIDWSDLWrapper wsdl = new LSIDWSDLWrapper(lsid); + LSIDMetadataPort[] metaLocs = getMetadataLocations(lsid, url); + if (metaLocs != null) + for (int i = 0; i < metaLocs.length; ++i) { + wsdl.setMetadataLocation(metaLocs[i]); + } + return new ExpiringResponse(wsdl.toString(), getExpiration()); + } catch (LSIDException e) { + throw new LSIDServerException(e, e.getErrorCode(), + "Simple Authority Error in getAvailableOperations(" + lsid + + "): "); + } } + /* * (non-Javadoc) * @@ -83,4 +92,4 @@ throws LSIDServerException { lookup = new LSIDDataLookup(); } -} \ No newline at end of file +} =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/ui/graphical/servlet/lsid/authority/LSIDDataLookup.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/ui/graphical/servlet/lsid/authority/LSIDDataLookup.java 2005/04/07 16:42:26 1.1 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/ui/graphical/servlet/lsid/authority/LSIDDataLookup.java 2005/05/31 18:13:13 1.2 @@ -18,9 +18,11 @@ package org.biomoby.client.ui.graphical.servlet.lsid.authority; import java.io.IOException; import java.util.HashMap; +import java.util.Properties; import org.biomoby.client.rdf.builder.RDFConfigure; import org.biomoby.client.rdf.builder.ServiceInstanceRDF; +import org.biomoby.registry.properties.MobyProperties; import com.ibm.lsid.LSID; import com.ibm.lsid.server.LSIDServerException; @@ -43,6 +45,12 @@ public static final int MOBY_PREDICATE = 6; + private Properties mobycentral = MobyProperties.SERVICE_INSTANCE_PROPERTIES(); + private Properties mobyobject = MobyProperties.OBJECT_PROPERTIES(); + private Properties mobyservice = MobyProperties.SERVICE_PROPERTIES(); + private Properties mobynamespace = MobyProperties.NAMESPACE_PROPERTIES(); + private Properties mobyrelationship = MobyProperties.RELATIONSHIP_PROPERTIES(); + /** * 0 - object * 1 - namespace @@ -64,15 +72,15 @@ int result = UNKNOWN; System.err.println(lsid.toString()); String authority = lsid.getAuthority().getAuthority(); - if (!authority.equals("biomoby.org")) { - throw new LSIDServerException("Error in lsidType - Unknown LSID: " + lsid.getLsid()); - } if (ver != null || (ver != null && ver.length() != 0)) return UNKNOWN; - if (ns.equalsIgnoreCase("namespacetype")) { + if (ns.equalsIgnoreCase(mobynamespace.getProperty("lsid_namespace"))) { if (lsidLookup[1] == null) { + if (!authority.equals(mobynamespace.getProperty("lsid_authority"))) { + throw new LSIDServerException("Error in lsidType - Unknown LSID: " + lsid.getLsid()); + } try { lsidLookup[1] = new RDFConfigure(RDFConfigure.URI_NAMESPACE); } catch (IOException e) { @@ -82,8 +90,11 @@ if (lsidLookup[1].objectExists(lsid.getObject())) result = NAMESPACE_TYPE; } - else if (ns.equalsIgnoreCase("objectclass")) { + else if (ns.equalsIgnoreCase(mobyobject.getProperty("lsid_namespace"))) { if (lsidLookup[0] == null) { + if (!authority.equals(mobyobject.getProperty("lsid_authority"))) { + throw new LSIDServerException("Error in lsidType - Unknown LSID: " + lsid.getLsid()); + } try { lsidLookup[0] = new RDFConfigure(RDFConfigure.URI_OBJECT); } catch (IOException e) { @@ -93,8 +104,11 @@ if (lsidLookup[0].objectExists(lsid.getObject())) result = OBJECT_CLASS; } - else if (ns.equalsIgnoreCase("servicetype")) { + else if (ns.equalsIgnoreCase(mobyservice.getProperty("lsid_namespace"))) { if (lsidLookup[2] == null) { + if (!authority.equals(mobyservice.getProperty("lsid_authority"))) { + throw new LSIDServerException("Error in lsidType - Unknown LSID: " + lsid.getLsid()); + } try { lsidLookup[2] = new RDFConfigure(RDFConfigure.URI_SERVICE); } catch (IOException e) { @@ -117,11 +131,14 @@ return UNKNOWN; } - else if (ns.equalsIgnoreCase("serviceinstance")) { + else if (ns.equalsIgnoreCase(mobycentral.getProperty("lsid_namespace"))) { String str = lsid.getObject(); // make sure that the service instance is in the form // domain,serviceInstanceName if (lsidLookup[3] == null) { + if (!authority.equals(mobycentral.getProperty("lsid_authority"))) { + throw new LSIDServerException("Error in lsidType - Unknown LSID: " + lsid.getLsid()); + } try { lsidLookup[3] = new RDFConfigure(RDFConfigure.URI_ServiceINSTANCE); } catch (IOException e) { From kawas at pub.open-bio.org Tue May 31 14:15:14 2005 From: kawas at pub.open-bio.org (Eddie Kawas) Date: Tue, 31 May 2005 14:15:14 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505311815.j4VIFEXG006469@pub.open-bio.org> kawas Tue May 31 14:15:14 EDT 2005 Update of /home/repository/moby/moby-live/Java/src/main/org/biomoby/registry/properties In directory pub.open-bio.org:/tmp/cvs-serv6440/org/biomoby/registry/properties Modified Files: MobyProperties.java MobyCentralConfig.java Log Message: Made the properties more consistent with how Mark uses mobycentral.config in Perl. Eddie moby-live/Java/src/main/org/biomoby/registry/properties MobyProperties.java,1.1,1.2 MobyCentralConfig.java,1.2,1.3 =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/registry/properties/MobyProperties.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/registry/properties/MobyProperties.java 2005/04/07 16:42:26 1.1 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/registry/properties/MobyProperties.java 2005/05/31 18:15:14 1.2 @@ -31,8 +31,12 @@ package org.biomoby.registry.properties; import java.io.IOException; +import java.util.HashMap; +import java.util.Map; import java.util.Properties; +import org.biomoby.shared.MobyException; + /** * @author Eddie Kawas *

    This class was created to provide classes that depend on external variables a way to retrieve these variables. @@ -51,10 +55,110 @@ */ public final static Properties PROPERTIES() { try { - properties.load(MobyProperties.class.getClassLoader().getResourceAsStream("org/biomoby/client/properties/biomoby.properties")); + properties.load(MobyProperties.class.getClassLoader().getResourceAsStream("org/biomoby/registry/properties/biomoby.properties")); } catch (IOException e) { System.err.println("Biomoby properties file cannot be found!"); } return properties; } + + /** + * + * Retrieve the properties for [mobyobject] in mobycentral.conf + *

    PRE:The file org/biomoby/registry/properties/biomoby.properties exists and is valid. + *

    POST:The properties contained in mobycentral.conf for [mobyobject] are returned in a Properties object. + * @return Properties contained in the mobycentral.conf file. + */ + public final static Properties OBJECT_PROPERTIES() { + Map map = new HashMap(); + try { + map = MobyCentralConfig.getMobyObject(); + } catch (MobyException e) { + System.err.println("Error retrieving Moby Object Properties.\n" + e); + } + Properties p = new Properties(); + p.putAll(map); + return p; + } + + /** + * + * Retrieve the properties for [mobycentral] in mobycentral.conf + *

    PRE:The file org/biomoby/registry/properties/biomoby.properties exists and is valid. + *

    POST:The properties contained in mobycentral.conf for [mobycentral] are returned in a Properties object. + * @return Properties contained in the mobycentral.conf file. + */ + public final static Properties SERVICE_INSTANCE_PROPERTIES() { + Map map = new HashMap(); + try { + map = MobyCentralConfig.getMobyCentral(); + } catch (MobyException e) { + System.err.println("Error retrieving Moby Service Instance Properties.\n" + e); + } + Properties p = new Properties(); + p.putAll(map); + return p; + } + + /** + * + * Retrieve the properties for [mobyservice] in mobycentral.conf + *

    PRE:The file org/biomoby/registry/properties/biomoby.properties exists and is valid. + *

    POST:The properties contained in mobycentral.conf for [mobyservice] are returned in a Properties object. + * @return Properties contained in the mobycentral.conf file. + */ + public final static Properties SERVICE_PROPERTIES() { + Map map = new HashMap(); + try { + map = MobyCentralConfig.getMobyService(); + } catch (MobyException e) { + System.err.println("Error retrieving Moby Service Properties.\n" + e); + } + Properties p = new Properties(); + p.putAll(map); + return p; + } + + /** + * + * Retrieve the properties for [mobynamespace] in mobycentral.conf + *

    PRE:The file org/biomoby/registry/properties/biomoby.properties exists and is valid. + *

    POST:The properties contained in mobycentral.conf for [mobynamespace] are returned in a Properties object. + * @return Properties contained in the mobycentral.conf file. + */ + public final static Properties NAMESPACE_PROPERTIES() { + Map map = new HashMap(); + try { + map = MobyCentralConfig.getMobyNamespace(); + } catch (MobyException e) { + System.err.println("Error retrieving Moby Namespace Properties.\n" + e); + } + Properties p = new Properties(); + p.putAll(map); + return p; + } + + /** + * + * Retrieve the properties for [mobyrelationship] in mobycentral.conf + *

    PRE:The file org/biomoby/registry/properties/biomoby.properties exists and is valid. + *

    POST:The properties contained in mobycentral.conf for [mobyrelationship] are returned in a Properties object. + * @return Properties contained in the mobycentral.conf file. + */ + public final static Properties RELATIONSHIP_PROPERTIES() { + Map map = new HashMap(); + try { + map = MobyCentralConfig.getMobyRelationship(); + } catch (MobyException e) { + System.err.println("Error retrieving Moby Relationship Properties.\n" + e); + } + Properties p = new Properties(); + p.putAll(map); + return p; + } + + /* a little test method*/ + public static void main(String[] args) { + System.out.println(NAMESPACE_PROPERTIES()); + } } =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/registry/properties/MobyCentralConfig.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/registry/properties/MobyCentralConfig.java 2005/04/20 21:42:10 1.2 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/registry/properties/MobyCentralConfig.java 2005/05/31 18:15:14 1.3 @@ -127,7 +127,6 @@ String key = parse(line, 1); String value = parse(line, 2); map.put(key, value); - System.out.println(key+"->"+value); } } } From gss at pub.open-bio.org Thu May 5 17:30:47 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Thu, 5 May 2005 13:30:47 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505051730.j45HUlqC017398@pub.open-bio.org> gss Thu May 5 13:30:47 EDT 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies In directory pub.open-bio.org:/tmp/cvs-serv17312/WebRoot/examples/proxies Modified Files: wormbase-query tair-seqviewer flybase-genequery ncbi-megablast.n3 gramene-query.n3 sgd-quicksearch.n3 tair-seqviewer.n3 tair-mapviewer tair-mapviewer.n3 pubmed ncbi-megablast sgd-quicksearch pubmed.n3 gramene-query wormbase-query.n3 flybase-genequery.n3 Log Message: Some new proxy providers moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies wormbase-query,1.1,1.2 tair-seqviewer,1.1,1.2 flybase-genequery,1.1,1.2 ncbi-megablast.n3,1.1,1.2 gramene-query.n3,1.1,1.2 sgd-quicksearch.n3,1.1,1.2 tair-seqviewer.n3,1.1,1.2 tair-mapviewer,1.1,1.2 tair-mapviewer.n3,1.1,1.2 pubmed,1.1,1.2 ncbi-megablast,1.1,1.2 sgd-quicksearch,1.1,1.2 pubmed.n3,1.1,1.2 gramene-query,1.1,1.2 wormbase-query.n3,1.1,1.2 flybase-genequery.n3,1.2,1.3 =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/wormbase-query,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/wormbase-query 2005/03/23 19:56:12 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/wormbase-query 2005/05/05 17:30:46 1.2 @@ -7,22 +7,23 @@ xmlns:owl="http://www.w3.org/2002/07/owl#" xmlns:moby="http://www.semanticmoby.org/ontologies/core/" > - - - - - + + + C. elegans database query at wormbase.org http://www.wormbase.org/ - + WormBase Query - - + + + + + - \ No newline at end of file + =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/tair-seqviewer,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/tair-seqviewer 2005/03/23 19:56:12 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/tair-seqviewer 2005/05/05 17:30:46 1.2 @@ -9,20 +9,21 @@ - - - - TAIR Sequence Viewer Arabidopsis Sequence Viewera service provided by TAIR + http://www.arabidopsis.org/servlets/sv + + + + - + - \ No newline at end of file + =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/flybase-genequery,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/flybase-genequery 2005/04/18 22:58:16 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/flybase-genequery 2005/05/05 17:30:46 1.2 @@ -7,22 +7,23 @@ xmlns:owl="http://www.w3.org/2002/07/owl#" xmlns:moby="http://www.semanticmoby.org/ontologies/core/" > - - FlyBase gene query form at flybase.bio.indiana.edu - http://flybase.bio.indiana.edu/genes/fbgquery.hform + + FlyBase Gene Query + http://flybase.bio.indiana.edu/genes/fbgquery.hform + FlyBase gene query form at flybase.bio.indiana.edu + + + - + - - - - - + + - \ No newline at end of file + =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/ncbi-megablast.n3,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/ncbi-megablast.n3 2005/03/21 21:42:02 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/ncbi-megablast.n3 2005/05/05 17:30:46 1.2 @@ -7,7 +7,7 @@ @prefix xsd: . ex:ncbi-megablast - a moby:Provider, exterms:ProxyProvider ; + a moby:Provider, exterms:ProxyProvider, exterms:BlastProvider ; moby:name "NCBI Mega BLAST" ; moby:oneLineDescription "NCBI MegaBlast service provided by NCBI" ; moby:inputURI "http://www.ncbi.nlm.nih.gov/BLAST/Blast.cgi?CMD=Web&LAYOUT=TwoWindows&AUTO_FORMAT=Semiauto&ALIGNMENTS=50&ALIGNMENT_VIEW=Tabular&CLIENT=web&DATABASE=nr&DESCRIPTIONS=100&ENTREZ_QUERY=%28none%29&EXPECT=10&FILTER=L&FORMAT_OBJECT=Alignment&FORMAT_TYPE=HTML&NCBI_GI=on&PAGE=MegaBlast&SERVICE=plain&SET_DEFAULTS.x=34&SET_DEFAULTS.y=8&SHOW_OVERVIEW=on&END_OF_HTTPGET=Yes&SHOW_LINKOUT=yes&GET_SEQUENCE=yes&PERC_IDENT=None,1,-2" ; =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/gramene-query.n3,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/gramene-query.n3 2005/03/23 19:56:12 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/gramene-query.n3 2005/05/05 17:30:46 1.2 @@ -7,7 +7,7 @@ @prefix xsd: . ex:gramene-query - a moby:Provider, exterms:ProxyProvider ; + a moby:Provider, exterms:ProxyProvider, exterms:CerealGrainSearchProvider ; moby:name "Gramene Query" ; moby:oneLineDescription "Cereal grains database query at gramene.org" ; moby:inputURI "http://www.gramene.org/" ; =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/sgd-quicksearch.n3,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/sgd-quicksearch.n3 2005/03/23 19:56:12 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/sgd-quicksearch.n3 2005/05/05 17:30:46 1.2 @@ -7,7 +7,7 @@ @prefix xsd: . ex:sgd-quicksearch - a moby:Provider, exterms:ProxyProvider ; + a moby:Provider, exterms:ProxyProvider, exterms:SacchromycesSearchProvider ; moby:name "SGD Quick Search" ; moby:oneLineDescription "Saccharomyces cerevisiae quick search" ; moby:inputURI "http://db.yeastgenome.org/cgi-bin/search/quickSearch" ; =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/tair-seqviewer.n3,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/tair-seqviewer.n3 2005/03/23 19:56:12 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/tair-seqviewer.n3 2005/05/05 17:30:46 1.2 @@ -7,7 +7,7 @@ @prefix xsd: . ex:tair-seqviewer - a moby:Provider, exterms:ProxyProvider ; + a moby:Provider, exterms:ProxyProvider, exterms:ArabidopsisSearchProvider ; moby:name "TAIR Sequence Viewer" ; moby:oneLineDescription "Arabidopsis Sequence Viewera service provided by TAIR" ; moby:inputURI "http://www.arabidopsis.org/servlets/sv" ; =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/tair-mapviewer,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/tair-mapviewer 2005/03/23 19:56:12 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/tair-mapviewer 2005/05/05 17:30:46 1.2 @@ -10,19 +10,20 @@ http://www.arabidopsis.org/servlets/mapper TAIR Map Viewer - Arabidopsis Map Viewer service provided by TAIR + + - - - - \ No newline at end of file + + + + =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/tair-mapviewer.n3,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/tair-mapviewer.n3 2005/03/23 19:56:12 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/tair-mapviewer.n3 2005/05/05 17:30:46 1.2 @@ -7,7 +7,7 @@ @prefix xsd: . ex:tair-mapviewer - a moby:Provider, exterms:ProxyProvider ; + a moby:Provider, exterms:ProxyProvider, exterms:ArabidopsisSearchProvider ; moby:name "TAIR Map Viewer" ; moby:oneLineDescription "Arabidopsis Map Viewer service provided by TAIR" ; moby:inputURI "http://www.arabidopsis.org/servlets/mapper" ; =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/pubmed,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/pubmed 2005/03/21 21:42:02 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/pubmed 2005/05/05 17:30:46 1.2 @@ -7,22 +7,23 @@ xmlns:owl="http://www.w3.org/2002/07/owl#" xmlns:moby="http://www.semanticmoby.org/ontologies/core/" > - - - + - + + + + - PubMed http://www.ncbi.nlm.nih.gov/entrez/query.fcgi? - Entrez PubMed service provided by NCBI + PubMed + - - + + - \ No newline at end of file + =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/ncbi-megablast,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/ncbi-megablast 2005/03/21 21:42:02 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/ncbi-megablast 2005/05/05 17:30:46 1.2 @@ -7,8 +7,8 @@ xmlns:owl="http://www.w3.org/2002/07/owl#" xmlns:moby="http://www.semanticmoby.org/ontologies/core/" > - + @@ -19,9 +19,10 @@ NCBI Mega BLAST - + http://www.ncbi.nlm.nih.gov/BLAST/Blast.cgi?CMD=Web&LAYOUT=TwoWindows&AUTO_FORMAT=Semiauto&ALIGNMENTS=50&ALIGNMENT_VIEW=Tabular&CLIENT=web&DATABASE=nr&DESCRIPTIONS=100&ENTREZ_QUERY=%28none%29&EXPECT=10&FILTER=L&FORMAT_OBJECT=Alignment&FORMAT_TYPE=HTML&NCBI_GI=on&PAGE=MegaBlast&SERVICE=plain&SET_DEFAULTS.x=34&SET_DEFAULTS.y=8&SHOW_OVERVIEW=on&END_OF_HTTPGET=Yes&SHOW_LINKOUT=yes&GET_SEQUENCE=yes&PERC_IDENT=None,1,-2 + NCBI MegaBlast service provided by NCBI =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/sgd-quicksearch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/sgd-quicksearch 2005/03/23 19:56:12 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/sgd-quicksearch 2005/05/05 17:30:46 1.2 @@ -7,22 +7,23 @@ xmlns:owl="http://www.w3.org/2002/07/owl#" xmlns:moby="http://www.semanticmoby.org/ontologies/core/" > - - - - + - - - - SGD Quick Search - + http://db.yeastgenome.org/cgi-bin/search/quickSearch Saccharomyces cerevisiae quick search + + + + + + + + - \ No newline at end of file + =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/pubmed.n3,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/pubmed.n3 2005/03/21 21:42:02 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/pubmed.n3 2005/05/05 17:30:46 1.2 @@ -7,7 +7,7 @@ @prefix xsd: . ex:pubmed - a moby:Provider, exterms:ProxyProvider ; + a moby:Provider, exterms:ProxyProvider, exterms:PubSearchProvider ; moby:name "PubMed" ; moby:oneLineDescription "Entrez PubMed service provided by NCBI" ; moby:inputURI "http://www.ncbi.nlm.nih.gov/entrez/query.fcgi?" ; =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/gramene-query,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/gramene-query 2005/03/23 19:56:12 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/gramene-query 2005/05/05 17:30:46 1.2 @@ -13,16 +13,17 @@ - - - - Gramene Query - http://www.gramene.org/ + + Cereal grains database query at gramene.org + + + + \ No newline at end of file =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/wormbase-query.n3,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/wormbase-query.n3 2005/03/23 19:56:12 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/wormbase-query.n3 2005/05/05 17:30:46 1.2 @@ -7,7 +7,7 @@ @prefix xsd: . ex:wormbase-query - a moby:Provider, exterms:ProxyProvider ; + a moby:Provider, exterms:ProxyProvider, exterms:ElegansSearchProvider ; moby:name "WormBase Query" ; moby:oneLineDescription "C. elegans database query at wormbase.org" ; moby:inputURI "http://www.wormbase.org/" ; =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/flybase-genequery.n3,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/flybase-genequery.n3 2005/04/18 22:58:17 1.2 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/flybase-genequery.n3 2005/05/05 17:30:46 1.3 @@ -7,7 +7,7 @@ @prefix xsd: . ex:flybase-genequery - a moby:Provider, exterms:ProxyProvider ; + a moby:Provider, exterms:ProxyProvider, exterms:DrosophilaSearchProvider ; moby:name "FlyBase Gene Query" ; moby:oneLineDescription "FlyBase gene query form at flybase.bio.indiana.edu" ; moby:inputURI "http://flybase.bio.indiana.edu/genes/fbgquery.hform" ; From gss at pub.open-bio.org Thu May 5 17:32:37 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Thu, 5 May 2005 13:32:37 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505051732.j45HWbGc017435@pub.open-bio.org> gss Thu May 5 13:32:36 EDT 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/ontologies In directory pub.open-bio.org:/tmp/cvs-serv17414/WebRoot/examples/ontologies Added Files: BlastProvider CerealGrainSearchProvider SacchromycesSearchProvider.n3 DrosophilaSearchProvider ArabidopsisSearchProvider.n3 DrosophilaSearchProvider.n3 PubSearchProvider ElegansSearchProvider.n3 PubSearchProvider.n3 ElegansSearchProvider SacchromycesSearchProvider ArabidopsisSearchProvider BlastProvider.n3 CerealGrainSearchProvider.n3 Log Message: Supporting ontology elements for proxy providers moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/ontologies BlastProvider,NONE,1.1 CerealGrainSearchProvider,NONE,1.1 SacchromycesSearchProvider.n3,NONE,1.1 DrosophilaSearchProvider,NONE,1.1 ArabidopsisSearchProvider.n3,NONE,1.1 DrosophilaSearchProvider.n3,NONE,1.1 PubSearchProvider,NONE,1.1 ElegansSearchProvider.n3,NONE,1.1 PubSearchProvider.n3,NONE,1.1 ElegansSearchProvider,NONE,1.1 SacchromycesSearchProvider,NONE,1.1 ArabidopsisSearchProvider,NONE,1.1 BlastProvider.n3,NONE,1.1 CerealGrainSearchProvider.n3,NONE,1.1 From gss at pub.open-bio.org Thu May 5 17:35:26 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Thu, 5 May 2005 13:35:26 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505051735.j45HZQGX017501@pub.open-bio.org> gss Thu May 5 13:35:26 EDT 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies In directory pub.open-bio.org:/tmp/cvs-serv17464/WebRoot/examples/proxies Modified Files: tair-seqviewer.n3 tair-seqviewer sgd-quicksearch sgd-quicksearch.n3 Log Message: Incorporated new ontology elements moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies tair-seqviewer.n3,1.2,1.3 tair-seqviewer,1.2,1.3 sgd-quicksearch,1.2,1.3 sgd-quicksearch.n3,1.2,1.3 =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/tair-seqviewer.n3,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/tair-seqviewer.n3 2005/05/05 17:30:46 1.2 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/tair-seqviewer.n3 2005/05/05 17:35:26 1.3 @@ -9,7 +9,7 @@ ex:tair-seqviewer a moby:Provider, exterms:ProxyProvider, exterms:ArabidopsisSearchProvider ; moby:name "TAIR Sequence Viewer" ; - moby:oneLineDescription "Arabidopsis Sequence Viewera service provided by TAIR" ; + moby:oneLineDescription "Arabidopsis Sequence Viewer service provided by TAIR" ; moby:inputURI "http://www.arabidopsis.org/servlets/sv" ; moby:operatesOn [ a moby:Graph ; =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/tair-seqviewer,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/tair-seqviewer 2005/05/05 17:30:46 1.2 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/tair-seqviewer 2005/05/05 17:35:26 1.3 @@ -12,7 +12,7 @@ TAIR Sequence Viewer - Arabidopsis Sequence Viewera service provided by TAIR + Arabidopsis Sequence Viewer service provided by TAIR =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/sgd-quicksearch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/sgd-quicksearch 2005/05/05 17:30:46 1.2 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/sgd-quicksearch 2005/05/05 17:35:26 1.3 @@ -9,6 +9,7 @@ + SGD Quick Search @@ -21,6 +22,7 @@ + =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/sgd-quicksearch.n3,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/sgd-quicksearch.n3 2005/05/05 17:30:46 1.2 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/sgd-quicksearch.n3 2005/05/05 17:35:26 1.3 @@ -14,9 +14,9 @@ moby:operatesOn [ a moby:Graph ; moby:hasMapping [ - a moby:Subject ; + a moby:Subject, exterms:GeneSymbol ; moby:mapsTo [ - a moby:Object + a moby:Object, exterms:GeneDetails ] ] ] . From gss at pub.open-bio.org Thu May 5 17:35:57 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Thu, 5 May 2005 13:35:57 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505051735.j45HZvUE017535@pub.open-bio.org> gss Thu May 5 13:35:57 EDT 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/ontologies In directory pub.open-bio.org:/tmp/cvs-serv17514/WebRoot/examples/ontologies Added Files: GeneSymbol GeneSymbol.n3 GeneDetails GeneDetails.n3 Log Message: Supporting ontology elements for proxy providers moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/ontologies GeneSymbol,NONE,1.1 GeneSymbol.n3,NONE,1.1 GeneDetails,NONE,1.1 GeneDetails.n3,NONE,1.1 From kawas at pub.open-bio.org Sun May 8 20:04:25 2005 From: kawas at pub.open-bio.org (Eddie Kawas) Date: Sun, 8 May 2005 16:04:25 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505082004.j48K4PJ0006981@pub.open-bio.org> kawas Sun May 8 16:04:25 EDT 2005 Update of /home/repository/moby/moby-live/Java/docs In directory pub.open-bio.org:/tmp/cvs-serv6956 Modified Files: index.html Added Files: CodingGuidelines.html jMobyDesignManual.html Log Message: added some files for ben (jMoby doc) Ed moby-live/Java/docs CodingGuidelines.html,NONE,1.1 jMobyDesignManual.html,NONE,1.1 index.html,1.6,1.7 =================================================================== RCS file: /home/repository/moby/moby-live/Java/docs/index.html,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- /home/repository/moby/moby-live/Java/docs/index.html 2004/12/05 22:28:02 1.6 +++ /home/repository/moby/moby-live/Java/docs/index.html 2005/05/08 20:04:25 1.7 @@ -48,6 +48,7 @@

    How to develop with jMoby
    +
    The twelve commandments for jMoby Developers (and some good advice)
    Available APIs (more explanation coming...)
    How to develop a client talking to a BioMoby service
    How to develop a BioMoby service (coming...) From gordonp at pub.open-bio.org Thu May 12 04:58:12 2005 From: gordonp at pub.open-bio.org (Paul Gordon) Date: Thu, 12 May 2005 00:58:12 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505120458.j4C4wCYs026015@pub.open-bio.org> gordonp Thu May 12 00:58:12 EDT 2005 Update of /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data In directory pub.open-bio.org:/tmp/cvs-serv25991/main/org/biomoby/shared/data Log Message: Directory /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data added to the repository moby-live/Java/src/main/org/biomoby/shared/data - New directory rcsdiff: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/RCS/-,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/RCS/New,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/RCS/directory,v: No such file or directory From gordonp at pub.open-bio.org Thu May 12 04:59:49 2005 From: gordonp at pub.open-bio.org (Paul Gordon) Date: Thu, 12 May 2005 00:59:49 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505120459.j4C4xndH026055@pub.open-bio.org> gordonp Thu May 12 00:59:49 EDT 2005 Update of /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data In directory pub.open-bio.org:/tmp/cvs-serv26034 Added Files: MobyDataBytes.java MobyDataComposite.java MobyDataDateTime.java MobyDataFloat.java MobyDataInstance.java MobyDataInt.java MobyDataObject.java MobyDataObjectSet.java MobyDataSecondaryInstance.java MobyDataServiceAssocInstance.java MobyDataString.java MobyDataXref.java Log Message: Moved Data instances classes to new package, and included complete experimental instance implementations moby-live/Java/src/main/org/biomoby/shared/data MobyDataBytes.java,NONE,1.1 MobyDataComposite.java,NONE,1.1 MobyDataDateTime.java,NONE,1.1 MobyDataFloat.java,NONE,1.1 MobyDataInstance.java,NONE,1.1 MobyDataInt.java,NONE,1.1 MobyDataObject.java,NONE,1.1 MobyDataObjectSet.java,NONE,1.1 MobyDataSecondaryInstance.java,NONE,1.1 MobyDataServiceAssocInstance.java,NONE,1.1 MobyDataString.java,NONE,1.1 MobyDataXref.java,NONE,1.1 From gordonp at pub.open-bio.org Thu May 12 05:02:11 2005 From: gordonp at pub.open-bio.org (Paul Gordon) Date: Thu, 12 May 2005 01:02:11 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505120502.j4C52BwT026107@pub.open-bio.org> gordonp Thu May 12 01:02:11 EDT 2005 Update of /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared In directory pub.open-bio.org:/tmp/cvs-serv26081 Removed Files: MobyDataSecondaryInstance.java MobyDataServiceAssocInstance.java MobyDataSetInstance.java MobyDataSimpleInstance.java MobyDataString.java Log Message: Removed in favor of data instance classes in org.biomoby.shared.data moby-live/Java/src/main/org/biomoby/shared MobyDataSecondaryInstance.java,1.1,NONE MobyDataServiceAssocInstance.java,1.2,NONE MobyDataSetInstance.java,1.2,NONE MobyDataSimpleInstance.java,1.9,NONE MobyDataString.java,1.5,NONE rcsdiff: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/RCS/MobyDataSecondaryInstance.java,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/RCS/MobyDataServiceAssocInstance.java,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/RCS/MobyDataSetInstance.java,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/RCS/MobyDataSimpleInstance.java,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/RCS/MobyDataString.java,v: No such file or directory From gordonp at pub.open-bio.org Thu May 12 05:03:20 2005 From: gordonp at pub.open-bio.org (Paul Gordon) Date: Thu, 12 May 2005 01:03:20 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505120503.j4C53K2L026152@pub.open-bio.org> gordonp Thu May 12 01:03:20 EDT 2005 Update of /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared In directory pub.open-bio.org:/tmp/cvs-serv26126 Removed Files: MobyDataDateTime.java MobyDataFloat.java MobyDataInstance.java MobyDataInt.java MobyDataXref.java Log Message: Removed in favor of data instance classes in org.biomoby.shared.data moby-live/Java/src/main/org/biomoby/shared MobyDataDateTime.java,1.5,NONE MobyDataFloat.java,1.6,NONE MobyDataInstance.java,1.2,NONE MobyDataInt.java,1.5,NONE MobyDataXref.java,1.1,NONE rcsdiff: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/RCS/MobyDataDateTime.java,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/RCS/MobyDataFloat.java,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/RCS/MobyDataInstance.java,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/RCS/MobyDataInt.java,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/RCS/MobyDataXref.java,v: No such file or directory From gordonp at pub.open-bio.org Thu May 12 05:12:01 2005 From: gordonp at pub.open-bio.org (Paul Gordon) Date: Thu, 12 May 2005 01:12:01 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505120512.j4C5C1bP026223@pub.open-bio.org> gordonp Thu May 12 01:12:01 EDT 2005 Update of /home/repository/moby/moby-live/Java/src/Clients In directory pub.open-bio.org:/tmp/cvs-serv26201 Removed Files: MobyServiceInvocationExample.java Log Message: Replaced by TestRequest moby-live/Java/src/Clients MobyServiceInvocationExample.java,1.1,NONE rcsdiff: /home/repository/moby/moby-live/Java/src/Clients/RCS/MobyServiceInvocationExample.java,v: No such file or directory From gordonp at pub.open-bio.org Thu May 12 05:13:37 2005 From: gordonp at pub.open-bio.org (Paul Gordon) Date: Thu, 12 May 2005 01:13:37 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505120513.j4C5DbYh026267@pub.open-bio.org> gordonp Thu May 12 01:13:37 EDT 2005 Update of /home/repository/moby/moby-live/Java/src/main/org/biomoby/client In directory pub.open-bio.org:/tmp/cvs-serv26242 Modified Files: MobyRequest.java Log Message: Updates to deal with new data instance package moby-live/Java/src/main/org/biomoby/client MobyRequest.java,1.10,1.11 =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/MobyRequest.java,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/MobyRequest.java 2005/04/18 17:29:43 1.10 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/MobyRequest.java 2005/05/12 05:13:37 1.11 @@ -23,10 +23,10 @@ import org.apache.xpath.objects.XObject; import org.biomoby.shared.Central; import org.biomoby.shared.MobyData; -import org.biomoby.shared.MobyDataInstance; -import org.biomoby.shared.MobyDataSecondaryInstance; -import org.biomoby.shared.MobyDataSetInstance; -import org.biomoby.shared.MobyDataSimpleInstance; +import org.biomoby.shared.data.MobyDataInstance; +import org.biomoby.shared.data.MobyDataSecondaryInstance; +import org.biomoby.shared.data.MobyDataObjectSet; +import org.biomoby.shared.data.MobyDataObject; import org.biomoby.shared.MobyException; import org.biomoby.shared.MobyPrefixResolver; import org.biomoby.shared.MobyService; @@ -111,18 +111,24 @@ MobyPrefixResolver.XSI1999_PREFIX+ ":type, ':'), \"base64\") or starts-with(substring-after(@"+ MobyPrefixResolver.XSI2001_PREFIX+ - ":type, ':'), \"base64\")]", null, mobyPrefixResolver, XPath.SELECT); + ":type, ':'), \"base64\")]", null, + mobyPrefixResolver, XPath.SELECT); stringEncodedXPath = new XPath("//*[substring-after(@"+ MobyPrefixResolver.XSI1999_PREFIX+ ":type, ':')=\"string\" or substring-after(@"+ MobyPrefixResolver.XSI2001_PREFIX+ - ":type, ':')=\"string\"]", null, mobyPrefixResolver, XPath.SELECT); - queryResponseXPath = new XPath("//moby:mobyData | //mobyData", null, mobyPrefixResolver, XPath.SELECT); - simpleChildXPath = new XPath("moby:Simple | Simple", null, mobyPrefixResolver, XPath.SELECT); - collectionChildXPath = new XPath("moby:Collection | Collection", null, mobyPrefixResolver, XPath.SELECT); + ":type, ':')=\"string\"]", null, + mobyPrefixResolver, XPath.SELECT); + queryResponseXPath = new XPath("//moby:mobyData | //mobyData", null, + mobyPrefixResolver, XPath.SELECT); + simpleChildXPath = new XPath("moby:Simple | Simple", null, + mobyPrefixResolver, XPath.SELECT); + collectionChildXPath = new XPath("moby:Collection | Collection", null, + mobyPrefixResolver, XPath.SELECT); } catch(TransformerException te){ - debugPS.println("Syntax error encountered while compiling XPath statements for internal use (code bug?): " + te); + debugPS.println("Syntax error encountered while compiling XPath " + + "statements for internal use (code bug?): " + te); } } @@ -194,7 +200,7 @@ } /** - * Convenience method to run services that take one argument. + * Convenience method to run services that take one unnamed argument. */ public void setInput(MobyDataInstance datum) throws IllegalArgumentException{ inputData = new MobyDataInstance[1]; @@ -586,17 +592,23 @@ data[i].setXmlMode(MobyDataInstance.SERVICE_XML_MODE); } - if(data[i] instanceof MobyDataSimpleInstance){ - mobyRequest += ((MobyDataSimpleInstance) data[i]).toXML(); + if(data[i] instanceof MobyDataObject){ + // This line should be replaced with a named field + mobyRequest += ""+ + ((MobyDataObject) data[i]).toXML()+ + ""; } - else if(data[i] instanceof MobyDataSetInstance){ - mobyRequest += ((MobyDataSetInstance) data[i]).toXML(); + else if(data[i] instanceof MobyDataObjectSet){ + mobyRequest += ((MobyDataObjectSet) data[i]).toXML(); } else{ + // Could just call toXML, but don't know if it has a Simple wrapper + // already or not, or even if it's a set. throw new MobyException("Element #" + i + " of the input data was not a " + - "MobyDataSimpleInstance or a " + - "MobyDataSetInstance (found " + data[i] + ")"); + "MobyDataObject or a " + + "MobyDataObjectSet (found " + + data[i].getClass().getName() + ")"); } // Restore the old XML mode setting if not service mode @@ -667,7 +679,7 @@ if(debug & j == 0) debugPS.println("There are " + collections.getLength() + " collections in response #" +i); - MobyDataSetInstance collection = new MobyDataSetInstance(""); + MobyDataObjectSet collection = new MobyDataObjectSet(""); // For each collection, find the simple children NodeList subsimples = null; @@ -679,13 +691,13 @@ } // And add their values to the collection - MobyDataSimpleInstance[] subout = new MobyDataSimpleInstance[subsimples.getLength()]; + MobyDataObject[] subout = new MobyDataObject[subsimples.getLength()]; for(int k = 0; k < subsimples.getLength(); k++){ if(debug && k == 0) debugPS.println("There are " + subsimples.getLength() + " simples in response #" + i + ", collection #" + j); - subout[k] = new MobyDataSimpleInstance(mobyCentral, (Element) subsimples.item(k)); + subout[k] = (MobyDataObject) MobyDataObject.createInstanceFromDOM((Element) subsimples.item(k)); } collection.setElements(subout); releaseXPath(collections.item(j)); @@ -708,7 +720,7 @@ for(int j = 0; simples != null && j < simples.getLength(); j++){ if(debug && j == 0) debugPS.println("There are " + simples.getLength() + " simples in response #" +i); - out.add(new MobyDataSimpleInstance(mobyCentral, (Element) simples.item(j))); + out.add(MobyDataObject.createInstanceFromDOM((Element) simples.item(j))); } // What we're building is a Vector, where each element represents From gordonp at pub.open-bio.org Thu May 12 05:17:59 2005 From: gordonp at pub.open-bio.org (Paul Gordon) Date: Thu, 12 May 2005 01:17:59 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505120517.j4C5HxOI026333@pub.open-bio.org> gordonp Thu May 12 01:17:58 EDT 2005 Update of /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data In directory pub.open-bio.org:/tmp/cvs-serv26312/src/main/org/biomoby/shared/data Added Files: MobyProvisionInfo.java Log Message: New class encoding the PIB moby-live/Java/src/main/org/biomoby/shared/data MobyProvisionInfo.java,NONE,1.1 From gordonp at pub.open-bio.org Thu May 12 05:19:20 2005 From: gordonp at pub.open-bio.org (Paul Gordon) Date: Thu, 12 May 2005 01:19:20 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505120519.j4C5JKmN026366@pub.open-bio.org> gordonp Thu May 12 01:19:20 EDT 2005 Update of /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/rdf/builder In directory pub.open-bio.org:/tmp/cvs-serv26341/src/main/org/biomoby/client/rdf/builder Modified Files: ServiceInstanceRDF.java Log Message: Updates to Eddie's code to deal with the new org.biomoby.shared.data instance class package moby-live/Java/src/main/org/biomoby/client/rdf/builder ServiceInstanceRDF.java,1.1,1.2 =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/rdf/builder/ServiceInstanceRDF.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/rdf/builder/ServiceInstanceRDF.java 2005/04/07 16:42:29 1.1 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/rdf/builder/ServiceInstanceRDF.java 2005/05/12 05:19:20 1.2 @@ -15,7 +15,7 @@ import org.biomoby.registry.properties.MobyProperties; import org.biomoby.shared.Central; import org.biomoby.shared.MobyData; -import org.biomoby.shared.MobyDataSecondaryInstance; +import org.biomoby.shared.data.MobyDataSecondaryInstance; import org.biomoby.shared.MobyException; import org.biomoby.shared.MobyNamespace; import org.biomoby.shared.MobyPrimaryDataSet; From gordonp at pub.open-bio.org Thu May 12 05:19:20 2005 From: gordonp at pub.open-bio.org (Paul Gordon) Date: Thu, 12 May 2005 01:19:20 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505120519.j4C5JKSM026409@pub.open-bio.org> gordonp Thu May 12 01:19:20 EDT 2005 Update of /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared In directory pub.open-bio.org:/tmp/cvs-serv26341/src/main/org/biomoby/shared Modified Files: MobyObjectDecomposition.java MobyObjectDecompositionImpl.java Log Message: Updates to Eddie's code to deal with the new org.biomoby.shared.data instance class package moby-live/Java/src/main/org/biomoby/shared MobyObjectDecomposition.java,1.3,1.4 MobyObjectDecompositionImpl.java,1.3,1.4 =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/MobyObjectDecomposition.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/MobyObjectDecomposition.java 2005/04/18 23:57:45 1.3 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/MobyObjectDecomposition.java 2005/05/12 05:19:20 1.4 @@ -21,7 +21,7 @@ * @param object - the object to flatten into its primitives. * @return - the full decomposition of an object into its primitives. */ - public MobyDataSimpleInstance[] getFlattenedPrims(String object); + public org.biomoby.shared.data.MobyDataObject[] getFlattenedPrims(String object); /** * @@ -42,4 +42,4 @@ */ public boolean isPrimitive(String object); -} \ No newline at end of file +} =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/MobyObjectDecompositionImpl.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/MobyObjectDecompositionImpl.java 2005/04/18 23:57:45 1.3 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/MobyObjectDecompositionImpl.java 2005/05/12 05:19:20 1.4 @@ -4,6 +4,8 @@ */ package org.biomoby.shared; +import org.biomoby.shared.data.*; + import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; @@ -44,10 +46,10 @@ /* (non-Javadoc) * @see org.biomoby.client.gui.util.MobyObjectDecomposition#getFlattenedPrims(java.lang.String) */ - public final MobyDataSimpleInstance[] getFlattenedPrims(String object) { + public final MobyDataObject[] getFlattenedPrims(String object) { ArrayList list = new ArrayList(); if (isPrimitive(object)) { - return new MobyDataSimpleInstance[] {}; + return new MobyDataObject[] {}; } String lsid = "urn:lsid:biomoby.org:objectclass:" + object; String rdf = getObjectRDF(lsid); @@ -81,11 +83,11 @@ : articleNode.getTextContent(); // TODO - recurse if object is not a primitive if (isPrimitive(localName)) { - MobyDataSimpleInstance mdsi = createPrimitiveType( + MobyDataObject mdsi = createPrimitiveType( localName, articleName); list.add(mdsi); } else { - MobyDataSimpleInstance[] recurseArray = getFlattenedPrims(localName); + MobyDataObject[] recurseArray = getFlattenedPrims(localName); for (int k = 0; k < recurseArray.length; k++) { list.add(recurseArray[k]); } @@ -104,11 +106,11 @@ : articleNode.getTextContent(); // TODO - recurse if object is not a primitive if (isPrimitive(localName)) { - MobyDataSimpleInstance mdsi = createPrimitiveType( + MobyDataObject mdsi = createPrimitiveType( localName, articleName); list.add(mdsi); } else { - MobyDataSimpleInstance[] recurseArray = getFlattenedPrims(localName); + MobyDataObject[] recurseArray = getFlattenedPrims(localName); for (int k = 0; k < recurseArray.length; k++) { list.add(recurseArray[k]); } @@ -126,7 +128,7 @@ _object = _object.substring(_object.indexOf("#") + 1); } if (isPrimitive(_object) && !_object.equals("Object")) { - MobyDataSimpleInstance mdsi = new MobyDataSimpleInstance( + MobyDataObject mdsi = new MobyDataObject( _object); mdsi.setDataType(new MobyDataType(_object)); list.add(mdsi); @@ -139,7 +141,7 @@ _object = _object.substring(_object.indexOf("#") + 1); } if (isPrimitive(_object) && !_object.equals("Object")) { - MobyDataSimpleInstance mdsi = new MobyDataSimpleInstance( + MobyDataObject mdsi = new MobyDataObject( _object); mdsi.setDataType(new MobyDataType(_object)); list.add(mdsi); @@ -271,7 +273,7 @@ /* * method to create default DataTypes. */ - public final MobyDataSimpleInstance createPrimitiveType(String localName, + public final MobyDataObject createPrimitiveType(String localName, String articleName) { if (localName.equalsIgnoreCase("Float")) { return new MobyDataFloat(articleName, 0.0); @@ -280,7 +282,7 @@ } else if (localName.equalsIgnoreCase("Integer")) { return new MobyDataInt(articleName, 0); } else if (localName.equalsIgnoreCase("DateTime")) { - MobyDataSimpleInstance mdsi = new MobyDataSimpleInstance( + MobyDataObject mdsi = new MobyDataObject( articleName); mdsi.setDataType(new MobyDataType(localName)); return mdsi; @@ -289,12 +291,12 @@ return null; } - private final MobyDataSimpleInstance[] convertArrayListToMoby(ArrayList list) { + private final MobyDataObject[] convertArrayListToMoby(ArrayList list) { int size = list.size(); - MobyDataSimpleInstance[] mdsi = new MobyDataSimpleInstance[size]; + MobyDataObject[] mdsi = new MobyDataObject[size]; size = 0; for (Iterator x = list.iterator(); x.hasNext(); size++) { - mdsi[size] = (MobyDataSimpleInstance) x.next(); + mdsi[size] = (MobyDataObject) x.next(); } return mdsi; } @@ -415,4 +417,4 @@ return sb.toString(); } } -} \ No newline at end of file +} From gordonp at pub.open-bio.org Thu May 12 05:19:20 2005 From: gordonp at pub.open-bio.org (Paul Gordon) Date: Thu, 12 May 2005 01:19:20 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505120519.j4C5JKXH026385@pub.open-bio.org> gordonp Thu May 12 01:19:20 EDT 2005 Update of /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/ui/graphical/servlet/jresources In directory pub.open-bio.org:/tmp/cvs-serv26341/src/main/org/biomoby/client/ui/graphical/servlet/jresources Modified Files: RESOURCE.java Log Message: Updates to Eddie's code to deal with the new org.biomoby.shared.data instance class package moby-live/Java/src/main/org/biomoby/client/ui/graphical/servlet/jresources RESOURCE.java,1.2,1.3 =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/ui/graphical/servlet/jresources/RESOURCE.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/ui/graphical/servlet/jresources/RESOURCE.java 2005/04/28 18:39:40 1.2 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/ui/graphical/servlet/jresources/RESOURCE.java 2005/05/12 05:19:20 1.3 @@ -25,7 +25,7 @@ import org.biomoby.registry.properties.MobyProperties; import org.biomoby.shared.CentralDigest; import org.biomoby.shared.MobyData; -import org.biomoby.shared.MobyDataSecondaryInstance; +import org.biomoby.shared.data.MobyDataSecondaryInstance; import org.biomoby.shared.MobyException; import org.biomoby.shared.MobyNamespace; import org.biomoby.shared.MobyPrimaryDataSet; From gordonp at pub.open-bio.org Thu May 12 05:22:27 2005 From: gordonp at pub.open-bio.org (Paul Gordon) Date: Thu, 12 May 2005 01:22:27 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505120522.j4C5MRnU026477@pub.open-bio.org> gordonp Thu May 12 01:22:27 EDT 2005 Update of /home/repository/moby/moby-live/Java/src/Clients In directory pub.open-bio.org:/tmp/cvs-serv26456/src/Clients Added Files: TestRequest.java Log Message: Sample client demonstrating the usage of data instance classes in org.biomoby.shared.data, and the use of MobyRequest for service invocation moby-live/Java/src/Clients TestRequest.java,NONE,1.1 From kawas at pub.open-bio.org Fri May 13 19:18:19 2005 From: kawas at pub.open-bio.org (Eddie Kawas) Date: Fri, 13 May 2005 15:18:19 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505131918.j4DJIJ9T002285@pub.open-bio.org> kawas Fri May 13 15:18:18 EDT 2005 Update of /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/ui/graphical/servlet/jresources In directory pub.open-bio.org:/tmp/cvs-serv2260/org/biomoby/client/ui/graphical/servlet/jresources Modified Files: RESOURCE.java Log Message: Fixed some import statements. Not sure really why I had to do this though!?! Eddie moby-live/Java/src/main/org/biomoby/client/ui/graphical/servlet/jresources RESOURCE.java,1.3,1.4 =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/ui/graphical/servlet/jresources/RESOURCE.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/ui/graphical/servlet/jresources/RESOURCE.java 2005/05/12 05:19:20 1.3 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/ui/graphical/servlet/jresources/RESOURCE.java 2005/05/13 19:18:18 1.4 @@ -17,6 +17,7 @@ import javax.servlet.http.HttpServletResponse; import org.biomoby.client.CentralDigestImpl; +import org.biomoby.client.CentralImpl; import org.biomoby.client.rdf.vocabulary.MobyResources; import org.biomoby.client.rdf.vocabulary.Predicates; import org.biomoby.registry.definitions.types.JNamespaces; @@ -25,13 +26,15 @@ import org.biomoby.registry.properties.MobyProperties; import org.biomoby.shared.CentralDigest; import org.biomoby.shared.MobyData; -import org.biomoby.shared.data.MobyDataSecondaryInstance; +import org.biomoby.shared.MobyDataType; import org.biomoby.shared.MobyException; import org.biomoby.shared.MobyNamespace; import org.biomoby.shared.MobyPrimaryDataSet; import org.biomoby.shared.MobyPrimaryDataSimple; import org.biomoby.shared.MobySecondaryData; import org.biomoby.shared.MobyService; +import org.biomoby.shared.NoSuccessException; +import org.biomoby.shared.data.MobyDataSecondaryInstance; import org.w3c.rdf.model.ModelException; import com.hp.hpl.jena.rdf.model.Bag; @@ -663,6 +666,8 @@ // create the base object type "class" Resource subject = _addClassResource(model, OBJ, "Object", "a base object class consisting of a namespace and an identifier"); + model.add(model.createStatement(subject, DC.publisher, model.createLiteral("www.illuminae.com", "en"))); + model.add(model.createStatement(subject, DC.creator, model.createLiteral("markw at illuminae.com", "en"))); model.add(model.createStatement(subject, RDF.type, RDFS.Class)); for (int x = 0; x < objects.length; x++) { String[] _line = objects[x].split("\t"); @@ -679,7 +684,17 @@ Matcher m; if (obj.indexOf("(") >= 0) obj = obj.substring(0, obj.indexOf("(")); + Resource _subject = _addClassResource(model, OBJ, sub, def); + try { + //TODO make this an sql call + MobyDataType _datatype = new CentralImpl().getDataType(sub); + model.add(model.createStatement(subject, DC.publisher, model.createLiteral(_datatype.getAuthority(), "en"))); + model.add(model.createStatement(subject, DC.creator, model.createLiteral( _datatype.getEmailContact(), "en"))); + } catch (NoSuccessException e) { + // oh well, at least we tried + System.err.println(sub + " could not be augmented with its 'creator' or its 'publisher'. Oh well, at least we tried"); + } m = Pattern.compile(".*:isa$", Pattern.CASE_INSENSITIVE).matcher( pred); if (m.matches()) { @@ -921,7 +936,7 @@ } public static void main(String[] args) throws MobyException { - System.out.println(new RESOURCE().getRESOURCES("Objects")); + System.out.println(new RESOURCE().getRESOURCES("ServiceInstances")); } } From kawas at pub.open-bio.org Fri May 13 19:20:14 2005 From: kawas at pub.open-bio.org (Eddie Kawas) Date: Fri, 13 May 2005 15:20:14 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505131920.j4DJKEjx002361@pub.open-bio.org> kawas Fri May 13 15:20:14 EDT 2005 Update of /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared In directory pub.open-bio.org:/tmp/cvs-serv2332/org/biomoby/shared Modified Files: Tag: java_1_5_compat MobyObjectDecompositionImpl.java MobyObjectDecomposition.java Log Message: Changed the import statements and references to MobyDataSimpleInstance to MobyDataObject. Seems to be the right change. Eddie moby-live/Java/src/main/org/biomoby/shared MobyObjectDecompositionImpl.java,1.1,1.1.2.1 MobyObjectDecomposition.java,1.1,1.1.2.1 =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/MobyObjectDecompositionImpl.java,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -r1.1 -r1.1.2.1 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/MobyObjectDecompositionImpl.java 2005/04/07 16:37:02 1.1 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/MobyObjectDecompositionImpl.java 2005/05/13 19:20:14 1.1.2.1 @@ -18,6 +18,7 @@ import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; +import org.biomoby.shared.data.*; import org.biomoby.client.CentralImpl; import org.biomoby.client.ui.graphical.applets.util.PrimitiveTypes; import org.w3c.dom.Document; @@ -44,10 +45,10 @@ /* (non-Javadoc) * @see org.biomoby.client.gui.util.MobyObjectDecomposition#getFlattenedPrims(java.lang.String) */ - public final MobyDataSimpleInstance[] getFlattenedPrims(String object) { + public final MobyDataObject[] getFlattenedPrims(String object) { ArrayList list = new ArrayList(); if (isPrimitive(object)) { - return new MobyDataSimpleInstance[] {}; + return new MobyDataObject[] {}; } String lsid = "urn:lsid:biomoby.org:objectclass:" + object; String rdf = getObjectRDF(lsid); @@ -81,11 +82,11 @@ : articleNode.getTextContent(); // TODO - recurse if object is not a primitive if (isPrimitive(localName)) { - MobyDataSimpleInstance mdsi = createPrimitiveType( + MobyDataObject mdsi = createPrimitiveType( localName, articleName); list.add(mdsi); } else { - MobyDataSimpleInstance[] recurseArray = getFlattenedPrims(localName); + MobyDataObject[] recurseArray = getFlattenedPrims(localName); for (int k = 0; k < recurseArray.length; k++) { list.add(recurseArray[k]); } @@ -104,11 +105,11 @@ : articleNode.getTextContent(); // TODO - recurse if object is not a primitive if (isPrimitive(localName)) { - MobyDataSimpleInstance mdsi = createPrimitiveType( + MobyDataObject mdsi = createPrimitiveType( localName, articleName); list.add(mdsi); } else { - MobyDataSimpleInstance[] recurseArray = getFlattenedPrims(localName); + MobyDataObject[] recurseArray = getFlattenedPrims(localName); for (int k = 0; k < recurseArray.length; k++) { list.add(recurseArray[k]); } @@ -126,7 +127,7 @@ _object = _object.substring(_object.indexOf("#") + 1); } if (isPrimitive(_object) && !_object.equals("Object")) { - MobyDataSimpleInstance mdsi = new MobyDataSimpleInstance( + MobyDataObject mdsi = new MobyDataObject( _object); mdsi.setDataType(new MobyDataType(_object)); list.add(mdsi); @@ -139,7 +140,7 @@ _object = _object.substring(_object.indexOf("#") + 1); } if (isPrimitive(_object) && !_object.equals("Object")) { - MobyDataSimpleInstance mdsi = new MobyDataSimpleInstance( + MobyDataObject mdsi = new MobyDataObject( _object); mdsi.setDataType(new MobyDataType(_object)); list.add(mdsi); @@ -271,7 +272,7 @@ /* * method to create default DataTypes. */ - public final MobyDataSimpleInstance createPrimitiveType(String localName, + public final MobyDataObject createPrimitiveType(String localName, String articleName) { if (localName.equalsIgnoreCase("Float")) { return new MobyDataFloat(articleName, 0.0); @@ -280,7 +281,7 @@ } else if (localName.equalsIgnoreCase("Integer")) { return new MobyDataInt(articleName, 0); } else if (localName.equalsIgnoreCase("DateTime")) { - MobyDataSimpleInstance mdsi = new MobyDataSimpleInstance( + MobyDataObject mdsi = new MobyDataObject( articleName); mdsi.setDataType(new MobyDataType(localName)); return mdsi; @@ -289,12 +290,12 @@ return null; } - private final MobyDataSimpleInstance[] convertArrayListToMoby(ArrayList list) { + private final MobyDataObject[] convertArrayListToMoby(ArrayList list) { int size = list.size(); - MobyDataSimpleInstance[] mdsi = new MobyDataSimpleInstance[size]; + MobyDataObject[] mdsi = new MobyDataObject[size]; size = 0; for (Iterator x = list.iterator(); x.hasNext(); size++) { - mdsi[size] = (MobyDataSimpleInstance) x.next(); + mdsi[size] = (MobyDataObject) x.next(); } return mdsi; } =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/MobyObjectDecomposition.java,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -r1.1 -r1.1.2.1 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/MobyObjectDecomposition.java 2005/04/07 16:37:02 1.1 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/MobyObjectDecomposition.java 2005/05/13 19:20:14 1.1.2.1 @@ -4,6 +4,8 @@ */ package org.biomoby.shared; +import org.biomoby.shared.data.MobyDataObject; + /** * @author Eddie Kawas @@ -21,7 +23,7 @@ * @param object - the object to flatten into its primitives. * @return - the full decomposition of an object into its primitives. */ - public MobyDataSimpleInstance[] getFlattenedPrims(String object); + public MobyDataObject[] getFlattenedPrims(String object); /** * From yanwong at pub.open-bio.org Mon May 16 12:42:01 2005 From: yanwong at pub.open-bio.org (Yan Wong) Date: Mon, 16 May 2005 08:42:01 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505161242.j4GCg1qW022091@pub.open-bio.org> yanwong Mon May 16 08:42:01 EDT 2005 Update of /home/repository/moby/moby-live/Python/bioMoby In directory pub.open-bio.org:/tmp/cvs-serv22018 Modified Files: mobyDataTypes.py Log Message: Modified the serialization/deserialization code: from bioMoby import MobyMarshaller m=MobyMarshaller() m.dumps(0) should return 0 and not same for the float numbers ;) this should fix problems of deserializing numbers. moby-live/Python/bioMoby mobyDataTypes.py,1.20,1.21 =================================================================== RCS file: /home/repository/moby/moby-live/Python/bioMoby/mobyDataTypes.py,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- /home/repository/moby/moby-live/Python/bioMoby/mobyDataTypes.py 2005/04/26 15:09:59 1.20 +++ /home/repository/moby/moby-live/Python/bioMoby/mobyDataTypes.py 2005/05/16 12:42:01 1.21 @@ -107,7 +107,7 @@ mobyObjects=filter(filterFunc, dir(self)) #If none, return the tag closed - if len(mobyObjects)==0 and (not hasattr(self, "__cross__") or len(self.__cross__)==0) and (not hasattr(self, "__PIB__") or len(self.__PIB__)==0) and (not hasattr(self, "content") or not self.content): + if len(mobyObjects)==0 and (not hasattr(self, "__cross__") or len(self.__cross__)==0) and (not hasattr(self, "__PIB__") or len(self.__PIB__)==0) and (not hasattr(self, "content") or (self.content==None or self.content=="")): beginTag.append("/>") return " ".join(beginTag) @@ -149,8 +149,7 @@ #Put the raw content of the object #If you want to put your special object, then then you should write #a __str__ method - if hasattr(self, "content") and self.content: - result.append("%s"%(self.content)) + result.append("%s"%(self.content)) result.append(""%(self.__prefix__, self.__tag__)) @@ -269,7 +268,11 @@ def fromMoby(self, xml): MobyObject.fromMoby(self, xml) - self.content = int(self.content) + + try: + self.content = int(self.content) + except: + self.content=0 class MobyFloat(MobyObject): """Serialize/deserialize floating point numbers @@ -279,7 +282,11 @@ def fromMoby(self, xml): MobyObject.fromMoby(self, xml) - self.content=float(self.content) + + try: + self.content=float(self.content) + except: + self.content=0.0 class MobyString(MobyObject): From yanwong at pub.open-bio.org Wed May 18 08:26:33 2005 From: yanwong at pub.open-bio.org (Yan Wong) Date: Wed, 18 May 2005 04:26:33 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505180826.j4I8QXd5029919@pub.open-bio.org> yanwong Wed May 18 04:26:33 EDT 2005 Update of /home/repository/moby/moby-live/Python/bioMoby In directory pub.open-bio.org:/tmp/cvs-serv29889 Modified Files: mobyDataTypes.py Log Message: added a test (without it, some objects (objects without a content attributes) wouldn't get marshalled) Thanks Mark Fiers ;) moby-live/Python/bioMoby mobyDataTypes.py,1.21,1.22 =================================================================== RCS file: /home/repository/moby/moby-live/Python/bioMoby/mobyDataTypes.py,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- /home/repository/moby/moby-live/Python/bioMoby/mobyDataTypes.py 2005/05/16 12:42:01 1.21 +++ /home/repository/moby/moby-live/Python/bioMoby/mobyDataTypes.py 2005/05/18 08:26:32 1.22 @@ -149,7 +149,8 @@ #Put the raw content of the object #If you want to put your special object, then then you should write #a __str__ method - result.append("%s"%(self.content)) + if hasattr(self, "content"): + result.append("%s"%(self.content)) result.append(""%(self.__prefix__, self.__tag__)) @@ -161,7 +162,7 @@ elem=xml if isinstance(xml, str): - doc=parseString(xmlstring) + doc=parseString(xml) elem=doc.firstChild From senger at pub.open-bio.org Thu May 19 10:56:06 2005 From: senger at pub.open-bio.org (Martin Senger) Date: Thu, 19 May 2005 06:56:06 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505191056.j4JAu6j2002918@pub.open-bio.org> senger Thu May 19 06:56:05 EDT 2005 Update of /home/repository/moby/moby-live/Java In directory pub.open-bio.org:/tmp/cvs-serv2887 Modified Files: build-dev.bat build-dev.sh build.bat build.sh Log Message: moby-live/Java build-dev.bat,1.3,1.4 build-dev.sh,1.3,1.4 build.bat,1.3,1.4 build.sh,1.3,1.4 =================================================================== RCS file: /home/repository/moby/moby-live/Java/build-dev.bat,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- /home/repository/moby/moby-live/Java/build-dev.bat 2003/11/08 00:27:23 1.3 +++ /home/repository/moby/moby-live/Java/build-dev.bat 2005/05/19 10:56:05 1.4 @@ -18,11 +18,9 @@ goto end :javadone -REM Set-up and check ANT_HOME -REM ------------------------- -if NOT "%ANT_HOME%"=="" goto antdone +REM Set-up ANT_HOME +REM --------------- set ANT_HOME=.\lib\ant_home -:antdone REM Put Ant libraries in CLASSPATH REM ------------------------------ =================================================================== RCS file: /home/repository/moby/moby-live/Java/build-dev.sh,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- /home/repository/moby/moby-live/Java/build-dev.sh 2003/11/08 00:27:23 1.3 +++ /home/repository/moby/moby-live/Java/build-dev.sh 2005/05/19 10:56:05 1.4 @@ -16,8 +16,6 @@ # # This script can make use of the following environment variables: # -# ANT_HOME ... pointing to a directory with Ant libraries. -# Default (used if variable is not set): ./lib/ant_home # JAVA_HOME ... pointing to a directory with your Java JDK. # If not set the script tries to find it anyway. @@ -35,16 +33,9 @@ fi #echo "Using Java from: $JAVA_HOME." -# --- setup and check ANT_HOME -if [ -z "$ANT_HOME" ] ; then - ANT_HOME=./lib/ant_home - export ANT_HOME -fi -if [ ! -d "$ANT_HOME" ] ; then - echo "ANT_HOME is set to '$ANT_HOME' which is not an existing directory." - echo "Please set your ANT_HOME." - exit 1 -fi +# --- setup ANT_HOME +ANT_HOME=./lib/ant_home +export ANT_HOME #echo "Using Ant libraries from: $ANT_HOME/lib." # --- put Ant libraries in CLASSPATH =================================================================== RCS file: /home/repository/moby/moby-live/Java/build.bat,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- /home/repository/moby/moby-live/Java/build.bat 2003/11/08 00:27:23 1.3 +++ /home/repository/moby/moby-live/Java/build.bat 2005/05/19 10:56:05 1.4 @@ -19,11 +19,9 @@ goto end :javadone -REM Set-up and check ANT_HOME -REM ------------------------- -if NOT "%ANT_HOME%"=="" goto antdone +REM Set-up ANT_HOME +REM --------------- set ANT_HOME=.\lib\ant_home -:antdone REM Put Ant libraries in CLASSPATH REM ------------------------------ =================================================================== RCS file: /home/repository/moby/moby-live/Java/build.sh,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- /home/repository/moby/moby-live/Java/build.sh 2003/11/08 00:27:23 1.3 +++ /home/repository/moby/moby-live/Java/build.sh 2005/05/19 10:56:05 1.4 @@ -12,8 +12,6 @@ # # This script can make use of the following environment variables: # -# ANT_HOME ... pointing to a directory with Ant libraries. -# Default (used if variable is not set): ./lib/ant_home # JAVA_HOME ... pointing to a directory with your Java JDK. # If not set the script tries to find it anyway. @@ -31,16 +29,9 @@ fi #echo "Using Java from: $JAVA_HOME." -# --- setup and check ANT_HOME -if [ -z "$ANT_HOME" ] ; then - ANT_HOME=./lib/ant_home - export ANT_HOME -fi -if [ ! -d "$ANT_HOME" ] ; then - echo "ANT_HOME is set to '$ANT_HOME' which is not an existing directory." - echo "Please set your ANT_HOME." - exit 1 -fi +# --- setup ANT_HOME +ANT_HOME=./lib/ant_home +export ANT_HOME #echo "Using Ant libraries from: $ANT_HOME/lib." # --- put Ant libraries in CLASSPATH From senger at pub.open-bio.org Thu May 19 10:56:06 2005 From: senger at pub.open-bio.org (Martin Senger) Date: Thu, 19 May 2005 06:56:06 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505191056.j4JAu6S5002990@pub.open-bio.org> senger Thu May 19 06:56:06 EDT 2005 Update of /home/repository/moby/moby-live/Java/docs/images In directory pub.open-bio.org:/tmp/cvs-serv2887/docs/images Added Files: b_yellow.gif stylesheet.css Log Message: moby-live/Java/docs/images b_yellow.gif,NONE,1.1 stylesheet.css,NONE,1.1 From senger at pub.open-bio.org Thu May 19 11:00:41 2005 From: senger at pub.open-bio.org (Martin Senger) Date: Thu, 19 May 2005 07:00:41 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505191100.j4JB0fHZ003072@pub.open-bio.org> senger Thu May 19 07:00:41 EDT 2005 Update of /home/repository/moby/moby-live/Java/docs In directory pub.open-bio.org:/tmp/cvs-serv3049/docs Modified Files: ToDo.html index.html Log Message: moby-live/Java/docs ToDo.html,1.2,1.3 index.html,1.8,1.9 =================================================================== RCS file: /home/repository/moby/moby-live/Java/docs/ToDo.html,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- /home/repository/moby/moby-live/Java/docs/ToDo.html 2005/05/19 10:56:06 1.2 +++ /home/repository/moby/moby-live/Java/docs/ToDo.html 2005/05/19 11:00:41 1.3 @@ -39,33 +39,33 @@
    -
    MS +
    MS Generate a complete XML Schema for registered services. This will allow to have complete WSDLs for BioMoby services, which will further allow to use all existing tools using such WSDLs for generating code and documentation.

    -

    MS +
    MS Support for auto-generated clients (using the outcome of the previous issue).

    -

    MS +
    MS Similar support for BioMoby service providers - a library helping to hide SOAP and BioMoby envelope layers so service providers can concentrate only on the business logic.

    -

    MS +
    MS More support for BioMoby complex data type in Taverna.

    -

    MS +
    MS The BioMoby Graphs available directly in Taverna.

    -

    MS, GS +
    MS, GS Integrate Semantic Moby services into Taverna. This will (hopefully) help to combine S-Moby and Moby-S in the (near?) future. @@ -77,7 +77,7 @@ individual registered services (e.g. examples of their valid inputs).

    -

    MS +
    MS MobyDigestClient (actually the classes it relies on) can be significantly optimized by @@ -98,14 +98,14 @@
    -
    MS +
    MS MobyCmdLineClient does not correctly implement its -nc and -np options.

    -

    MS +
    MS The servlet for BioMoby Graphs is still not robust enough.

    @@ -119,7 +119,7 @@

    Martin Senger
    -Last modified: Tue May 17 15:55:44 2005 +Last modified: Thu May 19 11:20:08 2005
    =================================================================== RCS file: /home/repository/moby/moby-live/Java/docs/index.html,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- /home/repository/moby/moby-live/Java/docs/index.html 2005/05/19 10:56:06 1.8 +++ /home/repository/moby/moby-live/Java/docs/index.html 2005/05/19 11:00:41 1.9 @@ -79,9 +79,9 @@
    -
    Martin Senger
    +
    Martin Senger
    -Last modified: Tue May 17 16:01:17 2005 +Last modified: Thu May 19 11:20:22 2005
    From senger at pub.open-bio.org Thu May 19 15:57:21 2005 From: senger at pub.open-bio.org (Martin Senger) Date: Thu, 19 May 2005 11:57:21 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505191557.j4JFvLML003910@pub.open-bio.org> senger Thu May 19 11:57:21 EDT 2005 Update of /home/repository/moby/moby-live/Java In directory pub.open-bio.org:/tmp/cvs-serv3891 Modified Files: build.xml Log Message: moby-live/Java build.xml,1.14,1.15 =================================================================== RCS file: /home/repository/moby/moby-live/Java/build.xml,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- /home/repository/moby/moby-live/Java/build.xml 2005/04/18 23:57:44 1.14 +++ /home/repository/moby/moby-live/Java/build.xml 2005/05/19 15:57:21 1.15 @@ -371,47 +371,102 @@ - + + - - - -
    Generated: ${TODAY_LONG}]]>
    - - Submit a bug or feature
    - Generated: ${TODAY_LONG}]]>
    -
    + + + + + + + + + + + + + + +
    Generated: ${TODAY_LONG}]]>
    + + Submit a bug or feature
    + Generated: ${TODAY_LONG}]]>
    + + + + + + + + + + +
    - - + + + + + + + + - - - - - - + + + + + + @@ -493,7 +548,11 @@ --> - + @@ -541,7 +600,11 @@ - +
    From senger at pub.open-bio.org Thu May 19 15:57:21 2005 From: senger at pub.open-bio.org (Martin Senger) Date: Thu, 19 May 2005 11:57:21 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505191557.j4JFvL5a003942@pub.open-bio.org> senger Thu May 19 11:57:21 EDT 2005 Update of /home/repository/moby/moby-live/Java/docs In directory pub.open-bio.org:/tmp/cvs-serv3891/docs Modified Files: ChangeLog DirectoriesGuidelines.html Download.html index.html Added Files: ChangesInBuild.html Log Message: moby-live/Java/docs ChangesInBuild.html,NONE,1.1 ChangeLog,1.28,1.29 DirectoriesGuidelines.html,1.1,1.2 Download.html,1.2,1.3 index.html,1.9,1.10 =================================================================== RCS file: /home/repository/moby/moby-live/Java/docs/ChangeLog,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- /home/repository/moby/moby-live/Java/docs/ChangeLog 2005/05/19 10:56:06 1.28 +++ /home/repository/moby/moby-live/Java/docs/ChangeLog 2005/05/19 15:57:21 1.29 @@ -1,3 +1,7 @@ +2005-05-19 Martin Senger + + * Ant changed to its latest release. + 2005-05-17 Martin Senger * Added documentation as a result of the BioMoby meeting in =================================================================== RCS file: /home/repository/moby/moby-live/Java/docs/DirectoriesGuidelines.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/Java/docs/DirectoriesGuidelines.html 2005/05/19 10:56:06 1.1 +++ /home/repository/moby/moby-live/Java/docs/DirectoriesGuidelines.html 2005/05/19 15:57:21 1.2 @@ -86,7 +86,7 @@
    - +

    jMoby packages

    One of the Ben's Twelve @@ -105,7 +105,7 @@ it).

    -
    org.biomoby.client +
    org.biomoby.client
    It contains components used to develop Moby clients. The Moby clients can be both clients of the Moby registry and clients of the @@ -123,7 +123,7 @@ access to the registry databases (like a direct JDBC access), or here we may have Java-implementation of the whole registry someday. -
    org.biomoby.service +
    org.biomoby.service
    It contains general components that can be used by those writing code for Moby services. This is not meant to be used for the @@ -159,10 +159,13 @@

    Other package names

    Please feel free (or better: feel obliged) to add here basic -descriptions of your own packages. +descriptions of your own packages. You may also consider to add a +package.html file directly into your package directory (to +the same sub-directory where your sources are) - such files will be +picked up by Ant and included directly in the generated API.
    -
    embl.ebi.soap +
    embl.ebi.soap
    It contains general utilities for making SOAP calls (for SOAP clients) and to get access to the request and deployment environment, @@ -181,7 +184,7 @@
    Martin Senger
    -Last modified: Thu May 19 11:13:55 2005 +Last modified: Thu May 19 15:29:48 2005
    =================================================================== RCS file: /home/repository/moby/moby-live/Java/docs/Download.html,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- /home/repository/moby/moby-live/Java/docs/Download.html 2005/05/19 10:56:06 1.2 +++ /home/repository/moby/moby-live/Java/docs/Download.html 2005/05/19 15:57:21 1.3 @@ -49,7 +49,7 @@
    How to build it
    What are the build targets
    -Where to put things
    +Where to put things
    How to use it
    @@ -362,7 +362,7 @@
    Martin Senger
    -Last modified: Tue May 17 13:38:10 2005 +Last modified: Thu May 19 13:46:02 2005
    =================================================================== RCS file: /home/repository/moby/moby-live/Java/docs/index.html,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- /home/repository/moby/moby-live/Java/docs/index.html 2005/05/19 11:00:41 1.9 +++ /home/repository/moby/moby-live/Java/docs/index.html 2005/05/19 15:57:21 1.10 @@ -53,7 +53,9 @@ @@ -81,7 +83,7 @@
    Martin Senger
    -Last modified: Thu May 19 11:20:22 2005 +Last modified: Thu May 19 13:48:27 2005
    From senger at pub.open-bio.org Thu May 19 15:57:25 2005 From: senger at pub.open-bio.org (Martin Senger) Date: Thu, 19 May 2005 11:57:25 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505191557.j4JFvPvZ003994@pub.open-bio.org> senger Thu May 19 11:57:25 EDT 2005 Update of /home/repository/moby/moby-live/Java/src/Clients In directory pub.open-bio.org:/tmp/cvs-serv3891/src/Clients Modified Files: PopulateLocalCentralForTesting.java Log Message: moby-live/Java/src/Clients PopulateLocalCentralForTesting.java,1.3,1.4 =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/Clients/PopulateLocalCentralForTesting.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- /home/repository/moby/moby-live/Java/src/Clients/PopulateLocalCentralForTesting.java 2004/09/23 10:20:29 1.3 +++ /home/repository/moby/moby-live/Java/src/Clients/PopulateLocalCentralForTesting.java 2005/05/19 15:57:24 1.4 @@ -49,7 +49,7 @@ * @version $Id$ */ public class PopulateLocalCentralForTesting { - public final String DEFAULT_ENDPOINT = "http://localhost/cgi-bin/moby"; + public static final String DEFAULT_ENDPOINT = "http://localhost/cgi-bin/moby"; protected String serviceType = "ATestingServiceType"; protected String namespace_1 = "ns1"; @@ -351,7 +351,7 @@ return services; } - private final int MAX_MSG_LEN = 35; + private static final int MAX_MSG_LEN = 35; protected void start (String msg) { System.out.print (msg); for (int i = MAX_MSG_LEN; i > msg.length(); i--) From senger at pub.open-bio.org Thu May 19 15:57:25 2005 From: senger at pub.open-bio.org (Martin Senger) Date: Thu, 19 May 2005 11:57:25 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505191557.j4JFvPIm003975@pub.open-bio.org> senger Thu May 19 11:57:22 EDT 2005 Update of /home/repository/moby/moby-live/Java/lib/ant_home/lib In directory pub.open-bio.org:/tmp/cvs-serv3891/lib/ant_home/lib Modified Files: ant.jar xercesImpl.jar xml-apis.jar Added Files: ant-antlr.jar ant-apache-bcel.jar ant-apache-bsf.jar ant-apache-log4j.jar ant-apache-oro.jar ant-apache-regexp.jar ant-apache-resolver.jar ant-commons-logging.jar ant-commons-net.jar ant-icontract.jar ant-jai.jar ant-javamail.jar ant-jdepend.jar ant-jmf.jar ant-jsch.jar ant-junit.jar ant-launcher.jar ant-netrexx.jar ant-nodeps.jar ant-starteam.jar ant-stylebook.jar ant-swing.jar ant-trax.jar ant-vaj.jar ant-weblogic.jar ant-xalan1.jar ant-xslp.jar Removed Files: optional.jar Log Message: moby-live/Java/lib/ant_home/lib ant-antlr.jar,NONE,1.1 ant-apache-bcel.jar,NONE,1.1 ant-apache-bsf.jar,NONE,1.1 ant-apache-log4j.jar,NONE,1.1 ant-apache-oro.jar,NONE,1.1 ant-apache-regexp.jar,NONE,1.1 ant-apache-resolver.jar,NONE,1.1 ant-commons-logging.jar,NONE,1.1 ant-commons-net.jar,NONE,1.1 ant-icontract.jar,NONE,1.1 ant-jai.jar,NONE,1.1 ant-javamail.jar,NONE,1.1 ant-jdepend.jar,NONE,1.1 ant-jmf.jar,NONE,1.1 ant-jsch.jar,NONE,1.1 ant-junit.jar,NONE,1.1 ant-launcher.jar,NONE,1.1 ant-netrexx.jar,NONE,1.1 ant-nodeps.jar,NONE,1.1 ant-starteam.jar,NONE,1.1 ant-stylebook.jar,NONE,1.1 ant-swing.jar,NONE,1.1 ant-trax.jar,NONE,1.1 ant-vaj.jar,NONE,1.1 ant-weblogic.jar,NONE,1.1 ant-xalan1.jar,NONE,1.1 ant-xslp.jar,NONE,1.1 ant.jar,1.2,1.3 xercesImpl.jar,1.2,1.3 xml-apis.jar,1.1,1.2 optional.jar,1.2,NONE =================================================================== RCS file: /home/repository/moby/moby-live/Java/lib/ant_home/lib/ant.jar,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 Binary files /home/repository/moby/moby-live/Java/lib/ant_home/lib/ant.jar 2003/09/25 02:48:14 1.2 and /home/repository/moby/moby-live/Java/lib/ant_home/lib/ant.jar 2005/05/19 15:57:21 1.3 differ rcsdiff: /home/repository/moby/moby-live/Java/lib/ant_home/lib/ant.jar: diff failed =================================================================== RCS file: /home/repository/moby/moby-live/Java/lib/ant_home/lib/xercesImpl.jar,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 Binary files /home/repository/moby/moby-live/Java/lib/ant_home/lib/xercesImpl.jar 2003/09/25 02:48:15 1.2 and /home/repository/moby/moby-live/Java/lib/ant_home/lib/xercesImpl.jar 2005/05/19 15:57:22 1.3 differ rcsdiff: /home/repository/moby/moby-live/Java/lib/ant_home/lib/xercesImpl.jar: diff failed =================================================================== RCS file: /home/repository/moby/moby-live/Java/lib/ant_home/lib/xml-apis.jar,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 Binary files /home/repository/moby/moby-live/Java/lib/ant_home/lib/xml-apis.jar 2003/09/24 12:33:49 1.1 and /home/repository/moby/moby-live/Java/lib/ant_home/lib/xml-apis.jar 2005/05/19 15:57:22 1.2 differ rcsdiff: /home/repository/moby/moby-live/Java/lib/ant_home/lib/xml-apis.jar: diff failed rcsdiff: /home/repository/moby/moby-live/Java/lib/ant_home/lib/RCS/optional.jar,v: No such file or directory From senger at pub.open-bio.org Thu May 19 15:57:25 2005 From: senger at pub.open-bio.org (Martin Senger) Date: Thu, 19 May 2005 11:57:25 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505191557.j4JFvP7O004013@pub.open-bio.org> senger Thu May 19 11:57:25 EDT 2005 Update of /home/repository/moby/moby-live/Java/src/Services/org/biomoby/service In directory pub.open-bio.org:/tmp/cvs-serv3891/src/Services/org/biomoby/service Added Files: package.html Removed Files: Echo.java EchoImpl.java EchoImplFromStubs.java README Log Message: moby-live/Java/src/Services/org/biomoby/service package.html,NONE,1.1 Echo.java,1.1,NONE EchoImpl.java,1.2,NONE EchoImplFromStubs.java,1.1,NONE README,1.1,NONE rcsdiff: /home/repository/moby/moby-live/Java/src/Services/org/biomoby/service/RCS/Echo.java,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/Java/src/Services/org/biomoby/service/RCS/EchoImpl.java,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/Java/src/Services/org/biomoby/service/RCS/EchoImplFromStubs.java,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/Java/src/Services/org/biomoby/service/RCS/README,v: No such file or directory From senger at pub.open-bio.org Thu May 19 15:57:25 2005 From: senger at pub.open-bio.org (Martin Senger) Date: Thu, 19 May 2005 11:57:25 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505191557.j4JFvP4U004108@pub.open-bio.org> senger Thu May 19 11:57:25 EDT 2005 Update of /home/repository/moby/moby-live/Java/src/main/org/biomoby/client In directory pub.open-bio.org:/tmp/cvs-serv3891/src/main/org/biomoby/client Modified Files: CentralDigestCachedImpl.java GraphsServlet.java Graphviz.java RDF.java SimpleCache.java SimpleFileCache.java Taverna.java package.html Log Message: moby-live/Java/src/main/org/biomoby/client CentralDigestCachedImpl.java,1.3,1.4 GraphsServlet.java,1.9,1.10 Graphviz.java,1.6,1.7 RDF.java,1.2,1.3 SimpleCache.java,1.3,1.4 SimpleFileCache.java,1.2,1.3 Taverna.java,1.2,1.3 package.html,1.1,1.2 =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/CentralDigestCachedImpl.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/CentralDigestCachedImpl.java 2005/04/07 16:37:02 1.3 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/CentralDigestCachedImpl.java 2005/05/19 15:57:25 1.4 @@ -359,9 +359,9 @@ if (list == null) throw new MobyException ("Surprisingly, '" + servicesCache.getAbsolutePath() + "' is not a directory. Strange..."); for (int i = 0; i < list.length; i++) { - MobyService[] services = extractServices (load (list[i])); - for (int j = 0; j < services.length; j++) - v.addElement (services[j]); + MobyService[] servs = extractServices (load (list[i])); + for (int j = 0; j < servs.length; j++) + v.addElement (servs[j]); } MobyService[] result = new MobyService [v.size()]; v.copyInto (result); =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/GraphsServlet.java,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/GraphsServlet.java 2005/04/07 22:55:06 1.9 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/GraphsServlet.java 2005/05/19 15:57:25 1.10 @@ -1639,13 +1639,13 @@ static final int BUF_SIZE = 8192; public void run() { - byte[] buf = new byte [BUF_SIZE]; + byte[] myBuf = new byte [BUF_SIZE]; int readBytes; try { - while ((readBytes = stream.read (buf)) != -1) { + while ((readBytes = stream.read (myBuf)) != -1) { byte[] tmp = new byte [result.length + readBytes]; System.arraycopy (result, 0, tmp, 0, result.length); - System.arraycopy (buf, 0, tmp, result.length, readBytes); + System.arraycopy (myBuf, 0, tmp, result.length, readBytes); result = new byte [tmp.length]; System.arraycopy (tmp, 0, result, 0, tmp.length); } =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/Graphviz.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/Graphviz.java 2005/04/07 16:37:02 1.6 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/Graphviz.java 2005/05/19 15:57:25 1.7 @@ -17,7 +17,7 @@ /** * A utility class that understands how to create - * {@link http://www.research.att.com/sw/tools/graphviz/ graphviz} graphs from a set of + * graphviz graphs from a set of * {@link org.biomoby.client.ServicesEdge ServiceEdges}, or from other * data structures. * @@ -293,7 +293,7 @@ * Creates a graph connecting 'serviceTypes' using their ISA * relationship.

    * - * @param servicesTypes represent nodes in the created graph + * @param serviceTypes represent nodes in the created graph * @param props are some properties that can influence how the * graph will look like; see the property names elswhere in this * API what properties are understood =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/RDF.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/RDF.java 2005/04/07 16:37:02 1.2 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/RDF.java 2005/05/19 15:57:25 1.3 @@ -19,7 +19,7 @@ /** * A utility class that understands how to create - * {@link http://www.research.att.com/sw/tools/graphviz/ graphviz} graphs from a set of + * graphviz graphs from a set of * {@link org.biomoby.client.ServicesEdge ServiceEdges}, or from other * data structures. * =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/SimpleCache.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/SimpleCache.java 2005/04/07 16:37:02 1.3 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/SimpleCache.java 2005/05/19 15:57:25 1.4 @@ -65,7 +65,7 @@ * @param id a unique ID of the object being returned * @return data previously stored under 'id'; or null if such data * do not exist - * @thow IOExcepiton if the retrieving failed + * @throws IOExcepiton if the retrieving failed **************************************************************************/ java.lang.Object getContents (String id) throws IOException; @@ -75,7 +75,7 @@ * * @param id a unique ID of the object being stored * @param data are being stored - * @thow IOExcepiton if the storing failed + * @throws IOExcepiton if the storing failed **************************************************************************/ void setContents (String id, java.lang.Object data) throws IOException; @@ -85,7 +85,7 @@ *

    * * @param id a unique ID - * @throw IOException if the object exists but cannot be removed + * @throws IOException if the object exists but cannot be removed * (meaning that it does not raise any exception if the * object is not anymore in the cache) **************************************************************************/ =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/SimpleFileCache.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/SimpleFileCache.java 2005/04/07 16:37:02 1.2 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/SimpleFileCache.java 2005/05/19 15:57:25 1.3 @@ -32,7 +32,7 @@ * * @param id a unique ID of the cached (or possibly cached) object * @return a filename with the full path representing an object 'id' - * @throw IOException if creating the parent directories caused problem + * @throws IOException if creating the parent directories caused problem **************************************************************************/ String getFilename (String id) throws IOException; @@ -42,7 +42,7 @@ * * @param id a unique ID of the object being stored * @param data are being stored - * @thow IOExcepiton if the storing failed + * @throws IOExcepiton if the storing failed **************************************************************************/ void setContents (String id, byte[] data) throws IOException; @@ -62,7 +62,7 @@ * * @param millis how many milliseconds must be an object stored to * be remopved by calling this method - * @throw IOException if any object that exists in the cache and + * @throws IOException if any object that exists in the cache and * is targeted to be removed but cannot be removed **************************************************************************/ void removeOlderThen (long millis) =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/Taverna.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/Taverna.java 2005/04/07 16:37:02 1.2 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/Taverna.java 2005/05/19 15:57:25 1.3 @@ -24,7 +24,7 @@ /** * A utility class that understands how to create workflow definitions - * for {@link http://taverna.sf.net/ Taverna}.

    + * for Taverna.

    * * @see MobyGraphs * @author Martin Senger =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/package.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/package.html 2003/09/24 14:33:37 1.1 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/package.html 2005/05/19 15:57:25 1.2 @@ -3,17 +3,13 @@ -The components used for developing Moby clients. -

    -The most important class is {@link org.biomoby.client.CentralImpl} -implementing interface {@link org.biomoby.shared.Central} and by doing so -hiding all Moby complexity (and changes) under the hood. +The components used for developing Moby clients. The Moby clients can +be both clients of the Moby registry and clients of the Moby services.

    -Note that this package does not contain ready and complete Moby clients -but only pieces, tools and helpers to build such clients. The ready/full -clients are in the Clients sub-directory (they are not in any -named package) - {@link MobyCmdLineClient} and {@link TestingCentral}. +The most important class is {@link org.biomoby.client.CentralImpl} +implementing interface {@link org.biomoby.shared.Central} and by doing +so hiding all Moby complexity (and changes) under the hood.

    From senger at pub.open-bio.org Thu May 19 15:57:26 2005 From: senger at pub.open-bio.org (Martin Senger) Date: Thu, 19 May 2005 11:57:26 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505191557.j4JFvQYv004171@pub.open-bio.org> senger Thu May 19 11:57:26 EDT 2005 Update of /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared In directory pub.open-bio.org:/tmp/cvs-serv3891/src/main/org/biomoby/shared Modified Files: package.html Log Message: moby-live/Java/src/main/org/biomoby/shared package.html,1.1,1.2 =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/package.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/package.html 2003/09/24 14:33:37 1.1 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/package.html 2005/05/19 15:57:26 1.2 @@ -3,15 +3,22 @@ -The components used by packages and classes developed for both -Moby clients and (in the future) Moby servers. -

    -The cornerstone piece is the interface {@link org.biomoby.shared.Central} that -defines how to access Moby registry without any knowledge of -the used transport protocol (SOAP, XML, etc.). This interface -uses several "containers" representing pieces of the Moby mosaic - -but most of them may not be necessary for the client. -

    +It contains components that are used from more than one (other) +packages. The bottom-line (or a bottom-rule) is: If one wants to run +clients, it must be sufficent for him to pack all classes from {@link +org.biomoby.client} and from this package only. If one wants to create +a registry oriented component, it is enough for him to pack +org.biomoby.registry and this package. And similarly for service +providers which would pack org.biomoby.service and again this +package.

    + +Additionally this is a good place for putting here Java interfaces - +assuming that they are expected to be used more generally. The +cornerstone piece is the interface {@link org.biomoby.shared.Central} +that defines how to access Moby registry without any knowledge of the +used transport protocol (SOAP, XML, etc.). This interface uses several +container classes representing pieces of the Moby mosaic. + From senger at pub.open-bio.org Thu May 19 15:57:26 2005 From: senger at pub.open-bio.org (Martin Senger) Date: Thu, 19 May 2005 11:57:26 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505191557.j4JFvQqI004249@pub.open-bio.org> senger Thu May 19 11:57:26 EDT 2005 Update of /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/dom/wrappers In directory pub.open-bio.org:/tmp/cvs-serv3891/src/main/org/biomoby/shared/dom/wrappers Modified Files: Xerces.java Log Message: moby-live/Java/src/main/org/biomoby/shared/dom/wrappers Xerces.java,1.2,1.3 =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/dom/wrappers/Xerces.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/dom/wrappers/Xerces.java 2005/04/20 21:42:10 1.2 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/dom/wrappers/Xerces.java 2005/05/19 15:57:26 1.3 @@ -14,7 +14,7 @@ /** * Wraps the Xerces DOM parser in order to provide interface - * {@link org.biomoby.shared.dom/ParserWrapper}. + * {@link org.biomoby.shared.dom.ParserWrapper}. * * @version $Id$ */ From senger at pub.open-bio.org Thu May 19 15:57:25 2005 From: senger at pub.open-bio.org (Martin Senger) Date: Thu, 19 May 2005 11:57:25 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505191557.j4JFvPER004129@pub.open-bio.org> senger Thu May 19 11:57:25 EDT 2005 Update of /home/repository/moby/moby-live/Java/src/main/org/biomoby/registry In directory pub.open-bio.org:/tmp/cvs-serv3891/src/main/org/biomoby/registry Added Files: package.html Removed Files: .keep_me Log Message: moby-live/Java/src/main/org/biomoby/registry package.html,NONE,1.1 .keep_me,1.1,NONE rcsdiff: /home/repository/moby/moby-live/Java/src/main/org/biomoby/registry/RCS/.keep_me,v: No such file or directory From senger at pub.open-bio.org Thu May 19 15:57:25 2005 From: senger at pub.open-bio.org (Martin Senger) Date: Thu, 19 May 2005 11:57:25 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505191557.j4JFvPP9004053@pub.open-bio.org> senger Thu May 19 11:57:25 EDT 2005 Update of /home/repository/moby/moby-live/Java/src/main/embl/ebi/soap In directory pub.open-bio.org:/tmp/cvs-serv3891/src/main/embl/ebi/soap Modified Files: SOAPToolkit.java Added Files: package.html Log Message: moby-live/Java/src/main/embl/ebi/soap package.html,NONE,1.1 SOAPToolkit.java,1.2,1.3 =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/embl/ebi/soap/SOAPToolkit.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- /home/repository/moby/moby-live/Java/src/main/embl/ebi/soap/SOAPToolkit.java 2005/04/07 16:33:07 1.2 +++ /home/repository/moby/moby-live/Java/src/main/embl/ebi/soap/SOAPToolkit.java 2005/05/19 15:57:25 1.3 @@ -63,7 +63,7 @@ * current service space (giving the priority to the one which is * service-specific).

    * - * @see getAttributeNames + * @see #getAttributeNames */ String getAttribute (String name); @@ -71,8 +71,6 @@ * Returns an Enumeration of Strings containing the attribute names of all * objects bound to the underlying session which the current request is * part of. - * These attributes were created by previous requests within the same - * session - see method {@link #setSessionAttribute}. *

    * Use the {@link #getSessionAttribute(String)} method with an attribute name * to get the value of an attribute. @@ -82,7 +80,7 @@ /** * Returns the object bound with the specified name in this session, * or null if no object is bound under the name. - * @see getSessionAttributeNames + * @see #getSessionAttributeNames */ Object getSessionAttribute (String name); From senger at pub.open-bio.org Thu May 19 15:57:25 2005 From: senger at pub.open-bio.org (Martin Senger) Date: Thu, 19 May 2005 11:57:25 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505191557.j4JFvPBo004034@pub.open-bio.org> senger Thu May 19 11:57:25 EDT 2005 Update of /home/repository/moby/moby-live/Java/src/Services/org/biomoby/service/generated In directory pub.open-bio.org:/tmp/cvs-serv3891/src/Services/org/biomoby/service/generated Modified Files: EchoServiceLocator.java Log Message: moby-live/Java/src/Services/org/biomoby/service/generated EchoServiceLocator.java,1.1,1.2 =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/Services/org/biomoby/service/generated/EchoServiceLocator.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/Java/src/Services/org/biomoby/service/generated/EchoServiceLocator.java 2003/11/08 00:49:06 1.1 +++ /home/repository/moby/moby-live/Java/src/Services/org/biomoby/service/generated/EchoServiceLocator.java 2005/05/19 15:57:25 1.2 @@ -10,7 +10,7 @@ public class EchoServiceLocator extends org.apache.axis.client.Service implements org.biomoby.service.generated.EchoService { // Use to get a proxy class for echoString - private final java.lang.String echoString_address = "http://localhost:8080/axis/services/echoString"; + private static final java.lang.String echoString_address = "http://localhost:8080/axis/services/echoString"; public java.lang.String getechoStringAddress() { return echoString_address; From senger at pub.open-bio.org Thu May 19 15:57:26 2005 From: senger at pub.open-bio.org (Martin Senger) Date: Thu, 19 May 2005 11:57:26 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505191557.j4JFvQjm004150@pub.open-bio.org> senger Thu May 19 11:57:25 EDT 2005 Update of /home/repository/moby/moby-live/Java/src/main/org/biomoby/registry/rdfagent/verifier In directory pub.open-bio.org:/tmp/cvs-serv3891/src/main/org/biomoby/registry/rdfagent/verifier Modified Files: ServiceDescrParser.java Log Message: moby-live/Java/src/main/org/biomoby/registry/rdfagent/verifier ServiceDescrParser.java,1.4,1.5 =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/registry/rdfagent/verifier/ServiceDescrParser.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/registry/rdfagent/verifier/ServiceDescrParser.java 2005/04/16 14:32:12 1.4 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/registry/rdfagent/verifier/ServiceDescrParser.java 2005/05/19 15:57:25 1.5 @@ -146,12 +146,12 @@ Report.add(" "); Report.add("DELETED SERVICES: "); Iterator i = deletedServ.iterator(); - int n=1; + int m=1; while (i.hasNext()){ String delServ = i.next().toString(); - Report.doWrite(n+". "+delServ); - Report.add(n+". "+delServ); - n+=1; + Report.doWrite(m+". "+delServ); + Report.add(m+". "+delServ); + m+=1; } } @@ -791,4 +791,4 @@ } return lsid; } -} \ No newline at end of file +} From senger at pub.open-bio.org Thu May 19 15:57:26 2005 From: senger at pub.open-bio.org (Martin Senger) Date: Thu, 19 May 2005 11:57:26 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505191557.j4JFvQil004228@pub.open-bio.org> senger Thu May 19 11:57:26 EDT 2005 Update of /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data In directory pub.open-bio.org:/tmp/cvs-serv3891/src/main/org/biomoby/shared/data Modified Files: MobyDataBytes.java MobyDataComposite.java MobyDataDateTime.java MobyDataFloat.java MobyDataInt.java MobyDataObject.java MobyDataObjectSet.java MobyDataString.java MobyDataXref.java Log Message: moby-live/Java/src/main/org/biomoby/shared/data MobyDataBytes.java,1.1,1.2 MobyDataComposite.java,1.1,1.2 MobyDataDateTime.java,1.1,1.2 MobyDataFloat.java,1.1,1.2 MobyDataInt.java,1.1,1.2 MobyDataObject.java,1.1,1.2 MobyDataObjectSet.java,1.1,1.2 MobyDataString.java,1.1,1.2 MobyDataXref.java,1.1,1.2 =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataBytes.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataBytes.java 2005/05/12 04:59:49 1.1 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataBytes.java 2005/05/19 15:57:26 1.2 @@ -27,7 +27,7 @@ /** * Construct the object using a DOM fragment. * - * @throw IllegalArgumentException if the element is not a text-base64 tag + * @throws IllegalArgumentException if the element is not a text-base64 tag */ public MobyDataBytes(org.w3c.dom.Element element) throws IllegalArgumentException{ this(getName(element), getTextContents(element)); =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataComposite.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataComposite.java 2005/05/12 04:59:49 1.1 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataComposite.java 2005/05/19 15:57:26 1.2 @@ -28,7 +28,7 @@ /** * Construct the object using a DOM fragment. * - * @throw IllegalArgumentException if the element is not a MobyObject tag + * @throws IllegalArgumentException if the element is not a MobyObject tag */ public MobyDataComposite(org.w3c.dom.Element element) throws IllegalArgumentException{ this(new MobyDataType(element.getLocalName()), getName(element), getNamespace(element), getId(element)); =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataDateTime.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataDateTime.java 2005/05/12 04:59:49 1.1 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataDateTime.java 2005/05/19 15:57:26 1.2 @@ -31,7 +31,7 @@ /** * Construct the object using a DOM fragment. * - * @throw IllegalArgumentException if the element is not a DateTime tag, or the text children of the element do not encode a valid ISO8601 date/time + * @throws IllegalArgumentException if the element is not a DateTime tag, or the text children of the element do not encode a valid ISO8601 date/time */ public MobyDataDateTime(org.w3c.dom.Element element) throws IllegalArgumentException{ this(getName(element), getTextContents(element)); =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataFloat.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataFloat.java 2005/05/12 04:59:49 1.1 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataFloat.java 2005/05/19 15:57:26 1.2 @@ -23,7 +23,7 @@ /** * Construct the object using a DOM fragment. * - * @throw IllegalArgumentException if the element is not a Float tag + * @throws IllegalArgumentException if the element is not a Float tag */ public MobyDataFloat(org.w3c.dom.Element element) throws IllegalArgumentException{ this(getName(element), getTextContents(element)); =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataInt.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataInt.java 2005/05/12 04:59:49 1.1 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataInt.java 2005/05/19 15:57:26 1.2 @@ -23,7 +23,7 @@ /** * Construct the object using a DOM fragment. * - * @throw IllegalArgumentException if the element is not a Integer tag + * @throws IllegalArgumentException if the element is not a Integer tag */ public MobyDataInt(org.w3c.dom.Element element) throws IllegalArgumentException{ this(getName(element), getTextContents(element)); =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataObject.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataObject.java 2005/05/12 04:59:49 1.1 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataObject.java 2005/05/19 15:57:26 1.2 @@ -45,7 +45,7 @@ /** * Construct the object using a DOM fragment. * - * @throw IllegalArgumentException if the element is not an Object tag + * @throws IllegalArgumentException if the element is not an Object tag */ public MobyDataObject(Element element) throws IllegalArgumentException{ this(getNamespace(element).getName(), getId(element)); =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataObjectSet.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataObjectSet.java 2005/05/12 04:59:49 1.1 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataObjectSet.java 2005/05/19 15:57:26 1.2 @@ -52,7 +52,7 @@ /** * Creates a collection with a name, initializing the members with the given array * - * @throw NullPointerException if the input array is null, or contains null elements + * @throws NullPointerException if the input array is null, or contains null elements */ public MobyDataObjectSet(String name, MobyDataObject[] values) throws NullPointerException{ this(name); @@ -64,8 +64,8 @@ * * @param c usually another MobyDataObjectSet, or a Vector of MobyDataObjects * - * @throw ClassCastException if a member of the input collection is not a MobyDataObject - * @throw NullPointerException if the collection or one of its members is a null object + * @throws ClassCastException if a member of the input collection is not a MobyDataObject + * @throws NullPointerException if the collection or one of its members is a null object */ public MobyDataObjectSet(String name, Collection c) throws ClassCastException, NullPointerException{ this(name); @@ -75,7 +75,7 @@ /** * Replace whatever is in the collection right now with the values in the input array. * - * @throw NullPointerException if the input array is null, or contains null elements + * @throws NullPointerException if the input array is null, or contains null elements */ public void setElements(MobyDataObject[] values) throws NullPointerException{ if(values == null){ @@ -139,8 +139,8 @@ /** * Add a single MobyDataObject to the collection. * - * @throw ClassCastException if the input is not a MobyDataObject - * @throw NullPointerException if the input is a null object + * @throws ClassCastException if the input is not a MobyDataObject + * @throws NullPointerException if the input is a null object */ public boolean add(Object mdsi) throws ClassCastException, NullPointerException{ checkInputClass("add", mdsi); @@ -153,8 +153,8 @@ * (usually a MobyDataObjectSet, or a Vector of MobyDataObjects) * to this collection. * - * @throw ClassCastException if a member of the input collection is not a MobyDataObject - * @throw NullPointerException if the collection or one of its members is a null object + * @throws ClassCastException if a member of the input collection is not a MobyDataObject + * @throws NullPointerException if the collection or one of its members is a null object * @return true if the collection changes as a result of the operation */ public boolean addAll(Collection c) throws ClassCastException, NullPointerException{ @@ -172,8 +172,8 @@ /** * @return true if this collection contains an element with the exact same value (equivalent in MOBY XML representation, including name) - * @throw ClassCastException if the input is not a MobyDataObject - * @throw NullPointerException if the input is a null object + * @throws ClassCastException if the input is not a MobyDataObject + * @throws NullPointerException if the input is a null object */ public boolean contains(Object mdsi) throws ClassCastException, NullPointerException{ checkInputClass("check for the presence of", mdsi); @@ -183,8 +183,8 @@ /** * @return true if each element in the input collection returns true when contains(Object o) is called - * @throw ClassCastException if a member of the input collection is not a MobyDataObject - * @throw NullPointerException if the collection or one of its members is a null object + * @throws ClassCastException if a member of the input collection is not a MobyDataObject + * @throws NullPointerException if the collection or one of its members is a null object */ public boolean containsAll(Collection c) throws ClassCastException, NullPointerException{ checkCollectionClass("check for presence of", c); @@ -198,8 +198,8 @@ * to convert into an array for sorting. * * @return true if and only if the input object is a MobyDataObjectSet, and the two collections contain exactly equal elements from a MOBY XML perspective - * @throw ClassCastException if the input is not a Collection of MobyDataObjects - * @throw NullPointerException if the input is a null object + * @throws ClassCastException if the input is not a Collection of MobyDataObjects + * @throws NullPointerException if the input is a null object */ public boolean equals(Object set) throws ClassCastException, NullPointerException{ if(!(set instanceof Collection)){ @@ -259,8 +259,8 @@ * * @param mdsi the MobyDataObject whose value equivalent (not object reference) is to be removed * @return true if the element was found and removed - * @throw ClassCastException if the input is not a MobyDataObject - * @throw NullPointerException if the input is a null object + * @throws ClassCastException if the input is not a MobyDataObject + * @throws NullPointerException if the input is a null object */ public boolean remove(Object mdsi) throws ClassCastException, NullPointerException{ checkInputClass("remove", mdsi); @@ -272,8 +272,8 @@ * Set theory subtraction operator implementation. * * @return true if this collection changed as a result of the call - * @throw ClassCastException if a member of the input collection is not a MobyDataObject - * @throw NullPointerException if the collection or one of its members is a null object + * @throws ClassCastException if a member of the input collection is not a MobyDataObject + * @throws NullPointerException if the collection or one of its members is a null object */ public boolean removeAll(Collection c) throws ClassCastException, NullPointerException{ checkCollectionClass("remove", c); @@ -285,8 +285,8 @@ * Set theory intersection operator implementation. * * @return true if this collection changed as a result of the call - * @throw ClassCastException if a member of the input collection is not a MobyDataObject - * @throw NullPointerException if the collection or one of its members is a null object + * @throws ClassCastException if a member of the input collection is not a MobyDataObject + * @throws NullPointerException if the collection or one of its members is a null object */ public boolean retainAll(Collection c){ checkCollectionClass("intersect", c); =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataString.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataString.java 2005/05/12 04:59:49 1.1 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataString.java 2005/05/19 15:57:26 1.2 @@ -18,7 +18,7 @@ /** * Construct the object using a DOM fragment. * - * @throw IllegalArgumentException if the element is not a String tag + * @throws IllegalArgumentException if the element is not a String tag */ public MobyDataString(org.w3c.dom.Element element) throws IllegalArgumentException{ this(getName(element), getTextContents(element)); =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataXref.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataXref.java 2005/05/12 04:59:49 1.1 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/data/MobyDataXref.java 2005/05/19 15:57:26 1.2 @@ -261,8 +261,8 @@ // If we are a service provider it should look like an Xref if(isCRIBXML){ MobyService service = getService(); - MobyNamespace[] namespaces = getNamespaces(); - return " @@ -67,110 +71,19 @@ - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - + + &libraries; + + &exceptions; @@ -193,47 +106,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -557,8 +429,6 @@ - - From senger at pub.open-bio.org Thu May 19 20:18:54 2005 From: senger at pub.open-bio.org (Martin Senger) Date: Thu, 19 May 2005 16:18:54 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505192018.j4JKIskt005036@pub.open-bio.org> senger Thu May 19 16:18:54 EDT 2005 Update of /home/repository/moby/moby-live/Java/docs In directory pub.open-bio.org:/tmp/cvs-serv4985/docs Modified Files: ChangeLog DirectoriesGuidelines.html Download.html index.html Added Files: vizant.txt Log Message: moby-live/Java/docs vizant.txt,NONE,1.1 ChangeLog,1.29,1.30 DirectoriesGuidelines.html,1.2,1.3 Download.html,1.3,1.4 index.html,1.10,1.11 =================================================================== RCS file: /home/repository/moby/moby-live/Java/docs/ChangeLog,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- /home/repository/moby/moby-live/Java/docs/ChangeLog 2005/05/19 15:57:21 1.29 +++ /home/repository/moby/moby-live/Java/docs/ChangeLog 2005/05/19 20:18:53 1.30 @@ -1,5 +1,8 @@ 2005-05-19 Martin Senger + * Updated build.xml; also separate some fragments into xmls + directory. + * Ant changed to its latest release. 2005-05-17 Martin Senger =================================================================== RCS file: /home/repository/moby/moby-live/Java/docs/DirectoriesGuidelines.html,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- /home/repository/moby/moby-live/Java/docs/DirectoriesGuidelines.html 2005/05/19 15:57:21 1.2 +++ /home/repository/moby/moby-live/Java/docs/DirectoriesGuidelines.html 2005/05/19 20:18:53 1.3 @@ -84,6 +84,10 @@

    data
    A place for data files used by various tutorials or examples. +
    xmls +
    A place for additional fragments used by Ant's +build.xml. +
    @@ -184,7 +188,7 @@
    Martin Senger
    -Last modified: Thu May 19 15:29:48 2005 +Last modified: Thu May 19 19:59:46 2005
    =================================================================== RCS file: /home/repository/moby/moby-live/Java/docs/Download.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- /home/repository/moby/moby-live/Java/docs/Download.html 2005/05/19 15:57:21 1.3 +++ /home/repository/moby/moby-live/Java/docs/Download.html 2005/05/19 20:18:53 1.4 @@ -136,9 +136,14 @@ The build scripts (as usual for building with Ant) are based on file build.xml. There you can find all details what can be build, -and what properties are used. Here are just few targets explained in +and what properties are used. Here are just main targets explained in more details.

    +There is also a graphical +snapshot of our Ant tagrets (and here you can find how it was +created).

    + Note that a target name is used as the command-line parameter of a build script. For example a target docs is invoked by typing:

    @@ -362,7 +367,7 @@
     
    Martin Senger
    -Last modified: Thu May 19 13:46:02 2005 +Last modified: Thu May 19 19:07:17 2005
    =================================================================== RCS file: /home/repository/moby/moby-live/Java/docs/index.html,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- /home/repository/moby/moby-live/Java/docs/index.html 2005/05/19 15:57:21 1.10 +++ /home/repository/moby/moby-live/Java/docs/index.html 2005/05/19 20:18:53 1.11 @@ -57,7 +57,6 @@ (see also a general description of package names)
  • How to change Ant's build.xml
  • How to develop a client talking to a BioMoby service (a Paul Gordon's simple client) -
  • How to develop a BioMoby service (coming...)

    @@ -83,7 +82,7 @@

    Martin Senger
    -Last modified: Thu May 19 13:48:27 2005 +Last modified: Thu May 19 18:54:56 2005
    From senger at pub.open-bio.org Thu May 19 20:18:54 2005 From: senger at pub.open-bio.org (Martin Senger) Date: Thu, 19 May 2005 16:18:54 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505192018.j4JKIsex005052@pub.open-bio.org> senger Thu May 19 16:18:54 EDT 2005 Update of /home/repository/moby/moby-live/Java/docs/images In directory pub.open-bio.org:/tmp/cvs-serv4985/docs/images Added Files: ant-snapshot.png Log Message: moby-live/Java/docs/images ant-snapshot.png,NONE,1.1 From senger at pub.open-bio.org Thu May 19 20:18:54 2005 From: senger at pub.open-bio.org (Martin Senger) Date: Thu, 19 May 2005 16:18:54 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505192018.j4JKIsas005067@pub.open-bio.org> senger Thu May 19 16:18:54 EDT 2005 Update of /home/repository/moby/moby-live/Java/xmls In directory pub.open-bio.org:/tmp/cvs-serv4985/xmls Added Files: exceptions.xml libraries.xml Log Message: moby-live/Java/xmls exceptions.xml,NONE,1.1 libraries.xml,NONE,1.1 From senger at pub.open-bio.org Thu May 19 20:25:40 2005 From: senger at pub.open-bio.org (Martin Senger) Date: Thu, 19 May 2005 16:25:40 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505192025.j4JKPeVb005141@pub.open-bio.org> senger Thu May 19 16:25:40 EDT 2005 Update of /home/repository/moby/moby-live/Java/docs In directory pub.open-bio.org:/tmp/cvs-serv5118/docs Modified Files: 3rdPartyLibraries.html LatestJava.html Log Message: moby-live/Java/docs 3rdPartyLibraries.html,1.1,1.2 LatestJava.html,1.1,1.2 =================================================================== RCS file: /home/repository/moby/moby-live/Java/docs/3rdPartyLibraries.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/Java/docs/3rdPartyLibraries.html 2005/05/19 10:56:06 1.1 +++ /home/repository/moby/moby-live/Java/docs/3rdPartyLibraries.html 2005/05/19 20:25:40 1.2 @@ -11,6 +11,10 @@ Comming soon.. +

    + +For now, just look into xmls/libraries.xml - and it's almost +self-explanatory...

    @@ -19,7 +23,7 @@

    Martin Senger
    -Last modified: Thu May 19 10:39:48 2005 +Last modified: Thu May 19 20:35:23 2005
    =================================================================== RCS file: /home/repository/moby/moby-live/Java/docs/LatestJava.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/Java/docs/LatestJava.html 2005/05/19 10:56:06 1.1 +++ /home/repository/moby/moby-live/Java/docs/LatestJava.html 2005/05/19 20:25:40 1.2 @@ -27,9 +27,10 @@ First to say is that it was put there as a working solution for those who really need to use 1.5. Any new class that needs 1.5 must be explicitly named in the build.xml file in the property -version.excludes. Which is not too suitable if you have many -such classes. So when we start to use Java 1.5. in greater scale we -need to re-factor it.

    +version.excludes (the property is actually in a separate +fragment in xmls/exceptions.xml). Which is not too suitable +if you have many such classes. So when we start to use Java 1.5. in +greater scale we need to re-factor it.

    Having said that please note that nothing prevents you to use Java 1.5 @@ -76,7 +77,7 @@

    Martin Senger
    -Last modified: Tue May 17 13:01:36 2005 +Last modified: Thu May 19 20:33:59 2005
    From senger at pub.open-bio.org Thu May 19 20:27:03 2005 From: senger at pub.open-bio.org (Martin Senger) Date: Thu, 19 May 2005 16:27:03 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505192027.j4JKR3ev005186@pub.open-bio.org> senger Thu May 19 16:27:03 EDT 2005 Update of /home/repository/moby/moby-live/Java/docs/API In directory pub.open-bio.org:/tmp/cvs-serv5167/docs/API Modified Files: .cvsignore.template Log Message: moby-live/Java/docs/API .cvsignore.template,1.3,1.4 =================================================================== RCS file: /home/repository/moby/moby-live/Java/docs/API/.cvsignore.template,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- /home/repository/moby/moby-live/Java/docs/API/.cvsignore.template 2004/09/23 00:18:01 1.3 +++ /home/repository/moby/moby-live/Java/docs/API/.cvsignore.template 2005/05/19 20:27:02 1.4 @@ -4,4 +4,5 @@ *-list class-use org +embl resources From yanwong at pub.open-bio.org Fri May 20 07:35:23 2005 From: yanwong at pub.open-bio.org (Yan Wong) Date: Fri, 20 May 2005 03:35:23 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505200735.j4K7ZNns006617@pub.open-bio.org> yanwong Fri May 20 03:35:23 EDT 2005 Update of /home/repository/moby/moby-live/Python/bioMoby In directory pub.open-bio.org:/tmp/cvs-serv6578 Modified Files: mobyDataTypes.py Log Message: Changed the tag into moby-live/Python/bioMoby mobyDataTypes.py,1.22,1.23 =================================================================== RCS file: /home/repository/moby/moby-live/Python/bioMoby/mobyDataTypes.py,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- /home/repository/moby/moby-live/Python/bioMoby/mobyDataTypes.py 2005/05/18 08:26:32 1.22 +++ /home/repository/moby/moby-live/Python/bioMoby/mobyDataTypes.py 2005/05/20 07:35:23 1.23 @@ -31,7 +31,7 @@ def toMoby(self): """Returns the object as a XML """ - return ""+str(self.value)+"" + return ""+str(self.value)+"" def __str__(self): """Return the Parameter in its XML form @@ -52,9 +52,9 @@ xmlelt=parseString(xml).firstChild self.articleName=xmlelt.getAttribute('moby:articleName') - l=xmlelt.getElementsByTagName("value") + l=xmlelt.getElementsByTagName("Value") if len(l)==0: - l=xmlelt.getElementsByTagName("moby:value") + l=xmlelt.getElementsByTagName("moby:Value") self.value=l[0].firstChild.nodeValue From senger at pub.open-bio.org Wed May 25 10:09:16 2005 From: senger at pub.open-bio.org (Martin Senger) Date: Wed, 25 May 2005 06:09:16 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505251009.j4PA9GTc002366@pub.open-bio.org> senger Wed May 25 06:09:16 EDT 2005 Update of /home/repository/moby/moby-live/Java/docs In directory pub.open-bio.org:/tmp/cvs-serv2347 Modified Files: CodingGuidelines.html Log Message: moby-live/Java/docs CodingGuidelines.html,1.2,1.3 =================================================================== RCS file: /home/repository/moby/moby-live/Java/docs/CodingGuidelines.html,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- /home/repository/moby/moby-live/Java/docs/CodingGuidelines.html 2005/05/19 10:56:06 1.2 +++ /home/repository/moby/moby-live/Java/docs/CodingGuidelines.html 2005/05/25 10:09:16 1.3 @@ -42,7 +42,7 @@ href="DirectoriesGuidelines.html#packages">package descriptions.
  • -
  • Do not commit your services unless they are part of a tutorial (aka didactice services). +
  • Do not commit your services unless they are part of a tutorial (aka didactic services).
    In other words, jMoby is not a place for every BioMoby service written in Java. Such services are and will be spread around @@ -57,12 +57,27 @@
  • Whenever possible, include test programs that display the functionality of the new classes. -
  • Use the shared libraries (what come when you -execute gather Ant target, or when you use -./build.sh script). +
  • Join the MOBY-dev +mailing list, consider to join also the moby-l +mailing list. -
  • If you have to use another third party library, +
  • If you have to use a new third party library, you need to modify the build.xml file to go and get it. +
    + + It is not enough just to add a new jar file in your lib +sub-directory (because other developers will not have it). It is not +recommended to add a new jar file into CVS - if you have a new jar +file, change instead the build.xml file (actually change the +xmls/libraries that is used by build.xml).

    + +All third parties come to your CVS local copy when you execute +gather Ant target, or when you use ./build.sh +script. + +

  • Package names do not neccesarily have to start with org.biomoby. @@ -88,7 +103,7 @@
    Eddie Kawas
    -Last modified: Thu May 19 11:07:49 2005 +Last modified: Wed May 25 10:50:58 2005
    From kawas at pub.open-bio.org Mon May 30 21:39:05 2005 From: kawas at pub.open-bio.org (Eddie Kawas) Date: Mon, 30 May 2005 17:39:05 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505302139.j4ULd5NC002524@pub.open-bio.org> kawas Mon May 30 17:39:05 EDT 2005 Update of /home/repository/moby/moby-live/Perl/MOBY/Client In directory pub.open-bio.org:/tmp/cvs-serv2499/Client Modified Files: ServiceInstance.pm Log Message: added lsid specific code. eddie moby-live/Perl/MOBY/Client ServiceInstance.pm,1.13,1.14 =================================================================== RCS file: /home/repository/moby/moby-live/Perl/MOBY/Client/ServiceInstance.pm,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- /home/repository/moby/moby-live/Perl/MOBY/Client/ServiceInstance.pm 2004/11/18 17:41:16 1.13 +++ /home/repository/moby/moby-live/Perl/MOBY/Client/ServiceInstance.pm 2005/05/30 21:39:05 1.14 @@ -189,6 +189,7 @@ authoritative => [ undef, 'read/write' ], URL => [ undef, 'read/write' ], contactEmail => [ undef, 'read/write' ], + LSID => [ undef, 'read/write'] ); #_____________________________________________________________ From kawas at pub.open-bio.org Mon May 30 22:39:54 2005 From: kawas at pub.open-bio.org (Eddie Kawas) Date: Mon, 30 May 2005 18:39:54 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505302239.j4UMds6m002678@pub.open-bio.org> kawas Mon May 30 18:39:54 EDT 2005 Update of /home/repository/moby/moby-live/Perl/MOBY/Client In directory pub.open-bio.org:/tmp/cvs-serv2653/Client Modified Files: Central.pm Log Message: made lsid properties lowercase. Eddie moby-live/Perl/MOBY/Client Central.pm,1.95,1.96 =================================================================== RCS file: /home/repository/moby/moby-live/Perl/MOBY/Client/Central.pm,v retrieving revision 1.95 retrieving revision 1.96 diff -u -r1.95 -r1.96 --- /home/repository/moby/moby-live/Perl/MOBY/Client/Central.pm 2005/05/30 21:38:42 1.95 +++ /home/repository/moby/moby-live/Perl/MOBY/Client/Central.pm 2005/05/30 22:39:54 1.96 @@ -1017,8 +1017,8 @@ #create LSID for service and register it in the DB my $_config ||= MOBY::Config->new; my $service_lsid = "urn:lsid:" - . $_config->{mobycentral}->{LSID_authority} . ":" - . $_config->{mobycentral}->{LSID_namespace} . ":" + . $_config->{mobycentral}->{lsid_authority} . ":" + . $_config->{mobycentral}->{lsid_namespace} . ":" . $authURI . "," . $name; my $dbhA = $_config->getDataAdaptor( source => 'mobycentral' ); From kawas at pub.open-bio.org Mon May 30 22:54:43 2005 From: kawas at pub.open-bio.org (Eddie Kawas) Date: Mon, 30 May 2005 18:54:43 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505302254.j4UMshxm002771@pub.open-bio.org> kawas Mon May 30 18:54:43 EDT 2005 Update of /home/repository/moby/moby-live/Perl/MOBY/Client In directory pub.open-bio.org:/tmp/cvs-serv2746/Client Modified Files: Central.pm Log Message: excised some db code that was ill placed. Eddie moby-live/Perl/MOBY/Client Central.pm,1.96,1.97 =================================================================== RCS file: /home/repository/moby/moby-live/Perl/MOBY/Client/Central.pm,v retrieving revision 1.96 retrieving revision 1.97 diff -u -r1.96 -r1.97 --- /home/repository/moby/moby-live/Perl/MOBY/Client/Central.pm 2005/05/30 22:39:54 1.96 +++ /home/repository/moby/moby-live/Perl/MOBY/Client/Central.pm 2005/05/30 22:54:43 1.97 @@ -1013,21 +1013,7 @@ # my $rdf = $response->content; # print "$rdf\n"; #} - - #create LSID for service and register it in the DB - my $_config ||= MOBY::Config->new; - my $service_lsid = "urn:lsid:" - . $_config->{mobycentral}->{lsid_authority} . ":" - . $_config->{mobycentral}->{lsid_namespace} . ":" - . $authURI . "," - . $name; - my $dbhA = $_config->getDataAdaptor( source => 'mobycentral' ); - my $dbh = $dbhA->dbh; - my $sth = - $dbh->prepare( -"update service_instance set lsid = ? where authority_id= ? and servicename= ?" - ); - $sth->execute( $service_lsid, $authURI, $name ); + return $reg; #_______________________________________________________________________________________________ From kawas at pub.open-bio.org Mon May 30 23:28:45 2005 From: kawas at pub.open-bio.org (Eddie Kawas) Date: Mon, 30 May 2005 19:28:45 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505302328.j4UNSjJ4002915@pub.open-bio.org> kawas Mon May 30 19:28:45 EDT 2005 Update of /home/repository/moby/moby-live/Perl/MOBY In directory pub.open-bio.org:/tmp/cvs-serv2890 Modified Files: service_instance.pm Log Message: created an lsid for insertion into db Eddie moby-live/Perl/MOBY service_instance.pm,1.9,1.10 =================================================================== RCS file: /home/repository/moby/moby-live/Perl/MOBY/service_instance.pm,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- /home/repository/moby/moby-live/Perl/MOBY/service_instance.pm 2004/11/18 17:41:14 1.9 +++ /home/repository/moby/moby-live/Perl/MOBY/service_instance.pm 2005/05/30 23:28:45 1.10 @@ -261,6 +261,14 @@ && ( defined $self->description ) ) { # then create it de novo if we have enough information + #create LSID for service and register it in the DB + my $_config ||= MOBY::Config->new; + my $service_lsid = "urn:lsid:" + . $_config->{mobycentral}->{lsid_authority} . ":" + . $_config->{mobycentral}->{lsid_namespace} . ":" + . $self->authority_uri . "," + . $self->servicename; + my $id = $self->adaptor->insert_service_instance( category => $self->category, servicename => $self->servicename, @@ -271,6 +279,7 @@ authoritative => $self->authoritative, description => $self->description, signatureURL => $self->signatureURL, + lsid => $service_lsid ); $self->service_instance_id($id); $self->{__exists__} = 1; # this service now exists From kawas at pub.open-bio.org Mon May 30 23:33:44 2005 From: kawas at pub.open-bio.org (Eddie Kawas) Date: Mon, 30 May 2005 19:33:44 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505302333.j4UNXiPr002980@pub.open-bio.org> kawas Mon May 30 19:33:44 EDT 2005 Update of /home/repository/moby/moby-live/Perl/MOBY In directory pub.open-bio.org:/tmp/cvs-serv2936 Modified Files: service_instance.pm Log Message: Added more lsid stuff. Last time, i promise. Eddie moby-live/Perl/MOBY service_instance.pm,1.10,1.11 =================================================================== RCS file: /home/repository/moby/moby-live/Perl/MOBY/service_instance.pm,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- /home/repository/moby/moby-live/Perl/MOBY/service_instance.pm 2005/05/30 23:28:45 1.10 +++ /home/repository/moby/moby-live/Perl/MOBY/service_instance.pm 2005/05/30 23:33:44 1.11 @@ -71,7 +71,8 @@ contact_email => [ undef, 'read/write' ], authoritative => [ 0, 'read/write' ], description => [ undef, 'read/write' ], - registry => [ 'MOBY_Central', 'read/write' ], + registry => [ 'MOBY_Central', 'read/write' ], + lsid => [ undef, 'read/write' ], test => [ 0, 'read/write' ] , # toggles create or test_existence behaviour ); @@ -249,6 +250,7 @@ $self->description( $existing_service->{'desc'} ); $self->authority( $existing_service->{'authURI'} ); $self->signatureURL( $existing_service->{'signatureURL'} ); + $self->lsid( $existing_service->{'lsid'} ); $self->{__exists__} = 1; # this service already existed } elsif ( !($existing_service) # if it doesn't exist From kawas at pub.open-bio.org Mon May 30 23:33:44 2005 From: kawas at pub.open-bio.org (Eddie Kawas) Date: Mon, 30 May 2005 19:33:44 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505302333.j4UNXiM4002961@pub.open-bio.org> kawas Mon May 30 19:33:43 EDT 2005 Update of /home/repository/moby/moby-live/Perl/MOBY/Adaptor/moby/queryapi In directory pub.open-bio.org:/tmp/cvs-serv2936/Adaptor/moby/queryapi Modified Files: mysql.pm Log Message: Added more lsid stuff. Last time, i promise. Eddie moby-live/Perl/MOBY/Adaptor/moby/queryapi mysql.pm,1.9,1.10 =================================================================== RCS file: /home/repository/moby/moby-live/Perl/MOBY/Adaptor/moby/queryapi/mysql.pm,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- /home/repository/moby/moby-live/Perl/MOBY/Adaptor/moby/queryapi/mysql.pm 2005/03/09 00:56:15 1.9 +++ /home/repository/moby/moby-live/Perl/MOBY/Adaptor/moby/queryapi/mysql.pm 2005/05/30 23:33:43 1.10 @@ -173,7 +173,7 @@ my ($self, %args) = @_; my $dbh = $self->dbh; - my ($serviceid, $category, $name, $typeURI, $authURI,$url,$email,$authoritative,$desc, $signatureURL) = $dbh->selectrow_array( # does this service already exist? + my ($serviceid, $category, $name, $typeURI, $authURI,$url,$email,$authoritative,$desc, $signatureURL, $lsid) = $dbh->selectrow_array( # does this service already exist? q{select service_instance_id, category, @@ -184,7 +184,8 @@ service_instance.contact_email, authoritative, description, - signatureURL + signatureURL, + lsid from service_instance, authority where service_instance.authority_id = authority.authority_id @@ -202,6 +203,7 @@ email => $email, authoritative => $authoritative, desc => $desc, + lsid => $lsid }; } @@ -210,7 +212,7 @@ my ($self, %args) = @_; my $dbh = $self->dbh; - $dbh->do(q{insert into service_instance (category, servicename, service_type_uri, authority_id, url, contact_email, authoritative, description, signatureURL) values (?,?,?,?,?,?,?,?,?)}, + $dbh->do(q{insert into service_instance (category, servicename, service_type_uri, authority_id, url, contact_email, authoritative, description, signatureURL, lsid) values (?,?,?,?,?,?,?,?,?,?)}, undef, $args{'category'}, $args{'servicename'}, @@ -220,7 +222,8 @@ $args{'contact_email'}, $args{'authoritative'}, $args{'description'}, - $args{'signatureURL'}); + $args{'signatureURL'}, + $args{'lsid'}); my $id = $dbh->{mysql_insertid}; return $id; From mwilkinson at pub.open-bio.org Tue May 31 00:06:48 2005 From: mwilkinson at pub.open-bio.org (Mark Wilkinson) Date: Mon, 30 May 2005 20:06:48 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505310006.j4V06mDj003119@pub.open-bio.org> mwilkinson Mon May 30 20:06:48 EDT 2005 Update of /home/repository/moby/moby-live/Perl In directory pub.open-bio.org:/tmp/cvs-serv3100 Modified Files: Makefile.PL Log Message: updated Makefile moving to LS::ID dependencies moby-live/Perl Makefile.PL,1.7,1.8 =================================================================== RCS file: /home/repository/moby/moby-live/Perl/Makefile.PL,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- /home/repository/moby/moby-live/Perl/Makefile.PL 2005/02/18 15:21:03 1.7 +++ /home/repository/moby/moby-live/Perl/Makefile.PL 2005/05/31 00:06:48 1.8 @@ -77,6 +77,10 @@ 'PREREQ_PM' => { 'SOAP::Lite' => 0.55, 'XML::LibXML' => 1.58, + 'Text::Shellwords' => 1.00, + 'SOAP::MIME' => 0.55, + 'XML::XPath' => 1.12, + 'LS::ID' => 1.1.1, }, # e.g., Module::Name => 1.1 #'PM_FILTER' => "", ($] >= 5.005 ? ## Add these new keywords supported since 5.005 From kawas at pub.open-bio.org Tue May 31 15:09:26 2005 From: kawas at pub.open-bio.org (Eddie Kawas) Date: Tue, 31 May 2005 11:09:26 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505311509.j4VF9Qnu005820@pub.open-bio.org> kawas Tue May 31 11:09:26 EDT 2005 Update of /home/repository/moby/moby-live/Perl/MOBY In directory pub.open-bio.org:/tmp/cvs-serv5794 Modified Files: Central.pm Log Message: Fixed bug that caused an error on test 17 of testMobyClientCentral. ... Eddie moby-live/Perl/MOBY Central.pm,1.152,1.153 =================================================================== RCS file: /home/repository/moby/moby-live/Perl/MOBY/Central.pm,v retrieving revision 1.152 retrieving revision 1.153 diff -u -r1.152 -r1.153 --- /home/repository/moby/moby-live/Perl/MOBY/Central.pm 2005/05/30 21:38:41 1.152 +++ /home/repository/moby/moby-live/Perl/MOBY/Central.pm 2005/05/31 15:09:25 1.153 @@ -1409,16 +1409,16 @@ ); } - # use MOBY::Client::Central; - # my $services = MOBY::Client::Central::_parseServices( '', '', $si ); - # my $service_instance = shift @{$services}; + use MOBY::Client::Central; + my $services = MOBY::Client::Central::_parseServices( '', '', $si ); + my $service_instance = shift @{$services}; # my $storage = new RDF::Core::Storage::Memory; # my $model = new RDF::Core::Model( Storage => $storage ); # my $RDF_MODEL = MOBY::RDF::ServiceInstanceRDF->new( #model => $model, #service_instance => $service_instance ); # my $RDF_XML = $RDF_MODEL->serialize; - my $LSID = $si->LSID; + my $LSID = $service_instance->LSID; my $RDF = _getServiceInstanceRDF($LSID); unless ($RDF){return &_success("Registration successful but LSID resolution error",$SVC->service_instance_id,"" )} unless ($RDF =~ /RDF/){ From kawas at pub.open-bio.org Tue May 31 18:09:24 2005 From: kawas at pub.open-bio.org (Eddie Kawas) Date: Tue, 31 May 2005 14:09:24 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505311809.j4VI9Obi006293@pub.open-bio.org> kawas Tue May 31 14:09:24 EDT 2005 Update of /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/ui/graphical/servlet/jresources In directory pub.open-bio.org:/tmp/cvs-serv6268/org/biomoby/client/ui/graphical/servlet/jresources Modified Files: RESOURCE.java Log Message: updated the 'script' to use updated properties. Eddie moby-live/Java/src/main/org/biomoby/client/ui/graphical/servlet/jresources RESOURCE.java,1.4,1.5 =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/ui/graphical/servlet/jresources/RESOURCE.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/ui/graphical/servlet/jresources/RESOURCE.java 2005/05/13 19:18:18 1.4 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/ui/graphical/servlet/jresources/RESOURCE.java 2005/05/31 18:09:24 1.5 @@ -17,7 +17,6 @@ import javax.servlet.http.HttpServletResponse; import org.biomoby.client.CentralDigestImpl; -import org.biomoby.client.CentralImpl; import org.biomoby.client.rdf.vocabulary.MobyResources; import org.biomoby.client.rdf.vocabulary.Predicates; import org.biomoby.registry.definitions.types.JNamespaces; @@ -26,14 +25,12 @@ import org.biomoby.registry.properties.MobyProperties; import org.biomoby.shared.CentralDigest; import org.biomoby.shared.MobyData; -import org.biomoby.shared.MobyDataType; import org.biomoby.shared.MobyException; import org.biomoby.shared.MobyNamespace; import org.biomoby.shared.MobyPrimaryDataSet; import org.biomoby.shared.MobyPrimaryDataSimple; import org.biomoby.shared.MobySecondaryData; import org.biomoby.shared.MobyService; -import org.biomoby.shared.NoSuccessException; import org.biomoby.shared.data.MobyDataSecondaryInstance; import org.w3c.rdf.model.ModelException; @@ -143,21 +140,21 @@ private static Properties properties = MobyProperties.PROPERTIES();; private static final String OBJ = "http://" - + properties.getProperty("domain") + "/RESOURCES/MOBY-S/Objects#"; + + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/Objects#"; private static final String SRV = "http://" - + properties.getProperty("domain") + "/RESOURCES/MOBY-S/Services#"; + + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/Services#"; private static final String NS = "http://" - + properties.getProperty("domain") + + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/Namespaces#"; private static final String MP = "http://" - + properties.getProperty("domain") + + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/Predicates#"; private static final String SI = "http://" - + properties.getProperty("domain") + + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/ServiceInstances#"; private static boolean RUN_MAIN = false; @@ -686,15 +683,7 @@ obj = obj.substring(0, obj.indexOf("(")); Resource _subject = _addClassResource(model, OBJ, sub, def); - try { - //TODO make this an sql call - MobyDataType _datatype = new CentralImpl().getDataType(sub); - model.add(model.createStatement(subject, DC.publisher, model.createLiteral(_datatype.getAuthority(), "en"))); - model.add(model.createStatement(subject, DC.creator, model.createLiteral( _datatype.getEmailContact(), "en"))); - } catch (NoSuccessException e) { - // oh well, at least we tried - System.err.println(sub + " could not be augmented with its 'creator' or its 'publisher'. Oh well, at least we tried"); - } + m = Pattern.compile(".*:isa$", Pattern.CASE_INSENSITIVE).matcher( pred); if (m.matches()) { From kawas at pub.open-bio.org Tue May 31 18:11:08 2005 From: kawas at pub.open-bio.org (Eddie Kawas) Date: Tue, 31 May 2005 14:11:08 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505311811.j4VIB8vk006343@pub.open-bio.org> kawas Tue May 31 14:11:08 EDT 2005 Update of /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/rdf/builder In directory pub.open-bio.org:/tmp/cvs-serv6314/org/biomoby/client/rdf/builder Modified Files: ServiceInstanceRDF.java RDFConfigure.java Log Message: updated the code to use updated properties located in MobyProperties.java. Eddie moby-live/Java/src/main/org/biomoby/client/rdf/builder ServiceInstanceRDF.java,1.2,1.3 RDFConfigure.java,1.1,1.2 =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/rdf/builder/ServiceInstanceRDF.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/rdf/builder/ServiceInstanceRDF.java 2005/05/12 05:19:20 1.2 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/rdf/builder/ServiceInstanceRDF.java 2005/05/31 18:11:07 1.3 @@ -40,10 +40,9 @@ */ /** - * @author Eddie Kawas - *

    This class was created to present a way to retrieve a service instances' RDF using just a service name and authority. - *

    For questions, comments, or bugs - *

    email me at edward.kawas at gmail.com + * @author Eddie Kawas

    This class was created to present a way to retrieve a + * service instances' RDF using just a service name and authority.

    For + * questions, comments, or bugs

    email me at edward.kawas at gmail.com */ public class ServiceInstanceRDF { @@ -60,26 +59,28 @@ + System.getProperty("line.separator") + ""; /* - * load the properties file and set the properties + * load the properties file and set the properties */ private static Properties properties = MobyProperties.PROPERTIES(); private static final String OBJ = "http://" - + properties.getProperty("domain") + "/RESOURCES/MOBY-S/Objects#"; + + properties.getProperty("resources_script_domain") + + "/RESOURCES/MOBY-S/Objects#"; private static final String SRV = "http://" - + properties.getProperty("domain") + "/RESOURCES/MOBY-S/Services#"; + + properties.getProperty("resources_script_domain") + + "/RESOURCES/MOBY-S/Services#"; private static final String NS = "http://" - + properties.getProperty("domain") + + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/Namespaces#"; private static final String MP = "http://" - + properties.getProperty("domain") + + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/Predicates#"; private static final String SI = "http://" - + properties.getProperty("domain") + + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/ServiceInstances#"; // the endpoint for the test server @@ -88,15 +89,23 @@ private final static String TEST_URI = properties.getProperty("test_uri"); /** - * - * PRE:name is either a valid name or null

    - * POST:If authorURI is a valid authority, then a RDF containing all of the service instances will be returned. - * If authorURI and name are valid then a single RDF containing just the service instance identified by name is returned.

    - * @param authorURI - the authority to query - * @param name - the name of the service instance if applicable or null. - * @param useTestMachine - if true then services are searched for on the test server, otherwise the production server is used. - * @return a string representing either all of services defined by authorURI, (if name is null) or a single service instances' - * rdf if name and authorURI are valid. If name and/or authorURI are invalid an empty rdf document is returned. + * + * PRE:name is either a valid name or null

    POST:If + * authorURI is a valid authority, then a RDF containing all of the service + * instances will be returned. If authorURI and name are valid then a single + * RDF containing just the service instance identified by name is returned.

    + * + * @param authorURI - + * the authority to query + * @param name - + * the name of the service instance if applicable or null. + * @param useTestMachine - + * if true then services are searched for on the test server, + * otherwise the production server is used. + * @return a string representing either all of services defined by + * authorURI, (if name is null) or a single service instances' rdf + * if name and authorURI are valid. If name and/or authorURI are + * invalid an empty rdf document is returned. */ public final static String findService(String authorURI, String name, boolean useTestMachine) { @@ -109,19 +118,28 @@ /** * - * method that retrieves the RDF describing a specific service instance based on the parameters domain, serviceName, url and uri. - *

    PRE:None. - *

    POST:The RDF describing the service with parameters domain, serviceName, url and uri is created. - * @param domain - the authoring domain of the service instance in question. - * @param serviceName - the name of the service instance in question. - * @param url - the URL of the endpoint of the BioMoby registry that you would like to query. If null, the mobycentral registry is queried. - * @param uri - the URI of the BioMoby registry that you would like to query. If null, the mobycentral registry is queried. - * @return - the string representation of the RDF describing the service instance based on the parameters given. + * method that retrieves the RDF describing a specific service instance + * based on the parameters domain, serviceName, url and uri.

    PRE:None. + *

    POST:The RDF describing the service with parameters domain, + * serviceName, url and uri is created. + * + * @param domain - + * the authoring domain of the service instance in question. + * @param serviceName - + * the name of the service instance in question. + * @param url - + * the URL of the endpoint of the BioMoby registry that you would + * like to query. If null, the mobycentral registry is queried. + * @param uri - + * the URI of the BioMoby registry that you would like to query. + * If null, the mobycentral registry is queried. + * @return - the string representation of the RDF describing the service + * instance based on the parameters given. */ public final static String findService(String domain, String serviceName, String url, String uri) { if (serviceName != null) { - // variables needed + // variables needed MobyService service = null; MobyService[] services = null; Central central = null; @@ -157,7 +175,8 @@ } /* - * a method that retrieves all of the service instances based on an authoriy. + * a method that retrieves all of the service instances based on an + * authoriy. */ private final static String getAllServices(String URI, boolean useTestMachine) { @@ -239,20 +258,19 @@ } /* - * method that actually creates the rdf based on one or more services contained in the array services + * method that actually creates the rdf based on one or more services + * contained in the array services */ private final static String createRDF(MobyService[] services) { Model model = ModelFactory.createDefaultModel(); // set up the prefixes/namespaces Map map = model.getNsPrefixMap(); map.put("mobyPred", Predicates.getURI()); - map.put("mobyObject", "http://biomoby.org/RESOURCES/MOBY-S/Objects#"); - map.put("serviceInstances", - "http://biomoby.org/RESOURCES/MOBY-S/ServiceInstances#"); - map.put("mobyNamespace", - "http://biomoby.org/RESOURCES/MOBY-S/Namespaces#"); - map.put("mobyService", "http://biomoby.org/RESOURCES/MOBY-S/Services#"); - map.put("moby", "http://biomoby.org/RESOURCES/MOBY-S/MOBYResources#"); + map.put("mobyObject", OBJ); + map.put("serviceInstances", SI); + map.put("mobyNamespace", NS); + map.put("mobyService", SRV); + map.put("moby", MobyResources.getURI()); model.setNsPrefixes(map); for (int i = 0; i < services.length; i++) { @@ -340,7 +358,7 @@ } } if (innerBag != null && innerBag.size() > 0) { - //TODO + // TODO consumeBag.add(innerBag); } @@ -443,7 +461,7 @@ return null; } } - if (innerBag != null /*&& innerBag.size() > 0*/) { + if (innerBag != null /* && innerBag.size() > 0 */) { produceBag.add(innerBag); } } else { @@ -489,7 +507,7 @@ } /* - * convenience method that creates a mobyPred:Simple + * convenience method that creates a mobyPred:Simple */ private final static Resource createSimpleDataItem(Model model, MobyPrimaryDataSimple simpleData, Resource _li) { @@ -505,19 +523,24 @@ MobyNamespace mns = ns[k]; _li.addProperty(Predicates.namespace_type, model .createResource(NS + mns.getName())); - //.addProperty(RDF.type, RDFS.Class)); + // .addProperty(RDF.type, RDFS.Class)); } } return _li; } /** - * - * PRE:None

    - * POST:If a service instance exists such that it has a name of name and an authoring URI of uri true is returned, otherwise false is returned.

    - * @param uri - the authors uri - * @param name - the name of the service instance - * @return true if a service instance exists with authority uri, and name name, otherwise false is returned. + * + * PRE:None

    POST:If a service instance exists such that + * it has a name of name and an authoring URI of uri true is returned, + * otherwise false is returned.

    + * + * @param uri - + * the authors uri + * @param name - + * the name of the service instance + * @return true if a service instance exists with authority uri, and name + * name, otherwise false is returned. */ public final static boolean serviceInstanceExists(String uri, String name) { Central central = null; @@ -542,15 +565,16 @@ } /** - * + * * Usage: ServiceInstanceRDF authorityURI [serviceName]

    * authorityURI: is the authortitys' domain to query

    - * serviceName:optional argument that identifies a specific service instance

    + * serviceName:optional argument that identifies a specific service + * instance

    + * * @throws LSIDException */ public final static void main(String[] args) throws LSIDException { - System.out.println("1:\n" - + findService("www.test.com", null, false)); + System.out.println("1:\n" + findService("www.test.com", null, false)); } } =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/rdf/builder/RDFConfigure.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/rdf/builder/RDFConfigure.java 2005/04/07 16:42:29 1.1 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/rdf/builder/RDFConfigure.java 2005/05/31 18:11:07 1.2 @@ -46,15 +46,15 @@ /* * Some constants for use in the rdfs */ - final public static String URI_OBJECT = "http://" + properties.getProperty("domain") +"/RESOURCES/MOBY-S/Objects#"; + final public static String URI_OBJECT = "http://" + properties.getProperty("resources_script_domain") +"/RESOURCES/MOBY-S/Objects#"; - final public static String URI_SERVICE = "http://" + properties.getProperty("domain") +"/RESOURCES/MOBY-S/Services#"; + final public static String URI_SERVICE = "http://" + properties.getProperty("resources_script_domain") +"/RESOURCES/MOBY-S/Services#"; - final public static String URI_NAMESPACE = "http://" + properties.getProperty("domain") +"/RESOURCES/MOBY-S/Namespaces#"; + final public static String URI_NAMESPACE = "http://" + properties.getProperty("resources_script_domain") +"/RESOURCES/MOBY-S/Namespaces#"; - final public static String URI_PREDICATE = "http://" + properties.getProperty("domain") +"/RESOURCES/MOBY-S/Predicates#"; + final public static String URI_PREDICATE = "http://" + properties.getProperty("resources_script_domain") +"/RESOURCES/MOBY-S/Predicates#"; - final public static String URI_ServiceINSTANCE = "http://" + properties.getProperty("domain") +"/RESOURCES/MOBY-S/ServiceInstances#"; + final public static String URI_ServiceINSTANCE = "http://" + properties.getProperty("resources_script_domain") +"/RESOURCES/MOBY-S/ServiceInstances#"; private Model model = null; From kawas at pub.open-bio.org Tue May 31 18:11:08 2005 From: kawas at pub.open-bio.org (Eddie Kawas) Date: Tue, 31 May 2005 14:11:08 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505311811.j4VIB8So006366@pub.open-bio.org> kawas Tue May 31 14:11:08 EDT 2005 Update of /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/rdf/vocabulary In directory pub.open-bio.org:/tmp/cvs-serv6314/org/biomoby/client/rdf/vocabulary Modified Files: Predicates.java MobyResources.java Log Message: updated the code to use updated properties located in MobyProperties.java. Eddie moby-live/Java/src/main/org/biomoby/client/rdf/vocabulary Predicates.java,1.1,1.2 MobyResources.java,1.1,1.2 =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/rdf/vocabulary/Predicates.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/rdf/vocabulary/Predicates.java 2005/04/07 16:42:29 1.1 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/rdf/vocabulary/Predicates.java 2005/05/31 18:11:08 1.2 @@ -22,33 +22,33 @@ public class Predicates { private final static Properties properties = MobyProperties.PROPERTIES(); - protected final static String uri = "http://" + properties.getProperty("domain") + "/RESOURCES/MOBY-S/Predicates#"; + protected final static String uri = "http://" + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/Predicates#"; private final static Model _model = ModelFactory.createDefaultModel();; - public static final Property category = _model.getProperty("http://" + properties.getProperty("domain") + "/RESOURCES/MOBY-S/Predicates#category"); - public static final Property isa = _model.getProperty("http://" + properties.getProperty("domain") + "/RESOURCES/MOBY-S/Predicates#isa"); - public static final Property has = _model.getProperty("http://" + properties.getProperty("domain") + "/RESOURCES/MOBY-S/Predicates#has"); - public static final Property hasa = _model.getProperty("http://" + properties.getProperty("domain") + "/RESOURCES/MOBY-S/Predicates#hasa"); - public static final Property articleName = _model.getProperty("http://" + properties.getProperty("domain") + "/RESOURCES/MOBY-S/Predicates#articleName"); - public static final Property article_name = _model.getProperty("http://" + properties.getProperty("domain") + "/RESOURCES/MOBY-S/Predicates#article_name"); - public static final Property namespace_type = _model.getProperty("http://" + properties.getProperty("domain") + "/RESOURCES/MOBY-S/Predicates#namespace_type"); - public static final Property object_type = _model.getProperty("http://" + properties.getProperty("domain") + "/RESOURCES/MOBY-S/Predicates#object_type"); - public static final Property input = _model.getProperty("http://" + properties.getProperty("domain") + "/RESOURCES/MOBY-S/Predicates#input"); - public static final Property output = _model.getProperty("http://" + properties.getProperty("domain") + "/RESOURCES/MOBY-S/Predicates#output"); - public static final Property consumes = _model.getProperty("http://" + properties.getProperty("domain") + "/RESOURCES/MOBY-S/Predicates#consumes"); - public static final Property produces = _model.getProperty("http://" + properties.getProperty("domain") + "/RESOURCES/MOBY-S/Predicates#produces"); - public static final Property performs_task = _model.getProperty("http://" + properties.getProperty("domain") + "/RESOURCES/MOBY-S/Predicates#performs_task"); - public static final Property comment = _model.getProperty("http://" + properties.getProperty("domain") + "/RESOURCES/MOBY-S/Predicates#comment"); - public static final Property label = _model.getProperty("http://" + properties.getProperty("domain") + "/RESOURCES/MOBY-S/Predicates#label"); - public static final Property default_value = _model.getProperty("http://" + properties.getProperty("domain") + "/RESOURCES/MOBY-S/Predicates#default_value"); - public static final Property datatype = _model.getProperty("http://" + properties.getProperty("domain") + "/RESOURCES/MOBY-S/Predicates#datatype"); - public static final Property max = _model.getProperty("http://" + properties.getProperty("domain") + "/RESOURCES/MOBY-S/Predicates#max"); - public static final Property min = _model.getProperty("http://" + properties.getProperty("domain") + "/RESOURCES/MOBY-S/Predicates#min"); - public static final Property enumeration = _model.getProperty("http://" + properties.getProperty("domain") + "/RESOURCES/MOBY-S/Predicates#enum"); - public static final Property SimpleArticle = _model.getProperty("http://" + properties.getProperty("domain") + "/RESOURCES/MOBY-S/Predicates#SimpleArticle"); - public static final Property CollectionArticle = _model.getProperty("http://" + properties.getProperty("domain") + "/RESOURCES/MOBY-S/Predicates#CollectionArticle"); - public static final Property SecondaryArticle = _model.getProperty("http://" + properties.getProperty("domain") + "/RESOURCES/MOBY-S/Predicates#SecondaryArticle"); - public static final Property SignatureURL = _model.getProperty("http://" + properties.getProperty("domain") + "/RESOURCES/MOBY-S/Predicates#SignatureURL"); - public static final Property authoritative = _model.getProperty("http://" + properties.getProperty("domain") + "/RESOURCES/MOBY-S/Predicates#authoritative"); + public static final Property category = _model.getProperty("http://" + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/Predicates#category"); + public static final Property isa = _model.getProperty("http://" + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/Predicates#isa"); + public static final Property has = _model.getProperty("http://" + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/Predicates#has"); + public static final Property hasa = _model.getProperty("http://" + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/Predicates#hasa"); + public static final Property articleName = _model.getProperty("http://" + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/Predicates#articleName"); + public static final Property article_name = _model.getProperty("http://" + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/Predicates#article_name"); + public static final Property namespace_type = _model.getProperty("http://" + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/Predicates#namespace_type"); + public static final Property object_type = _model.getProperty("http://" + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/Predicates#object_type"); + public static final Property input = _model.getProperty("http://" + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/Predicates#input"); + public static final Property output = _model.getProperty("http://" + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/Predicates#output"); + public static final Property consumes = _model.getProperty("http://" + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/Predicates#consumes"); + public static final Property produces = _model.getProperty("http://" + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/Predicates#produces"); + public static final Property performs_task = _model.getProperty("http://" + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/Predicates#performs_task"); + public static final Property comment = _model.getProperty("http://" + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/Predicates#comment"); + public static final Property label = _model.getProperty("http://" + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/Predicates#label"); + public static final Property default_value = _model.getProperty("http://" + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/Predicates#default_value"); + public static final Property datatype = _model.getProperty("http://" + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/Predicates#datatype"); + public static final Property max = _model.getProperty("http://" + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/Predicates#max"); + public static final Property min = _model.getProperty("http://" + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/Predicates#min"); + public static final Property enumeration = _model.getProperty("http://" + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/Predicates#enum"); + public static final Property SimpleArticle = _model.getProperty("http://" + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/Predicates#SimpleArticle"); + public static final Property CollectionArticle = _model.getProperty("http://" + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/Predicates#CollectionArticle"); + public static final Property SecondaryArticle = _model.getProperty("http://" + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/Predicates#SecondaryArticle"); + public static final Property SignatureURL = _model.getProperty("http://" + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/Predicates#SignatureURL"); + public static final Property authoritative = _model.getProperty("http://" + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/Predicates#authoritative"); public final static String getURI() { return uri; } =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/rdf/vocabulary/MobyResources.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/rdf/vocabulary/MobyResources.java 2005/04/07 16:42:29 1.1 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/rdf/vocabulary/MobyResources.java 2005/05/31 18:11:08 1.2 @@ -21,13 +21,13 @@ */ public class MobyResources { private final static Properties properties = MobyProperties.PROPERTIES(); - private static final String uri = "http://" + properties.getProperty("domain") + "/RESOURCES/MOBY-S/MOBYResources#"; + private static final String uri = "http://" + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/MOBYResources#"; private static Model _model = ModelFactory.createDefaultModel(); - public static final Property SimpleArticle = _model.getProperty("http://" + properties.getProperty("domain") + "/RESOURCES/MOBY-S/MOBYResources#Simple"); - public static final Property CollectionArticle = _model.getProperty("http://" + properties.getProperty("domain") + "/RESOURCES/MOBY-S/MOBYResources#articleName"); - public static final Property SecondaryArticle = _model.getProperty("http://" + properties.getProperty("domain") + "/RESOURCES/MOBY-S/MOBYResources#Secondary"); - public static final Property Collection = _model.getProperty("http://" + properties.getProperty("domain") + "/RESOURCES/MOBY-S/MOBYResources#Collection"); + public static final Property SimpleArticle = _model.getProperty("http://" + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/MOBYResources#Simple"); + public static final Property CollectionArticle = _model.getProperty("http://" + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/MOBYResources#articleName"); + public static final Property SecondaryArticle = _model.getProperty("http://" + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/MOBYResources#Secondary"); + public static final Property Collection = _model.getProperty("http://" + properties.getProperty("resources_script_domain") + "/RESOURCES/MOBY-S/MOBYResources#Collection"); public final static String getURI() { return uri; } From kawas at pub.open-bio.org Tue May 31 18:13:13 2005 From: kawas at pub.open-bio.org (Eddie Kawas) Date: Tue, 31 May 2005 14:13:13 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505311813.j4VIDDWr006414@pub.open-bio.org> kawas Tue May 31 14:13:13 EDT 2005 Update of /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/ui/graphical/servlet/lsid/authority In directory pub.open-bio.org:/tmp/cvs-serv6385/org/biomoby/client/ui/graphical/servlet/lsid/authority Modified Files: MobyAuthority.java LSIDDataLookup.java Log Message: Updated property file usage and improved some logic to (Hopefully) make code more portable. Eddie moby-live/Java/src/main/org/biomoby/client/ui/graphical/servlet/lsid/authority MobyAuthority.java,1.1,1.2 LSIDDataLookup.java,1.1,1.2 =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/ui/graphical/servlet/lsid/authority/MobyAuthority.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/ui/graphical/servlet/lsid/authority/MobyAuthority.java 2005/04/07 16:42:26 1.1 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/ui/graphical/servlet/lsid/authority/MobyAuthority.java 2005/05/31 18:13:13 1.2 @@ -1,6 +1,9 @@ - package org.biomoby.client.ui.graphical.servlet.lsid.authority; +import java.util.Properties; + +import org.biomoby.registry.properties.MobyProperties; + import com.ibm.lsid.ExpiringResponse; import com.ibm.lsid.LSID; import com.ibm.lsid.LSIDException; @@ -20,19 +23,14 @@ */ /** - * @author Eddie Kawas - *

    - * Created for - *

    - * This class was created to ... - *

    - * For questions, comments, or bugs - *

    - * email me at edward.kawas at gmail.com + * @author Eddie Kawas

    Created for

    This class was created to ...

    For + * questions, comments, or bugs

    email me at edward.kawas at gmail.com */ public class MobyAuthority extends SimpleAuthority { private LSIDDataLookup lookup = null; + private Properties properties = MobyProperties.PROPERTIES(); + public LSIDMetadataPort[] getMetadataLocations(LSID lsid, String url) { if (lookup == null) @@ -48,7 +46,13 @@ if (lsType == LSIDDataLookup.UNKNOWN) return null; - return new LSIDMetadataPort[] { new SOAPLocation("BioMOBYSOAPPort","http://mobycentral.cbr.nrc.ca:8090/authority/metadata"), new HTTPLocation("BioMOBYHTTPPort","mobycentral.cbr.nrc.ca",8090, "/authority/metadata" ) }; + return new LSIDMetadataPort[] { + new SOAPLocation("BioMOBYSOAPPort", "http://" + + properties.getProperty("lsid_domain") + ":" + + properties.getProperty("lsid_port") + + "/authority/metadata"), + new HTTPLocation("BioMOBYHTTPPort", properties.getProperty("lsid_domain"), + Integer.parseInt(properties.getProperty("lsid_port")), "/authority/metadata") }; } public LSIDDataPort[] getDataLocations(LSID lsid, String url) { @@ -56,24 +60,29 @@ } /* - * (non-Javadoc) + * (non-Javadoc) + * * @see com.ibm.lsid.server.LSIDAuthorityService#getAvailableServices(com.ibm.lsid.server.LSIDRequestContext) */ - public ExpiringResponse getAvailableServices(LSIDRequestContext ctx) throws LSIDServerException { + public ExpiringResponse getAvailableServices(LSIDRequestContext ctx) + throws LSIDServerException { LSID lsid = ctx.getLsid(); - String url = ctx.getReqUrl(); - try { - LSIDWSDLWrapper wsdl = new LSIDWSDLWrapper(lsid); - LSIDMetadataPort[] metaLocs = getMetadataLocations(lsid,url); - if (metaLocs != null) - for (int i = 0; i < metaLocs.length; ++i) { - wsdl.setMetadataLocation(metaLocs[i]); - } - return new ExpiringResponse(wsdl.toString(),getExpiration()); - } catch (LSIDException e) { - throw new LSIDServerException(e, e.getErrorCode(), "Simple Authority Error in getAvailableOperations(" + lsid + "): "); - } + String url = ctx.getReqUrl(); + try { + LSIDWSDLWrapper wsdl = new LSIDWSDLWrapper(lsid); + LSIDMetadataPort[] metaLocs = getMetadataLocations(lsid, url); + if (metaLocs != null) + for (int i = 0; i < metaLocs.length; ++i) { + wsdl.setMetadataLocation(metaLocs[i]); + } + return new ExpiringResponse(wsdl.toString(), getExpiration()); + } catch (LSIDException e) { + throw new LSIDServerException(e, e.getErrorCode(), + "Simple Authority Error in getAvailableOperations(" + lsid + + "): "); + } } + /* * (non-Javadoc) * @@ -83,4 +92,4 @@ throws LSIDServerException { lookup = new LSIDDataLookup(); } -} \ No newline at end of file +} =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/ui/graphical/servlet/lsid/authority/LSIDDataLookup.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/ui/graphical/servlet/lsid/authority/LSIDDataLookup.java 2005/04/07 16:42:26 1.1 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/ui/graphical/servlet/lsid/authority/LSIDDataLookup.java 2005/05/31 18:13:13 1.2 @@ -18,9 +18,11 @@ package org.biomoby.client.ui.graphical.servlet.lsid.authority; import java.io.IOException; import java.util.HashMap; +import java.util.Properties; import org.biomoby.client.rdf.builder.RDFConfigure; import org.biomoby.client.rdf.builder.ServiceInstanceRDF; +import org.biomoby.registry.properties.MobyProperties; import com.ibm.lsid.LSID; import com.ibm.lsid.server.LSIDServerException; @@ -43,6 +45,12 @@ public static final int MOBY_PREDICATE = 6; + private Properties mobycentral = MobyProperties.SERVICE_INSTANCE_PROPERTIES(); + private Properties mobyobject = MobyProperties.OBJECT_PROPERTIES(); + private Properties mobyservice = MobyProperties.SERVICE_PROPERTIES(); + private Properties mobynamespace = MobyProperties.NAMESPACE_PROPERTIES(); + private Properties mobyrelationship = MobyProperties.RELATIONSHIP_PROPERTIES(); + /** * 0 - object * 1 - namespace @@ -64,15 +72,15 @@ int result = UNKNOWN; System.err.println(lsid.toString()); String authority = lsid.getAuthority().getAuthority(); - if (!authority.equals("biomoby.org")) { - throw new LSIDServerException("Error in lsidType - Unknown LSID: " + lsid.getLsid()); - } if (ver != null || (ver != null && ver.length() != 0)) return UNKNOWN; - if (ns.equalsIgnoreCase("namespacetype")) { + if (ns.equalsIgnoreCase(mobynamespace.getProperty("lsid_namespace"))) { if (lsidLookup[1] == null) { + if (!authority.equals(mobynamespace.getProperty("lsid_authority"))) { + throw new LSIDServerException("Error in lsidType - Unknown LSID: " + lsid.getLsid()); + } try { lsidLookup[1] = new RDFConfigure(RDFConfigure.URI_NAMESPACE); } catch (IOException e) { @@ -82,8 +90,11 @@ if (lsidLookup[1].objectExists(lsid.getObject())) result = NAMESPACE_TYPE; } - else if (ns.equalsIgnoreCase("objectclass")) { + else if (ns.equalsIgnoreCase(mobyobject.getProperty("lsid_namespace"))) { if (lsidLookup[0] == null) { + if (!authority.equals(mobyobject.getProperty("lsid_authority"))) { + throw new LSIDServerException("Error in lsidType - Unknown LSID: " + lsid.getLsid()); + } try { lsidLookup[0] = new RDFConfigure(RDFConfigure.URI_OBJECT); } catch (IOException e) { @@ -93,8 +104,11 @@ if (lsidLookup[0].objectExists(lsid.getObject())) result = OBJECT_CLASS; } - else if (ns.equalsIgnoreCase("servicetype")) { + else if (ns.equalsIgnoreCase(mobyservice.getProperty("lsid_namespace"))) { if (lsidLookup[2] == null) { + if (!authority.equals(mobyservice.getProperty("lsid_authority"))) { + throw new LSIDServerException("Error in lsidType - Unknown LSID: " + lsid.getLsid()); + } try { lsidLookup[2] = new RDFConfigure(RDFConfigure.URI_SERVICE); } catch (IOException e) { @@ -117,11 +131,14 @@ return UNKNOWN; } - else if (ns.equalsIgnoreCase("serviceinstance")) { + else if (ns.equalsIgnoreCase(mobycentral.getProperty("lsid_namespace"))) { String str = lsid.getObject(); // make sure that the service instance is in the form // domain,serviceInstanceName if (lsidLookup[3] == null) { + if (!authority.equals(mobycentral.getProperty("lsid_authority"))) { + throw new LSIDServerException("Error in lsidType - Unknown LSID: " + lsid.getLsid()); + } try { lsidLookup[3] = new RDFConfigure(RDFConfigure.URI_ServiceINSTANCE); } catch (IOException e) { From kawas at pub.open-bio.org Tue May 31 18:15:14 2005 From: kawas at pub.open-bio.org (Eddie Kawas) Date: Tue, 31 May 2005 14:15:14 -0400 Subject: [MOBY-guts] biomoby commit Message-ID: <200505311815.j4VIFEXG006469@pub.open-bio.org> kawas Tue May 31 14:15:14 EDT 2005 Update of /home/repository/moby/moby-live/Java/src/main/org/biomoby/registry/properties In directory pub.open-bio.org:/tmp/cvs-serv6440/org/biomoby/registry/properties Modified Files: MobyProperties.java MobyCentralConfig.java Log Message: Made the properties more consistent with how Mark uses mobycentral.config in Perl. Eddie moby-live/Java/src/main/org/biomoby/registry/properties MobyProperties.java,1.1,1.2 MobyCentralConfig.java,1.2,1.3 =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/registry/properties/MobyProperties.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/registry/properties/MobyProperties.java 2005/04/07 16:42:26 1.1 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/registry/properties/MobyProperties.java 2005/05/31 18:15:14 1.2 @@ -31,8 +31,12 @@ package org.biomoby.registry.properties; import java.io.IOException; +import java.util.HashMap; +import java.util.Map; import java.util.Properties; +import org.biomoby.shared.MobyException; + /** * @author Eddie Kawas *

    This class was created to provide classes that depend on external variables a way to retrieve these variables. @@ -51,10 +55,110 @@ */ public final static Properties PROPERTIES() { try { - properties.load(MobyProperties.class.getClassLoader().getResourceAsStream("org/biomoby/client/properties/biomoby.properties")); + properties.load(MobyProperties.class.getClassLoader().getResourceAsStream("org/biomoby/registry/properties/biomoby.properties")); } catch (IOException e) { System.err.println("Biomoby properties file cannot be found!"); } return properties; } + + /** + * + * Retrieve the properties for [mobyobject] in mobycentral.conf + *

    PRE:The file org/biomoby/registry/properties/biomoby.properties exists and is valid. + *

    POST:The properties contained in mobycentral.conf for [mobyobject] are returned in a Properties object. + * @return Properties contained in the mobycentral.conf file. + */ + public final static Properties OBJECT_PROPERTIES() { + Map map = new HashMap(); + try { + map = MobyCentralConfig.getMobyObject(); + } catch (MobyException e) { + System.err.println("Error retrieving Moby Object Properties.\n" + e); + } + Properties p = new Properties(); + p.putAll(map); + return p; + } + + /** + * + * Retrieve the properties for [mobycentral] in mobycentral.conf + *

    PRE:The file org/biomoby/registry/properties/biomoby.properties exists and is valid. + *

    POST:The properties contained in mobycentral.conf for [mobycentral] are returned in a Properties object. + * @return Properties contained in the mobycentral.conf file. + */ + public final static Properties SERVICE_INSTANCE_PROPERTIES() { + Map map = new HashMap(); + try { + map = MobyCentralConfig.getMobyCentral(); + } catch (MobyException e) { + System.err.println("Error retrieving Moby Service Instance Properties.\n" + e); + } + Properties p = new Properties(); + p.putAll(map); + return p; + } + + /** + * + * Retrieve the properties for [mobyservice] in mobycentral.conf + *

    PRE:The file org/biomoby/registry/properties/biomoby.properties exists and is valid. + *

    POST:The properties contained in mobycentral.conf for [mobyservice] are returned in a Properties object. + * @return Properties contained in the mobycentral.conf file. + */ + public final static Properties SERVICE_PROPERTIES() { + Map map = new HashMap(); + try { + map = MobyCentralConfig.getMobyService(); + } catch (MobyException e) { + System.err.println("Error retrieving Moby Service Properties.\n" + e); + } + Properties p = new Properties(); + p.putAll(map); + return p; + } + + /** + * + * Retrieve the properties for [mobynamespace] in mobycentral.conf + *

    PRE:The file org/biomoby/registry/properties/biomoby.properties exists and is valid. + *

    POST:The properties contained in mobycentral.conf for [mobynamespace] are returned in a Properties object. + * @return Properties contained in the mobycentral.conf file. + */ + public final static Properties NAMESPACE_PROPERTIES() { + Map map = new HashMap(); + try { + map = MobyCentralConfig.getMobyNamespace(); + } catch (MobyException e) { + System.err.println("Error retrieving Moby Namespace Properties.\n" + e); + } + Properties p = new Properties(); + p.putAll(map); + return p; + } + + /** + * + * Retrieve the properties for [mobyrelationship] in mobycentral.conf + *

    PRE:The file org/biomoby/registry/properties/biomoby.properties exists and is valid. + *

    POST:The properties contained in mobycentral.conf for [mobyrelationship] are returned in a Properties object. + * @return Properties contained in the mobycentral.conf file. + */ + public final static Properties RELATIONSHIP_PROPERTIES() { + Map map = new HashMap(); + try { + map = MobyCentralConfig.getMobyRelationship(); + } catch (MobyException e) { + System.err.println("Error retrieving Moby Relationship Properties.\n" + e); + } + Properties p = new Properties(); + p.putAll(map); + return p; + } + + /* a little test method*/ + public static void main(String[] args) { + System.out.println(NAMESPACE_PROPERTIES()); + } } =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/registry/properties/MobyCentralConfig.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- /home/repository/moby/moby-live/Java/src/main/org/biomoby/registry/properties/MobyCentralConfig.java 2005/04/20 21:42:10 1.2 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/registry/properties/MobyCentralConfig.java 2005/05/31 18:15:14 1.3 @@ -127,7 +127,6 @@ String key = parse(line, 1); String value = parse(line, 2); map.put(key, value); - System.out.println(key+"->"+value); } } }